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

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

diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index 6755af3d5960fd2b941d3f01fef40a49fcb8d8a1..f1104902be4357e14eda81277b7bd4b206956c98 100644 (file)
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -35,7 +35,6 @@
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_NFS
 #define CONFIG_CMD_PING
-#define CONFIG_CMD_DFL
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_SAVEENV
@@ -48,7 +47,7 @@
 #undef  CONFIG_SHOW_BOOT_PROGRESS
 
 /* SMC9111 */
-#define CONFIG_DRIVER_SMC91111
+#define CONFIG_SMC91111
 #define CONFIG_SMC91111_BASE    (0xB8000000)
 
 /* MEMORY */
@@ -56,6 +55,7 @@
 #define MS7722SE_FLASH_BASE_1  (0xA0000000)
 #define MS7722SE_FLASH_BANK_SIZE       (8*1024 * 1024)
 
+#define CONFIG_SYS_TEXT_BASE   0x8FFC0000
 #define CONFIG_SYS_LONGHELP                            /* undef to save memory */
 #define CONFIG_SYS_PROMPT              "=> "           /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE              256             /* Buffer size for input from the Console */
@@ -88,7 +88,6 @@
                                                        in Flash (NOT run time address in SDRAM) ?!? */
 #define CONFIG_SYS_MONITOR_LEN (128 * 1024)            /* */
 #define CONFIG_SYS_MALLOC_LEN  (256 * 1024)            /* Size of DRAM reserved for malloc() use */
-#define CONFIG_SYS_GBL_DATA_SIZE       (256)           /* size in bytes reserved for initial data */
 #define CONFIG_SYS_BOOTMAPSZ   (8 * 1024 * 1024)
 
 /* FLASH */