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 9c992c1ea3288ffdeb95a1322494955df6c82c33,b27e7577dfdce0428b6f9628998049f9c1666e56..ecb1710d01cca2decd4286f3584e19aecd3026b4
--- 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 73351a6fd042b2732c7b431adb875b4c53e569e2,8b429623d0537b17988b86047182e7a9d7d4575c..ad9a56289dbe92a9794f20d98999bd402c9bd9b3
--- 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 4e9fa5b1c7faee915f1fe8b87e7c609282fccebe,d400276045b2e6ca46672de80e5bed69441c9ef9..0a696ed2dd84915a569f13caee27cc456bafbbff
--- 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 1b75e75f45e12fd0e66ac3ac231963ccc04c38f8,06c4243d1278c80fb5d9ac82ce99f391d0e8b8dd..048933ed5569a174ab022b170292a1157600612a
--- 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 871c35d5e9d0f342bb51e1364fcc4e36f0be39bb,15c29c25fa60ba7708526efc0096fc7fd0d9988a..9986afa742810c97ae2f2fdd4706746df22f578c
--- 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 83a8b5f65adb0d202bb38d0b572f124da9298423,e9808e9bda39a1b8bc2292efbe63181870cc8f7e..490175abbe20fef5e5a4948b12c853fafa814804
--- 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 2864916bdd5e545239e3af2dd2d48dff251fe428,6b188326a6622ff0ccf5c30cf26b0b2747d7d001..57937b9a82340028a1bac2d56c24f74402e9da16
--- 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 4d8302e3e809b3bb4e779e2ddbf8f18c19206631,cdd187ad9f1bcafe7a897120e27290011a60a9d8..45782be2488801e884cbb997b6f51b5e649c1517
--- 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 53ee3c56ffb75437c9046f3bcb2fbf3a93a39cd7,488990a0431c93aca9d767585101c41b26f37c0b..caf47fe4b41e4fd66e99eb8c3adecb7e5350b002
--- 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 3cf68248e9116531ca55ffd2eb3f52461f566dde,800cb2c261583490c09ce7315234a2f8fcd92080..998d2cf82169d9b0508c8aa27bdab532eef33b11
--- 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 fcd15097fa13ccf0198101c98465ed21755341fd,7b50fc7228bbebee51c9a22885c2000c518f1a0d..4a34209aa802a759ee90dc68603663c485486bd9
--- 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 1fb5cac0a9f78e86be0bc0ef17124754ef073892,41d6984e6e37bc3631b3e1b9a48a9cd9632904e0..e2eaa9ec98a1f886e9c29cd4616f8adc72224ef4
--- 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 ea1fa799b0a3e80df3ec4415e02b31b51b530cbe,9e6d23b4cb9ec758fcdbf8d98e96f09f9080175a..a8df6cc386631512bd3111f0c6b1f82c5625cbed
--- 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 fc99b965a3c85f2e4ca80ee42ee7c417fc8efc3e,4267d81d952293f8ef99a747d01c1ceb82e7acf5..2fdb869383c6053dfe95852a9347e41a8c7c74bc
--- 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 77f0927d6e594a713f64855f71b5eba9cf843d55,db7574d5b54d76da1deffdacd0fcf39162d64254..41162349cf1eefeda764fb5e7a9bf213c0ee21c7
--- 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 9e729fd2f74b72d9e89c6b92ad71cf807e5d8aef,4c55da401cde461abf1dab180da865db5c2ded45..942123b82882cae33cbe1e57222140a13a72f125
--- 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 e1ce7ad55b742d279b09f22c17cd452692e25873,269cd49648730620dd8bda7b6a844afa57ac921d..8f68748d87678b124e0671e502bfff3db03bc3c1
--- 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 4635cdfcde0610c863b4f0e2ea5ee14b2a0d36ea,8c42d72f6a486af429fbd74413a898d757be2f5f..b9eab4e382e258fd6c4bccb79fe5d0eb40856906
--- 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 caa52bec00dd6dce59eb158ed4a1dbeb595aab69,baee4a06e05259247885586d65e98fbbb4e1c85c..91e17d9399463cbf665a3c99ef4db31cef7572a7
--- 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 b933d21d4b7e8307e0a3127bce789dbc1a0a7aff,d7b136615f5180d27707b83a8feb76c15e027e01..3d4c8a81024bfe67c7ab13ccd04e648106bf4dca
--- 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 baa83698c50ab3bfa5dcc1be69c1c55892af4ebf,83bb2ccf1a252aa282fbce884432c4ba78575122..cf574da7c332eb93c492f6f57a64f7c5f693d791
--- 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 f1d8116fb258f0b0fdcbc0f5075f8c990164a374,70dcd9b321f03edb1813da1d4a38841949478070..e601cc64bd110f12297293fbab77774db9b5ce76
--- 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 1369035c6bd145bf72b6f975c3af74db9c45454c,7b10625b54ade2a3b2d1d96a3a2f65dd36767f93..58a3507dc17bf6236772524a29a3bbff0e9fd852
--- 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 15384f1e87981dbfe000cbc8fce70e5433bab332,e22b1f5afc30ff4b4861f03a8a8e5d8e00bb454a..3fad88f62c855ba744e13f5380a91cb543a6f18d
--- 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 00ffb8353900192b0423059213aeff7c22e24377,669a09487c22735a95f2414785a8de46aa7f8a30..fcaa803c4e8badb12ad7fade233dcff7906bc8e8
--- 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 02c3fddf2f0e051e6999322d14e7f207bbf9f5fc,57e0cfa07b0091fb4665224bf06d9d21b37869ae..e46bf007adbf3fae2229f28f14d9beafa7fdfb83
--- 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 bd8e46e942271bfc791af2f9943b102ac4effd0f,385e7abc29f628db9ce423d8edd40a5fcead08b1..2d436c2900c568ac28fde5deaddc527ddfa5148c
--- 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 82d3f102e55411966d5c44b3ca3461f9f04ccbd0,bcb8edaa0d220c0c3ce529b866e6f3968a63a7f5..9306b734081379fa815f0a984ef2310768c44fdd
--- 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 a9835b9317ef3035b81798f57ba5ce8520c61614,9ec326abca6ad9ddce2d68dc2a179d1a10f0060f..0a65d0e8648f327ca7d80c86029ddc0ce6c37285
--- 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 1e2b94e74f15e3c482b109c0dde67bf38fc15f15,b11423447c315aa45e7e5a633e8b2f9bf30de031..f8337320387b65fc4add3986d4a631d539a538d2
--- 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 2a1b547ae1cf9b7eb82285350eb89d32b045ecf7,9136bf036ed59f6047ae00d609752469262d9654..dbb9fd4da1dc7b088accd559a41579b909b3800d
--- 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 28f4b148b223bbe01acd43e667b5be920fb584d8,a9b7a5aba9a4e0be3fc60ca06835f80aaf552ed9..8082ec5d7c6efab8f9456e1aab45aad790c2dac2
--- 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 e5d60fbf3c09bee70407bfc11f8f700ec3288f18,7c6fd741d369fa559cae57f36c7c78176d545231..cc2b2736f4801d534d97b2a96e19acf045f92e51
--- 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 7637bb8777ce7d839fa18487450e5de32f7d03ea,3ca30cbb71c713d9c9b1311b2801315db5030eab..dd38fa3511e580e8d64069b5a622e8a1f74618b2
--- 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 c9a57afbaea5bc77d3aaba3236adbaad329c9465,e98682c1201d2426730596d5a256624253622c19..3f195ab413501e22eff29dcad745b3d228592cf1
--- 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 8669fcd4313610d9a7830767ad6ff78ec3c4bb49,6796f09985112786a61ed0256707b0c62d636dc5..efd3b2890021ec58170c22adc04a292220e25536
--- 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 efc0fd936e075df77bdbfd17733f577db2de158a,30947b24dbe4aed735cfe5aa07ab7c946ff8a69e..0e648b1ac882716a437a7a684ddd7f323a6b2195
--- 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 9b142bc6f471e3fb9bf088b05379256927067781,f24ade96631ed60c3738b2f354b00e7d0941cf40..88876d639e564cb23f5b2a6645b791d16db6aea1
--- 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 a98e1b2b17f5bb3f21a78988276eba1df9691849,c605fbe24677b58ec27df3822d6f835c64bb0fd4..d403f8461778568e988f1b2ad1f50bbf5b2fcd96
--- 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 15c0e8935cc5975fd65cb89278de5b9bac0ce29c,82e4691ca3c0364c5621d1bb9f62bf2e90d2b77b..7803a849bc13712c4bf6fa0630cb9d46de9492dc
--- 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 6346f849d46d283d9b38511d36e747db66dcef19,76e3db1706e34996f3d3a2e1c6bdc5eff9e2c364..4ac25a6b2143e0a7d359b0e2c0706005f2f26b81
--- 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.