From: Stefan Roese <sr@denx.de>
Date: Wed, 15 Apr 2009 08:50:48 +0000 (+0200)
Subject: ppc4xx: Add "booting from NAND" to 4xx NAND-booting targets
X-Git-Tag: v2009.06-rc1~42
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cf9409885cbe01405bad76790e99f8adf3351f4d;p=u-boot

ppc4xx: Add "booting from NAND" to 4xx NAND-booting targets

This additional text in the bootup log helps to see if the board is
configured for NAND-booting. Especially helpful for boards that can
boot from NOR and NAND (e.g. most of the AMCC eval boards).

Signed-off-by: Stefan Roese <sr@denx.de>
---

diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c
index d09c4c2153..9a6a8d7c9b 100644
--- a/cpu/ppc4xx/cpu.c
+++ b/cpu/ppc4xx/cpu.c
@@ -586,7 +586,11 @@ int checkcpu (void)
 #endif	/* I2C_BOOTROM */
 #if defined(SDR0_PINSTP_SHIFT)
 	printf ("       Bootstrap Option %c - ", bootstrap_char[bootstrap_option()]);
-	printf ("Boot ROM Location %s\n", bootstrap_str[bootstrap_option()]);
+	printf ("Boot ROM Location %s", bootstrap_str[bootstrap_option()]);
+#ifdef CONFIG_NAND_U_BOOT
+	puts(", booting from NAND");
+#endif /* CONFIG_NAND_U_BOOT */
+	putc('\n');
 #endif	/* SDR0_PINSTP_SHIFT */
 
 #if defined(CONFIG_PCI) && !defined(CONFIG_405EX)