mmc: move CONFIG_GENERIC_MMC to Kconfig

[oweals/u-boot.git] / include / configs / zipitz2.h

diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h
index fcd777264296df824aacf9d763d90482137181e2..3df9a078a807e56c51e51202b01e1409408fc570 100644 (file)
--- a/include/configs/zipitz2.h
+++ b/include/configs/zipitz2.h
@@ -15,7 +15,6 @@
 #define        CONFIG_CPU_PXA27X               1       /* Marvell PXA270 CPU */
 #define        CONFIG_SYS_TEXT_BASE            0x0
 
-#undef CONFIG_BOARD_LATE_INIT
 #undef CONFIG_SKIP_LOWLEVEL_INIT
 #define        CONFIG_PREBOOT
 
@@ -40,7 +39,6 @@
 #define        CONFIG_BOOTARGS                                                 \
        "console=tty0 console=ttyS2,115200 fbcon=rotate:3"
 #define        CONFIG_TIMESTAMP
-#define        CONFIG_BOOTDELAY                2       /* Autoboot delay */
 #define        CONFIG_CMDLINE_TAG
 #define        CONFIG_SETUP_MEMORY_TAGS
 #define        CONFIG_SYS_TEXT_BASE            0x0
@@ -50,7 +48,6 @@
  * Serial Console Configuration
  * STUART - the lower serial port on Colibri board
  */
-#define        CONFIG_PXA_SERIAL
 #define        CONFIG_STUART                   1
 #define CONFIG_CONS_INDEX              2
 #define        CONFIG_BAUDRATE                 115200
@@ -64,11 +61,8 @@
  * MMC Card Configuration
  */
 #ifdef CONFIG_CMD_MMC
-#define        CONFIG_MMC
-#define        CONFIG_GENERIC_MMC
 #define        CONFIG_PXA_MMC_GENERIC
 #define        CONFIG_SYS_MMC_BASE             0xF0000000
-#define        CONFIG_DOS_PARTITION
 #endif
 
 /*
@@ -76,7 +70,6 @@
  */
 #ifdef CONFIG_CMD_SPI
 #define        CONFIG_SOFT_SPI
-#define        CONFIG_LCD
 #define        CONFIG_LCD_ROTATION
 #define        CONFIG_PXA_LCD
 #define        CONFIG_LMS283GF05