1
0
mirror of https://xff.cz/git/u-boot/ synced 2026-01-07 08:09:17 +01:00

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>
This commit is contained in:
Tom Rini
2021-07-09 10:11:55 -04:00
parent 3fa03bcf8c
commit e8d3eaadcd
7 changed files with 7 additions and 7 deletions

View File

@@ -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

View File

@@ -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;

View File

@@ -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,

View File

@@ -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.

View File

@@ -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

View File

@@ -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)

View File

@@ -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" \