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

Signed-off-by: Tom Rini <[email protected]>
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 871c35d5e9d0f342bb51e1364fcc4e36f0be39bb,15c29c25fa60ba7708526efc0096fc7fd0d9988a..9986afa742810c97ae2f2fdd4706746df22f578c
--- 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 2864916bdd5e545239e3af2dd2d48dff251fe428,6b188326a6622ff0ccf5c30cf26b0b2747d7d001..57937b9a82340028a1bac2d56c24f74402e9da16
--- 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 4d8302e3e809b3bb4e779e2ddbf8f18c19206631,cdd187ad9f1bcafe7a897120e27290011a60a9d8..45782be2488801e884cbb997b6f51b5e649c1517
--- 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 53ee3c56ffb75437c9046f3bcb2fbf3a93a39cd7,488990a0431c93aca9d767585101c41b26f37c0b..caf47fe4b41e4fd66e99eb8c3adecb7e5350b002
--- 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 3cf68248e9116531ca55ffd2eb3f52461f566dde,800cb2c261583490c09ce7315234a2f8fcd92080..998d2cf82169d9b0508c8aa27bdab532eef33b11
--- 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 fcd15097fa13ccf0198101c98465ed21755341fd,7b50fc7228bbebee51c9a22885c2000c518f1a0d..4a34209aa802a759ee90dc68603663c485486bd9
--- 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 1fb5cac0a9f78e86be0bc0ef17124754ef073892,41d6984e6e37bc3631b3e1b9a48a9cd9632904e0..e2eaa9ec98a1f886e9c29cd4616f8adc72224ef4
--- 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 ea1fa799b0a3e80df3ec4415e02b31b51b530cbe,9e6d23b4cb9ec758fcdbf8d98e96f09f9080175a..a8df6cc386631512bd3111f0c6b1f82c5625cbed
--- 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