mmc: complete unfinished move of CONFIG_MMC

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

diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 13d6aa271d6eb262ed67f5322acad18e87b0b8ab..b17a6c570d0f9059062d424680240e59b6fa3af5 100644 (file)
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -40,11 +40,8 @@
 /* High Level Configuration Options */
 #define CONFIG_BOOKE           1       /* BOOKE */
 #define CONFIG_E500            1       /* BOOKE e500 family */
-#define CONFIG_MPC8536         1
-#define CONFIG_MPC8536DS       1
 
 #define CONFIG_FSL_ELBC                1       /* Has Enhanced localbus controller */
-#define CONFIG_PCI             1       /* Enable PCI/PCIE */
 #define CONFIG_PCI1            1       /* Enable PCI controller 1 */
 #define CONFIG_PCIE1           1       /* PCIE controller 1 (slot 1) */
 #define CONFIG_PCIE2           1       /* PCIE controller 2 (slot 2) */
@@ -54,7 +51,6 @@
 #define CONFIG_FSL_PCIE_RESET  1       /* need PCIe reset errata */
 #define CONFIG_SYS_PCI_64BIT   1       /* enable 64-bit PCI resources */
 
-#define CONFIG_FSL_LAW         1       /* Use common FSL init code */
 
 #define CONFIG_TSEC_ENET               /* tsec ethernet support */
 #define CONFIG_ENV_OVERWRITE
@@ -493,9 +489,6 @@
 #define CONFIG_SYS_PCIE3_IO_SIZE       0x00010000      /* 64k */
 
 #if defined(CONFIG_PCI)
-
-#define CONFIG_PCI_PNP                 /* do pci plug-and-play */
-
 /*PCIE video card used*/
 #define VIDEO_IO_OFFSET                CONFIG_SYS_PCIE3_IO_VIRT
 
@@ -616,8 +609,6 @@
 
 #undef CONFIG_WATCHDOG                 /* watchdog disabled */
 
-#define CONFIG_MMC     1
-
 #ifdef CONFIG_MMC
 #define CONFIG_FSL_ESDHC
 #define CONFIG_SYS_FSL_ESDHC_ADDR      CONFIG_SYS_MPC85xx_ESDHC_ADDR