Convert CONFIG_USB_EHCI_IS_TDI to Kconfig
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 <marek.behun@nic.cz>
This commit is contained in:
parent
645a0afb32
commit
56882dc4cb
@ -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
|
||||
*/
|
||||
|
@ -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.
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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 */
|
||||
|
@ -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 */
|
||||
|
@ -13,9 +13,6 @@
|
||||
#define CONFIG_SYS_BOOTM_LEN (64 * 1024 * 1024) /* 64 MB */
|
||||
#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg
|
||||
|
||||
/* USB/EHCI configuration */
|
||||
#define CONFIG_USB_EHCI_IS_TDI
|
||||
|
||||
/* Environment in SPI NOR flash */
|
||||
|
||||
/* Keep device tree and initrd in lower memory so the kernel can access them */
|
||||
|
@ -20,7 +20,6 @@
|
||||
#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE
|
||||
|
||||
/* USB/EHCI configuration */
|
||||
#define CONFIG_USB_EHCI_IS_TDI
|
||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
|
||||
|
||||
/* Environment in SPI NOR flash */
|
||||
|
@ -10,9 +10,6 @@
|
||||
* High Level Configuration Options (easy to change)
|
||||
*/
|
||||
|
||||
/* 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 */
|
||||
|
@ -22,9 +22,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 */
|
||||
|
@ -21,7 +21,6 @@
|
||||
#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE
|
||||
|
||||
/* USB/EHCI configuration */
|
||||
#define CONFIG_USB_EHCI_IS_TDI
|
||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
|
||||
|
||||
/* Environment in SPI NOR flash */
|
||||
|
@ -12,9 +12,6 @@
|
||||
|
||||
#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg
|
||||
|
||||
/* USB/EHCI configuration */
|
||||
#define CONFIG_USB_EHCI_IS_TDI
|
||||
|
||||
/* Environment in SPI NOR flash */
|
||||
|
||||
/* NAND */
|
||||
|
@ -24,9 +24,6 @@
|
||||
#define CONFIG_PCI_SCAN_SHOW
|
||||
#endif
|
||||
|
||||
/* USB/EHCI/XHCI configuration */
|
||||
#define CONFIG_USB_EHCI_IS_TDI
|
||||
|
||||
/*
|
||||
* mv-common.h should be defined after CMD configs since it used them
|
||||
* to enable certain macros
|
||||
|
@ -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 */
|
||||
|
@ -121,9 +121,4 @@
|
||||
#define CONFIG_SPI_HALF_DUPLEX
|
||||
#endif
|
||||
|
||||
/* USB */
|
||||
#ifdef CONFIG_CMD_USB
|
||||
#define CONFIG_USB_EHCI_IS_TDI
|
||||
#endif
|
||||
|
||||
#endif /* __CONFIGS_MXS_H__ */
|
||||
|
@ -60,13 +60,6 @@
|
||||
#define CONFIG_PHY_BASE_ADR 8
|
||||
#endif /* CONFIG_CMD_NET */
|
||||
|
||||
/*
|
||||
* USB/EHCI
|
||||
*/
|
||||
#ifdef CONFIG_CMD_USB
|
||||
#define CONFIG_USB_EHCI_IS_TDI
|
||||
#endif /* CONFIG_CMD_USB */
|
||||
|
||||
/*
|
||||
* File system
|
||||
*/
|
||||
|
@ -58,7 +58,6 @@
|
||||
#define CONFIG_SPL_STACK 0x800ffffc
|
||||
|
||||
/* For USB EHCI controller */
|
||||
#define CONFIG_USB_EHCI_IS_TDI
|
||||
#define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10
|
||||
|
||||
#endif /* _TEGRA114_COMMON_H_ */
|
||||
|
@ -60,7 +60,6 @@
|
||||
#define CONFIG_SPL_STACK 0x800ffffc
|
||||
|
||||
/* For USB EHCI controller */
|
||||
#define CONFIG_USB_EHCI_IS_TDI
|
||||
#define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10
|
||||
|
||||
/* GPU needs setup */
|
||||
|
@ -78,7 +78,6 @@
|
||||
* packets depending on the buffer address and size.
|
||||
*/
|
||||
#define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10
|
||||
#define CONFIG_USB_EHCI_IS_TDI
|
||||
|
||||
#define CONFIG_SYS_NAND_SELF_INIT
|
||||
|
||||
|
@ -47,7 +47,6 @@
|
||||
"ramdisk_addr_r=0x83200000\0"
|
||||
|
||||
/* For USB EHCI controller */
|
||||
#define CONFIG_USB_EHCI_IS_TDI
|
||||
#define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10
|
||||
|
||||
/* GPU needs setup */
|
||||
|
@ -55,7 +55,6 @@
|
||||
#define CONFIG_SPL_STACK 0x800ffffc
|
||||
|
||||
/* For USB EHCI controller */
|
||||
#define CONFIG_USB_EHCI_IS_TDI
|
||||
#define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10
|
||||
|
||||
#endif /* _TEGRA30_COMMON_H_ */
|
||||
|
@ -29,7 +29,6 @@
|
||||
#define CONFIG_I2C_MVTWSI_BASE1 MVEBU_TWSI1_BASE
|
||||
|
||||
/* USB/EHCI configuration */
|
||||
#define CONFIG_USB_EHCI_IS_TDI
|
||||
#define CONFIG_USB_MAX_CONTROLLER_COUNT 3
|
||||
|
||||
/* Environment in SPI NOR flash */
|
||||
|
@ -41,7 +41,6 @@
|
||||
/* USB, USB storage, USB ethernet */
|
||||
#define CONFIG_EHCI_MMIO_BIG_ENDIAN
|
||||
#define CONFIG_EHCI_DESC_BIG_ENDIAN
|
||||
#define CONFIG_USB_EHCI_IS_TDI
|
||||
|
||||
/*
|
||||
* Diagnostics
|
||||
|
@ -17,9 +17,6 @@
|
||||
* U-Boot into it.
|
||||
*/
|
||||
|
||||
/* 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 */
|
||||
|
@ -45,9 +45,6 @@
|
||||
|
||||
/* Additional FS support/configuration */
|
||||
|
||||
/* 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 */
|
||||
|
@ -55,8 +55,6 @@
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_USB_EHCI_ZYNQ
|
||||
# define CONFIG_USB_EHCI_IS_TDI
|
||||
|
||||
# define DFU_DEFAULT_POLL_TIMEOUT 300
|
||||
# define CONFIG_THOR_RESET_OFF
|
||||
#endif
|
||||
|
@ -3013,7 +3013,6 @@ CONFIG_USB_EHCI_BASE
|
||||
CONFIG_USB_EHCI_BASE_LIST
|
||||
CONFIG_USB_EHCI_EXYNOS
|
||||
CONFIG_USB_EHCI_FARADAY
|
||||
CONFIG_USB_EHCI_IS_TDI
|
||||
CONFIG_USB_EHCI_TXFIFO_THRESH
|
||||
CONFIG_USB_ETH_QMULT
|
||||
CONFIG_USB_ETH_SUBSET
|
||||
|
Loading…
Reference in New Issue
Block a user