From: Tom Rini <trini@konsulko.com>
Date: Wed, 2 Aug 2017 14:52:26 +0000 (-0400)
Subject: Merge git://git.denx.de/u-boot-fsl-qoriq
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fu-boot.git;a=commitdiff_plain;h=ec7483e34ea932fb68267dc0b1de30be51f271c9

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
---

ec7483e34ea932fb68267dc0b1de30be51f271c9
diff --cc include/configs/ls1046aqds.h
index 53cdcf2caf,891f2a3575..9dc74b4f09
--- a/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 10af410136,e6bd6779f1..3d3dfb1f8f
--- a/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