hush.c: Move default CONFIG_SYS_PROMPT_HUSH_PS2 to hush.c

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

diff --git a/include/configs/sorcery.h b/include/configs/sorcery.h
index 75b8e60..f67898e 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
@@ -227,10 +223,9 @@
 
 /* Use SRAM until RAM will be available */
 #define CONFIG_SYS_INIT_RAM_ADDR       (CONFIG_SYS_MBAR + 0x20000)
-#define CONFIG_SYS_INIT_RAM_END        0x8000  /* End of used area in DPRAM */
+#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_END - 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