diff options
| author | Jarkko Sakkinen <jarkko.sakkinen@intel.com> | 2012-05-09 22:25:06 +0200 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-05-09 22:32:17 +0200 |
| commit | c5403aed044e23f8d1ecdf05d0ff120314186527 (patch) | |
| tree | 7c0a3dbfd8a75bbbf48ba581aaed2fef0581f040 /arch/x86/realmode | |
| parent | x86, realmode: read cr4 and EFER from kernel for 64-bit trampoline (diff) | |
| download | linux-c5403aed044e23f8d1ecdf05d0ff120314186527.tar.xz linux-c5403aed044e23f8d1ecdf05d0ff120314186527.zip | |
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>
Diffstat (limited to 'arch/x86/realmode')
| -rw-r--r-- | arch/x86/realmode/Makefile | 5 | ||||
| -rw-r--r-- | 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 f22a4f8d99d6..a05b3aca64ad 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 de40bc44b92f..1c1d3d3bbee4 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 $@ |