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

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

diff --git a/include/configs/tx25.h b/include/configs/tx25.h
index f77c546687cee27b4c81d557666c19e53252eaa4..71b1d326de5a04674286e324af71f869eab71105 100644 (file)
--- a/include/configs/tx25.h
+++ b/include/configs/tx25.h
@@ -84,16 +84,14 @@
 /* 8MB DRAM test */
 #define CONFIG_SYS_MEMTEST_START       PHYS_SDRAM_1
 #define CONFIG_SYS_MEMTEST_END         (PHYS_SDRAM_1+0x0800000)
-#define CONFIG_STACKSIZE       (256 * 1024)    /* regular stack */
 
 /*
  * Serial Info
  */
 #define CONFIG_MXC_UART
-#define CONFIG_SYS_MX25_UART1
+#define CONFIG_MXC_UART_BASE   UART1_BASE
 #define CONFIG_CONS_INDEX      1       /* use UART0 for console */
 #define CONFIG_BAUDRATE                115200  /* Default baud rate */
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_MXC_GPIO
 
@@ -109,7 +107,6 @@
 
 /* NAND */
 #define CONFIG_NAND_MXC
-#define CONFIG_NAND_MXC_V1_1
 #define CONFIG_MXC_NAND_REGS_BASE      (0xBB000000)
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
 #define CONFIG_SYS_NAND_BASE           (0xBB000000)
@@ -117,8 +114,6 @@
 #define CONFIG_MXC_NAND_HWECC
 #define CONFIG_SYS_NAND_LARGEPAGE
 
-#define CONFIG_SYS_64BIT_VSPRINTF
-
 /* U-Boot general configuration */
 #define CONFIG_SYS_PROMPT      "=> "   /* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE      1024    /* Console I/O Buffer Size  */