From b9a5d1f54fc7a5dcc0753e5c1ec86669c25e89c6 Mon Sep 17 00:00:00 2001 From: Jarkko Sakkinen Date: Wed, 9 May 2012 23:25:06 +0300 Subject: [PATCH] --- yaml --- r: 309163 b: refs/heads/master c: c5403aed044e23f8d1ecdf05d0ff120314186527 h: refs/heads/master i: 309161: 3a412e8dc605ec0833a6b6603def45b43fcba44f 309159: e6eba2271295583e0c8ca4937fd47bf46ff45356 v: v3 --- [refs] | 2 +- trunk/arch/x86/realmode/Makefile | 5 +---- trunk/arch/x86/realmode/rm/Makefile | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c66f07096437..a8eb1cf4a55c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cda846f101fb1396b6924f1d9b68ac3d42de5403 +refs/heads/master: c5403aed044e23f8d1ecdf05d0ff120314186527 diff --git a/trunk/arch/x86/realmode/Makefile b/trunk/arch/x86/realmode/Makefile index f22a4f8d99d6..a05b3aca64ad 100644 --- a/trunk/arch/x86/realmode/Makefile +++ b/trunk/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/trunk/arch/x86/realmode/rm/Makefile b/trunk/arch/x86/realmode/rm/Makefile index de40bc44b92f..1c1d3d3bbee4 100644 --- a/trunk/arch/x86/realmode/rm/Makefile +++ b/trunk/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 $@