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 --cc README
Simple merge

diff --cc configs/ls1012afrdm_qspi_defconfig
Simple merge

diff --cc configs/ls1012aqds_qspi_defconfig
Simple merge

diff --cc configs/ls1012ardb_qspi_defconfig
Simple merge

diff --cc configs/ls1046aqds_defconfig
index 871c35d,15c29c2..9986afa
--- 1/configs/ls1046aqds_defconfig
--- 2/configs/ls1046aqds_defconfig
+++ b/configs/ls1046aqds_defconfig
@@@ -29,6 -29,7 +29,8 @@@ CONFIG_PCI=
  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 --cc configs/ls1046aqds_lpuart_defconfig
Simple merge

diff --cc configs/ls1046aqds_nand_defconfig
index 2864916,6b18832..57937b9
--- 1/configs/ls1046aqds_nand_defconfig
--- 2/configs/ls1046aqds_nand_defconfig
+++ b/configs/ls1046aqds_nand_defconfig
@@@ -34,6 -34,7 +34,8 @@@ CONFIG_PCI=
  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 --cc configs/ls1046aqds_qspi_defconfig
index 4d8302e,cdd187a..45782be
--- 1/configs/ls1046aqds_qspi_defconfig
--- 2/configs/ls1046aqds_qspi_defconfig
+++ b/configs/ls1046aqds_qspi_defconfig
@@@ -31,7 -32,7 +31,9 @@@ CONFIG_PCI=
  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 --cc 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
@@@ -35,6 -34,7 +35,8 @@@ CONFIG_PCI=
  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 --cc 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
@@@ -36,7 -36,7 +36,9 @@@ CONFIG_PCI=
  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 --cc configs/ls1046ardb_emmc_defconfig
index fcd1509,7b50fc7..4a34209
--- 1/configs/ls1046ardb_emmc_defconfig
--- 2/configs/ls1046ardb_emmc_defconfig
+++ b/configs/ls1046ardb_emmc_defconfig
@@@ -32,6 -31,7 +32,8 @@@ CONFIG_PCI=
  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 --cc configs/ls1046ardb_qspi_defconfig
index 1fb5cac,41d6984..e2eaa9e
--- 1/configs/ls1046ardb_qspi_defconfig
--- 2/configs/ls1046ardb_qspi_defconfig
+++ b/configs/ls1046ardb_qspi_defconfig
@@@ -28,6 -29,7 +28,8 @@@ CONFIG_PCI=
  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 --cc configs/ls1046ardb_sdcard_defconfig
index ea1fa79,9e6d23b..a8df6cc
--- 1/configs/ls1046ardb_sdcard_defconfig
--- 2/configs/ls1046ardb_sdcard_defconfig
+++ b/configs/ls1046ardb_sdcard_defconfig
@@@ -32,6 -31,7 +32,8 @@@ CONFIG_PCI=
  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 --cc include/configs/B4860QDS.h
Simple merge

diff --cc include/configs/BSC9131RDB.h
Simple merge

diff --cc include/configs/BSC9132QDS.h
Simple merge

diff --cc include/configs/C29XPCIE.h
Simple merge

diff --cc include/configs/MPC8536DS.h
Simple merge

diff --cc include/configs/MPC8569MDS.h
Simple merge

diff --cc include/configs/MPC8572DS.h
Simple merge

diff --cc include/configs/P1010RDB.h
Simple merge

diff --cc include/configs/P1022DS.h
Simple merge

diff --cc include/configs/P1023RDB.h
Simple merge

diff --cc include/configs/P2041RDB.h
Simple merge

diff --cc include/configs/T102xQDS.h
Simple merge

diff --cc include/configs/T102xRDB.h
Simple merge

diff --cc include/configs/T1040QDS.h
Simple merge

diff --cc include/configs/T104xRDB.h
Simple merge

diff --cc include/configs/T208xQDS.h
Simple merge

diff --cc include/configs/T208xRDB.h
Simple merge

diff --cc include/configs/T4240RDB.h
Simple merge

diff --cc include/configs/UCP1020.h
Simple merge

diff --cc include/configs/controlcenterd.h
Simple merge

diff --cc include/configs/corenet_ds.h
Simple merge

diff --cc include/configs/cyrus.h
Simple merge

diff --cc include/configs/km/kmp204x-common.h
Simple merge

diff --cc include/configs/ls1046aqds.h
Simple merge

diff --cc include/configs/p1_p2_rdb_pc.h
Simple merge

diff --cc include/configs/p1_twr.h
Simple merge

diff --cc include/configs/t4qds.h
Simple merge

diff --cc include/configs/xpedite550x.h
Simple merge