ge_bx50v3: Remove unused USB related defines
Subsystems (13)
PATCH v2 1/4 ge_bx50v3: Remove unused USB related defines
These USB defines do not change the build as there is no USB support enabled currently.
---
Changes in v2:
- New patch
--- include/configs/ge_bx50v3.h | 11 ----------- 1 file changed, 11 deletions(-)
include/configs/ge_bx50v3.h +0 -11
@@ -33,17 +33,6 @@#define CONFIG_LBA48 #endif -/* USB Configs */ -#ifdef CONFIG_USB -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 - -#define CONFIG_USBD_HS -#define CONFIG_USB_GADGET_MASS_STORAGE -#endif -/* Serial Flash */ #define CONFIG_LOADADDR 0x12000000
Signature · 1 line
2.17.1
PATCH v2 2/4 tegra: Test on CONFIG_CMD_USB being enabled for distro bootcmd
Reuse the common logic to allow for BOOT_TARGET_DEVICES to list USB as a possibility if we're building for a platform that will have USB but not if we don't, so that we don't hit the link-time check for trying to have USB boot on a non-USB system.
---
Changes in v2:
- New patch. This problem shows up later in the series when we stop building USB framework without a host controller of some sort also enabled.
--- include/configs/tegra-common-post.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
include/configs/tegra-common-post.h +8 -1
@@ -21,11 +21,18 @@#define CONFIG_SYS_NONCACHED_MEMORY (1 << 20)/* 1 MiB */ #ifndef CONFIG_SPL_BUILD + +#if CONFIG_IS_ENABLED (CMD_USB ) +# define BOOT_TARGET_USB (func) func(USB, usb, 0) +#else +# define BOOT_TARGET_USB (func) +#endif +#ifndef BOOT_TARGET_DEVICES #define BOOT_TARGET_DEVICES (func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 0) \ - func(USB, usb, 0) \ + BOOT_TARGET_USB(func) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na)#endif
Signature · 1 line
2.17.1
RE: [PATCHv2 2/4] tegra: Test on CONFIG_CMD_USB being enabled for distro bootcmd
Acked-by [email protected]
-----Original Message-----
From: Tom Rini <[email protected]>
Sent: Friday, July 9, 2021 7:12 AM
To: [email protected]
Cc: Tom Warren <[email protected]>
Subject: [PATCHv2 2/4] tegra: Test on CONFIG_CMD_USB being enabled for distro bootcmd
External email: Use caution opening links or attachments
Reuse the common logic to allow for BOOT_TARGET_DEVICES to list USB as a possibility if we're building for a platform that will have USB but not if we don't, so that we don't hit the link-time check for trying to have USB boot on a non-USB system.
---
Changes in v2:
- New patch. This problem shows up later in the series when we stop building USB framework without a host controller of some sort also enabled.
--- include/configs/tegra-common-post.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
include/configs/tegra-common-post.h +6 -1
@@ -21,11 +21,18 @@#define CONFIG_SYS_NONCACHED_MEMORY (1 << 20)/* 1 MiB */ #ifndef CONFIG_SPL_BUILD + +#if CONFIG_IS_ENABLED (CMD_USB ) +# define BOOT_TARGET_USB (func) func(USB, usb, 0) #else # define +BOOT_TARGET_USB(func) #endif +#ifndef BOOT_TARGET_DEVICES #define BOOT_TARGET_DEVICES (func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 0) \ - func(USB, usb, 0) \ + BOOT_TARGET_USB(func) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na)#endif
--
2.17.1
Re: [PATCHv2 2/4] tegra: Test on CONFIG_CMD_USB being enabled for distro bootcmd
In reply to Tom RiniQuoted 7 lines · Tom Rini
Reuse the common logic to allow for
BOOT_TARGET_DEVICESto list USB as a possibility if we're building for a platform that will have USB but not if we don't, so that we don't hit the link-time check for trying to have USB boot on a non-USB system.Acked-by Tom Warren <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v2 3/4 treewide: Test on CONFIG_USB_HOST (or CONFIG_CMD_USB) not CONFIG_USB
In reply to Tom RiniAs the logic here is only used when we have a USB host controller, test on CONFIG_USB_HOST rather than CONFIG_USB in general. This lets us move towards using CONFIG_USB only as a menu symbol to say that we have some form of USB, and then USB_HOST or USB_GADGET depending on the role that USB plays within the build.
---
Changes in v2:
- New patch
--- board/freescale/lx2160a/lx2160a.c | 2 +- board/freescale/mpc837xerdb/mpc837xerdb.c | 2 +- board/tplink/wdr4300/wdr4300.c | 2 +- cmd/Kconfig | 2 +- include/configs/lx2160a_common.h | 2 +- include/configs/stm32mp1.h | 2 +- include/configs/topic_miami.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)
board/freescale/lx2160a/lx2160a.c +1 -1
@@ -781,7 +781,7 @@ int ft_board_setup(void *blob, struct bd_info *bd)fdt_fixup_memory_banks (blob, base, size, total_memory_banks); -#ifdef CONFIG_USB +#ifdef CONFIG_USB_HOST fsl_fdt_fixup_dr_usb (blob, bd);#endif
board/freescale/mpc837xerdb/mpc837xerdb.c +1 -1
@@ -220,7 +220,7 @@ int misc_init_r(void)int board_late_init (void ) {volatile immap_t *immap = (immap_t *)CONFIG_SYS_IMMR ; -#ifdef CONFIG_USB +#ifdef CONFIG_USB_HOST clrsetbits_be32 (&immap->sysconf.sicrl,SICRL_USB_A ,0x40000000 );#endif return 0 ;
board/tplink/wdr4300/wdr4300.c +1 -1
@@ -15,7 +15,7 @@#include <mach/ddr.h> #include <debug_uart.h> -#ifdef CONFIG_USB +#ifdef CONFIG_USB_HOST static void wdr4300_usb_start (void ) { void __iomem *gpio_regs = map_physmem(AR71XX_GPIO_BASE,
cmd/Kconfig +1 -1
@@ -1322,7 +1322,7 @@ config CMD_UNIVERSE config CMD_USB bool "usb" - depends on USB + depends on USB_HOST select HAVE_BLOCK_DEVICE help USB support.
include/configs/lx2160a_common.h +1 -1
@@ -142,7 +142,7 @@#endif /* USB */ -#ifdef CONFIG_USB +#ifdef CONFIG_USB_HOST #define CONFIG_HAS_FSL_XHCI_USB #ifndef CONFIG_TARGET_LX2162AQDS #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
include/configs/stm32mp1.h +1 -1
@@ -101,7 +101,7 @@#define BOOT_TARGET_UBIFS (func)#endif -#ifdef CONFIG_USB +#ifdef CONFIG_CMD_USB #define BOOT_TARGET_USB (func) func(USB, usb, 0)#else #define BOOT_TARGET_USB (func)
include/configs/topic_miami.h +1 -1
@@ -34,7 +34,7 @@/* Setup proper boot sequences for Miami boards */ -#if defined(CONFIG_USB ) +#if defined(CONFIG_USB_HOST )# define EXTRA_ENV_USB \ "usbreset=i2c dev 1 && i2c mw 41 1 ff && i2c mw 41 3 fe && "\ "i2c mw 41 1 fe && i2c mw 41 1 ff\0" \
Signature · 1 line
2.17.1
Re: [PATCHv2 3/4] treewide: Test on CONFIG_USB_HOST (or CONFIG_CMD_USB) not CONFIG_USB
Quoted 7 lines · Tom Rini
As the logic here is only used when we have a USB host controller, test on
CONFIG_USB_HOSTrather thanCONFIG_USBin general. This lets us move towards usingCONFIG_USBonly as a menu symbol to say that we have some form of USB, and thenUSB_HOSTorUSB_GADGETdepending on the role that USB plays within the build.Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v2 4/4 usb: Enforce DM_USB migration for USB_HOST devices.
In reply to Tom RiniAs the deadline for migration to DM_USB, when using a USB host controller has now gone two years past the deadline, enforce migration. This is done by:
- Ensuring that all host controller options (other than the very legacy old MUSB ones) now select USB_HOST. USB_HOST now enforces DM_USB and OF_CONTROL.
- Remove other parts of Kconfig logic that had platforms pick DM_USB.
- To keep Kconfig happy, have some select statements test for USB_HOST as well.
- Re-order some Kconfig entries and menus so that we can cleanly pick host or gadget roles. For the various HCD options that have platform glue options, group them together and update dependencies in some cases.
- As SPL_DM_USB is not required, on platforms that had not yet enabled it, disable it.
---
Changes in v2:
- Rework the final stage of migration to result in splitting USB_HOST and USB_GADGET from the plain USB symbol. This resolves the problem of gadget-only platforms seeing a migration warning.
As part of this, a few boards get converted to DM_USB, because they had everything required but hadn't enabled the options. Also as part of this, and why I've cc'd some sunxi board maintainers, a number of platforms like pinephone and pinecube free up space as they had been building in USB host or gadget support without having a controller enabled. With the Kconfig changes here we no longer build in that functionality.
--- Makefile | 2 -- arch/arm/Kconfig | 15 +++------------ arch/arm/mach-imx/mx5/Kconfig | 1 - arch/arm/mach-imx/mx6/Kconfig | 2 -- arch/arm/mach-omap2/am33xx/Kconfig | 1 - board/tqc/tqma6/Kconfig | 1 - configs/devkit3250_defconfig | 1 + configs/draco_defconfig | 1 + configs/etamin_defconfig | 1 + configs/imx6dl_mamoj_defconfig | 1 + configs/k2e_evm_defconfig | 1 + configs/k2hk_evm_defconfig | 1 + configs/k2l_evm_defconfig | 1 + configs/pxm2_defconfig | 1 + configs/rastaban_defconfig | 1 + configs/rut_defconfig | 1 + configs/sniper_defconfig | 1 - configs/socrates_defconfig | 1 + configs/thuban_defconfig | 1 + drivers/block/Kconfig | 2 +- drivers/usb/Kconfig | 14 +++++++++----- drivers/usb/cdns3/Kconfig | 2 +- drivers/usb/dwc3/Kconfig | 2 +- drivers/usb/emul/Kconfig | 4 +++- drivers/usb/gadget/Kconfig | 2 ++ drivers/usb/host/Kconfig | 20 ++++++++++---------- drivers/usb/mtu3/Kconfig | 2 +- drivers/usb/musb-new/Kconfig | 13 ++++++++----- 28 files changed, 51 insertions(+), 45 deletions(-)
Makefile +0 -2
@@ -1118,8 +1118,6 @@ ifneq ($(CONFIG_DM),y) @echo >&2 "See doc/driver-model/migration.rst for more info." @echo >&2 "====================================================" endif - $(call deprecated,CONFIG_DM_USB CONFIG_OF_CONTROL CONFIG_BLK,\ - USB,v2019.07,$(CONFIG_USB)) $(call deprecated,CONFIG_DM_PCI,PCI,v2019.07,$(CONFIG_PCI)) $(call deprecated,CONFIG_DM_VIDEO,video,v2019.07,\ $(CONFIG_LCD)$(CONFIG_VIDEO))
arch/arm/Kconfig +3 -12
@@ -984,7 +984,7 @@ config ARCH_SUNXI select BINMAN select CMD_GPIO select CMD_MMC if MMC - select CMD_USB if DISTRO_DEFAULTS + select CMD_USB if DISTRO_DEFAULTS && USB_HOST select CLK select DM select DM_ETH
@@ -993,7 +993,6 @@ config ARCH_SUNXI select DM_MMC if MMC select DM_SCSI if SCSI select DM_SERIAL - select DM_USB if DISTRO_DEFAULTS select GPIO_EXTRA_HEADER select OF_BOARD_SETUP select OF_CONTROL
@@ -1006,8 +1005,8 @@ config ARCH_SUNXI select SYS_NS16550 select SYS_THUMB_BUILD if !ARM64 select USB if DISTRO_DEFAULTS - select USB_KEYBOARD if DISTRO_DEFAULTS - select USB_STORAGE if DISTRO_DEFAULTS + select USB_KEYBOARD if DISTRO_DEFAULTS && USB_HOST + select USB_STORAGE if DISTRO_DEFAULTS && USB_HOST select SPL_USE_TINY_PRINTF select USE_PREBOOT select SYS_RELOC_GD_ENV_ADDR
@@ -1035,7 +1034,6 @@ config ARCH_U8500 select DM_GPIO select DM_MMC if MMC select DM_SERIAL - select DM_USB if USB select OF_CONTROL select SYSRESET select TIMER
@@ -1078,7 +1076,6 @@ config ARCH_ZYNQ select DM_SERIAL select DM_SPI select DM_SPI_FLASH - select DM_USB if USB select GPIO_EXTRA_HEADER select OF_CONTROL select SPI
@@ -1122,7 +1119,6 @@ config ARCH_ZYNQMP select DM_SERIAL select DM_SPI if SPI select DM_SPI_FLASH if DM_SPI - select DM_USB if USB select FIRMWARE select GPIO_EXTRA_HEADER select OF_CONTROL
@@ -1177,7 +1173,6 @@ config TARGET_VEXPRESS64_JUNO select DM_ETH select BLK select USB - select DM_USB config TARGET_TOTAL_COMPUTE bool "Support Total Compute Platform"
@@ -1343,7 +1338,6 @@ config TARGET_POPLAR select ARM64 select DM select DM_SERIAL - select DM_USB select GPIO_EXTRA_HEADER select OF_CONTROL select PL01X_SERIAL
@@ -1681,7 +1675,6 @@ config TARGET_SL28 select DM_SCSI select DM_SERIAL select DM_SPI - select DM_USB select GPIO_EXTRA_HEADER select SPL_DM if SPL select SPL_DM_SPI if SPL
@@ -1708,7 +1701,6 @@ config ARCH_UNIPHIER select DM_MTD select DM_RESET select DM_SERIAL - select DM_USB select OF_BOARD_SETUP select OF_CONTROL select OF_LIBFDT
@@ -1809,7 +1801,6 @@ config ARCH_ROCKCHIP select DM_SERIAL select DM_SPI select DM_SPI_FLASH - select DM_USB if USB select ENABLE_ARM_SOC_BOOT0_HOOK select OF_CONTROL select SPI
arch/arm/mach-imx/mx5/Kconfig +0 -1
@@ -29,7 +29,6 @@ config TARGET_KP_IMX53 select DM_SERIAL select DM_MMC select BLK - select DM_USB select DM_REGULATOR select MX53 imply CMD_DM
arch/arm/mach-imx/mx6/Kconfig +0 -2
@@ -239,7 +239,6 @@ config TARGET_KOSAGI_NOVENA select DM_MMC select DM_PCI select DM_SCSI - select DM_USB select DM_VIDEO select OF_CONTROL select SUPPORT_SPL
@@ -556,7 +555,6 @@ config TARGET_KP_IMX6Q_TPC select DM_SERIAL select DM_I2C select DM_GPIO - select DM_USB select SUPPORT_SPL select SPL_SEPARATE_BSS if SPL imply CMD_DM
arch/arm/mach-omap2/am33xx/Kconfig +0 -1
@@ -94,7 +94,6 @@ config TARGET_AM335X_GUARDIAN select DM select DM_SERIAL select DM_GPIO - select DM_USB config TARGET_AM335X_SL50 bool "Support am335x_sl50"
board/tqc/tqma6/Kconfig +0 -1
@@ -65,7 +65,6 @@ config MBA6 bool "TQMa6 on MBa6 Starterkit" select DM_ETH select USB - select DM_USB select CMD_USB select USB_STORAGE select USB_HOST_ETHER
configs/devkit3250_defconfig +1 -0
@@ -57,5 +57,6 @@ CONFIG_CONS_INDEX=5 CONFIG_SYS_NS16550=y CONFIG_SPI=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_STORAGE=y CONFIG_OF_LIBFDT=y
configs/draco_defconfig +1 -0
@@ -90,6 +90,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_DSPS=y
configs/etamin_defconfig +1 -0
@@ -91,6 +91,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_DSPS=y
configs/imx6dl_mamoj_defconfig +1 -0
@@ -52,6 +52,7 @@ CONFIG_PINCTRL_IMX6=y CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="FSL" CONFIG_USB_GADGET_VENDOR_NUM=0x0525
configs/k2e_evm_defconfig +1 -0
@@ -76,6 +76,7 @@ CONFIG_DM_SPI=y CONFIG_DAVINCI_SPI=y CONFIG_USB=y CONFIG_DM_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y
configs/k2hk_evm_defconfig +1 -0
@@ -76,6 +76,7 @@ CONFIG_DM_SPI=y CONFIG_DAVINCI_SPI=y CONFIG_USB=y CONFIG_DM_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y
configs/k2l_evm_defconfig +1 -0
@@ -76,6 +76,7 @@ CONFIG_DM_SPI=y CONFIG_DAVINCI_SPI=y CONFIG_USB=y CONFIG_DM_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y
configs/pxm2_defconfig +1 -0
@@ -90,6 +90,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_DSPS=y
configs/rastaban_defconfig +1 -0
@@ -90,6 +90,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_DSPS=y
configs/rut_defconfig +1 -0
@@ -90,6 +90,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_DSPS=y
configs/sniper_defconfig +0 -1
@@ -31,7 +31,6 @@ CONFIG_SYS_OMAP24_I2C_SPEED=400000 CONFIG_TWL4030_INPUT=y CONFIG_MMC_OMAP_HS=y CONFIG_CONS_INDEX=3 -CONFIG_USB=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_OMAP2PLUS=y CONFIG_TWL4030_USB=y
configs/socrates_defconfig +1 -0
@@ -73,5 +73,6 @@ CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_DM_USB=y # CONFIG_USB_EHCI_HCD is not set +CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_PCI=y CONFIG_USB_STORAGE=y
configs/thuban_defconfig +1 -0
@@ -90,6 +90,7 @@ CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +# CONFIG_SPL_DM_USB is not set CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_DSPS=y
drivers/block/Kconfig +1 -1
@@ -1,7 +1,7 @@ config BLK bool "Support block devices" depends on DM - default y if DM_MMC + default y if DM_MMC || DM_USB help Enable support for block devices, such as SCSI, MMC and USB flash sticks. These provide a block-level interface which permits
drivers/usb/Kconfig +9 -5
@@ -34,8 +34,8 @@ menuconfig USB if USB config DM_USB - bool "Enable driver model for USB" - depends on USB && DM + bool + depends on DM && OF_CONTROL help Enable driver model for USB. The USB interface is then implemented by the USB uclass. Multiple USB controllers of different types
@@ -48,7 +48,7 @@ config DM_USB automatically probed when found on the bus. config SPL_DM_USB - bool "Enable driver model for USB in SPL" + bool "Enable driver model for USB host most in SPL" depends on SPL_DM && DM_USB default y
@@ -84,6 +84,8 @@ source "drivers/usb/phy/Kconfig" source "drivers/usb/ulpi/Kconfig" +if USB_HOST + comment "USB peripherals" config USB_STORAGE
@@ -129,8 +131,10 @@ endchoice endif -source "drivers/usb/gadget/Kconfig" - source "drivers/usb/eth/Kconfig" endif + +source "drivers/usb/gadget/Kconfig" + +endif
drivers/usb/cdns3/Kconfig +1 -1
@@ -1,6 +1,6 @@ config USB_CDNS3 tristate "Cadence USB3 Dual-Role Controller" - depends on USB_HOST || USB_GADGET + depends on USB_XHCI_HCD || USB_GADGET help Say Y here if your system has a Cadence USB3 dual-role controller. It supports: Host-only, and Peripheral-only.
drivers/usb/dwc3/Kconfig +1 -1
@@ -1,6 +1,6 @@ config USB_DWC3 bool "DesignWare USB3 DRD Core Support" - depends on USB_HOST || USB_GADGET + depends on USB_XHCI_HCD || USB_GADGET help Say Y here if your system has a Dual Role SuperSpeed USB controller based on the DesignWare USB3 IP Core.
drivers/usb/emul/Kconfig +3 -1
@@ -1,6 +1,8 @@ config USB_EMUL bool "Support for USB device emulation" - depends on DM_USB && SANDBOX + depends on SANDBOX + select DM_USB + select USB_HOST help Since sandbox does not have access to a real USB bus, it is possible to use device emulators instead. This allows testing of the USB
drivers/usb/gadget/Kconfig +2 -0
@@ -15,6 +15,8 @@ menuconfig USB_GADGET bool "USB Gadget Support" + depends on DM + select DM_USB help USB is a master/slave protocol, organized with one master host (such as a PC) controlling up to 127 peripheral devices.
drivers/usb/host/Kconfig +10 -10
@@ -5,9 +5,11 @@ comment "USB Host Controller Drivers" config USB_HOST bool + select DM_USB config USB_XHCI_HCD bool "xHCI HCD (USB 3.0) support" + depends on DM && OF_CONTROL select USB_HOST ---help--- The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0
@@ -107,6 +109,7 @@ endif # USB_XHCI_HCD config USB_EHCI_HCD bool "EHCI HCD (USB 2.0) support" default y if ARCH_MX5 || ARCH_MX6 + depends on DM && OF_CONTROL select USB_HOST ---help--- The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
@@ -217,7 +220,6 @@ config USB_EHCI_ZYNQ config USB_EHCI_GENERIC bool "Support for generic EHCI USB controller" - depends on OF_CONTROL depends on DM_USB default ARCH_SUNXI default n
@@ -234,6 +236,8 @@ endif # USB_EHCI_HCD config USB_OHCI_HCD bool "OHCI HCD (USB 1.1) support" + depends on DM && OF_CONTROL + select USB_HOST ---help--- The Open Host Controller Interface (OHCI) is a standard for accessing USB 1.1 host controller hardware. It does more in hardware than Intel's
@@ -244,21 +248,17 @@ config USB_OHCI_HCD based system where you're not sure, the "lspci -v" entry will list the right "prog-if" for your USB controller(s): EHCI, OHCI, or UHCI. +if USB_OHCI_HCD + config USB_OHCI_PCI bool "Support for PCI-based OHCI USB controller" - depends on DM_USB - default n + depends on PCI help Enables support for the PCI-based OHCI controller. -if USB_OHCI_HCD - config USB_OHCI_GENERIC bool "Support for generic OHCI USB controller" - depends on OF_CONTROL - depends on DM_USB default ARCH_SUNXI - select USB_HOST ---help--- Enables support for generic OHCI controller.
@@ -289,6 +289,7 @@ endif # USB_UHCI_HCD config USB_DWC2 bool "DesignWare USB2 Core support" + depends on DM && OF_CONTROL select USB_HOST ---help--- The DesignWare USB 2.0 controller is compliant with the
@@ -311,8 +312,7 @@ endif # USB_DWC2 config USB_R8A66597_HCD bool "Renesas R8A66597 USB Core support" - depends on OF_CONTROL - depends on DM_USB + depends on DM && OF_CONTROL select USB_HOST ---help--- This enables support for the on-chip Renesas R8A66597 USB 2.0
drivers/usb/mtu3/Kconfig +1 -1
@@ -4,7 +4,7 @@ config USB_MTU3 bool "MediaTek USB3 Dual Role controller" - depends on USB_HOST || USB_GADGET + depends on USB_XHCI_HCD || USB_GADGET depends on ARCH_MEDIATEK help Say Y here if your system runs on MediaTek SoCs with
drivers/usb/musb-new/Kconfig +8 -5
@@ -5,22 +5,26 @@ comment "MUSB Controller Driver" config USB_MUSB_HOST bool "MUSB host mode support" + depends on DM && OF_CONTROL select SPL_SPRINTF if SPL select TPL_SPRINTF if TPL + select USB_HOST help Enables the MUSB USB dual-role controller in host mode. config USB_MUSB_GADGET bool "MUSB gadget mode support" + depends on USB_GADGET select USB_GADGET_DUALSPEED select SPL_SPRINTF if SPL select TPL_SPRINTF if TPL help Enables the MUSB USB dual-role controller in gadget mode. +if USB_MUSB_HOST || USB_MUSB_GADGET config USB_MUSB_DA8XX bool "Enable DA8xx MUSB Controller" - depends on DM_USB + depends on ARCH_DAVINCI help Say y here to enable support for the dual role high speed USB controller based on the Mentor Graphics
@@ -28,7 +32,7 @@ config USB_MUSB_DA8XX config USB_MUSB_TI bool "Enable TI OTG USB controller" - depends on DM_USB + depends on AM33XX select USB_MUSB_DSPS default n help
@@ -46,10 +50,9 @@ config USB_MUSB_AM35X config USB_MUSB_DSPS bool "TI DSPS platforms" -if USB_MUSB_HOST || USB_MUSB_GADGET config USB_MUSB_MT85XX bool "Enable Mediatek MT85XX DRC USB controller" - depends on DM_USB && ARCH_MEDIATEK + depends on ARCH_MEDIATEK default n help Say y to enable Mediatek MT85XX USB DRC controller support
@@ -59,7 +62,7 @@ config USB_MUSB_MT85XX config USB_MUSB_PIC32 bool "Enable Microchip PIC32 DRC USB controller" - depends on DM_USB && MACH_PIC32 + depends on MACH_PIC32 help Say y to enable PIC32 USB DRC controller support if it is available on your Microchip PIC32 platform.
Signature · 1 line
2.17.1
Re: [PATCHv2 4/4] usb: Enforce DM_USB migration for USB_HOST devices.
Quoted 17 lines · Tom Rini
As the deadline for migration to
DM_USB, when using a USB host controller has now gone two years past the deadline, enforce migration. This is done by:- Ensuring that all host controller options (other than the very legacy old MUSB ones) now select
USB_HOST.USB_HOSTnow enforcesDM_USBandOF_CONTROL.
- Remove other parts ofKconfiglogic that had platforms pickDM_USB.
- To keepKconfighappy, have some select statements test forUSB_HOSTas well.
- Re-order someKconfigentries and menus so that we can cleanly pick host or gadget roles. For the various HCD options that have platform glue options, group them together and update dependencies in some cases.
- AsSPL_DM_USBis not required, on platforms that had not yet enabled it, disable it.
Quoted 7 lines
Cc Marek Vasut <[email protected]>Cc Icenowy Zheng <[email protected]>Cc Samuel Holland <[email protected]>Cc FUKAUMI Naoki <[email protected]>Cc Andre Przywara <[email protected]>Cc Jagan Teki <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
Hi,
Quoted 7 lines · Tom Rini
These USB defines do not change the build as there is no USB support enabled currently.
Cc Ian Ray <[email protected]>Cc Sebastian Reichel <[email protected]>Signed-off-by Tom Rini <[email protected]>---
-- Sebastian
Quoted 31 lines
Changes in v2:
- New patch--- include/configs/ge_bx50v3.h | 11 ----------- 1 file changed, 11 deletions(-)include/configs/ge_bx50v3.h +0
-11@@ -33,17 +33,6 @@#define CONFIG_LBA48 #endif -/* USB Configs */ -#ifdef CONFIG_USB -#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#define CONFIG_EHCI_HCD_INIT_AFTER_RESET -#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) -#define CONFIG_MXC_USB_FLAGS 0 - -#define CONFIG_USBD_HS -#define CONFIG_USB_GADGET_MASS_STORAGE -#endif -/* Serial Flash */ #define CONFIG_LOADADDR 0x12000000Signature · 1 line
2.17.1
Quoted 7 lines · Tom Rini
These USB defines do not change the build as there is no USB support enabled currently.
Cc Ian Ray <[email protected]>Cc Sebastian Reichel <[email protected]>Signed-off-by Tom Rini <[email protected]>Reviewed-by Sebastian Reichel <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom