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

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

diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h
index c956e0d7b2fddf77587514bff5e0f8b496641079..f67898e840f817b62b0998cb716322e2d35d7fa0 100644 (file)
--- a/include/configs/sorcery.h
+++ b/include/configs/sorcery.h
@@ -128,7 +128,6 @@
 
 #define CONFIG_TIMESTAMP               /* Print image info with timestamp */
 
-#define CONFIG_NET_MULTI
 #define CONFIG_EEPRO100
 
 /*
@@ -141,9 +140,6 @@
 
 /* Use the HUSH parser */
 #define CONFIG_SYS_HUSH_PARSER
-#ifdef CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
-#endif
 
 /*
  * Flexbus Chipselect configuration
@@ -229,8 +225,7 @@
 #define CONFIG_SYS_INIT_RAM_ADDR       (CONFIG_SYS_MBAR + 0x20000)
 #define CONFIG_SYS_INIT_RAM_SIZE       0x8000  /* Size of used area in DPRAM */
 
-#define CONFIG_SYS_GBL_DATA_SIZE       128     /* size in bytes reserved for initial data */
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_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