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

Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
	include/configs/ls1046aqds.h
	include/configs/ls1046ardb.h

diff --cc configs/ls1043ardb_SECURE_BOOT_defconfig
Simple merge

diff --cc configs/ls1043ardb_defconfig
Simple merge

diff --cc configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
Simple merge

diff --cc configs/ls1043ardb_sdcard_defconfig
Simple merge

diff --cc configs/ls1046aqds_SECURE_BOOT_defconfig
Simple merge

diff --cc configs/ls1046aqds_defconfig
Simple merge

diff --cc configs/ls1046aqds_lpuart_defconfig
Simple merge

diff --cc configs/ls1046aqds_nand_defconfig
Simple merge

diff --cc configs/ls1046aqds_sdcard_ifc_defconfig
Simple merge

diff --cc configs/ls1046ardb_emmc_defconfig
Simple merge

diff --cc configs/ls1046ardb_qspi_SECURE_BOOT_defconfig
Simple merge

diff --cc configs/ls1046ardb_qspi_defconfig
Simple merge

diff --cc configs/ls1046ardb_sdcard_SECURE_BOOT_defconfig
Simple merge

diff --cc configs/ls1046ardb_sdcard_defconfig
Simple merge

diff --cc configs/ls2080ardb_defconfig
Simple merge

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

diff --cc include/configs/ls1046aqds.h
index 53cdcf2caf0ca82590ec2c8da5a48963997997fb,891f2a35753ef69167af0d29b108c93e259a314e..9dc74b4f095eea88d7257cca8a29139997b20d81
--- 1/include/configs/ls1046aqds.h
--- 2/include/configs/ls1046aqds.h
+++ b/include/configs/ls1046aqds.h
@@@ -144,7 -144,7 +144,6 @@@ unsigned long get_board_ddr_clk(void)
  #define CONFIG_USB_XHCI_FSL
  #define CONFIG_USB_XHCI_DWC3
  #define CONFIG_USB_MAX_CONTROLLER_COUNT         3
- #define CONFIG_CMD_USB
 -#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS      2
  #define CONFIG_USB_STORAGE
  #endif
  

diff --cc include/configs/ls1046ardb.h
index 10af410136658a111a41debfb56b13c95b317c53,e6bd6779f1d0a430e1c041497d836431998ade83..3d3dfb1f8f70ae1a4531d13f82fca81cc9279981
--- 1/include/configs/ls1046ardb.h
--- 2/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@@ -219,7 -220,7 +219,6 @@@
  #define CONFIG_USB_XHCI_FSL
  #define CONFIG_USB_XHCI_DWC3
  #define CONFIG_USB_MAX_CONTROLLER_COUNT         3
- #define CONFIG_CMD_USB
 -#define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS      2
  #define CONFIG_USB_STORAGE
  #endif
  #endif

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

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