Rename CONFIG_SPL_USBETH_SUPPORT to CONFIG_SPL_USB_ETHER.

This enables users to block text using CONFIG_IS_ENABLED() instead of resorting to #if ladders with SPL and non-SPL cases.

Signed-off-by: Faiz Abbas faiz_abbas@ti.com --- arch/arm/mach-omap2/boot-common.c | 2 +- board/birdland/bav335x/board.c | 2 +- board/bosch/shc/board.c | 4 ++-- board/tcl/sl50/board.c | 4 ++-- board/ti/am335x/board.c | 6 +++--- board/vscom/baltos/board.c | 2 +- common/spl/Kconfig | 2 +- common/spl/spl_net.c | 4 ++-- configs/am335x_evm_usbspl_defconfig | 2 +- configs/am43xx_hs_evm_defconfig | 2 +- configs/mx6memcal_defconfig | 2 +- drivers/Makefile | 2 +- include/configs/am335x_evm.h | 2 +- include/configs/am335x_sl50.h | 2 +- include/configs/am43xx_evm.h | 2 +- include/configs/baltos.h | 2 +- include/configs/bav335x.h | 2 +- 17 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c index 26245aa..db68a9d 100644 --- a/arch/arm/mach-omap2/boot-common.c +++ b/arch/arm/mach-omap2/boot-common.c @@ -99,7 +99,7 @@ void save_omap_boot_params(void) sys_boot_device = 1; break; #endif -#if defined(BOOT_DEVICE_USBETH) && !defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(BOOT_DEVICE_USBETH) && !defined(CONFIG_SPL_USB_ETHER) case BOOT_DEVICE_USBETH: sys_boot_device = 1; break; diff --git a/board/birdland/bav335x/board.c b/board/birdland/bav335x/board.c index f284568..d4bb1e7 100644 --- a/board/birdland/bav335x/board.c +++ b/board/birdland/bav335x/board.c @@ -360,7 +360,7 @@ static struct cpsw_platform_data cpsw_data = { * Build in only these cases to avoid warnings about unused variables * when we build an SPL that has neither option but full U-Boot will. */ -#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) &&\ +#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)) &&\ defined(CONFIG_SPL_BUILD)) || \ ((defined(CONFIG_DRIVER_TI_CPSW) || \ defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) && \ diff --git a/board/bosch/shc/board.c b/board/bosch/shc/board.c index 999ed95..92689da 100644 --- a/board/bosch/shc/board.c +++ b/board/bosch/shc/board.c @@ -522,7 +522,7 @@ static struct cpsw_platform_data cpsw_data = { * when we build an SPL that has neither option but full U-Boot will. */ #if ((defined(CONFIG_SPL_ETH_SUPPORT) || \ - defined(CONFIG_SPL_USBETH_SUPPORT)) && \ + defined(CONFIG_SPL_USB_ETHER)) && \ defined(CONFIG_SPL_BUILD)) || \ ((defined(CONFIG_DRIVER_TI_CPSW) || \ defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) && \ @@ -563,7 +563,7 @@ int board_eth_init(bd_t *bis) #endif

#if defined(CONFIG_USB_ETHER) && \ - (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT)) + (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USB_ETHER)) if (is_valid_ethaddr(mac_addr)) eth_env_set_enetaddr("usbnet_devaddr", mac_addr);

diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c index f79bb9d..933a407 100644 --- a/board/tcl/sl50/board.c +++ b/board/tcl/sl50/board.c @@ -299,7 +299,7 @@ static struct cpsw_platform_data cpsw_data = { * Build in only these cases to avoid warnings about unused variables * when we build an SPL that has neither option but full U-Boot will. */ -#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) \ +#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)) \ && defined(CONFIG_SPL_BUILD)) || \ ((defined(CONFIG_DRIVER_TI_CPSW) || \ defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) && \ @@ -371,7 +371,7 @@ int board_eth_init(bd_t *bis)

#endif #if defined(CONFIG_USB_ETHER) && \ - (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT)) + (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USB_ETHER)) if (is_valid_ether_addr(mac_addr)) eth_env_set_enetaddr("usbnet_devaddr", mac_addr);

diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 1a52bff..b144fd1 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -815,7 +815,7 @@ static struct cpsw_platform_data cpsw_data = { }; #endif

-#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) &&\ +#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)) &&\ defined(CONFIG_SPL_BUILD)) || \ ((defined(CONFIG_DRIVER_TI_CPSW) || \ defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) && \ @@ -836,7 +836,7 @@ int board_eth_init(bd_t *bis) { int rv, n = 0; #if defined(CONFIG_USB_ETHER) && \ - (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT)) + (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USB_ETHER)) uint8_t mac_addr[6]; uint32_t mac_hi, mac_lo;

@@ -906,7 +906,7 @@ int board_eth_init(bd_t *bis) } #endif #if defined(CONFIG_USB_ETHER) && \ - (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT)) + (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USB_ETHER)) if (is_valid_ethaddr(mac_addr)) eth_env_set_enetaddr("usbnet_devaddr", mac_addr);

diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c index cb39190..533d45e 100644 --- a/board/vscom/baltos/board.c +++ b/board/vscom/baltos/board.c @@ -423,7 +423,7 @@ static struct cpsw_platform_data cpsw_data = { }; #endif

-#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) \ +#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)) \ && defined(CONFIG_SPL_BUILD)) || \ ((defined(CONFIG_DRIVER_TI_CPSW) || \ defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) && \ diff --git a/common/spl/Kconfig b/common/spl/Kconfig index f58163c..9609fce 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -680,7 +680,7 @@ config SPL_USB_GADGET_SUPPORT

if SPL_USB_GADGET_SUPPORT

-config SPL_USBETH_SUPPORT +config SPL_USB_ETHER bool "Support USB Ethernet drivers" help Enable access to the USB network subsystem and associated diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c index 8883109..ef13145 100644 --- a/common/spl/spl_net.c +++ b/common/spl/spl_net.c @@ -15,7 +15,7 @@

DECLARE_GLOBAL_DATA_PTR;

-#if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER) static ulong spl_net_load_read(struct spl_load_info *load, ulong sector, ulong count, void *buf) { @@ -83,7 +83,7 @@ SPL_LOAD_IMAGE_METHOD("eth device", 0, BOOT_DEVICE_CPGMAC, spl_net_load_image_cpgmac); #endif

-#ifdef CONFIG_SPL_USBETH_SUPPORT +#ifdef CONFIG_SPL_USB_ETHER int spl_net_load_image_usb(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index d61aa94..e4bf757 100644 --- a/configs/am335x_evm_usbspl_defconfig +++ b/configs/am335x_evm_usbspl_defconfig @@ -15,7 +15,7 @@ CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL" CONFIG_SPL_OS_BOOT=y CONFIG_SPL_USB_GADGET_SUPPORT=y -CONFIG_SPL_USBETH_SUPPORT=y +CONFIG_SPL_USB_ETHER=y # CONFIG_SPL_YMODEM_SUPPORT is not set CONFIG_FASTBOOT=y CONFIG_CMD_SPL=y diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig index e8a641e..e409f93 100644 --- a/configs/am43xx_hs_evm_defconfig +++ b/configs/am43xx_hs_evm_defconfig @@ -24,7 +24,7 @@ CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL" CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_SUPPORT=y CONFIG_SPL_USB_GADGET_SUPPORT=y -CONFIG_SPL_USBETH_SUPPORT=y +CONFIG_SPL_USB_ETHER=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_NAND=y diff --git a/configs/mx6memcal_defconfig b/configs/mx6memcal_defconfig index 79ca723..344da80 100644 --- a/configs/mx6memcal_defconfig +++ b/configs/mx6memcal_defconfig @@ -11,7 +11,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SPL,MX6QDL" CONFIG_SPL=y CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_GADGET_SUPPORT=y -CONFIG_SPL_USBETH_SUPPORT=y +CONFIG_SPL_USB_ETHER=y CONFIG_SPL_USB_SDP_SUPPORT=y CONFIG_HUSH_PARSER=y # CONFIG_CMD_BOOTD is not set diff --git a/drivers/Makefile b/drivers/Makefile index e6062a5..2673428 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -35,7 +35,7 @@ obj-$(CONFIG_SPL_UBI) += mtd/ubispl/ obj-$(CONFIG_SPL_DMA_SUPPORT) += dma/ obj-$(CONFIG_SPL_ETH_SUPPORT) += net/ obj-$(CONFIG_SPL_ETH_SUPPORT) += net/phy/ -obj-$(CONFIG_SPL_USBETH_SUPPORT) += net/phy/ +obj-$(CONFIG_SPL_USB_ETHER) += net/phy/ obj-$(CONFIG_SPL_PCI_SUPPORT) += pci/ obj-$(CONFIG_SPL_PCH_SUPPORT) += pch/ obj-$(CONFIG_SPL_RTC_SUPPORT) += rtc/ diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 2e1dbf6..6b89f08 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -243,7 +243,7 @@ #undef CONFIG_DM_USB #endif

-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER) /* Remove other SPL modes. */ /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 1cb3578..a6b689b 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -77,7 +77,7 @@ #define CONFIG_BOOTCOUNT_AM33XX #define CONFIG_SYS_BOOTCOUNT_BE

-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER) /* Remove other SPL modes. */ /* disable host part of MUSB in SPL */ #undef CONFIG_MUSB_HOST diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 726dbba..0da525d 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -80,7 +80,7 @@ #define CONFIG_AM437X_USB2PHY2_HOST #endif

-#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USB_ETHER) #undef CONFIG_USB_DWC3_PHY_OMAP #undef CONFIG_USB_DWC3_OMAP #undef CONFIG_USB_DWC3 diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 440dbf5..7c64f19 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -275,7 +275,7 @@ #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_OTG

-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER) /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ /* diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 5ea7658..847f746 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -396,7 +396,7 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_AM335X_USB1 #define CONFIG_AM335X_USB1_MODE MUSB_HOST

-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) +#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER) /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ #endif