From e8d3eaadcd9474a7e2e2f3af51ad044c3ff2ad80 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 9 Jul 2021 10:11:55 -0400 Subject: 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 --- include/configs/lx2160a_common.h | 2 +- include/configs/stm32mp1.h | 2 +- include/configs/topic_miami.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'include') 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" \ -- cgit v1.2.3