diff mbox

[U-Boot] Makefile: remove tx25 exception

Message ID 1314629830-32588-1-git-send-email-sbabic@denx.de
State Accepted
Delegated to: Wolfgang Denk
Headers show

Commit Message

Stefano Babic Aug. 29, 2011, 2:57 p.m. UTC
An entry in the main Makefile for the tx25 board is not
necessary, and the board is added to boards.cfg as all
other targets.

Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Wolfgang Denk <wd@denx.de>
---
 Makefile   |    4 ----
 boards.cfg |    1 +
 2 files changed, 1 insertions(+), 4 deletions(-)

Comments

Wolfgang Denk Aug. 29, 2011, 7:59 p.m. UTC | #1
Dear Stefano Babic,

In message <1314629830-32588-1-git-send-email-sbabic@denx.de> you wrote:
> An entry in the main Makefile for the tx25 board is not
> necessary, and the board is added to boards.cfg as all
> other targets.

In theorey you are right, but this patch appears to be wrong:

> -tx25_config	: unconfig
> -	@echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
> -	@$(MKCONFIG) $@ arm arm926ejs tx25 karo mx25

The Makefile defined CONFIG_NAND_U_BOOT

> +tx25                         arm         arm926ejs   tx25                karo           mx25

This new entry fails to do that.   Please make sure to add NAND_U_BOOT
in the "Options" column.

Best regards,

Wolfgang Denk
Stefano Babic Aug. 30, 2011, 9:30 a.m. UTC | #2
On 08/29/2011 09:59 PM, Wolfgang Denk wrote:
> Dear Stefano Babic,
> 
> In message <1314629830-32588-1-git-send-email-sbabic@denx.de> you wrote:
>> An entry in the main Makefile for the tx25 board is not
>> necessary, and the board is added to boards.cfg as all
>> other targets.
> 
> In theorey you are right, but this patch appears to be wrong:
> 
>> -tx25_config	: unconfig
>> -	@echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
>> -	@$(MKCONFIG) $@ arm arm926ejs tx25 karo mx25
> 
> The Makefile defined CONFIG_NAND_U_BOOT

In principle you are right, too, but in include/configs/tx25.h:

/* NAND BOOT is the only boot method */
#define CONFIG_NAND_U_BOOT

CONFIG_NAND_U_BOOT is always defined for this board. No idea because
there is a special rule in Makefile.

> 
>> +tx25                         arm         arm926ejs   tx25                karo           mx25
> 
> This new entry fails to do that.   Please make sure to add NAND_U_BOOT
> in the "Options" column.

I do not think we need it, because it is already defined in the config.h.

Best regards,
Stefano Babic
Wolfgang Denk Aug. 30, 2011, 9:38 a.m. UTC | #3
Dear Stefano Babic,

In message <4E5CADA8.1030006@denx.de> you wrote:
>
> In principle you are right, too, but in include/configs/tx25.h:
> 
> /* NAND BOOT is the only boot method */
> #define CONFIG_NAND_U_BOOT

Ah, I see.

> I do not think we need it, because it is already defined in the config.h.

You are right.  Thanks for pointing out.

Best regards,

Wolfgang Denk
Wolfgang Denk Oct. 5, 2011, 6:45 p.m. UTC | #4
Dear Stefano Babic,

In message <1314629830-32588-1-git-send-email-sbabic@denx.de> you wrote:
> An entry in the main Makefile for the tx25 board is not
> necessary, and the board is added to boards.cfg as all
> other targets.
> 
> Signed-off-by: Stefano Babic <sbabic@denx.de>
> CC: Wolfgang Denk <wd@denx.de>
> ---
>  Makefile   |    4 ----
>  boards.cfg |    1 +
>  2 files changed, 1 insertions(+), 4 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/Makefile b/Makefile
index 676dc29..2166644 100644
--- a/Makefile
+++ b/Makefile
@@ -847,10 +847,6 @@  SX1_config:		unconfig
 	fi;
 	@$(MKCONFIG) -n $@ SX1 arm arm925t sx1
 
-tx25_config	: unconfig
-	@echo "CONFIG_NAND_U_BOOT = y" >> $(obj)include/config.mk
-	@$(MKCONFIG) $@ arm arm926ejs tx25 karo mx25
-
 edb9301_config \
 edb9302_config \
 edb9302a_config \
diff --git a/boards.cfg b/boards.cfg
index c31114d..6585163 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -162,6 +162,7 @@  rd6281a                      arm         arm926ejs   -                   Marvell
 sheevaplug                   arm         arm926ejs   -                   Marvell        kirkwood
 dockstar                     arm         arm926ejs   -                   Seagate        kirkwood
 jadecpu                      arm         arm926ejs   jadecpu             syteco         mb86r0x
+tx25                         arm         arm926ejs   tx25                karo           mx25
 zmx25                        arm         arm926ejs   zmx25               syteco         mx25
 imx27lite                    arm         arm926ejs   imx27lite           logicpd        mx27
 magnesium                    arm         arm926ejs   imx27lite           logicpd        mx27