[U-Boot] [PATCH] Fix define for MPC5121 ADS board.

[U-Boot] [PATCH] Fix define for MPC5121 ADS board.

[mark.vels at team-embedded.nl]

Originally the Makefile defines CONFIG_ADS5121_REV2 when configuring
for board mpc5121ads_rev2. The config in include/configs/mpc5121ads.h
expects a define CONFIG_MPC5121ADS_REV2 for this.
Therefore there are two defines used but only 1 is defined.
This patch renames references to CONFIG_ADS5121_REV2 to CONFIG_MPC5121ADS_REV2
to have one common define.

This patch fixes faulty mem size detection caused by wrong config in
include/configs/mpc5121ads.h

Signed-off-by: Mark Vels <mark.vels@team-embedded.nl>
---
 Makefile                                |    2 +-
 board/freescale/mpc5121ads/mpc5121ads.c |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 8df60fa..de4ceb9 100644
--- a/Makefile
+++ b/Makefile
@@ -700,7 +700,7 @@ mpc5121ads_rev2_config	\
 	: unconfig
 	@mkdir -p $(obj)include
 	@if [ "$(findstring rev2,$@)" ] ; then \
-		echo "#define CONFIG_ADS5121_REV2 1" > $(obj)include/config.h; \
+		echo "#define CONFIG_MPC5121ADS_REV2 1" > $(obj)include/config.h; \
 	fi
 	@$(MKCONFIG) -n $@ -a mpc5121ads powerpc mpc512x mpc5121ads freescale
 
diff --git a/board/freescale/mpc5121ads/mpc5121ads.c b/board/freescale/mpc5121ads/mpc5121ads.c
index a84644d..8cc6853 100644
--- a/board/freescale/mpc5121ads/mpc5121ads.c
+++ b/board/freescale/mpc5121ads/mpc5121ads.c
@@ -102,7 +102,7 @@ int board_early_init_f(void)
 	 * write commands in order to establish the device ID.
 	 */
 
-#ifdef CONFIG_ADS5121_REV2
+#ifdef CONFIG_MPC5121ADS_REV2
 	out_8((u8 *)(CONFIG_SYS_CPLD_BASE + 0x08), 0xC1);
 #else
 	if (in_8((u8 *)(CONFIG_SYS_CPLD_BASE + 0x08)) & 0x04) {
@@ -329,7 +329,7 @@ int checkboard (void)
 	volatile immap_t *im = (immap_t *) CONFIG_SYS_IMMR;
 	u32 spridr = in_be32(&im->sysconf.spridr);
 
-	printf ("Board: ADS5121 rev. 0x%04x (CPLD rev. 0x%02x)\n",
+	printf ("Board: MPC5121ADS rev. 0x%04x (CPLD rev. 0x%02x)\n",
 		brd_rev, cpld_rev);
 
 	/* initialize function mux & slew rate IO inter alia on IO Pins  */
-- 
1.7.0.4

[U-Boot] [PATCH] Fix define for MPC5121 ADS board.

[Wolfgang Denk]

Dear mark.vels at team-embedded.nl,

In message <1286293579-26587-1-git-send-email-mark.vels@team-embedded.nl> you wrote:
> Originally the Makefile defines CONFIG_ADS5121_REV2 when configuring
> for board mpc5121ads_rev2. The config in include/configs/mpc5121ads.h
> expects a define CONFIG_MPC5121ADS_REV2 for this.
> Therefore there are two defines used but only 1 is defined.
> This patch renames references to CONFIG_ADS5121_REV2 to CONFIG_MPC5121ADS_REV2
> to have one common define.
> 
> This patch fixes faulty mem size detection caused by wrong config in
> include/configs/mpc5121ads.h

Thanks. But... should we not rather drop that code completely?  I
guess the number of remaining Rev. 2 boards should be epsilon.  Do you
think these veterans are still in use anywhere?

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
Brain fried - Core dumped

[U-Boot] [PATCH] Fix define for MPC5121 ADS board.

[Mark Vels]

Dear Wolfgang,

On 05/10/10 20:21, Wolfgang Denk wrote:
> Dear mark.vels at team-embedded.nl,
> 
> In message <1286293579-26587-1-git-send-email-mark.vels@team-embedded.nl> you wrote:
>> Originally the Makefile defines CONFIG_ADS5121_REV2 when configuring
>> for board mpc5121ads_rev2. The config in include/configs/mpc5121ads.h
>> expects a define CONFIG_MPC5121ADS_REV2 for this.
>> Therefore there are two defines used but only 1 is defined.
>> This patch renames references to CONFIG_ADS5121_REV2 to CONFIG_MPC5121ADS_REV2
>> to have one common define.
>>
>> This patch fixes faulty mem size detection caused by wrong config in
>> include/configs/mpc5121ads.h
> 
> Thanks. But... should we not rather drop that code completely?  I
> guess the number of remaining Rev. 2 boards should be epsilon.  Do you
> think these veterans are still in use anywhere?

Hehe, well there is at least the one rev 2 board that I got from the customer on my desk at the moment. That's why I
tried to build and execute this config.

I really can't tell if there are many more around so I'd like to leave it up to the experts if it is necessary to keep
the code in. I am really glad though that it still is right now because it would have costed me a considerable amount of
time to figure out the differences between the different revs.

Best regards,

Mark

[U-Boot] [PATCH] Fix define for MPC5121 ADS board.

[Wolfgang Denk]

Dear Mark Vels,

In message <4CAB7A77.1090308@team-embedded.nl> you wrote:
> 
> Hehe, well there is at least the one rev 2 board that I got from the customer on my desk at the moment. That's why I
> tried to build and execute this config.

OK. What you have is an obvious bug fix. It does not hurt others (at
least not more than the existing code), and is useful to you. So it
may go in...

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
>  Is there a way to determine Yesterday's date using Unix utilities?
         echo "what is yesterday's date?" | /bin/mail root
         -- Randal L. Schwartz in <ukbuh2y982.fsf@julie.teleport.com>

[U-Boot] [PATCH] Fix define for MPC5121 ADS board.

[Wolfgang Denk]

Dear mark.vels at team-embedded.nl,

In message <1286293579-26587-1-git-send-email-mark.vels@team-embedded.nl> you wrote:
> Originally the Makefile defines CONFIG_ADS5121_REV2 when configuring
> for board mpc5121ads_rev2. The config in include/configs/mpc5121ads.h
> expects a define CONFIG_MPC5121ADS_REV2 for this.
> Therefore there are two defines used but only 1 is defined.
> This patch renames references to CONFIG_ADS5121_REV2 to CONFIG_MPC5121ADS_REV2
> to have one common define.
> 
> This patch fixes faulty mem size detection caused by wrong config in
> include/configs/mpc5121ads.h
> 
> Signed-off-by: Mark Vels <mark.vels@team-embedded.nl>
> ---
>  Makefile                                |    2 +-
>  board/freescale/mpc5121ads/mpc5121ads.c |    4 ++--
>  2 files changed, 3 insertions(+), 3 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
It became apparent that one reason why the Ice Giants were  known  as
the  Ice  Giants  was  because they were, well, giants. The other was
that they were made of ice.              -Terry Pratchett, _Sourcery_