powerpc/mpc85xx: T104x: Add nand secure boot target

[oweals/u-boot.git] / arch / powerpc / cpu / ppc4xx / cpu.c

diff --git a/arch/powerpc/cpu/ppc4xx/cpu.c b/arch/powerpc/cpu/ppc4xx/cpu.c
index d1fc7f3fc2ae789c7e1181b8cb68161c9c09e864..aab65d405c59950557ef8b2b2b6405f2c67e8e49 100644 (file)
--- a/arch/powerpc/cpu/ppc4xx/cpu.c
+++ b/arch/powerpc/cpu/ppc4xx/cpu.c
@@ -234,20 +234,6 @@ static char *bootstrap_str[] = {
 };
 static char bootstrap_char[] = { 'A', 'B', 'C', 'D', 'E', 'G', 'F', 'H' };
 #endif
-#if defined(CONFIG_APM821XX)
-#define SDR0_PINSTP_SHIFT       29
-static char *bootstrap_str[] = {
-       "RESERVED",
-       "RESERVED",
-       "RESERVED",
-       "NAND (8 bits)",
-       "NOR  (8 bits)",
-       "NOR  (8 bits) w/PLL Bypassed",
-       "I2C (Addr 0x54)",
-       "I2C (Addr 0x52)",
-};
-static char bootstrap_char[] = { 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H' };
-#endif
 
 #if defined(SDR0_PINSTP_SHIFT)
 static int bootstrap_option(void)
@@ -607,9 +593,6 @@ int checkcpu (void)
 #if defined(SDR0_PINSTP_SHIFT)
        printf ("       Bootstrap Option %c - ", bootstrap_char[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 */