spl: Kconfig: Rename SPL_USBETH_SUPPORT to SPL_USB_ETHER to match with the U-boot...

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>

diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
index 26245aa1694e47283c2acdeac8e322ed06fe1b76..db68a9d7e21f582e65bfc21c0f6e43acaef2e5b2 100644 (file)
--- 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 f284568ec92098a3380c056df495ecffb1a5b08a..d4bb1e743ff077a9d50460f5fc8dc45f27397dc2 100644 (file)
--- 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 999ed95c31d95a804fc57f8222be81d1938c1e59..92689da9d9606add1c1fe1284e8934911344da11 100644 (file)
--- 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 f79bb9dcdd5f76235b4697aa9ce13f429c9af84c..933a407fb268402475de909c957fa55a76cb4ab0 100644 (file)
--- 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 1a52bffc002294fbdeee04e509565cef33c183d1..b144fd182154480ef89d46c142cdcc8c5406058d 100644 (file)
--- 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 cb39190c286ae7d8ac33d344477ef7b5e3b500a4..533d45e88661459c787e919444e4c8c63a874f41 100644 (file)
--- 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 f58163ce53a861b4595a3f1d4cced6b365b9fb73..9609fceea59fef0aa8725abc9b401a469990950d 100644 (file)
--- 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 88831097fa60cb6dd681ad210ebe62a1ecad9680..ef13145eeaff92b80e4099599acfea8c3fec7138 100644 (file)
--- 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 d61aa944397bec1b2612c6faeceb6ca9b88b1e5f..e4bf757923557fe3878b64dd609281cb904c6566 100644 (file)
--- 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 170d7c0af41393fbb0fcf8ff8961229fd0caa64a..b69d8552f5a73d60fb2ebd5366bee9393efbd595 100644 (file)
--- a/configs/am43xx_hs_evm_defconfig
+++ b/configs/am43xx_hs_evm_defconfig
@@ -26,7 +26,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_CMD_FLASH is not set
 CONFIG_CMD_NAND=y
 # CONFIG_CMD_SETEXPR is not set

diff --git a/configs/mx6memcal_defconfig b/configs/mx6memcal_defconfig
index bf0b4f2978407ef8ac81e76ab696b7188dae51f3..fdcef6b65b65dde12661cd7197270667c55543db 100644 (file)
--- a/configs/mx6memcal_defconfig
+++ b/configs/mx6memcal_defconfig
@@ -12,7 +12,7 @@ CONFIG_SUPPORT_RAW_INITRD=y
 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 e6062a56833566229728022f503c6fd5c0d91eda..2673428cb693ebc085e29b533642857a087f5e43 100644 (file)
--- 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 80a523ddce1f27c4c5bc10c77658645456072e7e..158b7d4e8eb89a011555f965363153fa6b2ae3f4 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -242,7 +242,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 569220ea357c8ff365394779d841be0333395372..739a99860b6904e64889dec87dcba3c3ff0dc87e 100644 (file)
--- a/include/configs/am335x_sl50.h
+++ b/include/configs/am335x_sl50.h
@@ -74,7 +74,7 @@
 /* Bootcount using the RTC block */
 #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 a0d2b36d9982b82e5a12944e87597f941d14bd91..663f86170660e571f1b4853b8fa9781430622f92 100644 (file)
--- 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 10979c72ca7fbad98ad85444fb727ee6915eddef..5766a36f91083c1abcc932c27e2d00360309f0f3 100644 (file)
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -273,7 +273,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 48cd285d46863807aedbdb1627ccf0493bf2ac71..e7f65d6d03e5d5985d4607af1d8933e2a116a127 100644 (file)
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -395,7 +395,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