Merge branch 'master' of git://git.denx.de/u-boot-video

[u-boot] / include / configs / gdppc440etx.h

diff --git a/include/configs/gdppc440etx.h b/include/configs/gdppc440etx.h
index 32e3cd65852a12f729341bd37ef02642f4edc7fe..9efbb8e34cc9b252777bdc2529e8a0c51944aa0d 100644 (file)
--- a/include/configs/gdppc440etx.h
+++ b/include/configs/gdppc440etx.h
@@ -50,6 +50,10 @@
 #define CONFIG_BOARD_EARLY_INIT_F      1       /* call board_early_init_f*/
 #define CONFIG_MISC_INIT_R             1       /* call misc_init_r()     */
 
+#undef CONFIG_ZERO_BOOTDELAY_CHECK     /* ignore keypress on bootdelay==0 */
+#define CONFIG_AUTOBOOT_KEYED          /* use key strings to stop autoboot */
+#define CONFIG_AUTOBOOT_STOP_STR " "
+
 /*
  * Base addresses -- Note these are effective addresses where the
  * actual resources get mapped (not physical addresses)
@@ -73,9 +77,8 @@
 #define CONFIG_SYS_INIT_RAM_DCACHE     1               /* d-cache as init ram*/
 #define CONFIG_SYS_INIT_RAM_ADDR       0x70000000      /* DCache             */
 #define CONFIG_SYS_INIT_RAM_SIZE               (4 << 10)
-#define CONFIG_SYS_GBL_DATA_SIZE       256             /* num bytes init data*/
 #define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE \
-                                        - CONFIG_SYS_GBL_DATA_SIZE)
+                                        - GENERATED_GBL_DATA_SIZE)
 #define CONFIG_SYS_INIT_SP_OFFSET      CONFIG_SYS_GBL_DATA_OFFSET
 
 /*