mmc: complete unfinished move of CONFIG_MMC

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

diff --git a/include/configs/strider.h b/include/configs/strider.h
index 20ffc0c..9733299 100644 (file)
--- a/include/configs/strider.h
+++ b/include/configs/strider.h
@@ -20,19 +20,10 @@
 
 #define        CONFIG_SYS_TEXT_BASE    0xFE000000
 
-#ifdef CONFIG_STRIDER_CPU
-#define CONFIG_IDENT_STRING    " strider cpu 0.01"
-#elif defined(CONFIG_STRIDER_CON_DP)
-#define CONFIG_IDENT_STRING    " strider con dp 0.01"
-#else
-#define CONFIG_IDENT_STRING    " strider con 0.01"
-#endif
-
 #define CONFIG_BOARD_EARLY_INIT_F
 #define CONFIG_BOARD_EARLY_INIT_R
 #define CONFIG_LAST_STAGE_INIT
 
-#define CONFIG_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC83xx_ESDHC_ADDR
 #define CONFIG_SYS_FSL_ERRATUM_ESDHC111
@@ -414,6 +405,12 @@
 #define CONFIG_SYS_DP501_I2C                   {1, 3, 5, 7, 2, 4, 6, 8}
 #define CONFIG_STRIDER_FANS                    { {10, 0x4c}, {11, 0x4c}, \
                                                  {12, 0x4c} }
+#elif defined(CONFIG_STRIDER_CPU_DP)
+#define CONFIG_SYS_CH7301_I2C                  {1, 2, 3, 4}
+#define CONFIG_SYS_ADV7611_I2C                 {1, 2, 3, 4}
+#define CONFIG_SYS_DP501_I2C                   {1, 2, 3, 4}
+#define CONFIG_STRIDER_FANS                    { {6, 0x4c}, {7, 0x4c}, \
+                                                 {8, 0x4c} }
 #else
 #define CONFIG_SYS_CH7301_I2C                  {1, 2, 3, 4}
 #define CONFIG_SYS_ADV7611_I2C                 {1, 2, 3, 4}
@@ -510,12 +507,9 @@ void fpga_control_clear(unsigned int bus, int pin);
 /* enable PCIE clock */
 #define CONFIG_SYS_SCCR_PCIEXP1CM      1
 
-#define CONFIG_PCI
 #define CONFIG_PCI_INDIRECT_BRIDGE
 #define CONFIG_PCIE
 
-#define CONFIG_PCI_PNP         /* do pci plug-and-play */
-
 #define CONFIG_SYS_PCI_SUBSYS_VENDORID 0x1957  /* Freescale */
 #define CONFIG_83XX_GENERIC_PCIE_REGISTER_HOSES 1
 
@@ -573,12 +567,8 @@ void fpga_control_clear(unsigned int bus, int pin);
 #define CONFIG_SYS_LOAD_ADDR           0x2000000 /* default load address */
 #define CONFIG_SYS_HZ          1000    /* decrementer freq: 1ms ticks */
 
-#undef CONFIG_ZERO_BOOTDELAY_CHECK     /* ignore keypress on bootdelay==0 */
-
 #define CONFIG_SYS_CBSIZE      1024 /* Console I/O Buffer Size */
 
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
-
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #define CONFIG_SYS_MAXARGS     16      /* max number of command args */
@@ -651,7 +641,6 @@ void fpga_control_clear(unsigned int bus, int pin);
 
 #define CONFIG_LOADADDR        800000  /* default location for tftp and bootm */
 
-#define CONFIG_BOOTDELAY       5       /* -1 disables auto-boot */
 
 #define CONFIG_HOSTNAME                hrcon
 #define CONFIG_ROOTPATH                "/opt/nfsroot"