Update for SC3 board

* Make IDE timeout configurable through ide_reset_timeout variable.
* Use Newline as "password" string
* Use just a single partition in NAND flash

diff --git a/common/cmd_ide.c b/common/cmd_ide.c
index 2e185cc4411010ed750307b8296bf682d9b134b1..b4119f30725d2167e7e22f014c8b0c8b01541127 100644 (file)
--- a/common/cmd_ide.c
+++ b/common/cmd_ide.c
@@ -513,9 +513,11 @@ void ide_init (void)
 #endif
        unsigned char c;
        int i, bus;
+#if defined(CONFIG_AMIGAONEG3SE) || defined(CONFIG_SC3)
+       unsigned int ata_reset_time;
+#endif
 #ifdef CONFIG_AMIGAONEG3SE
        unsigned int max_bus_scan;
-       unsigned int ata_reset_time;
        char *s;
 #endif
 #ifdef CONFIG_IDE_8xx_PCCARD
@@ -617,10 +619,9 @@ void ide_init (void)
                udelay (100000);                /* 100 ms */
                ide_outb (dev, ATA_DEV_HD, ATA_LBA | ATA_DEVICE(dev));
                udelay (100000);                /* 100 ms */
-#ifdef CONFIG_AMIGAONEG3SE
-               ata_reset_time = ATA_RESET_TIME;
-               s = getenv("ide_reset_timeout");
-               if (s) ata_reset_time = 2*simple_strtol(s, NULL, 10);
+#if defined(CONFIG_AMIGAONEG3SE) || defined(CONFIG_SC3)
+               if ((s = getenv("ide_reset_timeout")) != NULL)
+                       ata_reset_time = simple_strtol(s, NULL, 10);
 #endif
                i = 0;
                do {
@@ -628,7 +629,7 @@ void ide_init (void)
 
                        c = ide_inb (dev, ATA_STATUS);
                        i++;
-#ifdef CONFIG_AMIGAONEG3SE
+#if defined(CONFIG_AMIGAONEG3SE) || defined(CONFIG_SC3)
                        if (i > (ata_reset_time * 100)) {
 #else
                        if (i > (ATA_RESET_TIME * 100)) {

diff --git a/include/configs/sc3.h b/include/configs/sc3.h
index 8298084f1ea9ac3a05d5b4ee8c779550760e2594..6b6acfa875834e0878b858bf1134f8da6188d044 100644 (file)
--- a/include/configs/sc3.h
+++ b/include/configs/sc3.h
@@ -133,8 +133,8 @@
 
 #if 1  /* feel free to disable for development */
 #define CONFIG_AUTOBOOT_KEYED          /* Enable password protection   */
-#define CONFIG_AUTOBOOT_PROMPT         "\nSC3 - booting... stop with S\n"
-#define CONFIG_AUTOBOOT_DELAY_STR      "S"     /* 1st "password"       */
+#define CONFIG_AUTOBOOT_PROMPT         "\nSC3 - booting... stop with ENTER\n"
+#define CONFIG_AUTOBOOT_DELAY_STR      "\n"    /* 1st "password"       */
 #endif
 
 /*
@@ -416,11 +416,11 @@ extern unsigned long offsetOfEnvironment;
 
 #define CONFIG_JFFS2_NAND 1                    /* jffs2 on nand support */
 
-/* No command line, one static partition Partition 3 contains jffs2 rootfs */
+/* No command line, one static partition */
 #undef CONFIG_JFFS2_CMDLINE
 #define CONFIG_JFFS2_DEV               "nand0"
-#define CONFIG_JFFS2_PART_SIZE         0x00400000
-#define CONFIG_JFFS2_PART_OFFSET       0x00c00000
+#define CONFIG_JFFS2_PART_SIZE         0x01000000
+#define CONFIG_JFFS2_PART_OFFSET       0x00000000
 
 /*-----------------------------------------------------------------------
  * Cache Configuration