Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / include / configs / ms7750se.h

diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h
index 4356a671e8369e402fd2c62832c910da7c086aea..aca367f8fff989f8c0be24ba2488030349c5dcc9 100644 (file)
--- a/include/configs/ms7750se.h
+++ b/include/configs/ms7750se.h
@@ -38,70 +38,67 @@
  */
 /*#include <config_cmd_default.h>*/
 
-#define CONFIG_CMD_DFL
 #define CONFIG_CMD_FLASH
-#define CONFIG_CMD_ENV
+#define CONFIG_CMD_SAVEENV
 
 #define CONFIG_SCIF_CONSOLE    1
 #define CONFIG_BAUDRATE                38400
 #define CONFIG_CONS_SCIF1      1
-#define BOARD_LATE_INIT                1
+#define CONFIG_BOARD_LATE_INIT
 
 #define CONFIG_BOOTDELAY       -1
 #define CONFIG_BOOTARGS                "console=ttySC0,38400"
 #define CONFIG_ENV_OVERWRITE   1
 
 /* SDRAM */
-#define CFG_SDRAM_BASE         (0x8C000000)
-#define CFG_SDRAM_SIZE         (64 * 1024 * 1024)
+#define CONFIG_SYS_SDRAM_BASE          (0x8C000000)
+#define CONFIG_SYS_SDRAM_SIZE          (64 * 1024 * 1024)
 
-#define CFG_LONGHELP
-#define CFG_PROMPT             "=> "
-#define CFG_CBSIZE             256
-#define CFG_PBSIZE             256
-#define CFG_MAXARGS            16
-#define CFG_BARGSIZE           512
-/* List of legal baudrate settings for this board */
-#define CFG_BAUDRATE_TABLE     { 115200, 57600, 38400, 19200, 9600 }
+#define CONFIG_SYS_LONGHELP
+#define CONFIG_SYS_PROMPT              "=> "
+#define CONFIG_SYS_CBSIZE              256
+#define CONFIG_SYS_PBSIZE              256
+#define CONFIG_SYS_MAXARGS             16
+#define CONFIG_SYS_BARGSIZE            512
 
-#define CFG_MEMTEST_START      (CFG_SDRAM_BASE)
-#define CFG_MEMTEST_END                (TEXT_BASE - 0x100000)
+#define CONFIG_SYS_TEXT_BASE           0x8FFC0000
+#define CONFIG_SYS_MEMTEST_START       (CONFIG_SYS_SDRAM_BASE)
+#define CONFIG_SYS_MEMTEST_END         (CONFIG_SYS_TEXT_BASE - 0x100000)
 
 /* NOR Flash */
-/* #define CFG_FLASH_BASE              (0xA1000000)*/
-#define CFG_FLASH_BASE         (0xA0000000)
-#define CFG_MAX_FLASH_BANKS    (1)     /* Max number of
+/* #define CONFIG_SYS_FLASH_BASE               (0xA1000000)*/
+#define CONFIG_SYS_FLASH_BASE          (0xA0000000)
+#define CONFIG_SYS_MAX_FLASH_BANKS     (1)     /* Max number of
                                         * Flash memory banks
                                         */
-#define CFG_MAX_FLASH_SECT     142
-#define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
+#define CONFIG_SYS_MAX_FLASH_SECT      142
+#define CONFIG_SYS_FLASH_BANKS_LIST    { CONFIG_SYS_FLASH_BASE }
 
-#define CFG_LOAD_ADDR          (CFG_SDRAM_BASE + 4 * 1024 * 1024)
-#define CFG_MONITOR_BASE       (CFG_FLASH_BASE)        /* Address of u-boot image in Flash */
-#define CFG_MONITOR_LEN                (128 * 1024)
-#define CFG_MALLOC_LEN         (256 * 1024)            /* Size of DRAM reserved for malloc() use */
+#define CONFIG_SYS_LOAD_ADDR           (CONFIG_SYS_SDRAM_BASE + 4 * 1024 * 1024)
+#define CONFIG_SYS_MONITOR_BASE        (CONFIG_SYS_FLASH_BASE) /* Address of u-boot image in Flash */
+#define CONFIG_SYS_MONITOR_LEN         (128 * 1024)
+#define CONFIG_SYS_MALLOC_LEN          (256 * 1024)            /* Size of DRAM reserved for malloc() use */
 
-#define CFG_GBL_DATA_SIZE      (256)                   /* size in bytes reserved for initial data */
-#define CFG_BOOTMAPSZ          (8 * 1024 * 1024)
-#define CFG_RX_ETH_BUFFER      (8)
+#define CONFIG_SYS_BOOTMAPSZ           (8 * 1024 * 1024)
+#define CONFIG_SYS_RX_ETH_BUFFER       (8)
 
-#define CFG_FLASH_CFI
+#define CONFIG_SYS_FLASH_CFI
 #define CONFIG_FLASH_CFI_DRIVER
-#undef CFG_FLASH_CFI_BROKEN_TABLE
-#undef  CFG_FLASH_QUIET_TEST
-#define CFG_FLASH_EMPTY_INFO                           /* print 'E' for empty sector on flinfo */
+#undef CONFIG_SYS_FLASH_CFI_BROKEN_TABLE
+#undef  CONFIG_SYS_FLASH_QUIET_TEST
+#define CONFIG_SYS_FLASH_EMPTY_INFO                            /* print 'E' for empty sector on flinfo */
 
 
-#define CFG_ENV_IS_IN_FLASH
-#define CFG_ENV_SECT_SIZE      0x20000
-#define CFG_ENV_SIZE           (CFG_ENV_SECT_SIZE)
-#define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
-#define CFG_FLASH_ERASE_TOUT   120000
-#define CFG_FLASH_WRITE_TOUT   500
+#define CONFIG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_SIZE                (CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_ADDR                (CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
+#define CONFIG_SYS_FLASH_ERASE_TOUT    120000
+#define CONFIG_SYS_FLASH_WRITE_TOUT    500
 
 /* Board Clock */
 #define CONFIG_SYS_CLK_FREQ    33333333
-#define TMU_CLK_DIVIDER                4
-#define CFG_HZ                 (CONFIG_SYS_CLK_FREQ / TMU_CLK_DIVIDER)
+#define CONFIG_SYS_TMU_CLK_DIV         4
+#define CONFIG_SYS_HZ          1000
 
 #endif /* __MS7750SE_H */