]> git.sur5r.net Git - u-boot/commitdiff
Use ALL-y style instead of ifeq blocks for better readability
authorDaniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Wed, 13 Jul 2011 05:11:01 +0000 (05:11 +0000)
committerWolfgang Denk <wd@denx.de>
Tue, 26 Jul 2011 12:41:43 +0000 (14:41 +0200)
Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
Makefile
arch/blackfin/config.mk
board/pcs440ep/config.mk
board/spear/spear300/config.mk
board/spear/spear310/config.mk
board/spear/spear320/config.mk
board/spear/spear600/config.mk

index e56fa02b2c1e4356cd934ecda61bc9b383deb5f1..62c2078d45095ea49e9790a6447acebfc31abb9f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -341,22 +341,14 @@ BOARD_SIZE_CHECK =
 endif
 
 # Always append ALL so that arch config.mk's can add custom ones
-ALL += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map
+ALL-y += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map
 
-ifeq ($(CONFIG_NAND_U_BOOT),y)
-ALL += $(obj)u-boot-nand.bin
-endif
-
-ifeq ($(CONFIG_ONENAND_U_BOOT),y)
-ALL += $(obj)u-boot-onenand.bin
+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
-endif
-
-ifeq ($(CONFIG_MMC_U_BOOT),y)
-ALL += $(obj)mmc_spl/u-boot-mmc-spl.bin
-endif
+ALL-$(CONFIG_MMC_U_BOOT) += $(obj)mmc_spl/u-boot-mmc-spl.bin
 
-all:           $(ALL)
+all:           $(ALL-y)
 
 $(obj)u-boot.hex:      $(obj)u-boot
                $(OBJCOPY) ${OBJCFLAGS} -O ihex $< $@
@@ -1096,7 +1088,7 @@ clobber:  clean
                | xargs -0 rm -f
        @rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS \
                $(obj)cscope.* $(obj)*.*~
-       @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL)
+       @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL-y)
        @rm -f $(obj)u-boot.kwb
        @rm -f $(obj)u-boot.imx
        @rm -f $(obj)tools/{env/crc32.c,inca-swap-bytes}
index 71fd53fba61efa5ac357babdea3c1429ca1b81be..f9d46de23167ee86b8b14e44732315067cf0356b 100644 (file)
@@ -44,7 +44,7 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
 PLATFORM_RELFLAGS += -mcpu=$(CONFIG_BFIN_CPU)
 
 ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
-ALL += $(obj)u-boot.ldr
+ALL-y += $(obj)u-boot.ldr
 endif
 ifeq ($(CONFIG_ENV_IS_EMBEDDED_IN_LDR),y)
 CREATE_LDR_ENV = $(obj)tools/envcrc --binary > $(obj)env-ldr.o
index 23631c510b88b2eaa8db488f11737a7c2c2318ef..f560ec639f265c7621503bf50f6c1f0a2d6de1fa 100644 (file)
@@ -26,7 +26,7 @@
 #
 
 # Check the U-Boot Image with a SHA1 checksum
-ALL += $(obj)u-boot.sha1
+ALL-y += $(obj)u-boot.sha1
 
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 
index 11da2c33384f41c84eb1e50eb7716f213279a6a9..5848ef89f89c5ae749c714f458c1e9e458019470 100644 (file)
@@ -25,7 +25,7 @@
 
 CONFIG_SYS_TEXT_BASE = 0x00700000
 
-ALL += $(obj)u-boot.img
+ALL-y += $(obj)u-boot.img
 
 # Environment variables in NAND
 ifeq ($(ENV),NAND)
index 2b59c39e7a279aadfe885a529c9aa21f367ce29f..f8a6bdb976ca1c08894099c6207581bb24ebd44e 100644 (file)
@@ -25,7 +25,7 @@
 
 CONFIG_SYS_TEXT_BASE = 0x00700000
 
-ALL += $(obj)u-boot.img
+ALL-y += $(obj)u-boot.img
 
 # Environment variables in NAND
 ifeq ($(ENV),NAND)
index 2b59c39e7a279aadfe885a529c9aa21f367ce29f..f8a6bdb976ca1c08894099c6207581bb24ebd44e 100644 (file)
@@ -25,7 +25,7 @@
 
 CONFIG_SYS_TEXT_BASE = 0x00700000
 
-ALL += $(obj)u-boot.img
+ALL-y += $(obj)u-boot.img
 
 # Environment variables in NAND
 ifeq ($(ENV),NAND)
index 11da2c33384f41c84eb1e50eb7716f213279a6a9..5848ef89f89c5ae749c714f458c1e9e458019470 100644 (file)
@@ -25,7 +25,7 @@
 
 CONFIG_SYS_TEXT_BASE = 0x00700000
 
-ALL += $(obj)u-boot.img
+ALL-y += $(obj)u-boot.img
 
 # Environment variables in NAND
 ifeq ($(ENV),NAND)