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

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

diff --git a/include/configs/versatile.h b/include/configs/versatile.h
index 32cee824bb64132a1de1b2e5d14b9a2d4f40a407..a65c6762b309bc1fefd8ea1204451bef247ba838 100644 (file)
--- a/include/configs/versatile.h
+++ b/include/configs/versatile.h
@@ -39,10 +39,6 @@
 #define CONFIG_VERSATILE       1       /* in Versatile Platform Board  */
 #define CONFIG_ARCH_VERSATILE  1       /* Specifically, a Versatile    */
 
-#ifndef CONFIG_ARCH_VERSATILE_AB       /* AB                           */
-#define CONFIG_ARCH_VERSATILE_PB       /* Versatile PB is default      */
-#endif
-
 #define CONFIG_SYS_MEMTEST_START       0x100000
 #define CONFIG_SYS_MEMTEST_END         0x10000000
 #define CONFIG_SYS_HZ                  (1000000 / 256)
@@ -81,7 +77,6 @@
  * Hardware drivers
  */
 
-#define CONFIG_NET_MULTI
 #define CONFIG_SMC91111
 #define CONFIG_SMC_USE_32_BIT
 #define CONFIG_SMC91111_BASE   0x10010000
@@ -98,7 +93,6 @@
 #define CONFIG_CONS_INDEX      0
 
 #define CONFIG_BAUDRATE                        38400
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 #define CONFIG_SYS_SERIAL0             0x101F1000
 #define CONFIG_SYS_SERIAL1             0x101F2000
 
@@ -150,17 +144,6 @@
 
 #define CONFIG_SYS_LOAD_ADDR   0x7fc0  /* default load address */
 
-/*-----------------------------------------------------------------------
- * Stack sizes
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE       (128 * 1024)    /* regular stack */
-#ifdef CONFIG_USE_IRQ
-#define CONFIG_STACKSIZE_IRQ   (4 * 1024)      /* IRQ stack */
-#define CONFIG_STACKSIZE_FIQ   (4 * 1024)      /* FIQ stack */
-#endif
-
 /*-----------------------------------------------------------------------
  * Physical Memory Map
  */
@@ -247,6 +230,7 @@
 #define CONFIG_SYS_FLASH_PROTECTION    /* The devices have real protection */
 #define CONFIG_SYS_FLASH_EMPTY_INFO    /* flinfo indicates empty blocks */
 
+#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* use buffered writes */
 #endif
 
 #endif /* __CONFIG_H */