]> git.sur5r.net Git - u-boot/commitdiff
Hook SPL build-system into toplevel Makefile
authorDaniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Wed, 13 Jul 2011 05:11:04 +0000 (05:11 +0000)
committerWolfgang Denk <wd@denx.de>
Tue, 26 Jul 2011 12:43:04 +0000 (14:43 +0200)
Signed-off-by: Aneesh V <aneesh@ti.com>
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Makefile

index 947805912d4d2b192f018ad32d5de0e0ab5690fc..0707036699a2fe5bc5ae9ece1abd91a09d11afe3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -348,6 +348,7 @@ ALL-$(CONFIG_NAND_U_BOOT) += $(obj)u-boot-nand.bin
 ALL-$(CONFIG_ONENAND_U_BOOT) += $(obj)u-boot-onenand.bin
 ONENAND_BIN ?= $(obj)onenand_ipl/onenand-ipl-2k.bin
 ALL-$(CONFIG_MMC_U_BOOT) += $(obj)mmc_spl/u-boot-mmc-spl.bin
+ALL-$(CONFIG_SPL) += $(obj)spl/u-boot-spl.bin
 
 all:           $(ALL-y)
 
@@ -445,6 +446,9 @@ mmc_spl:    $(TIMESTAMP_FILE) $(VERSION_FILE) depend
 
 $(obj)mmc_spl/u-boot-mmc-spl.bin:      mmc_spl
 
+$(obj)spl/u-boot-spl.bin:              depend
+               $(MAKE) -C spl all
+
 $(TIMESTAMP_FILE):
                @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@
                @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@
@@ -1076,6 +1080,7 @@ clean:
        @rm -f $(obj)mmc_spl/{u-boot.lds,u-boot-spl,u-boot-spl.map,u-boot-spl.bin,u-boot-mmc-spl.bin}
        @rm -f $(ONENAND_BIN)
        @rm -f $(obj)onenand_ipl/u-boot.lds
+       @rm -f $(obj)spl/{u-boot-spl,u-boot-spl.bin,u-boot-spl.lds,u-boot-spl.map}
        @rm -f $(TIMESTAMP_FILE) $(VERSION_FILE)
        @find $(OBJTREE) -type f \
                \( -name 'core' -o -name '*.bak' -o -name '*~' \