From: Marek Behún
On mvebu this is defined if and only if !ARM64.
Otherwise it is defined for boards with ARCH_MX23, ARCH_TEGRA and
ARCH_ZYNQ, and also for SOC_AR934X (tplink_wdr4300).
Signed-off-by: Marek Behún
---
arch/arm/mach-kirkwood/include/mach/config.h | 7 ---
arch/mips/mach-ath79/Kconfig | 1 +
drivers/usb/host/Kconfig | 7 +++
include/configs/clearfog.h | 3 ---
include/configs/controlcenterdc.h| 3 ---
include/configs/crs3xx-98dx3236.h| 3 ---
include/configs/db-88f6720.h | 1 -
include/configs/db-88f6820-amc.h | 3 ---
include/configs/db-88f6820-gp.h | 3 ---
include/configs/db-mv784mp-gp.h | 1 -
include/configs/db-xc3-24g4xg.h | 3 ---
include/configs/ds414.h | 3 ---
include/configs/helios4.h| 3 ---
include/configs/mxs.h| 5 -
include/configs/nas220.h | 7 ---
include/configs/tegra114-common.h| 1 -
include/configs/tegra124-common.h| 1 -
include/configs/tegra20-common.h | 1 -
include/configs/tegra210-common.h| 1 -
include/configs/tegra30-common.h | 1 -
include/configs/theadorable.h| 1 -
include/configs/tplink_wdr4300.h | 1 -
include/configs/turris_omnia.h | 3 ---
include/configs/x530.h | 3 ---
include/configs/zynq-common.h| 2 --
scripts/config_whitelist.txt | 1 -
26 files changed, 8 insertions(+), 61 deletions(-)
diff --git a/arch/arm/mach-kirkwood/include/mach/config.h
b/arch/arm/mach-kirkwood/include/mach/config.h
index f262d70b14..cf6b1b9b63 100644
--- a/arch/arm/mach-kirkwood/include/mach/config.h
+++ b/arch/arm/mach-kirkwood/include/mach/config.h
@@ -62,13 +62,6 @@
#define CONFIG_RESET_PHY_R /* use reset_phy() to init mv8831116 PHY */
#endif /* CONFIG_CMD_NET */
-/*
- * USB/EHCI
- */
-#ifdef CONFIG_CMD_USB
-#define CONFIG_USB_EHCI_IS_TDI
-#endif /* CONFIG_CMD_USB */
-
/*
* IDE Support on SATA ports
*/
diff --git a/arch/mips/mach-ath79/Kconfig b/arch/mips/mach-ath79/Kconfig
index bdb23b5765..cd85d1b6c3 100644
--- a/arch/mips/mach-ath79/Kconfig
+++ b/arch/mips/mach-ath79/Kconfig
@@ -20,6 +20,7 @@ config SOC_AR934X
select SUPPORTS_BIG_ENDIAN
select SUPPORTS_CPU_MIPS32_R1
select SUPPORTS_CPU_MIPS32_R2
+ select USB_EHCI_IS_TDI if USB_EHCI_HCD
help
This supports QCA/Atheros ar934x family SOCs.
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index be5e4b994d..ccecb5a3b0 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -139,6 +139,9 @@ config USB_EHCI_HCD
if USB_EHCI_HCD
+config USB_EHCI_IS_TDI
+ bool
+
config USB_EHCI_ATMEL
bool "Support for Atmel on-chip EHCI USB controller"
depends on ARCH_AT91
@@ -150,6 +153,7 @@ config USB_EHCI_MARVELL
bool "Support for Marvell on-chip EHCI USB controller"
depends on ARCH_MVEBU || ARCH_KIRKWOOD || ARCH_ORION5X
default y
+ select USB_EHCI_IS_TDI if !ARM64
---help---
Enables support for the on-chip EHCI controller on MVEBU SoCs.
@@ -179,6 +183,7 @@ config USB_EHCI_MXS
bool "Support for i.MX23 EHCI USB controller"
depends on ARCH_MX23
default y
+ select USB_EHCI_IS_TDI
help
Enables support for the on-chip EHCI controller on i.MX23 SoCs.
@@ -258,12 +263,14 @@ config USB_EHCI_PCI
config USB_EHCI_TEGRA
bool "Support for NVIDIA Tegra on-chip EHCI USB controller"
depends on ARCH_TEGRA
+ select USB_EHCI_IS_TDI
---help---
Enable support for Tegra on-chip EHCI USB controller
config USB_EHCI_ZYNQ
bool "Support for Xilinx Zynq on-chip EHCI USB controller"
default y if ARCH_ZYNQ
+ select USB_EHCI_IS_TDI
---help---
Enable support for Zynq on-chip EHCI USB controller
diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h
index a12e1582d6..a30bca5147 100644
--- a/include/configs/clearfog.h
+++ b/include/configs/clearfog.h
@@ -18,9 +18,6 @@
* U-Boot into it.
*/
-/* USB/EHCI configuration */
-#define CONFIG_USB_EHCI_IS_TDI
-
#define CONFIG_ENV_MIN_ENTRIES 128
/* Environment in MMC */
diff --git a/include/configs/controlcenterdc.h
b/include/configs/controlcenterdc.h
index 12e9b8d06d..21e61e5e8f 100644
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -27,9 +27,6 @@
#define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \
CONFIG_SYS_SCSI_MAX_LUN)
-/* USB/EHCI configuration */
-#define CONFIG_USB_EHCI_IS_TDI
-
/* Environment in SPI NOR flash */
#define PHY_ANEG_TIMEOUT 8000/* PHY needs a longer aneg time */
diff