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

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

diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h
index 5202004..c8d04f7 100644 (file)
--- a/include/configs/ms7722se.h
+++ b/include/configs/ms7722se.h
@@ -38,7 +38,7 @@
 #define CONFIG_CMD_DFL
 #define CONFIG_CMD_SDRAM
 #define CONFIG_CMD_MEMORY
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 
 #define CONFIG_BAUDRATE                115200
 #define CONFIG_BOOTDELAY       3
@@ -48,7 +48,8 @@
 #undef  CONFIG_SHOW_BOOT_PROGRESS
 
 /* SMC9111 */
-#define CONFIG_DRIVER_SMC91111
+#define CONFIG_NET_MULTI
+#define CONFIG_SMC91111
 #define CONFIG_SMC91111_BASE    (0xB8000000)
 
 /* MEMORY */
@@ -56,6 +57,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 +90,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 */
@@ -128,7 +129,7 @@
 
 /* Board Clock */
 #define CONFIG_SYS_CLK_FREQ    33333333
-#define TMU_CLK_DIVIDER                (4)     /* 4 (default), 16, 64, 256 or 1024 */
-#define CONFIG_SYS_HZ                  (CONFIG_SYS_CLK_FREQ / TMU_CLK_DIVIDER)
+#define CONFIG_SYS_TMU_CLK_DIV         (4)     /* 4 (default), 16, 64, 256 or 1024 */
+#define CONFIG_SYS_HZ          1000
 
 #endif /* __MS7722SE_H */