diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-01-14 10:48:28 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-01-14 10:48:28 +0100 |
| commit | 5dd372a23d12003276dddf7f9604154fd522ae73 (patch) | |
| tree | 2412e88bbf804e74759ef0793d67064b76b8ab1a /Makefile | |
| parent | 06c428bcd4413014b43236e77765022071424fa6 (diff) | |
| parent | a0dd99d51efa55fe023e19c97ead92683725eb11 (diff) | |
| download | u-boot-imx-5dd372a23d12003276dddf7f9604154fd522ae73.zip u-boot-imx-5dd372a23d12003276dddf7f9604154fd522ae73.tar.gz u-boot-imx-5dd372a23d12003276dddf7f9604154fd522ae73.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 6 insertions, 7 deletions
@@ -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): |