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>

diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c
index 47a7024f331337a1ee8aa103968cd49927e2b167..891bc0051413379d93f739f3ec45310c422a25b0 100644 (file)
--- 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 66b3d9a4651cbc49d94603e73e3b70b3b3540161..84671f63c60bd6b0e329f6d2d9bcd61263d07027 100644 (file)
--- 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 9134d6bf6d435e6fc7ec3699b4d276880e316493..f2b92109b6ac08e6fbceac4605242533efa97769 100644 (file)
--- 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 f196e6cdd8216ac3a4c80920a077536b244ce193..e40d390f8820cbd87f10c2e369d67a76c9938474 100644 (file)
--- 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 15ea0e4ce1f7ba00db8c9b646f7457991841eea5..1338ee3cda3b9d008fa443333d6b05d0001a3a72 100644 (file)
--- 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 2e7f49e7bb938c39c5c223a94d9255084d80c289..b372838be82f409ebe2173513223a63c4bd785ed 100644 (file)
--- 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 c12cd7ccad8f9293945b08fe2c1da7469c85ba5e..b668817c6c8dd493424f3e8caaeb774936ba0cb4 100644 (file)
--- 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" \