Merge remote-tracking branch 'u-boot-ti/master'

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

diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h
index 151059a..c1bfe31 100644 (file)
--- a/include/configs/trizepsiv.h
+++ b/include/configs/trizepsiv.h
@@ -64,10 +64,10 @@
  * select serial console configuration
  */
 #define CONFIG_PXA_SERIAL
-#define CONFIG_SERIAL_MULTI
 #define CONFIG_FFUART         1       /* we use FFUART on Conxs */
 #define CONFIG_BTUART         1       /* we use BTUART on Conxs */
 #define CONFIG_STUART         1       /* we use STUART on Conxs */
+#define CONFIG_CONS_INDEX      3
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
@@ -170,7 +170,8 @@
 #define CONFIG_SYS_CPUSPEED            0x207           /* need to look more closely, I think this is Turbo = 2x, L=91Mhz */
 
 #ifdef CONFIG_MMC
-#define CONFIG_PXA_MMC
+#define        CONFIG_GENERIC_MMC
+#define        CONFIG_PXA_MMC_GENERIC
 #define CONFIG_CMD_MMC
 #define CONFIG_SYS_MMC_BASE            0xF0000000
 #endif