Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

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

diff --git a/include/configs/galaxy5200.h b/include/configs/galaxy5200.h
index cb521a125feec185c1a84dae36ac7c26b6c26ce5..e43cc284f22af07290274cc07ee032076a3c38d5 100644 (file)
--- a/include/configs/galaxy5200.h
+++ b/include/configs/galaxy5200.h
@@ -209,11 +209,8 @@
 /* End of used area in SPRAM */
 #define CONFIG_SYS_INIT_RAM_SIZE               MPC5XXX_SRAM_SIZE
 
-/* Size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_SIZE       128
-
 #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
 
 #define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE
@@ -376,7 +373,6 @@
 #define CONFIG_DISPLAY_BOARDINFO 1
 
 #define CONFIG_SYS_HUSH_PARSER 1
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
 
 #define CONFIG_CRC32_VERIFY  1