Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI
Subsystems (8)
PATCH 1/4 Rename CONFIG_EHCI_IS_TDI to CONFIG_USB_EHCI_IS_TDI
From: Marek Behún <[email protected]>
In preparation for moving this option to Kconfig, rename it to be consistent with other USB EHCI Kconfig options.
--- arch/arm/mach-kirkwood/include/mach/config.h | 2 +- drivers/usb/host/ehci-hcd.c | 2 +- include/configs/clearfog.h | 2 +- include/configs/controlcenterdc.h | 2 +- include/configs/crs3xx-98dx3236.h | 2 +- include/configs/db-88f6720.h | 2 +- include/configs/db-88f6820-amc.h | 2 +- include/configs/db-88f6820-gp.h | 2 +- include/configs/db-mv784mp-gp.h | 2 +- include/configs/db-xc3-24g4xg.h | 2 +- include/configs/ds414.h | 2 +- include/configs/helios4.h | 2 +- include/configs/mxs.h | 2 +- include/configs/nas220.h | 2 +- include/configs/tegra114-common.h | 2 +- include/configs/tegra124-common.h | 2 +- include/configs/tegra20-common.h | 2 +- include/configs/tegra210-common.h | 2 +- include/configs/tegra30-common.h | 2 +- include/configs/theadorable.h | 2 +- include/configs/tplink_wdr4300.h | 2 +- include/configs/turris_omnia.h | 2 +- include/configs/x530.h | 2 +- include/configs/zynq-common.h | 2 +- scripts/config_whitelist.txt | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-)
arch/arm/mach-kirkwood/include/mach/config.h +1 -1
@@ -66,7 +66,7 @@* USB/EHCI */ #ifdef CONFIG_CMD_USB -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #endif /* CONFIG_CMD_USB */ /*
drivers/usb/host/ehci-hcd.c +1 -1
@@ -108,7 +108,7 @@ static struct descriptor { }, }; -#if defined(CONFIG_EHCI_IS_TDI ) +#if defined(CONFIG_USB_EHCI_IS_TDI )#define ehci_is_TDI () (1)#else #define ehci_is_TDI () (0)
include/configs/clearfog.h +1 -1
@@ -19,7 +19,7 @@*/ /* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #define CONFIG_ENV_MIN_ENTRIES 128
include/configs/controlcenterdc.h +1 -1
@@ -28,7 +28,7 @@ CONFIG_SYS_SCSI_MAX_LUN)/* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI /* Environment in SPI NOR flash */
include/configs/crs3xx-98dx3236.h +1 -1
@@ -14,7 +14,7 @@#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg/* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI /* Environment in SPI NOR flash */
include/configs/db-88f6720.h +1 -1
@@ -20,7 +20,7 @@#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE/* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #define CONFIG_USB_MAX_CONTROLLER_COUNT 3/* Environment in SPI NOR flash */
include/configs/db-88f6820-amc.h +1 -1
@@ -11,7 +11,7 @@*/ /* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI /* Environment in SPI NOR flash */
include/configs/db-88f6820-gp.h +1 -1
@@ -23,7 +23,7 @@ CONFIG_SYS_SCSI_MAX_LUN)/* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI /* Environment in SPI NOR flash */
include/configs/db-mv784mp-gp.h +1 -1
@@ -21,7 +21,7 @@#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE/* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #define CONFIG_USB_MAX_CONTROLLER_COUNT 3/* Environment in SPI NOR flash */
include/configs/db-xc3-24g4xg.h +1 -1
@@ -13,7 +13,7 @@#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg/* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI /* Environment in SPI NOR flash */
include/configs/ds414.h +1 -1
@@ -25,7 +25,7 @@#endif /* USB/EHCI/XHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI /* * mv-common.h should be defined after CMD configs since it used them
include/configs/helios4.h +1 -1
@@ -19,7 +19,7 @@*/ /* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #define CONFIG_ENV_MIN_ENTRIES 128
include/configs/mxs.h +1 -1
@@ -129,7 +129,7 @@/* USB */ #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI_MXS -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #endif #endif /* __CONFIGS_MXS_H__ */
include/configs/nas220.h +1 -1
@@ -65,7 +65,7 @@*/ #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI_KIRKWOOD /* on Kirkwood platform */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #endif /* CONFIG_CMD_USB */ /*
include/configs/tegra114-common.h +1 -1
@@ -58,7 +58,7 @@#define CONFIG_SPL_STACK 0x800ffffc/* For USB EHCI controller */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10#endif /* _TEGRA114_COMMON_H_ */
include/configs/tegra124-common.h +1 -1
@@ -60,7 +60,7 @@#define CONFIG_SPL_STACK 0x800ffffc/* For USB EHCI controller */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10/* GPU needs setup */
include/configs/tegra20-common.h +1 -1
@@ -78,7 +78,7 @@* packets depending on the buffer address and size. */ #define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10 -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #define CONFIG_SYS_NAND_SELF_INIT
include/configs/tegra210-common.h +1 -1
@@ -47,7 +47,7 @@"ramdisk_addr_r=0x83200000\0" /* For USB EHCI controller */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10/* GPU needs setup */
include/configs/tegra30-common.h +1 -1
@@ -55,7 +55,7 @@#define CONFIG_SPL_STACK 0x800ffffc/* For USB EHCI controller */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #define CONFIG_USB_EHCI_TXFIFO_THRESH 0x10#endif /* _TEGRA30_COMMON_H_ */
include/configs/theadorable.h +1 -1
@@ -29,7 +29,7 @@#define CONFIG_I2C_MVTWSI_BASE1 MVEBU_TWSI1_BASE/* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI #define CONFIG_USB_MAX_CONTROLLER_COUNT 3/* Environment in SPI NOR flash */
include/configs/tplink_wdr4300.h +1 -1
@@ -41,7 +41,7 @@/* USB, USB storage, USB ethernet */ #define CONFIG_EHCI_MMIO_BIG_ENDIAN #define CONFIG_EHCI_DESC_BIG_ENDIAN -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI /* * Diagnostics
include/configs/turris_omnia.h +1 -1
@@ -18,7 +18,7 @@*/ /* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI /* Environment in SPI NOR flash */
include/configs/x530.h +1 -1
@@ -46,7 +46,7 @@/* Additional FS support/configuration */ /* USB/EHCI configuration */ -#define CONFIG_EHCI_IS_TDI +#define CONFIG_USB_EHCI_IS_TDI /* Environment in SPI NOR flash */
include/configs/zynq-common.h +1 -1
@@ -55,7 +55,7 @@#endif #ifdef CONFIG_USB_EHCI_ZYNQ -# define CONFIG_EHCI_IS_TDI +# define CONFIG_USB_EHCI_IS_TDI # define DFU_DEFAULT_POLL_TIMEOUT 300# define CONFIG_THOR_RESET_OFF
scripts/config_whitelist.txt +1 -1
@@ -246,7 +246,6 @@ CONFIG_EDB93XX_SDCS3 CONFIG_EFLASH_PROTSECTORS CONFIG_EHCI_DESC_BIG_ENDIAN CONFIG_EHCI_HCD_INIT_AFTER_RESET -CONFIG_EHCI_IS_TDI CONFIG_EHCI_MMIO_BIG_ENDIAN CONFIG_EHCI_MXS_PORT0 CONFIG_EHCI_MXS_PORT1
@@ -3036,6 +3035,7 @@ 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_KIRKWOOD CONFIG_USB_EHCI_MXS CONFIG_USB_EHCI_TXFIFO_THRESH
Signature · 1 line
2.32.0
PATCH 2/4 Convert CONFIG_USB_EHCI_MXS to Kconfig
From: Marek Behún <[email protected]>
This option is only used for
mx23evk_defconfig
mx23_olinuxino_defconfig
which are the only i.MX23 boards.
Add depend on ARCH_MX23 and default to y.
--- drivers/usb/host/Kconfig | 7 +++++++ include/configs/mxs.h | 1 - scripts/config_whitelist.txt | 1 - 3 files changed, 7 insertions(+), 2 deletions(-)
drivers/usb/host/Kconfig +7 -0
@@ -175,6 +175,13 @@ config USB_EHCI_MX7 ---help--- Enables support for the on-chip EHCI controller on i.MX7 SoCs. +config USB_EHCI_MXS + bool "Support for i.MX23 EHCI USB controller" + depends on ARCH_MX23 + default y + help + Enables support for the on-chip EHCI controller on i.MX23 SoCs. + config USB_EHCI_OMAP bool "Support for OMAP3+ on-chip EHCI USB controller" depends on ARCH_OMAP2PLUS
include/configs/mxs.h +0 -1
@@ -128,7 +128,6 @@/* USB */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI_MXS #define CONFIG_USB_EHCI_IS_TDI #endif
scripts/config_whitelist.txt +0 -1
@@ -3037,7 +3037,6 @@ CONFIG_USB_EHCI_EXYNOS CONFIG_USB_EHCI_FARADAY CONFIG_USB_EHCI_IS_TDI CONFIG_USB_EHCI_KIRKWOOD -CONFIG_USB_EHCI_MXS CONFIG_USB_EHCI_TXFIFO_THRESH CONFIG_USB_ETH_QMULT CONFIG_USB_ETH_SUBSET
Signature · 1 line
2.32.0
PATCH 3/4 Drop CONFIG_USB_EHCI_KIRKWOOD
In reply to Marek BehúnFrom: Marek Behún <[email protected]>
This config option doesn't do anything.
nas220 uses USB_EHCI_MARVELL.
--- include/configs/nas220.h | 1 - scripts/config_whitelist.txt | 1 - 2 files changed, 2 deletions(-)
include/configs/nas220.h +0 -1
@@ -64,7 +64,6 @@* USB/EHCI */ #ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI_KIRKWOOD /* on Kirkwood platform */ #define CONFIG_USB_EHCI_IS_TDI #endif /* CONFIG_CMD_USB */
scripts/config_whitelist.txt +0 -1
@@ -3036,7 +3036,6 @@ CONFIG_USB_EHCI_BASE_LIST CONFIG_USB_EHCI_EXYNOS CONFIG_USB_EHCI_FARADAY CONFIG_USB_EHCI_IS_TDI -CONFIG_USB_EHCI_KIRKWOOD CONFIG_USB_EHCI_TXFIFO_THRESH CONFIG_USB_ETH_QMULT CONFIG_USB_ETH_SUBSET
Signature · 1 line
2.32.0
PATCH 4/4 Convert CONFIG_USB_EHCI_IS_TDI to Kconfig
In reply to Marek BehúnFrom: Marek Behún <[email protected]>
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).
--- 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(-)
arch/arm/mach-kirkwood/include/mach/config.h +0 -7
@@ -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 */
arch/mips/mach-ath79/Kconfig +1 -0
@@ -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.
drivers/usb/host/Kconfig +7 -0
@@ -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
include/configs/clearfog.h +0 -3
@@ -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 */
include/configs/controlcenterdc.h +0 -3
@@ -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 */
include/configs/crs3xx-98dx3236.h +0 -3
@@ -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 */
include/configs/db-88f6720.h +0 -1
@@ -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 */
include/configs/db-88f6820-amc.h +0 -3
@@ -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 */
include/configs/db-88f6820-gp.h +0 -3
@@ -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 */
include/configs/db-mv784mp-gp.h +0 -1
@@ -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 */
include/configs/db-xc3-24g4xg.h +0 -3
@@ -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 */
include/configs/ds414.h +0 -3
@@ -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
include/configs/helios4.h +0 -3
@@ -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 */
include/configs/mxs.h +0 -5
@@ -126,9 +126,4 @@#define CONFIG_SPI_HALF_DUPLEX #endif -/* USB */ -#ifdef CONFIG_CMD_USB -#define CONFIG_USB_EHCI_IS_TDI -#endif -#endif /* __CONFIGS_MXS_H__ */
include/configs/nas220.h +0 -7
@@ -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 */
include/configs/tegra114-common.h +0 -1
@@ -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_ */
include/configs/tegra124-common.h +0 -1
@@ -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 */
include/configs/tegra20-common.h +0 -1
@@ -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
include/configs/tegra210-common.h +0 -1
@@ -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 */
include/configs/tegra30-common.h +0 -1
@@ -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_ */
include/configs/theadorable.h +0 -1
@@ -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 */
include/configs/tplink_wdr4300.h +0 -1
@@ -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
include/configs/turris_omnia.h +0 -3
@@ -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 */
include/configs/x530.h +0 -3
@@ -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 */
include/configs/zynq-common.h +0 -2
@@ -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
scripts/config_whitelist.txt +0 -1
@@ -3035,7 +3035,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
Signature · 1 line
2.32.0
Quoted 6 lines · Marek Behún
From: Marek Behún <[email protected]>
In preparation for moving this option to
Kconfig, rename it to be consistent with other USB EHCIKconfigoptions.Signed-off-by Marek Behún <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
Re: [PATCH 2/4] Convert CONFIG_USB_EHCI_MXS to Kconfig
In reply to Marek BehúnQuoted 10 lines · Marek Behún
From: Marek Behún <[email protected]>
This option is only used for
mx23evk_defconfig
mx23_olinuxino_defconfig
which are the only i.MX23 boards.Add depend on
ARCH_MX23and default to y.Signed-off-by Marek Behún <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
Re: [PATCH 3/4] Drop CONFIG_USB_EHCI_KIRKWOOD
In reply to Marek BehúnQuoted 7 lines · Marek Behún
From: Marek Behún <[email protected]>
This config option doesn't do anything.
nas220 uses
USB_EHCI_MARVELL.Signed-off-by Marek Behún <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
Re: [PATCH 4/4] Convert CONFIG_USB_EHCI_IS_TDI to Kconfig
In reply to Marek BehúnQuoted 8 lines · Marek Behún
From: Marek Behún <[email protected]>
On mvebu this is defined if and only if !ARM64.
Otherwise it is defined for boards with
ARCH_MX23,ARCH_TEGRAandARCH_ZYNQ, and also forSOC_AR934X(tplink_wdr4300).Signed-off-by Marek Behún <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
Re: [PATCH 4/4] Convert CONFIG_USB_EHCI_IS_TDI to Kconfig
In reply to Marek BehúnHi Marek,
Quoted 5 lines · Marek Behún
From: Marek Behún <[email protected]>
On mvebu this is defined if and only if !ARM64.
I'm working on a 64-bit MVEBU board which I'll hopefully be submitting soon (just getting the Linux stuff sorted first). Was there any particular reason you added the !ARM64 ? My board appears to need CONFIG_USB_EHCI_IS_TDI=y. I can make the condition more complicated if necessary but it might just be easier to remove the !ARM64.
Quoted 5 lines
Otherwise it is defined for boards with
ARCH_MX23,ARCH_TEGRAandARCH_ZYNQ, and also forSOC_AR934X(tplink_wdr4300).Signed-off-by Marek Behún <[email protected]>---
<snip>
Quoted 15 lines
drivers/usb/host/Kconfig +3
-0@@ -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
drivers/usb/host/Kconfig config USB_EHCI_MARVELL · line 156
Quoted 4 lines
drivers/usb/host/Kconfig +1
-0@@ -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
Here I'm thinking about something like if !ARM64 || ALLEYCAT_5
Quoted 2 lines
drivers/usb/host/Kconfig +0
-0---help--- Enables support for the on-chip EHCI controller on MVEBU SoCs.
Re: [PATCH 4/4] Convert CONFIG_USB_EHCI_IS_TDI to Kconfig
Quoted 6 lines · On Wed, 18 May 2022 16:44:32 +1200 Chris Packham <[email protected]>…
Hi Marek,
Quoted 3 lines · Marek Behún
From: Marek Behún <[email protected]>
Quoted 8 lines
Quoted 2 lines
On mvebu this is defined if and only if !ARM64.
I'm working on a 64-bit MVEBU board which I'll hopefully be submitting soon (just getting the Linux stuff sorted first). Was there any particular reason you added the !ARM64 ? My board appears to need
CONFIG_USB_EHCI_IS_TDI=y. I can make the condition more complicated if necessary but it might just be easier to remove the !ARM64.
It was because only arm32 boards defined it in the config headers when I was converting. So I converted it so that Kconfig selected that if !ARM64.
Quoted 16 lines
Quoted 5 lines
Otherwise it is defined for boards with
ARCH_MX23,ARCH_TEGRAandARCH_ZYNQ, and also forSOC_AR934X(tplink_wdr4300).Signed-off-by Marek Behún <[email protected]>---
<snip>
Quoted 8 lines
drivers/usb/host/Kconfig +0
-0@@ -139,6 +139,9 @@ config USB_EHCI_HCD if USB_EHCI_HCD
Quoted 13 lines
drivers/usb/host/Kconfig config USB_EHCI_MARVELL · line 156
Quoted 11 lines
drivers/usb/host/Kconfig +4
-0+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 !ARM64Here I'm thinking about something like if !ARM64 ||
ALLEYCAT_5
Sure, if you need this, do this. Just make sure it does not get selected for boards that don't need it.
Marek