Fix config problems on SC3 board; make ide_reset_timeout work.

diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index ce99a41ab7db6eaaa76c5ac5ae700481fceabac1..e308474af71ba5ccfe4a22b1fea792d53b782422 100644 (file)
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -514,11 +514,11 @@ void ide_init (void)
        unsigned char c;
        int i, bus;
 #if defined(CONFIG_AMIGAONEG3SE) || defined(CONFIG_SC3)
-       unsigned int ata_reset_time;
+       unsigned int ata_reset_time = ATA_RESET_TIME;
+       char *s;
 #endif
 #ifdef CONFIG_AMIGAONEG3SE
        unsigned int max_bus_scan;
-       char *s;
 #endif
 #ifdef CONFIG_IDE_8xx_PCCARD
        extern int pcmcia_on (void);

diff --git a/cpu/ppc4xx/405gp_pci.c b/cpu/ppc4xx/405gp_pci.c
index 7134355635ed49d8fabe2c38890f1dff8938d4b2..8bf03e1b2f18cc2bb10a18d50cf0d0ef31f23a46 100644 (file)
--- a/cpu/ppc4xx/405gp_pci.c
+++ b/cpu/ppc4xx/405gp_pci.c
@@ -380,7 +380,7 @@ void pci_405gp_setup_vga(struct pci_controller *hose, pci_dev_t dev,
        pci_hose_write_config_dword(hose, dev, PCI_COMMAND, cmdstat);
 }
 
-#if !(defined(CONFIG_PIP405) || defined (CONFIG_MIP405)) && !(defined (CONFIG_SOLIDCARD3))
+#if !(defined(CONFIG_PIP405) || defined (CONFIG_MIP405)) && !(defined (CONFIG_SC3))
 
 /*
  *As is these functs get called out of flash Not a horrible

diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 6b6acfa875834e0878b858bf1134f8da6188d044..e4357b088542a4ea7052c0b8c1b288639bcf223b 100644 (file)
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -58,7 +58,7 @@
  * 0xFFE00000 .... 0xFFFFFFFF -> BOOT-ROM (2 MiB)
  */
 
-#define CONFIG_SOLIDCARD3      1
+#define CONFIG_SC3     1
 #define CONFIG_4xx     1
 #define CONFIG_405GP   1
 
@@ -134,7 +134,8 @@
 #if 1  /* feel free to disable for development */
 #define CONFIG_AUTOBOOT_KEYED          /* Enable password protection   */
 #define CONFIG_AUTOBOOT_PROMPT         "\nSC3 - booting... stop with ENTER\n"
-#define CONFIG_AUTOBOOT_DELAY_STR      "\n"    /* 1st "password"       */
+#define CONFIG_AUTOBOOT_DELAY_STR      "\r"    /* 1st "password"       */
+#define CONFIG_AUTOBOOT_DELAY_STR2     "\n"    /* 1st "password"       */
 #endif
 
 /*

diff --git a/lib_ppc/board.c b/lib_ppc/board.c
index 9e85cdddc4aee4192529b760a4ae3c92ce28b4e4..c4fc5805ab60d2948786bee0aaf555ea1022c4e3 100644 (file)
--- a/lib_ppc/board.c
+++ b/lib_ppc/board.c
@@ -76,7 +76,7 @@
 extern int update_flash_size (int flash_size);
 #endif
 
-#if defined(CONFIG_SOLIDCARD3)
+#if defined(CONFIG_SC3)
 extern void sc3_read_eeprom(void);
 #endif
 
@@ -820,7 +820,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
 #endif /* CONFIG_405GP, CONFIG_405EP */
 #endif /* CFG_EXTBDINFO */
 
-#if defined(CONFIG_SOLIDCARD3)
+#if defined(CONFIG_SC3)
        sc3_read_eeprom();
 #endif
        s = getenv ("ethaddr");
@@ -929,7 +929,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
     defined(CONFIG_KUP4X)      || \
     defined(CONFIG_LWMON)      || \
     defined(CONFIG_PCU_E)      || \
-    defined(CONFIG_SOLIDCARD3) || \
+    defined(CONFIG_SC3)                || \
     defined(CONFIG_W7O)                || \
     defined(CONFIG_MISC_INIT_R)
        /* miscellaneous platform dependent initialisations */