summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-01-13 21:05:52 +0100
committerWolfgang Denk <wd@denx.de>2008-01-13 23:36:06 +0100
commitdd531aac34aaad138f16cacdb51d61908d59c0e2 (patch)
treead8b12d1f9b73a071c3ae048a389a05326c7eb32
parent89967841e3ea02e3d0e5e1295ab687576e5b1089 (diff)
downloadu-boot-imx-dd531aac34aaad138f16cacdb51d61908d59c0e2.zip
u-boot-imx-dd531aac34aaad138f16cacdb51d61908d59c0e2.tar.gz
u-boot-imx-dd531aac34aaad138f16cacdb51d61908d59c0e2.tar.bz2
Fix Makefile dependency problem with parallel builds.
Signed-off-by: Wolfgang Denk <wd@denx.de>
-rw-r--r--Makefile13
1 files changed, 6 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index eba9333..8a888b9 100644
--- a/Makefile
+++ b/Makefile
@@ -309,26 +309,25 @@ $(obj)u-boot.sha1: $(obj)u-boot.bin
$(obj)u-boot.dis: $(obj)u-boot
$(OBJDUMP) -d $< > $@
-$(obj)u-boot: depend $(obj)include/autoconf.mk \
- $(SUBDIRS) $(OBJS) $(LIBS) $(LDSCRIPT)
+$(obj)u-boot: depend $(SUBDIRS) $(OBJS) $(LIBS) $(LDSCRIPT)
UNDEF_SYM=`$(OBJDUMP) -x $(LIBS) |sed -n -e 's/.*\(__u_boot_cmd_.*\)/-u\1/p'|sort|uniq`;\
cd $(LNDIR) && $(LD) $(LDFLAGS) $$UNDEF_SYM $(__OBJS) \
--start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \
-Map u-boot.map -o u-boot
-$(OBJS):
+$(OBJS): $(obj)include/autoconf.mk
$(MAKE) -C cpu/$(CPU) $(if $(REMOTE_BUILD),$@,$(notdir $@))
-$(LIBS):
+$(LIBS): $(obj)include/autoconf.mk
$(MAKE) -C $(dir $(subst $(obj),,$@))
-$(SUBDIRS):
+$(SUBDIRS): $(obj)include/autoconf.mk
$(MAKE) -C $@ all
-$(NAND_SPL): $(VERSION_FILE)
+$(NAND_SPL): $(VERSION_FILE) $(obj)include/autoconf.mk
$(MAKE) -C nand_spl/board/$(BOARDDIR) all
-$(U_BOOT_NAND): $(NAND_SPL) $(obj)u-boot.bin
+$(U_BOOT_NAND): $(NAND_SPL) $(obj)u-boot.bin $(obj)include/autoconf.mk
cat $(obj)nand_spl/u-boot-spl-16k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin
$(VERSION_FILE):