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

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

diff --git a/include/configs/tnetv107x_evm.h b/include/configs/tnetv107x_evm.h
index 454e9b2..23cab88 100644 (file)
--- a/include/configs/tnetv107x_evm.h
+++ b/include/configs/tnetv107x_evm.h
@@ -33,7 +33,7 @@
 #define CONFIG_TNETV107X
 #define CONFIG_TNETV107X_EVM
 #define CONFIG_ARCH_CPU_INIT
-#define CONFIG_SYS_UBOOT_BASE          TEXT_BASE
+#define CONFIG_SYS_UBOOT_BASE          CONFIG_SYS_TEXT_BASE
 #define CONFIG_DISABLE_TCM
 #define CONFIG_PERIPORT_REMAP
 #define CONFIG_PERIPORT_BASE           0x2000000
@@ -50,13 +50,17 @@
 
 /* Memory Info */
 #define CONFIG_SYS_MALLOC_LEN          (0x10000 + 1*1024*1024)
-#define CONFIG_SYS_GBL_DATA_SIZE       128
 #define PHYS_SDRAM_1                   TNETV107X_DDR_EMIF_DATA_BASE
 #define PHYS_SDRAM_1_SIZE              0x04000000
 #define CONFIG_SYS_MEMTEST_START       PHYS_SDRAM_1
 #define CONFIG_SYS_MEMTEST_END         (PHYS_SDRAM_1 + 16*1024*1024)
 #define CONFIG_NR_DRAM_BANKS           1
-#define CONFIG_STACKSIZE               (256*1024)
+
+#define CONFIG_SYS_SDRAM_BASE          PHYS_SDRAM_1
+#define CONFIG_SYS_INIT_RAM_SIZE       0x1000
+#define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_SDRAM_BASE + \
+                                        CONFIG_SYS_INIT_RAM_SIZE - \
+                                        GENERATED_GBL_DATA_SIZE)
 
 /* Serial Driver Info */
 #define CONFIG_SYS_NS16550
@@ -66,7 +70,6 @@
 #define CONFIG_SYS_NS16550_CLK         clk_get_rate(TNETV107X_LPSC_UART1)
 #define CONFIG_CONS_INDEX              1
 #define CONFIG_BAUDRATE                        115200
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 
 /* Flash and environment info */
 #define CONFIG_SYS_NO_FLASH
@@ -85,9 +88,7 @@
 #define CONFIG_CMD_MTDPARTS
 #define CONFIG_MTD_DEVICE
 #define CONFIG_JFFS2_NAND
-#define NAND_MAX_CHIPS                 1
 #define CONFIG_ENV_OFFSET              0x180000
-#define DEF_BOOTM                      ""
 
 /*
  * davinci_nand is a bit of a misnomer since this particular EMIF block is
@@ -112,7 +113,6 @@
 #define CONFIG_VERSION_VARIABLE
 #define CONFIG_AUTO_COMPLETE
 #define CONFIG_SYS_HUSH_PARSER
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
 #define CONFIG_CMDLINE_EDITING
 #define CONFIG_SYS_LONGHELP
 #define CONFIG_CRC32_VERIFY