Commit c5403aed authored by Jarkko Sakkinen's avatar Jarkko Sakkinen Committed by H. Peter Anvin

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: default avatarJarkko 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: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent cda846f1
...@@ -11,10 +11,7 @@ subdir- := rm ...@@ -11,10 +11,7 @@ subdir- := rm
obj-y += rmpiggy.o 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 $(obj)/rm/realmode.bin: FORCE
$(Q)$(MAKE) $(build)=$(obj)/rm $@ $(Q)$(MAKE) $(build)=$(obj)/rm $@
$(obj)/rm/realmode.relocs: FORCE
$(Q)$(MAKE) $(build)=$(obj)/rm $@
...@@ -48,7 +48,7 @@ $(obj)/realmode.elf: $(obj)/realmode.lds $(REALMODE_OBJS) FORCE ...@@ -48,7 +48,7 @@ $(obj)/realmode.elf: $(obj)/realmode.lds $(REALMODE_OBJS) FORCE
OBJCOPYFLAGS_realmode.bin := -O binary OBJCOPYFLAGS_realmode.bin := -O binary
$(obj)/realmode.bin: $(obj)/realmode.elf $(obj)/realmode.bin: $(obj)/realmode.elf $(obj)/realmode.relocs
$(call if_changed,objcopy) $(call if_changed,objcopy)
quiet_cmd_relocs = RELOCS $@ quiet_cmd_relocs = RELOCS $@
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment