Merge git://git.denx.de/u-boot-fsl-qoriq

Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
	configs/ls1046aqds_defconfig
	configs/ls1046aqds_nand_defconfig
	configs/ls1046aqds_qspi_defconfig
	configs/ls1046aqds_sdcard_ifc_defconfig
	configs/ls1046aqds_sdcard_qspi_defconfig
	configs/ls1046ardb_emmc_defconfig
	configs/ls1046ardb_qspi_defconfig
	configs/ls1046ardb_sdcard_defconfig

diff --combined README
index 9c992c1,b27e757..ecb1710
--- 1/README
--- 2/README
+++ b/README
@@@ -504,6 -504,12 +504,12 @@@ The following options need to be config
                CONFIG_SYS_FSL_IFC_LE
                Defines the IFC controller register space as Little Endian
  
+               CONFIG_SYS_FSL_IFC_CLK_DIV
+               Defines divider of platform clock(clock input to IFC controller).
+ 
+               CONFIG_SYS_FSL_LBC_CLK_DIV
+               Defines divider of platform clock(clock input to eLBC controller).
+ 
                CONFIG_SYS_FSL_PBL_PBI
                It enables addition of RCW (Power on reset configuration) in built image.
                Please refer doc/README.pblimage for more details
@@@ -1457,6 -1463,9 +1463,6 @@@
                        CONFIG_SH_MMCIF_CLK
                        Define the clock frequency for MMCIF
  
 -              CONFIG_GENERIC_MMC
 -              Enable the generic MMC driver
 -
                CONFIG_SUPPORT_EMMC_BOOT
                Enable some additional features of the eMMC boot partitions.
  

diff --combined configs/ls1012afrdm_qspi_defconfig
index 73351a6,8b42962..ad9a562
--- 1/configs/ls1012afrdm_qspi_defconfig
--- 2/configs/ls1012afrdm_qspi_defconfig
+++ b/configs/ls1012afrdm_qspi_defconfig
@@@ -1,10 -1,12 +1,11 @@@
  CONFIG_ARM=y
  CONFIG_TARGET_LS1012AFRDM=y
  CONFIG_QSPI_AHB_INIT=y
 -# CONFIG_MMC is not set
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a-frdm"
  # CONFIG_SYS_MALLOC_F is not set
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
+ CONFIG_FSL_LS_PPA=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
@@@ -13,7 -15,6 +14,7 @@@ CONFIG_BOOTDELAY=1
  # CONFIG_DISPLAY_BOARDINFO is not set
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
 +CONFIG_CMD_GPT=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_I2C=y
  CONFIG_CMD_USB=y
@@@ -27,15 -28,10 +28,15 @@@ CONFIG_CMD_FAT=
  CONFIG_OF_CONTROL=y
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_DM=y
 +# CONFIG_MMC is not set
  CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH=y
  CONFIG_NETDEVICES=y
  CONFIG_E1000=y
 +CONFIG_PCI=y
 +CONFIG_DM_PCI=y
 +CONFIG_DM_PCI_COMPAT=y
 +CONFIG_PCIE_LAYERSCAPE=y
  CONFIG_SYS_NS16550=y
  CONFIG_DM_SPI=y
  CONFIG_USB=y
@@@ -43,3 -39,7 +44,3 @@@ CONFIG_DM_USB=
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_STORAGE=y
 -CONFIG_PCI=y
 -CONFIG_DM_PCI=y
 -CONFIG_DM_PCI_COMPAT=y
 -CONFIG_PCIE_LAYERSCAPE=y

diff --combined configs/ls1012aqds_qspi_defconfig
index 4e9fa5b,d400276..0a696ed
--- 1/configs/ls1012aqds_qspi_defconfig
--- 2/configs/ls1012aqds_qspi_defconfig
+++ b/configs/ls1012aqds_qspi_defconfig
@@@ -5,6 -5,7 +5,7 @@@ CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a
  # CONFIG_SYS_MALLOC_F is not set
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
+ CONFIG_FSL_LS_PPA=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
@@@ -13,7 -14,6 +14,7 @@@ CONFIG_BOOTDELAY=1
  # CONFIG_DISPLAY_BOARDINFO is not set
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
 +CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_I2C=y
@@@ -28,22 -28,22 +29,22 @@@ CONFIG_CMD_FAT=
  CONFIG_OF_CONTROL=y
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_DM=y
 +# CONFIG_BLK is not set
 +CONFIG_DM_MMC=y
 +# CONFIG_DM_MMC_OPS is not set
  CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH=y
  CONFIG_NETDEVICES=y
  CONFIG_E1000=y
 +CONFIG_PCI=y
 +CONFIG_DM_PCI=y
 +CONFIG_DM_PCI_COMPAT=y
 +CONFIG_PCIE_LAYERSCAPE=y
  CONFIG_SYS_NS16550=y
  CONFIG_DM_SPI=y
  CONFIG_FSL_DSPI=y
 -CONFIG_DM_MMC=y
 -CONFIG_DM_MMC_OPS=n
 -CONFIG_BLK=n
  CONFIG_USB=y
  CONFIG_DM_USB=y
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_STORAGE=y
 -CONFIG_PCI=y
 -CONFIG_DM_PCI=y
 -CONFIG_DM_PCI_COMPAT=y
 -CONFIG_PCIE_LAYERSCAPE=y

diff --combined configs/ls1012ardb_qspi_defconfig
index 1b75e75,06c4243..048933e
--- 1/configs/ls1012ardb_qspi_defconfig
--- 2/configs/ls1012ardb_qspi_defconfig
+++ b/configs/ls1012ardb_qspi_defconfig
@@@ -5,6 -5,7 +5,7 @@@ CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1012a
  # CONFIG_SYS_MALLOC_F is not set
  CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
+ CONFIG_FSL_LS_PPA=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_OF_STDOUT_VIA_ALIAS=y
  CONFIG_SYS_EXTRA_OPTIONS="QSPI_BOOT"
@@@ -13,7 -14,6 +14,7 @@@ CONFIG_BOOTDELAY=1
  # CONFIG_DISPLAY_BOARDINFO is not set
  CONFIG_HUSH_PARSER=y
  CONFIG_CMD_GREPENV=y
 +CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_I2C=y
@@@ -28,22 -28,22 +29,22 @@@ CONFIG_CMD_FAT=
  CONFIG_OF_CONTROL=y
  CONFIG_NET_RANDOM_ETHADDR=y
  CONFIG_DM=y
 +# CONFIG_BLK is not set
 +CONFIG_DM_MMC=y
 +# CONFIG_DM_MMC_OPS is not set
  CONFIG_DM_SPI_FLASH=y
  CONFIG_SPI_FLASH=y
  CONFIG_NETDEVICES=y
  CONFIG_E1000=y
 +CONFIG_PCI=y
 +CONFIG_DM_PCI=y
 +CONFIG_DM_PCI_COMPAT=y
 +CONFIG_PCIE_LAYERSCAPE=y
  CONFIG_SYS_NS16550=y
  CONFIG_DM_SPI=y
  CONFIG_FSL_DSPI=y
 -CONFIG_DM_MMC=y
 -CONFIG_DM_MMC_OPS=n
 -CONFIG_BLK=n
  CONFIG_USB=y
  CONFIG_DM_USB=y
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_DWC3=y
  CONFIG_USB_STORAGE=y
 -CONFIG_PCI=y
 -CONFIG_DM_PCI=y
 -CONFIG_DM_PCI_COMPAT=y
 -CONFIG_PCIE_LAYERSCAPE=y

diff --combined configs/ls1046aqds_defconfig
index 871c35d,15c29c2..9986afa
--- 1/configs/ls1046aqds_defconfig
--- 2/configs/ls1046aqds_defconfig
+++ b/configs/ls1046aqds_defconfig
@@@ -10,7 -10,6 +10,7 @@@ CONFIG_CMD_BOOTZ=
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MEMTEST=y
  CONFIG_CMD_MEMINFO=y
 +CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_I2C=y
@@@ -23,12 -22,14 +23,14 @@@ CONFIG_CMD_FAT=
  CONFIG_OF_CONTROL=y
  CONFIG_DM=y
  CONFIG_SPI_FLASH=y
 -CONFIG_SYS_NS16550=y
 -CONFIG_DM_SPI=y
 -CONFIG_FSL_DSPI=y
 +CONFIG_NETDEVICES=y
 +CONFIG_E1000=y
  CONFIG_PCI=y
  CONFIG_DM_PCI=y
  CONFIG_DM_PCI_COMPAT=y
  CONFIG_PCIE_LAYERSCAPE=y
 -CONFIG_NETDEVICES=y
 -CONFIG_E1000=y
 +CONFIG_SYS_NS16550=y
 +CONFIG_DM_SPI=y
 +CONFIG_FSL_DSPI=y
+ CONFIG_USB=y
+ CONFIG_DM_USB=y

diff --combined configs/ls1046aqds_lpuart_defconfig
index 83a8b5f,e9808e9..490175a
--- 1/configs/ls1046aqds_lpuart_defconfig
--- 2/configs/ls1046aqds_lpuart_defconfig
+++ b/configs/ls1046aqds_lpuart_defconfig
@@@ -11,7 -11,6 +11,7 @@@ CONFIG_CMD_BOOTZ=
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MEMTEST=y
  CONFIG_CMD_MEMINFO=y
 +CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_I2C=y
@@@ -28,3 -27,5 +28,5 @@@ CONFIG_DM_SERIAL=
  CONFIG_FSL_LPUART=y
  CONFIG_DM_SPI=y
  CONFIG_FSL_DSPI=y
+ CONFIG_USB=y
+ CONFIG_DM_USB=y

diff --combined configs/ls1046aqds_nand_defconfig
index 2864916,6b18832..57937b9
--- 1/configs/ls1046aqds_nand_defconfig
--- 2/configs/ls1046aqds_nand_defconfig
+++ b/configs/ls1046aqds_nand_defconfig
@@@ -15,7 -15,6 +15,7 @@@ CONFIG_CMD_BOOTZ=
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MEMTEST=y
  CONFIG_CMD_MEMINFO=y
 +CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_I2C=y
@@@ -28,12 -27,14 +28,14 @@@ CONFIG_CMD_FAT=
  CONFIG_OF_CONTROL=y
  CONFIG_DM=y
  CONFIG_SPI_FLASH=y
 -CONFIG_SYS_NS16550=y
 -CONFIG_DM_SPI=y
 -CONFIG_FSL_DSPI=y
 +CONFIG_NETDEVICES=y
 +CONFIG_E1000=y
  CONFIG_PCI=y
  CONFIG_DM_PCI=y
  CONFIG_DM_PCI_COMPAT=y
  CONFIG_PCIE_LAYERSCAPE=y
 -CONFIG_NETDEVICES=y
 -CONFIG_E1000=y
 +CONFIG_SYS_NS16550=y
 +CONFIG_DM_SPI=y
 +CONFIG_FSL_DSPI=y
+ CONFIG_USB=y
+ CONFIG_DM_USB=y

diff --combined configs/ls1046aqds_qspi_defconfig
index 4d8302e,cdd187a..45782be
--- 1/configs/ls1046aqds_qspi_defconfig
--- 2/configs/ls1046aqds_qspi_defconfig
+++ b/configs/ls1046aqds_qspi_defconfig
@@@ -12,7 -12,6 +12,7 @@@ CONFIG_CMD_BOOTZ=
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MEMTEST=y
  CONFIG_CMD_MEMINFO=y
 +CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_I2C=y
@@@ -25,13 -24,15 +25,15 @@@ CONFIG_CMD_FAT=
  CONFIG_OF_CONTROL=y
  CONFIG_DM=y
  CONFIG_SPI_FLASH=y
 -CONFIG_SYS_NS16550=y
 -CONFIG_DM_SPI=y
 -CONFIG_FSL_DSPI=y
 -CONFIG_FSL_QSPI=y
 +CONFIG_NETDEVICES=y
 +CONFIG_E1000=y
  CONFIG_PCI=y
  CONFIG_DM_PCI=y
  CONFIG_DM_PCI_COMPAT=y
  CONFIG_PCIE_LAYERSCAPE=y
 -CONFIG_NETDEVICES=y
 -CONFIG_E1000=y
 +CONFIG_SYS_NS16550=y
 +CONFIG_DM_SPI=y
 +CONFIG_FSL_DSPI=y
 +CONFIG_FSL_QSPI=y
+ CONFIG_USB=y
+ CONFIG_DM_USB=y

diff --combined configs/ls1046aqds_sdcard_ifc_defconfig
index 53ee3c5,488990a..caf47fe
--- 1/configs/ls1046aqds_sdcard_ifc_defconfig
--- 2/configs/ls1046aqds_sdcard_ifc_defconfig
+++ b/configs/ls1046aqds_sdcard_ifc_defconfig
@@@ -15,7 -15,6 +15,7 @@@ CONFIG_CMD_BOOTZ=
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MEMTEST=y
  CONFIG_CMD_MEMINFO=y
 +CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_I2C=y
@@@ -25,16 -24,17 +25,18 @@@ CONFIG_CMD_PING=
  CONFIG_CMD_CACHE=y
  CONFIG_CMD_EXT2=y
  CONFIG_CMD_FAT=y
 +# CONFIG_SPL_EFI_PARTITION is not set
  CONFIG_OF_CONTROL=y
  CONFIG_DM=y
  CONFIG_SPI_FLASH=y
 -CONFIG_SYS_NS16550=y
 -CONFIG_DM_SPI=y
 -CONFIG_FSL_DSPI=y
 +CONFIG_NETDEVICES=y
 +CONFIG_E1000=y
  CONFIG_PCI=y
  CONFIG_DM_PCI=y
  CONFIG_DM_PCI_COMPAT=y
  CONFIG_PCIE_LAYERSCAPE=y
 -CONFIG_NETDEVICES=y
 -CONFIG_E1000=y
 +CONFIG_SYS_NS16550=y
 +CONFIG_DM_SPI=y
 +CONFIG_FSL_DSPI=y
+ CONFIG_USB=y
+ CONFIG_DM_USB=y

diff --combined configs/ls1046aqds_sdcard_qspi_defconfig
index 3cf6824,800cb2c..998d2cf
--- 1/configs/ls1046aqds_sdcard_qspi_defconfig
--- 2/configs/ls1046aqds_sdcard_qspi_defconfig
+++ b/configs/ls1046aqds_sdcard_qspi_defconfig
@@@ -16,7 -16,6 +16,7 @@@ CONFIG_CMD_BOOTZ=
  CONFIG_CMD_GREPENV=y
  CONFIG_CMD_MEMTEST=y
  CONFIG_CMD_MEMINFO=y
 +CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_I2C=y
@@@ -26,17 -25,18 +26,19 @@@ CONFIG_CMD_PING=
  CONFIG_CMD_CACHE=y
  CONFIG_CMD_EXT2=y
  CONFIG_CMD_FAT=y
 +# CONFIG_SPL_EFI_PARTITION is not set
  CONFIG_OF_CONTROL=y
  CONFIG_DM=y
  CONFIG_SPI_FLASH=y
 -CONFIG_SYS_NS16550=y
 -CONFIG_DM_SPI=y
 -CONFIG_FSL_DSPI=y
 -CONFIG_FSL_QSPI=y
 +CONFIG_NETDEVICES=y
 +CONFIG_E1000=y
  CONFIG_PCI=y
  CONFIG_DM_PCI=y
  CONFIG_DM_PCI_COMPAT=y
  CONFIG_PCIE_LAYERSCAPE=y
 -CONFIG_NETDEVICES=y
 -CONFIG_E1000=y
 +CONFIG_SYS_NS16550=y
 +CONFIG_DM_SPI=y
 +CONFIG_FSL_DSPI=y
 +CONFIG_FSL_QSPI=y
+ CONFIG_USB=y
+ CONFIG_DM_USB=y

diff --combined configs/ls1046ardb_emmc_defconfig
index fcd1509,7b50fc7..4a34209
--- 1/configs/ls1046ardb_emmc_defconfig
--- 2/configs/ls1046ardb_emmc_defconfig
+++ b/configs/ls1046ardb_emmc_defconfig
@@@ -12,7 -12,6 +12,7 @@@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SE
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x110
  CONFIG_HUSH_PARSER=y
  # CONFIG_CMD_IMLS is not set
 +CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_I2C=y
@@@ -22,16 -21,17 +22,18 @@@ CONFIG_CMD_PING=
  CONFIG_CMD_CACHE=y
  CONFIG_CMD_EXT2=y
  CONFIG_CMD_FAT=y
 +# CONFIG_SPL_EFI_PARTITION is not set
  CONFIG_OF_CONTROL=y
  CONFIG_DM=y
  CONFIG_SPI_FLASH=y
 -CONFIG_SYS_NS16550=y
 -CONFIG_DM_SPI=y
 -CONFIG_FSL_QSPI=y
 +CONFIG_NETDEVICES=y
 +CONFIG_E1000=y
  CONFIG_PCI=y
  CONFIG_DM_PCI=y
  CONFIG_DM_PCI_COMPAT=y
  CONFIG_PCIE_LAYERSCAPE=y
 -CONFIG_NETDEVICES=y
 -CONFIG_E1000=y
 +CONFIG_SYS_NS16550=y
 +CONFIG_DM_SPI=y
 +CONFIG_FSL_QSPI=y
+ CONFIG_USB=y
+ CONFIG_DM_USB=y

diff --combined configs/ls1046ardb_qspi_defconfig
index 1fb5cac,41d6984..e2eaa9e
--- 1/configs/ls1046ardb_qspi_defconfig
--- 2/configs/ls1046ardb_qspi_defconfig
+++ b/configs/ls1046ardb_qspi_defconfig
@@@ -1,15 -1,15 +1,15 @@@
  CONFIG_ARM=y
  CONFIG_TARGET_LS1046ARDB=y
 +CONFIG_FSL_LS_PPA=y
  CONFIG_QSPI_AHB_INIT=y
  CONFIG_DEFAULT_DEVICE_TREE="fsl-ls1046a-rdb"
 -CONFIG_FIT=y
  CONFIG_FIT_VERBOSE=y
 -CONFIG_FSL_LS_PPA=y
  CONFIG_OF_BOARD_SETUP=y
  CONFIG_QSPI_BOOT=y
  CONFIG_BOOTDELAY=10
  CONFIG_HUSH_PARSER=y
  # CONFIG_CMD_IMLS is not set
 +CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_I2C=y
@@@ -22,12 -22,14 +22,14 @@@ CONFIG_CMD_FAT=
  CONFIG_OF_CONTROL=y
  CONFIG_DM=y
  CONFIG_SPI_FLASH=y
 -CONFIG_SYS_NS16550=y
 -CONFIG_DM_SPI=y
 -CONFIG_FSL_QSPI=y
 +CONFIG_NETDEVICES=y
 +CONFIG_E1000=y
  CONFIG_PCI=y
  CONFIG_DM_PCI=y
  CONFIG_DM_PCI_COMPAT=y
  CONFIG_PCIE_LAYERSCAPE=y
 -CONFIG_NETDEVICES=y
 -CONFIG_E1000=y
 +CONFIG_SYS_NS16550=y
 +CONFIG_DM_SPI=y
 +CONFIG_FSL_QSPI=y
+ CONFIG_USB=y
+ CONFIG_DM_USB=y

diff --combined configs/ls1046ardb_sdcard_defconfig
index ea1fa79,9e6d23b..a8df6cc
--- 1/configs/ls1046ardb_sdcard_defconfig
--- 2/configs/ls1046ardb_sdcard_defconfig
+++ b/configs/ls1046ardb_sdcard_defconfig
@@@ -12,7 -12,6 +12,7 @@@ CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SE
  CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x110
  CONFIG_HUSH_PARSER=y
  # CONFIG_CMD_IMLS is not set
 +CONFIG_CMD_GPT=y
  CONFIG_CMD_MMC=y
  CONFIG_CMD_SF=y
  CONFIG_CMD_I2C=y
@@@ -22,16 -21,17 +22,18 @@@ CONFIG_CMD_PING=
  CONFIG_CMD_CACHE=y
  CONFIG_CMD_EXT2=y
  CONFIG_CMD_FAT=y
 +# CONFIG_SPL_EFI_PARTITION is not set
  CONFIG_OF_CONTROL=y
  CONFIG_DM=y
  CONFIG_SPI_FLASH=y
 -CONFIG_SYS_NS16550=y
 -CONFIG_DM_SPI=y
 -CONFIG_FSL_QSPI=y
 +CONFIG_NETDEVICES=y
 +CONFIG_E1000=y
  CONFIG_PCI=y
  CONFIG_DM_PCI=y
  CONFIG_DM_PCI_COMPAT=y
  CONFIG_PCIE_LAYERSCAPE=y
 -CONFIG_NETDEVICES=y
 -CONFIG_E1000=y
 +CONFIG_SYS_NS16550=y
 +CONFIG_DM_SPI=y
 +CONFIG_FSL_QSPI=y
+ CONFIG_USB=y
+ CONFIG_DM_USB=y

diff --combined include/configs/B4860QDS.h
index fc99b96,4267d81..2fdb869
--- 1/include/configs/B4860QDS.h
--- 2/include/configs/B4860QDS.h
+++ b/include/configs/B4860QDS.h
@@@ -63,7 -63,6 +63,6 @@@
  
  #define CONFIG_SYS_FSL_CPC            /* Corenet Platform Cache */
  #define CONFIG_SYS_NUM_CPC            CONFIG_SYS_NUM_DDR_CTLRS
- #define CONFIG_FSL_IFC                        /* Enable IFC Support */
  #define CONFIG_FSL_CAAM                       /* Enable SEC/CAAM */
  #define CONFIG_PCIE1                  /* PCIE controller 1 */
  #define CONFIG_FSL_PCI_INIT           /* Use common FSL init code */
@@@ -675,6 -674,7 +674,6 @@@ unsigned long get_board_ddr_clk(void)
  #define CONFIG_PCI_INDIRECT_BRIDGE
  
  #define CONFIG_PCI_SCAN_SHOW          /* show pci devices on startup */
 -#define CONFIG_DOS_PARTITION
  #endif        /* CONFIG_PCI */
  
  #ifdef CONFIG_FMAN_ENET

diff --combined include/configs/BSC9131RDB.h
index 77f0927,db7574d..4116234
--- 1/include/configs/BSC9131RDB.h
--- 2/include/configs/BSC9131RDB.h
+++ b/include/configs/BSC9131RDB.h
@@@ -46,7 -46,6 +46,6 @@@
  #endif
  
  /* High Level Configuration Options */
- #define CONFIG_FSL_IFC                        /* Enable IFC Support */
  #define CONFIG_FSL_CAAM                       /* Enable SEC/CAAM */
  
  #define CONFIG_TSEC_ENET
@@@ -299,6 -298,7 +298,6 @@@ extern unsigned long get_sdram_size(voi
   */
  #define CONFIG_CMD_ERRATA
  #define CONFIG_CMD_IRQ
 -#define CONFIG_DOS_PARTITION
  #define CONFIG_CMD_REGINFO
  
  /*

diff --combined include/configs/BSC9132QDS.h
index 9e729fd,4c55da4..942123b
--- 1/include/configs/BSC9132QDS.h
--- 2/include/configs/BSC9132QDS.h
+++ b/include/configs/BSC9132QDS.h
@@@ -68,7 -68,6 +68,6 @@@
  #endif
  
  /* High Level Configuration Options */
- #define CONFIG_FSL_IFC                        /* Enable IFC Support */
  #define CONFIG_FSL_CAAM                       /* Enable SEC/CAAM */
  #define CONFIG_SYS_HAS_SERDES         /* common SERDES init code */
  
@@@ -97,6 -96,7 +96,6 @@@
  #define CONFIG_SYS_PCIE1_IO_PHYS      0xC0010000
  
  #define CONFIG_PCI_SCAN_SHOW          /* show pci devices on startup */
 -#define CONFIG_DOS_PARTITION
  #endif
  
  #define CONFIG_ENV_OVERWRITE
@@@ -477,7 -477,9 +476,7 @@@ combinations. this should be removed la
  #endif        /* CONFIG_TSEC_ENET */
  
  #ifdef CONFIG_MMC
 -#define CONFIG_DOS_PARTITION
  #define CONFIG_FSL_ESDHC
 -#define CONFIG_GENERIC_MMC
  #define CONFIG_SYS_FSL_ESDHC_ADDR     CONFIG_SYS_MPC85xx_ESDHC_ADDR
  #endif
  
@@@ -532,6 -534,10 +531,6 @@@
  #define CONFIG_CMD_IRQ
  #define CONFIG_CMD_REGINFO
  
 -#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI)
 -#define CONFIG_DOS_PARTITION
 -#endif
 -
  /* Hash command with SHA acceleration supported in hardware */
  #ifdef CONFIG_FSL_CAAM
  #define CONFIG_CMD_HASH

diff --combined include/configs/C29XPCIE.h
index e1ce7ad,269cd49..8f68748
--- 1/include/configs/C29XPCIE.h
--- 2/include/configs/C29XPCIE.h
+++ b/include/configs/C29XPCIE.h
@@@ -68,7 -68,6 +68,6 @@@
  #endif
  
  /* High Level Configuration Options */
- #define CONFIG_FSL_IFC                        /* Enable IFC Support */
  #define CONFIG_FSL_CAAM                       /* Enable SEC/CAAM */
  #define CONFIG_SYS_HAS_SERDES         /* common SERDES init code */
  
@@@ -97,6 -96,7 +96,6 @@@
  #define CONFIG_SYS_PCIE1_IO_PHYS      0xfffc00000ull
  
  #define CONFIG_PCI_SCAN_SHOW          /* show pci devices on startup */
 -#define CONFIG_DOS_PARTITION
  #endif
  
  #define CONFIG_TSEC_ENET

diff --combined include/configs/MPC8536DS.h
index 4635cdf,8c42d72..b9eab4e
--- 1/include/configs/MPC8536DS.h
--- 2/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@@ -37,7 -37,6 +37,6 @@@
  #define CONFIG_SYS_MONITOR_BASE       CONFIG_SYS_TEXT_BASE    /* start of monitor */
  #endif
  
- #define CONFIG_FSL_ELBC               1       /* Has Enhanced localbus controller */
  #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) */
@@@ -524,6 -523,7 +523,6 @@@
  #ifdef CONFIG_FSL_SATA
  #define CONFIG_LBA48
  #define CONFIG_CMD_SATA
 -#define CONFIG_DOS_PARTITION
  #endif
  
  #if defined(CONFIG_TSEC_ENET)
@@@ -603,6 -603,7 +602,6 @@@
  #ifdef CONFIG_MMC
  #define CONFIG_FSL_ESDHC
  #define CONFIG_SYS_FSL_ESDHC_ADDR     CONFIG_SYS_MPC85xx_ESDHC_ADDR
 -#define CONFIG_GENERIC_MMC
  #endif
  
  /*
@@@ -618,6 -619,10 +617,6 @@@
  #endif
  #endif
  
 -#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI)
 -#define CONFIG_DOS_PARTITION
 -#endif
 -
  /*
   * Miscellaneous configurable options
   */

diff --combined include/configs/MPC8569MDS.h
index caa52be,baee4a0..91e17d9
--- 1/include/configs/MPC8569MDS.h
--- 2/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@@ -10,8 -10,6 +10,6 @@@
  #ifndef __CONFIG_H
  #define __CONFIG_H
  
- #define CONFIG_FSL_ELBC               1       /* Has Enhance localbus controller */
- 
  #define CONFIG_SYS_SRIO
  #define CONFIG_SRIO1                  /* SRIO port 1 */
  
@@@ -463,6 -461,8 +461,6 @@@ extern unsigned long get_clock_freq(voi
  #define CONFIG_FSL_ESDHC
  #define CONFIG_FSL_ESDHC_PIN_MUX
  #define CONFIG_SYS_FSL_ESDHC_ADDR     CONFIG_SYS_MPC85xx_ESDHC_ADDR
 -#define CONFIG_GENERIC_MMC
 -#define CONFIG_DOS_PARTITION
  #endif
  
  /*

diff --combined include/configs/MPC8572DS.h
index b933d21,d7b1366..3d4c8a8
--- 1/include/configs/MPC8572DS.h
--- 2/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@@ -28,7 -28,6 +28,6 @@@
  /* High Level Configuration Options */
  #define CONFIG_MP             1       /* support multiple processors */
  
- #define CONFIG_FSL_ELBC               1       /* Has Enhanced localbus controller */
  #define CONFIG_PCIE1          1       /* PCIE controller 1 (slot 1) */
  #define CONFIG_PCIE2          1       /* PCIE controller 2 (slot 2) */
  #define CONFIG_PCIE3          1       /* PCIE controller 3 (ULI bridge) */
@@@ -471,6 -470,7 +470,6 @@@
  #endif
  
  #define CONFIG_PCI_SCAN_SHOW          /* show pci devices on startup */
 -#define CONFIG_DOS_PARTITION
  #define CONFIG_SCSI_AHCI
  
  #ifdef CONFIG_SCSI_AHCI

diff --combined include/configs/P1010RDB.h
index baa8369,83bb2cc..cf574da
--- 1/include/configs/P1010RDB.h
--- 2/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@@ -130,7 -130,6 +130,6 @@@
  #endif
  
  /* High Level Configuration Options */
- #define CONFIG_FSL_IFC                        /* Enable IFC Support */
  #define CONFIG_FSL_CAAM                       /* Enable SEC/CAAM */
  #define CONFIG_SYS_HAS_SERDES         /* common SERDES init code */
  
@@@ -193,6 -192,7 +192,6 @@@
  #endif
  
  #define CONFIG_PCI_SCAN_SHOW          /* show pci devices on startup */
 -#define CONFIG_DOS_PARTITION
  #endif
  
  #define CONFIG_TSEC_ENET
@@@ -668,7 -668,9 +667,7 @@@ extern unsigned long get_sdram_size(voi
  #endif /* #ifdef CONFIG_FSL_SATA  */
  
  #ifdef CONFIG_MMC
 -#define CONFIG_DOS_PARTITION
  #define CONFIG_FSL_ESDHC
 -#define CONFIG_GENERIC_MMC
  #define CONFIG_SYS_FSL_ESDHC_ADDR     CONFIG_SYS_MPC85xx_ESDHC_ADDR
  #endif
  
@@@ -741,6 -743,7 +740,6 @@@
  
  #if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI) \
                 || defined(CONFIG_FSL_SATA)
 -#define CONFIG_DOS_PARTITION
  #endif
  
  /* Hash command with SHA acceleration supported in hardware */

diff --combined include/configs/P1022DS.h
index f1d8116,70dcd9b..e601cc6
--- 1/include/configs/P1022DS.h
--- 2/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@@ -96,7 -96,6 +96,6 @@@
  #define CONFIG_RESET_VECTOR_ADDRESS   0xeffffffc
  #endif
  
- #define CONFIG_FSL_ELBC                       /* Has Enhanced localbus controller */
  #define CONFIG_PCIE1                  /* PCIE controller 1 (slot 1) */
  #define CONFIG_PCIE2                  /* PCIE controller 2 (slot 2) */
  #define CONFIG_PCIE3                  /* PCIE controller 3 (ULI bridge) */
@@@ -500,13 -499,19 +499,13 @@@
  #ifdef CONFIG_FSL_SATA
  #define CONFIG_LBA48
  #define CONFIG_CMD_SATA
 -#define CONFIG_DOS_PARTITION
  #endif
  
  #ifdef CONFIG_MMC
  #define CONFIG_FSL_ESDHC
 -#define CONFIG_GENERIC_MMC
  #define CONFIG_SYS_FSL_ESDHC_ADDR     CONFIG_SYS_MPC85xx_ESDHC_ADDR
  #endif
  
 -#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI)
 -#define CONFIG_DOS_PARTITION
 -#endif
 -
  #define CONFIG_TSEC_ENET
  #ifdef CONFIG_TSEC_ENET
  

diff --combined include/configs/P1023RDB.h
index 1369035,7b10625..58a3507
--- 1/include/configs/P1023RDB.h
--- 2/include/configs/P1023RDB.h
+++ b/include/configs/P1023RDB.h
@@@ -25,7 -25,6 +25,6 @@@
  /* High Level Configuration Options */
  #define CONFIG_MP             /* support multiple processors */
  
- #define CONFIG_FSL_ELBC               /* Has Enhanced localbus controller */
  #define CONFIG_PCI_INDIRECT_BRIDGE     /* indirect PCI bridge support */
  #define CONFIG_PCIE1          /* PCIE controller 1 (slot 1) */
  #define CONFIG_PCIE2          /* PCIE controller 2 (slot 2) */
@@@ -259,6 -258,7 +258,6 @@@ extern unsigned long get_clock_freq(voi
  #ifdef CONFIG_USB_EHCI
  #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
  #define CONFIG_USB_EHCI_FSL
 -#define CONFIG_DOS_PARTITION
  #endif
  #endif
  

diff --combined include/configs/P2041RDB.h
index 15384f1,e22b1f5..3fad88f
--- 1/include/configs/P2041RDB.h
--- 2/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@@ -41,7 -41,6 +41,6 @@@
  
  #define CONFIG_SYS_FSL_CPC            /* Corenet Platform Cache */
  #define CONFIG_SYS_NUM_CPC            CONFIG_SYS_NUM_DDR_CTLRS
- #define CONFIG_FSL_ELBC                       /* Has Enhanced localbus controller */
  #define CONFIG_FSL_CAAM                       /* Enable SEC/CAAM */
  #define CONFIG_PCIE1                  /* PCIE controller 1 */
  #define CONFIG_PCIE2                  /* PCIE controller 2 */
@@@ -533,6 -532,7 +532,6 @@@ unsigned long get_board_sys_clk(unsigne
  #define CONFIG_PCI_INDIRECT_BRIDGE
  
  #define CONFIG_PCI_SCAN_SHOW          /* show pci devices on startup */
 -#define CONFIG_DOS_PARTITION
  #endif        /* CONFIG_PCI */
  
  /* SATA */
@@@ -552,6 -552,7 +551,6 @@@
  
  #define CONFIG_LBA48
  #define CONFIG_CMD_SATA
 -#define CONFIG_DOS_PARTITION
  #endif
  
  #ifdef CONFIG_FMAN_ENET
@@@ -606,6 -607,8 +605,6 @@@
  #define CONFIG_FSL_ESDHC
  #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
  #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
 -#define CONFIG_GENERIC_MMC
 -#define CONFIG_DOS_PARTITION
  #endif
  
  /* Hash command with SHA acceleration supported in hardware */

diff --combined include/configs/T102xQDS.h
index 00ffb83,669a094..fcaa803
--- 1/include/configs/T102xQDS.h
--- 2/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@@ -23,7 -23,6 +23,6 @@@
  
  #define CONFIG_SYS_FSL_CPC            /* Corenet Platform Cache */
  #define CONFIG_SYS_NUM_CPC            CONFIG_SYS_NUM_DDR_CTLRS
- #define CONFIG_FSL_IFC                        /* Enable IFC Support */
  
  #define CONFIG_ENV_OVERWRITE
  
@@@ -620,6 -619,7 +619,6 @@@ unsigned long get_board_ddr_clk(void)
  #endif
  
  #define CONFIG_PCI_SCAN_SHOW          /* show pci devices on startup */
 -#define CONFIG_DOS_PARTITION
  #endif        /* CONFIG_PCI */
  
  /*
@@@ -635,6 -635,7 +634,6 @@@
  #define CONFIG_SYS_SATA1_FLAGS                FLAGS_DMA
  #define CONFIG_LBA48
  #define CONFIG_CMD_SATA
 -#define CONFIG_DOS_PARTITION
  #endif
  
  /*
@@@ -654,6 -655,8 +653,6 @@@
  #ifdef CONFIG_MMC
  #define CONFIG_FSL_ESDHC
  #define CONFIG_SYS_FSL_ESDHC_ADDR     CONFIG_SYS_MPC85xx_ESDHC_ADDR
 -#define CONFIG_GENERIC_MMC
 -#define CONFIG_DOS_PARTITION
  #endif
  
  /* Qman/Bman */

diff --combined include/configs/T102xRDB.h
index 02c3fdd,57e0cfa..e46bf00
--- 1/include/configs/T102xRDB.h
--- 2/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@@ -23,7 -23,6 +23,6 @@@
  
  #define CONFIG_SYS_FSL_CPC            /* Corenet Platform Cache */
  #define CONFIG_SYS_NUM_CPC            CONFIG_SYS_NUM_DDR_CTLRS
- #define CONFIG_FSL_IFC                        /* Enable IFC Support */
  
  #define CONFIG_ENV_OVERWRITE
  
@@@ -639,6 -638,7 +638,6 @@@ unsigned long get_board_ddr_clk(void)
  #endif
  
  #define CONFIG_PCI_SCAN_SHOW          /* show pci devices on startup */
 -#define CONFIG_DOS_PARTITION
  #endif        /* CONFIG_PCI */
  
  /*
@@@ -658,6 -658,8 +657,6 @@@
  #ifdef CONFIG_MMC
  #define CONFIG_FSL_ESDHC
  #define CONFIG_SYS_FSL_ESDHC_ADDR     CONFIG_SYS_MPC85xx_ESDHC_ADDR
 -#define CONFIG_GENERIC_MMC
 -#define CONFIG_DOS_PARTITION
  #endif
  
  /* Qman/Bman */

diff --combined include/configs/T1040QDS.h
index bd8e46e,385e7ab..2d436c2
--- 1/include/configs/T1040QDS.h
--- 2/include/configs/T1040QDS.h
+++ b/include/configs/T1040QDS.h
@@@ -51,7 -51,6 +51,6 @@@
  
  #define CONFIG_SYS_FSL_CPC            /* Corenet Platform Cache */
  #define CONFIG_SYS_NUM_CPC            CONFIG_SYS_NUM_DDR_CTLRS
- #define CONFIG_FSL_IFC                        /* Enable IFC Support */
  #define CONFIG_FSL_CAAM                       /* Enable SEC/CAAM */
  #define CONFIG_PCI_INDIRECT_BRIDGE
  #define CONFIG_PCIE1                  /* PCIE controller 1 */
@@@ -504,6 -503,7 +503,6 @@@ unsigned long get_board_ddr_clk(void)
  #endif
  
  #define CONFIG_PCI_SCAN_SHOW          /* show pci devices on startup */
 -#define CONFIG_DOS_PARTITION
  #endif        /* CONFIG_PCI */
  
  /* SATA */
@@@ -522,6 -522,7 +521,6 @@@
  
  #define CONFIG_LBA48
  #define CONFIG_CMD_SATA
 -#define CONFIG_DOS_PARTITION
  #endif
  
  /*
@@@ -542,6 -543,8 +541,6 @@@
  #define CONFIG_FSL_ESDHC
  #define CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK
  #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
 -#define CONFIG_GENERIC_MMC
 -#define CONFIG_DOS_PARTITION
  #define CONFIG_FSL_ESDHC_ADAPTER_IDENT
  #endif
  

diff --combined include/configs/T104xRDB.h
index 82d3f10,bcb8eda..9306b73
--- 1/include/configs/T104xRDB.h
--- 2/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@@ -162,7 -162,6 +162,6 @@@ $(SRCTREE)/board/freescale/t104xrdb/t10
  
  #define CONFIG_SYS_FSL_CPC            /* Corenet Platform Cache */
  #define CONFIG_SYS_NUM_CPC            CONFIG_SYS_NUM_DDR_CTLRS
- #define CONFIG_FSL_IFC                        /* Enable IFC Support */
  #define CONFIG_FSL_CAAM                       /* Enable SEC/CAAM */
  #define CONFIG_PCI_INDIRECT_BRIDGE
  #define CONFIG_PCIE1                  /* PCIE controller 1 */
@@@ -618,6 -617,7 +617,6 @@@
  #endif
  
  #define CONFIG_PCI_SCAN_SHOW          /* show pci devices on startup */
 -#define CONFIG_DOS_PARTITION
  #endif        /* CONFIG_PCI */
  
  /* SATA */
@@@ -633,6 -633,7 +632,6 @@@
  
  #define CONFIG_LBA48
  #define CONFIG_CMD_SATA
 -#define CONFIG_DOS_PARTITION
  #endif
  
  /*
@@@ -652,6 -653,8 +651,6 @@@
  #ifdef CONFIG_MMC
  #define CONFIG_FSL_ESDHC
  #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
 -#define CONFIG_GENERIC_MMC
 -#define CONFIG_DOS_PARTITION
  #endif
  
  /* Qman/Bman */

diff --combined include/configs/T208xQDS.h
index a9835b9,9ec326a..0a65d0e
--- 1/include/configs/T208xQDS.h
--- 2/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@@ -33,7 -33,6 +33,6 @@@
  
  #define CONFIG_SYS_FSL_CPC    /* Corenet Platform Cache */
  #define CONFIG_SYS_NUM_CPC    CONFIG_SYS_NUM_DDR_CTLRS
- #define CONFIG_FSL_IFC                /* Enable IFC Support */
  #define CONFIG_FSL_CAAM               /* Enable SEC/CAAM */
  #define CONFIG_ENV_OVERWRITE
  
@@@ -591,6 -590,7 +590,6 @@@ unsigned long get_board_ddr_clk(void)
  #define CONFIG_PCI_INDIRECT_BRIDGE
  #define CONFIG_FSL_PCIE_RESET    /* need PCIe reset errata */
  #define CONFIG_PCI_SCAN_SHOW  /* show pci devices on startup */
 -#define CONFIG_DOS_PARTITION
  #endif
  
  /* Qman/Bman */
@@@ -701,6 -701,7 +700,6 @@@
  #define CONFIG_SYS_SATA2_FLAGS                FLAGS_DMA
  #define CONFIG_LBA48
  #define CONFIG_CMD_SATA
 -#define CONFIG_DOS_PARTITION
  #endif
  
  /*
@@@ -721,6 -722,8 +720,6 @@@
  #define CONFIG_SYS_FSL_ESDHC_ADDR     CONFIG_SYS_MPC85xx_ESDHC_ADDR
  #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
  #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 -#define CONFIG_GENERIC_MMC
 -#define CONFIG_DOS_PARTITION
  #define CONFIG_FSL_ESDHC_ADAPTER_IDENT
  #endif
  

diff --combined include/configs/T208xRDB.h
index 1e2b94e,b114234..f833732
--- 1/include/configs/T208xRDB.h
--- 2/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@@ -27,7 -27,6 +27,6 @@@
  
  #define CONFIG_SYS_FSL_CPC    /* Corenet Platform Cache */
  #define CONFIG_SYS_NUM_CPC    CONFIG_SYS_NUM_DDR_CTLRS
- #define CONFIG_FSL_IFC                /* Enable IFC Support */
  #define CONFIG_FSL_CAAM               /* Enable SEC/CAAM */
  #define CONFIG_ENV_OVERWRITE
  
@@@ -529,6 -528,7 +528,6 @@@ unsigned long get_board_ddr_clk(void)
  #define CONFIG_PCI_INDIRECT_BRIDGE
  #define CONFIG_FSL_PCIE_RESET           /* need PCIe reset errata LSZ ADD */
  #define CONFIG_PCI_SCAN_SHOW  /* show pci devices on startup */
 -#define CONFIG_DOS_PARTITION
  #endif
  
  /* Qman/Bman */
@@@ -651,6 -651,7 +650,6 @@@
  #define CONFIG_SYS_SATA2_FLAGS                FLAGS_DMA
  #define CONFIG_LBA48
  #define CONFIG_CMD_SATA
 -#define CONFIG_DOS_PARTITION
  #endif
  
  /*
@@@ -670,6 -671,8 +669,6 @@@
  #define CONFIG_SYS_FSL_ESDHC_ADDR     CONFIG_SYS_MPC85xx_ESDHC_ADDR
  #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
  #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
 -#define CONFIG_GENERIC_MMC
 -#define CONFIG_DOS_PARTITION
  #endif
  
  /*

diff --combined include/configs/T4240RDB.h
index 2a1b547,9136bf0..dbb9fd4
--- 1/include/configs/T4240RDB.h
--- 2/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@@ -73,7 -73,6 +73,6 @@@
  
  #define CONFIG_SYS_FSL_CPC            /* Corenet Platform Cache */
  #define CONFIG_SYS_NUM_CPC            CONFIG_SYS_NUM_DDR_CTLRS
- #define CONFIG_FSL_IFC                        /* Enable IFC Support */
  #define CONFIG_FSL_CAAM                       /* Enable SEC/CAAM */
  #define CONFIG_PCIE1                  /* PCIE controller 1 */
  #define CONFIG_PCIE2                  /* PCIE controller 2 */
@@@ -241,6 -240,7 +240,6 @@@
  #define CONFIG_PCI_INDIRECT_BRIDGE
  
  #define CONFIG_PCI_SCAN_SHOW          /* show pci devices on startup */
 -#define CONFIG_DOS_PARTITION
  #endif        /* CONFIG_PCI */
  
  /* SATA */
@@@ -258,6 -258,7 +257,6 @@@
  
  #define CONFIG_LBA48
  #define CONFIG_CMD_SATA
 -#define CONFIG_DOS_PARTITION
  #endif
  
  #ifdef CONFIG_FMAN_ENET
@@@ -679,6 -680,7 +678,6 @@@ unsigned long get_board_ddr_clk(void)
  
  #define CONFIG_LBA48
  #define CONFIG_CMD_SATA
 -#define CONFIG_DOS_PARTITION
  #endif
  
  #ifdef CONFIG_FMAN_ENET
@@@ -699,6 -701,8 +698,6 @@@
  #define CONFIG_FSL_ESDHC
  #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
  #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
 -#define CONFIG_GENERIC_MMC
 -#define CONFIG_DOS_PARTITION
  #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33
  #endif
  

diff --combined include/configs/UCP1020.h
index 28f4b14,a9b7a5a..8082ec5
--- 1/include/configs/UCP1020.h
--- 2/include/configs/UCP1020.h
+++ b/include/configs/UCP1020.h
@@@ -14,7 -14,6 +14,6 @@@
  #ifndef __CONFIG_H
  #define __CONFIG_H
  
- #define CONFIG_FSL_ELBC
  #define CONFIG_PCIE1  /* PCIE controller 1 (slot 1) */
  #define CONFIG_PCIE2  /* PCIE controller 2 (slot 2) */
  #define CONFIG_FSL_PCI_INIT   /* Use common FSL init code */
@@@ -378,6 -377,7 +377,6 @@@
  #define CONFIG_CMD_PCI
  
  #define CONFIG_PCI_SCAN_SHOW  /* show pci devices on startup */
 -#define CONFIG_DOS_PARTITION
  #endif /* CONFIG_PCI */
  
  /*
@@@ -473,6 -473,11 +472,6 @@@
  #define CONFIG_SYS_FSL_ESDHC_ADDR     CONFIG_SYS_MPC85xx_ESDHC_ADDR
  #define CONFIG_MMC_SPI
  #define CONFIG_CMD_MMC_SPI
 -#define CONFIG_GENERIC_MMC
 -#endif
 -
 -#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI) || defined(CONFIG_FSL_SATA)
 -#define CONFIG_DOS_PARTITION
  #endif
  
  /* Misc Extra Settings */

diff --combined include/configs/controlcenterd.h
index e5d60fb,7c6fd74..cc2b273
--- 1/include/configs/controlcenterd.h
--- 2/include/configs/controlcenterd.h
+++ b/include/configs/controlcenterd.h
@@@ -137,7 -137,6 +137,6 @@@
  /*
   * Local Bus Definitions
   */
- #define CONFIG_FSL_ELBC                       /* Has Enhanced localbus controller */
  
  #define CONFIG_SYS_ELBC_BASE          0xe0000000
  #ifdef CONFIG_PHYS_64BIT
@@@ -206,6 -205,8 +205,6 @@@
  /*
   * MMC
   */
 -#define CONFIG_GENERIC_MMC
 -
  #define CONFIG_FSL_ESDHC
  #define CONFIG_SYS_FSL_ESDHC_ADDR     CONFIG_SYS_MPC85xx_ESDHC_ADDR
  
@@@ -372,6 -373,7 +371,6 @@@
  #define CONFIG_HW_WATCHDOG
  #define CONFIG_LOADS_ECHO
  #define CONFIG_SYS_LOADS_BAUD_CHANGE
 -#define CONFIG_DOS_PARTITION
  
  /*
   * For booting Linux, the board info and command line data

diff --combined include/configs/corenet_ds.h
index 7637bb8,3ca30cb..dd38fa3
--- 1/include/configs/corenet_ds.h
--- 2/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@@ -59,7 -59,6 +59,6 @@@
  
  #define CONFIG_SYS_FSL_CPC            /* Corenet Platform Cache */
  #define CONFIG_SYS_NUM_CPC            CONFIG_SYS_NUM_DDR_CTLRS
- #define CONFIG_FSL_ELBC                       /* Has Enhanced localbus controller */
  #define CONFIG_FSL_CAAM                       /* Enable SEC/CAAM */
  #define CONFIG_PCIE1                  /* PCIE controller 1 */
  #define CONFIG_PCIE2                  /* PCIE controller 2 */
@@@ -549,6 -548,7 +548,6 @@@
  #define CONFIG_PCI_INDIRECT_BRIDGE
  
  #define CONFIG_PCI_SCAN_SHOW          /* show pci devices on startup */
 -#define CONFIG_DOS_PARTITION
  #endif        /* CONFIG_PCI */
  
  /* SATA */
@@@ -566,6 -566,7 +565,6 @@@
  
  #define CONFIG_LBA48
  #define CONFIG_CMD_SATA
 -#define CONFIG_DOS_PARTITION
  #endif
  
  #ifdef CONFIG_FMAN_ENET
@@@ -620,6 -621,8 +619,6 @@@
  #define CONFIG_FSL_ESDHC
  #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
  #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
 -#define CONFIG_GENERIC_MMC
 -#define CONFIG_DOS_PARTITION
  #endif
  
  /* Hash command with SHA acceleration supported in hardware */

diff --combined include/configs/cyrus.h
index c9a57af,e98682c..3f195ab
--- 1/include/configs/cyrus.h
--- 2/include/configs/cyrus.h
+++ b/include/configs/cyrus.h
@@@ -49,7 -49,6 +49,6 @@@
  
  #define CONFIG_SYS_FSL_CPC            /* Corenet Platform Cache */
  #define CONFIG_SYS_NUM_CPC            CONFIG_SYS_NUM_DDR_CTLRS
- #define CONFIG_FSL_ELBC                       /* Has Enhanced localbus controller */
  #define CONFIG_PCIE1                  /* PCIE controller 1 */
  #define CONFIG_PCIE2                  /* PCIE controller 2 */
  #define CONFIG_FSL_PCI_INIT           /* Use common FSL init code */
@@@ -380,6 -379,7 +379,6 @@@
  #define CONFIG_NET_MULTI
  
  #define CONFIG_PCI_SCAN_SHOW          /* show pci devices on startup */
 -#define CONFIG_DOS_PARTITION
  #endif        /* CONFIG_PCI */
  
  /* SATA */
@@@ -397,6 -397,7 +396,6 @@@
  
  #define CONFIG_LBA48
  #define CONFIG_CMD_SATA
 -#define CONFIG_DOS_PARTITION
  #endif
  
  #ifdef CONFIG_FMAN_ENET
@@@ -442,6 -443,8 +441,6 @@@
  #define CONFIG_FSL_ESDHC
  #define CONFIG_SYS_FSL_ESDHC_ADDR       CONFIG_SYS_MPC85xx_ESDHC_ADDR
  #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT
 -#define CONFIG_GENERIC_MMC
 -#define CONFIG_DOS_PARTITION
  #endif
  
  /*

diff --combined include/configs/km/kmp204x-common.h
index 8669fcd,6796f09..efd3b28
--- 1/include/configs/km/kmp204x-common.h
--- 2/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@@ -35,7 -35,6 +35,6 @@@
  
  #define CONFIG_SYS_FSL_CPC            /* Corenet Platform Cache */
  #define CONFIG_SYS_NUM_CPC            CONFIG_SYS_NUM_DDR_CTLRS
- #define CONFIG_FSL_ELBC                       /* Has Enhanced localbus controller */
  #define CONFIG_PCIE1                  /* PCIE controller 1 */
  #define CONFIG_PCIE3                  /* PCIE controller 3 */
  #define CONFIG_FSL_PCI_INIT           /* Use common FSL init code */
@@@ -345,6 -344,7 +344,6 @@@ int get_scl(void)
  #define CONFIG_PCI_INDIRECT_BRIDGE
  
  #define CONFIG_PCI_SCAN_SHOW          /* show pci devices on startup */
 -#define CONFIG_DOS_PARTITION
  
  /* RGMII (FM1@DTESC5) is used as debug itf, it's the only one configured */
  #define CONFIG_SYS_FM1_DTSEC5_PHY_ADDR        0x11

diff --combined include/configs/ls1046aqds.h
index efc0fd9,30947b2..0e648b1
--- 1/include/configs/ls1046aqds.h
--- 2/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@@ -135,11 -135,28 +135,23 @@@ unsigned long get_board_ddr_clk(void)
  #define CFG_LPUART_EN         0x2
  #endif
  
+ /* USB */
+ #define CONFIG_HAS_FSL_XHCI_USB
+ #ifdef CONFIG_HAS_FSL_XHCI_USB
+ #define CONFIG_USB_XHCI_HCD
+ #define CONFIG_USB_XHCI_FSL
+ #define CONFIG_USB_XHCI_DWC3
+ #define CONFIG_USB_MAX_CONTROLLER_COUNT         3
+ #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS      2
+ #define CONFIG_CMD_USB
+ #define CONFIG_USB_STORAGE
+ #endif
+ 
  /* SATA */
  #define CONFIG_LIBATA
  #define CONFIG_SCSI_AHCI
  #define CONFIG_SCSI_AHCI_PLAT
  #define CONFIG_SCSI
 -#define CONFIG_DOS_PARTITION
 -
 -#define CONFIG_PARTITION_UUIDS
 -#define CONFIG_EFI_PARTITION
 -#define CONFIG_CMD_GPT
  
  /* EEPROM */
  #define CONFIG_ID_EEPROM

diff --combined include/configs/p1_p2_rdb_pc.h
index 9b142bc,f24ade9..88876d6
--- 1/include/configs/p1_p2_rdb_pc.h
--- 2/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@@ -260,7 -260,6 +260,6 @@@
  
  #define CONFIG_MP
  
- #define CONFIG_FSL_ELBC
  #define CONFIG_PCIE1  /* PCIE controller 1 (slot 1) */
  #define CONFIG_PCIE2  /* PCIE controller 2 (slot 2) */
  #define CONFIG_FSL_PCI_INIT   /* Use common FSL init code */
@@@ -696,6 -695,7 +695,6 @@@
  #define CONFIG_CMD_PCI
  
  #define CONFIG_PCI_SCAN_SHOW  /* show pci devices on startup */
 -#define CONFIG_DOS_PARTITION
  #endif /* CONFIG_PCI */
  
  #if defined(CONFIG_TSEC_ENET)
@@@ -840,6 -840,12 +839,6 @@@
  #ifdef CONFIG_MMC
  #define CONFIG_FSL_ESDHC
  #define CONFIG_SYS_FSL_ESDHC_ADDR     CONFIG_SYS_MPC85xx_ESDHC_ADDR
 -#define CONFIG_GENERIC_MMC
 -#endif
 -
 -#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI) \
 -               || defined(CONFIG_FSL_SATA)
 -#define CONFIG_DOS_PARTITION
  #endif
  
  #undef CONFIG_WATCHDOG        /* watchdog disabled */

diff --combined include/configs/p1_twr.h
index a98e1b2,c605fbe..d403f84
--- 1/include/configs/p1_twr.h
--- 2/include/configs/p1_twr.h
+++ b/include/configs/p1_twr.h
@@@ -40,7 -40,6 +40,6 @@@
  
  #define CONFIG_MP
  
- #define CONFIG_FSL_ELBC
  #define CONFIG_PCIE1  /* PCIE controller 1 (slot 1) */
  #define CONFIG_PCIE2  /* PCIE controller 2 (slot 2) */
  #define CONFIG_FSL_PCI_INIT   /* Use common FSL init code */
@@@ -272,6 -271,7 +271,6 @@@ extern unsigned long get_board_sys_clk(
  #define CONFIG_CMD_PCI
  
  #define CONFIG_PCI_SCAN_SHOW  /* show pci devices on startup */
 -#define CONFIG_DOS_PARTITION
  #endif /* CONFIG_PCI */
  
  #if defined(CONFIG_TSEC_ENET)
@@@ -406,6 -406,12 +405,6 @@@
  #ifdef CONFIG_MMC
  #define CONFIG_FSL_ESDHC
  #define CONFIG_SYS_FSL_ESDHC_ADDR     CONFIG_SYS_MPC85xx_ESDHC_ADDR
 -#define CONFIG_GENERIC_MMC
 -#endif
 -
 -#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI) \
 -               || defined(CONFIG_FSL_SATA)
 -#define CONFIG_DOS_PARTITION
  #endif
  
  #undef CONFIG_WATCHDOG        /* watchdog disabled */

diff --combined include/configs/t4qds.h
index 15c0e89,82e4691..7803a84
--- 1/include/configs/t4qds.h
--- 2/include/configs/t4qds.h
+++ b/include/configs/t4qds.h
@@@ -26,7 -26,6 +26,6 @@@
  
  #define CONFIG_SYS_FSL_CPC            /* Corenet Platform Cache */
  #define CONFIG_SYS_NUM_CPC            CONFIG_SYS_NUM_DDR_CTLRS
- #define CONFIG_FSL_IFC                        /* Enable IFC Support */
  #define CONFIG_PCIE1                  /* PCIE controller 1 */
  #define CONFIG_PCIE2                  /* PCIE controller 2 */
  #define CONFIG_PCIE3                  /* PCIE controller 3 */
@@@ -208,6 -207,7 +207,6 @@@
  #define CONFIG_PCI_INDIRECT_BRIDGE
  
  #define CONFIG_PCI_SCAN_SHOW          /* show pci devices on startup */
 -#define CONFIG_DOS_PARTITION
  #endif        /* CONFIG_PCI */
  
  /* SATA */
@@@ -225,6 -225,7 +224,6 @@@
  
  #define CONFIG_LBA48
  #define CONFIG_CMD_SATA
 -#define CONFIG_DOS_PARTITION
  #endif
  
  #ifdef CONFIG_FMAN_ENET

diff --combined include/configs/xpedite550x.h
index 6346f84,76e3db1..4ac25a6
--- 1/include/configs/xpedite550x.h
--- 2/include/configs/xpedite550x.h
+++ b/include/configs/xpedite550x.h
@@@ -30,7 -30,6 +30,6 @@@
  #define CONFIG_PCI_INDIRECT_BRIDGE 1  /* indirect PCI bridge support */
  #define CONFIG_SYS_PCI_64BIT  1       /* enable 64-bit PCI resources */
  #define CONFIG_FSL_PCIE_RESET 1       /* need PCIe reset errata */
- #define CONFIG_FSL_ELBC               1
  
  /*
   * Multicore config
@@@ -337,6 -336,7 +336,6 @@@ extern unsigned long get_board_ddr_clk(
  #define CONFIG_USB_EHCI
  #define CONFIG_USB_EHCI_FSL
  #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
 -#define CONFIG_DOS_PARTITION
  
  /*
   * Command configuration.