diff options
| author | Tom Rini | 2021-07-09 10:11:55 -0400 |
|---|---|---|
| committer | Tom Rini | 2021-07-18 21:05:31 -0400 |
| commit | e8d3eaadcd9474a7e2e2f3af51ad044c3ff2ad80 (patch) | |
| tree | 8021b391d839ddf608b639557f000febeb39f0db | |
| parent | 3fa03bcf8c67f3636104ecfc941f80af5b31ad9a (diff) | |
treewide: Test on CONFIG_USB_HOST (or CONFIG_CMD_USB) not CONFIG_USB
As 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.
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | board/freescale/lx2160a/lx2160a.c | 2 | ||||
| -rw-r--r-- | board/freescale/mpc837xerdb/mpc837xerdb.c | 2 | ||||
| -rw-r--r-- | board/tplink/wdr4300/wdr4300.c | 2 | ||||
| -rw-r--r-- | cmd/Kconfig | 2 | ||||
| -rw-r--r-- | include/configs/lx2160a_common.h | 2 | ||||
| -rw-r--r-- | include/configs/stm32mp1.h | 2 | ||||
| -rw-r--r-- | include/configs/topic_miami.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index 47a7024f331..891bc005141 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -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 diff --git a/board/freescale/mpc837xerdb/mpc837xerdb.c b/board/freescale/mpc837xerdb/mpc837xerdb.c index 66b3d9a4651..84671f63c60 100644 --- a/board/freescale/mpc837xerdb/mpc837xerdb.c +++ b/board/freescale/mpc837xerdb/mpc837xerdb.c @@ -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; diff --git a/board/tplink/wdr4300/wdr4300.c b/board/tplink/wdr4300/wdr4300.c index 9134d6bf6d4..f2b92109b6a 100644 --- a/board/tplink/wdr4300/wdr4300.c +++ b/board/tplink/wdr4300/wdr4300.c @@ -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, diff --git a/cmd/Kconfig b/cmd/Kconfig index f196e6cdd82..e40d390f882 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -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. diff --git a/include/configs/lx2160a_common.h b/include/configs/lx2160a_common.h index 15ea0e4ce1f..1338ee3cda3 100644 --- a/include/configs/lx2160a_common.h +++ b/include/configs/lx2160a_common.h @@ -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 diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h index 2e7f49e7bb9..b372838be82 100644 --- a/include/configs/stm32mp1.h +++ b/include/configs/stm32mp1.h @@ -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) diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index c12cd7ccad8..b668817c6c8 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -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" \ |