Merge branch 'master' into next

[platform/kernel/u-boot.git] / include / configs / galaxy5200.h

diff --git a/include/configs/galaxy5200.h b/include/configs/galaxy5200.h
index 3b67ea9..4be28b2 100644 (file)
--- a/include/configs/galaxy5200.h
+++ b/include/configs/galaxy5200.h
@@ -88,15 +88,21 @@
 /*
  * Autobooting
  */
-#define CONFIG_BOOTDELAY       3       /* autoboot after 3 seconds */
+#define CONFIG_BOOTDELAY       10      /* autoboot after 10 seconds */
 #define CONFIG_ZERO_BOOTDELAY_CHECK    /* allow stopping of boot process */
                                        /* even with bootdelay=0 */
-#undef CONFIG_BOOTARGS
+#define CONFIG_BOOT_RETRY_TIME 120     /* Reset if no command is entered  */
+#define CONFIG_RESET_TO_RETRY
 
 #define CONFIG_PREBOOT "echo;" \
        "echo Welcome to U-Boot;"\
        "echo"
 
+#define CONFIG_BOOTCOMMAND     "go ff300004 0; go ff300004 2 2;" \
+       "bootm ff040000 ff900000 fffc0000"
+#define CONFIG_BOOTARGS        "console=ttyPSC0,115200"
+#define CONFIG_EXTRA_ENV_SETTINGS "epson=yes\0"
+
 /*
  * IPB Bus clocking configuration.
  */
@@ -210,7 +216,7 @@
 /* Chip Select configuration for NAND flash */
 #define CONFIG_SYS_CS1_START           0x20000000
 #define CONFIG_SYS_CS1_SIZE            0x90000
-#define CONFIG_SYS_CS1_CFG             0x0002d900
+#define CONFIG_SYS_CS1_CFG             0x00025b00
 
 /* Chip Select configuration for Epson S1D13513 */
 #define CONFIG_SYS_CS3_START           0x10000000