[U-Boot] [PATCH] Makefile: remove tx25 exception

[U-Boot] [PATCH] Makefile: remove tx25 exception

[Stefano Babic]

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(-)

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
-- 
1.7.1

[U-Boot] [PATCH] Makefile: remove tx25 exception

[Wolfgang Denk]

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

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
In accord with UNIX philosophy, Perl gives you enough  rope  to  hang
yourself.              - L. Wall & R. L. Schwartz, _Programming Perl_

[U-Boot] [PATCH] Makefile: remove tx25 exception

[Stefano Babic]

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

-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================

[U-Boot] [PATCH] Makefile: remove tx25 exception

[Wolfgang Denk]

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

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"There are three principal ways to lose money: wine, women, and engi-
neers. While the first two are more pleasant, the third is by far the
more certain."                           - Baron Rothschild, ca. 1800

[U-Boot] [PATCH] Makefile: remove tx25 exception

[Wolfgang Denk]

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

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"How is this place run - is it an anarchy?"
"No, I wouldn't say so; it is not that well organised..."