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

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

diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h
index 66c314fc42c15822b000375a18439bf4a000076e..2004d148c6b3c1057ec334bb562872c12dddb775 100644 (file)
--- a/include/configs/omap3_evm_common.h
+++ b/include/configs/omap3_evm_common.h
@@ -72,7 +72,6 @@
  */
 #define V_NS16550_CLK                  48000000        /* 48MHz (APLL96/2) */
 
-#define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    (-4)
 #define CONFIG_SYS_NS16550_CLK         V_NS16550_CLK
@@ -120,7 +119,7 @@
 
 /* Max number of NAND devices */
 #define CONFIG_SYS_MAX_NAND_DEVICE     1
-#define CONFIG_SYS_NAND_BUSWIDTH_16BIT 16
+#define CONFIG_SYS_NAND_BUSWIDTH_16BIT
 /* Timeout values (in ticks) */
 #define CONFIG_SYS_FLASH_ERASE_TOUT    (100 * CONFIG_SYS_HZ)
 #define CONFIG_SYS_FLASH_WRITE_TOUT    (100 * CONFIG_SYS_HZ)
@@ -179,7 +178,6 @@
  * U-boot features
  * ----------------------------------------------------------------------------
  */
-#define CONFIG_SYS_PROMPT              "OMAP3_EVM # "
 #define CONFIG_SYS_MAXARGS             16      /* max args for a command */
 
 #define CONFIG_MISC_INIT_R