diff mbox

[U-Boot,RFC,2/4] Use ALL-y style instead of ifeq blocks for better readability and upgradeability

Message ID 1309883182-12854-3-git-send-email-daniel.schwierzeck@googlemail.com
State Superseded, archived
Headers show

Commit Message

Daniel Schwierzeck July 5, 2011, 4:26 p.m. UTC
[daniel.schwierzeck@googlemail.com:
1. changed all appendings of ALL target in several config.mk files
   as Mike Frysinger suggested
]

Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck@googlemail.com>
---
 Makefile                       |   18 +++++-------------
 arch/blackfin/config.mk        |    2 +-
 board/pcs440ep/config.mk       |    2 +-
 board/spear/spear300/config.mk |    2 +-
 board/spear/spear310/config.mk |    2 +-
 board/spear/spear320/config.mk |    2 +-
 board/spear/spear600/config.mk |    2 +-
 7 files changed, 11 insertions(+), 19 deletions(-)

Comments

Mike Frysinger July 5, 2011, 5:53 p.m. UTC | #1
Acked-by: Mike Frysinger <vapier@gentoo.org>
-mike
Wolfgang Denk July 8, 2011, 9:12 a.m. UTC | #2
Dear Daniel Schwierzeck,

In message <1309883182-12854-3-git-send-email-daniel.schwierzeck@googlemail.com> you wrote:
> [daniel.schwierzeck@googlemail.com:
> 1. changed all appendings of ALL target in several config.mk files
>    as Mike Frysinger suggested
> ]

Please omit this '[...]' stuff for the real commits, then.

Else:

Acked-by: Wolfgang Denk <wd@denx.de>

Best regards,

Wolfgang Denk
Aneesh V July 8, 2011, 10:28 a.m. UTC | #3
Dear Wolfgang,

On Friday 08 July 2011 02:42 PM, Wolfgang Denk wrote:
> Dear Daniel Schwierzeck,
>
> In message<1309883182-12854-3-git-send-email-daniel.schwierzeck@googlemail.com>  you wrote:
>> [daniel.schwierzeck@googlemail.com:
>> 1. changed all appendings of ALL target in several config.mk files
>>     as Mike Frysinger suggested
>> ]
>
> Please omit this '[...]' stuff for the real commits, then.
>

In patches 1 and 3 of this series I had done some modifications on top
of Daniel's original work. So, I mentioned my changes in [...]. Hope
that is fine?

best regards,
Aneesh
Wolfgang Denk July 8, 2011, 11:20 a.m. UTC | #4
Dear Aneesh V,

In message <4E16DBB9.3090803@ti.com> you wrote:
> 
> > Please omit this '[...]' stuff for the real commits, then.
> >
> 
> In patches 1 and 3 of this series I had done some modifications on top
> of Daniel's original work. So, I mentioned my changes in [...]. Hope
> that is fine?

For the final commits, we should get rid of this stuff in the commit
messages.  It should be sufficient if you both add your SoB lines.

Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/Makefile b/Makefile
index e56fa02..8833f4b 100644
--- 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 $< $@
diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk
index 71fd53f..f9d46de 100644
--- a/arch/blackfin/config.mk
+++ b/arch/blackfin/config.mk
@@ -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
diff --git a/board/pcs440ep/config.mk b/board/pcs440ep/config.mk
index 23631c5..f560ec6 100644
--- a/board/pcs440ep/config.mk
+++ b/board/pcs440ep/config.mk
@@ -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
 
diff --git a/board/spear/spear300/config.mk b/board/spear/spear300/config.mk
index 11da2c3..5848ef8 100644
--- a/board/spear/spear300/config.mk
+++ b/board/spear/spear300/config.mk
@@ -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)
diff --git a/board/spear/spear310/config.mk b/board/spear/spear310/config.mk
index 2b59c39..f8a6bdb 100644
--- a/board/spear/spear310/config.mk
+++ b/board/spear/spear310/config.mk
@@ -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)
diff --git a/board/spear/spear320/config.mk b/board/spear/spear320/config.mk
index 2b59c39..f8a6bdb 100644
--- a/board/spear/spear320/config.mk
+++ b/board/spear/spear320/config.mk
@@ -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)
diff --git a/board/spear/spear600/config.mk b/board/spear/spear600/config.mk
index 11da2c3..5848ef8 100644
--- a/board/spear/spear600/config.mk
+++ b/board/spear/spear600/config.mk
@@ -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)