From: tip-bot for Jarkko Sakkinen <jarkko.sakkinen@intel.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org,
sam@ravnborg.org, mmarek@suse.cz, jarkko.sakkinen@intel.com,
tglx@linutronix.de, hpa@linux.intel.com
Subject: [tip:x86/trampoline] x86, realmode: build fix: remove duplicate build
Date: Wed, 9 May 2012 15:01:53 -0700 [thread overview]
Message-ID: <tip-c5403aed044e23f8d1ecdf05d0ff120314186527@git.kernel.org> (raw)
In-Reply-To: <1336595106-21135-1-git-send-email-jarkko.sakkinen@intel.com>
Commit-ID: c5403aed044e23f8d1ecdf05d0ff120314186527
Gitweb: http://git.kernel.org/tip/c5403aed044e23f8d1ecdf05d0ff120314186527
Author: Jarkko Sakkinen <jarkko.sakkinen@intel.com>
AuthorDate: Wed, 9 May 2012 23:25:06 +0300
Committer: H. Peter Anvin <hpa@linux.intel.com>
CommitDate: Wed, 9 May 2012 13:32:17 -0700
x86, realmode: build fix: remove duplicate build
Real-mode binary was built twice. This patch fixes
the issue by making realmode.relocs as target for
realmode.bin.
[ hpa: removed the direct dependency on realmode.relocs in
arch/x86/realmode/Makefile ]
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@intel.com>
Link: http://lkml.kernel.org/r/1336595106-21135-1-git-send-email-jarkko.sakkinen@intel.com
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Michal Marek <mmarek@suse.cz>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
arch/x86/realmode/Makefile | 5 +----
arch/x86/realmode/rm/Makefile | 2 +-
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/arch/x86/realmode/Makefile b/arch/x86/realmode/Makefile
index f22a4f8..a05b3ac 100644
--- a/arch/x86/realmode/Makefile
+++ b/arch/x86/realmode/Makefile
@@ -11,10 +11,7 @@ subdir- := rm
obj-y += rmpiggy.o
-$(obj)/rmpiggy.o: $(obj)/rm/realmode.relocs $(obj)/rm/realmode.bin
+$(obj)/rmpiggy.o: $(obj)/rm/realmode.bin
$(obj)/rm/realmode.bin: FORCE
$(Q)$(MAKE) $(build)=$(obj)/rm $@
-
-$(obj)/rm/realmode.relocs: FORCE
- $(Q)$(MAKE) $(build)=$(obj)/rm $@
diff --git a/arch/x86/realmode/rm/Makefile b/arch/x86/realmode/rm/Makefile
index de40bc4..1c1d3d3 100644
--- a/arch/x86/realmode/rm/Makefile
+++ b/arch/x86/realmode/rm/Makefile
@@ -48,7 +48,7 @@ $(obj)/realmode.elf: $(obj)/realmode.lds $(REALMODE_OBJS) FORCE
OBJCOPYFLAGS_realmode.bin := -O binary
-$(obj)/realmode.bin: $(obj)/realmode.elf
+$(obj)/realmode.bin: $(obj)/realmode.elf $(obj)/realmode.relocs
$(call if_changed,objcopy)
quiet_cmd_relocs = RELOCS $@
next prev parent reply other threads:[~2012-05-09 22:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-09 20:25 [PATCH] x86, realmode: build fix: remove duplicate build Jarkko Sakkinen
2012-05-09 22:01 ` tip-bot for Jarkko Sakkinen [this message]
2012-05-09 22:02 ` [tip:x86/trampoline] x86, realmode: Make sure all generated files are listed in targets tip-bot for H. Peter Anvin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-c5403aed044e23f8d1ecdf05d0ff120314186527@git.kernel.org \
--to=jarkko.sakkinen@intel.com \
--cc=hpa@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=mmarek@suse.cz \
--cc=sam@ravnborg.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox