Rename SPL_ETH_SUPPORT to SPL_ETH

Rename this option so that CONFIG_IS_ENABLED can be used with it.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/arm/mach-omap2/boot-common.c b/arch/arm/mach-omap2/boot-common.c
index 1268a325038f344f0ebc5e0f57330df4d51710a7..f4d63896b6c6352a5b58ccfcfcbe3e7063dc56c2 100644 (file)
--- a/arch/arm/mach-omap2/boot-common.c
+++ b/arch/arm/mach-omap2/boot-common.c
@@ -104,7 +104,7 @@ void save_omap_boot_params(void)
                        sys_boot_device = 1;
                        break;
 #endif
-#if defined(BOOT_DEVICE_CPGMAC) && !defined(CONFIG_SPL_ETH_SUPPORT)
+#if defined(BOOT_DEVICE_CPGMAC) && !defined(CONFIG_SPL_ETH)
                case BOOT_DEVICE_CPGMAC:
                        sys_boot_device = 1;
                        break;

diff --git a/board/siemens/draco/board.c b/board/siemens/draco/board.c
index 01fdfb5cb4de0911a0493bb61efab1eeeff481b5..af35bc188e318fcc29cc8cc285eb24159bda5ab8 100644 (file)
--- a/board/siemens/draco/board.c
+++ b/board/siemens/draco/board.c
@@ -288,7 +288,7 @@ int board_late_init(void)
 #endif
 
 #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
-       (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
+       (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD))
 static void cpsw_control(int enabled)
 {
        /* VTP can be added here */

diff --git a/board/siemens/pxm2/board.c b/board/siemens/pxm2/board.c
index b5e9b4242cd52a7bb43b081cf31e651c269385e8..de52838d771d1f59ae427bc36795e73071c6be20 100644 (file)
--- a/board/siemens/pxm2/board.c
+++ b/board/siemens/pxm2/board.c
@@ -171,7 +171,7 @@ int read_eeprom(void)
 }
 
 #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
-       (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
+       (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD))
 static void cpsw_control(int enabled)
 {
        /* VTP can be added here */
@@ -220,7 +220,7 @@ int board_eth_init(struct bd_info *bis)
 {
        int n = 0;
 #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
-       (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
+       (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD))
        struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;
 #ifdef CONFIG_FACTORYSET
        int rv;

diff --git a/board/tcl/sl50/board.c b/board/tcl/sl50/board.c
index 4821925c026de8a4191969f47fa49b1eb4cfe0ff..d2136084991ddf51f945f85e1c87dad0c3d0ffe3 100644 (file)
--- a/board/tcl/sl50/board.c
+++ b/board/tcl/sl50/board.c
@@ -250,7 +250,7 @@ int board_late_init(void)
 #endif
 
 #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
-       (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
+       (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD))
 static void cpsw_control(int enabled)
 {
        /* VTP can be added here */
@@ -302,7 +302,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_USB_ETHER)) \
+#if ((defined(CONFIG_SPL_ETH) || defined(CONFIG_SPL_USB_ETHER)) \
                && defined(CONFIG_SPL_BUILD)) || \
        ((defined(CONFIG_DRIVER_TI_CPSW) || \
          defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) && \
@@ -324,7 +324,7 @@ int board_eth_init(struct bd_info *bis)
        mac_addr[5] = (mac_lo & 0xFF00) >> 8;
 
 #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
-       (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
+       (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD))
        if (!env_get("ethaddr")) {
                printf("<ethaddr> not set. Validating first E-fuse MAC\n");
 

diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 5c156a5d1d81a21e0a8e1a63358641a25991a2e0..555c0aa4492164e25b9af4147e9125ecf12ebc14 100644 (file)
--- a/board/ti/am335x/board.c
+++ b/board/ti/am335x/board.c
@@ -588,7 +588,7 @@ void sdram_init(void)
 #endif
 
 #if defined(CONFIG_CLOCK_SYNTHESIZER) && (!defined(CONFIG_SPL_BUILD) || \
-       (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD)))
+       (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD)))
 static void request_and_set_gpio(int gpio, char *name, int val)
 {
        int ret;
@@ -724,7 +724,7 @@ int board_init(void)
 #endif
 
 #if defined(CONFIG_CLOCK_SYNTHESIZER) && (!defined(CONFIG_SPL_BUILD) || \
-       (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD)))
+       (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD)))
        if (board_is_icev2()) {
                int rv;
                u32 reg;

diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c
index 4175d414694b0143a8994fd133a13ff973906f48..0007cac1aaa7120701f23178a73eecf100c7b9fd 100644 (file)
--- a/board/vscom/baltos/board.c
+++ b/board/vscom/baltos/board.c
@@ -379,7 +379,7 @@ int board_late_init(void)
 #endif
 
 #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
-       (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
+       (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD))
 static void cpsw_control(int enabled)
 {
        /* VTP can be added here */
@@ -421,7 +421,7 @@ static struct cpsw_platform_data cpsw_data = {
 };
 #endif
 
-#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)) \
+#if ((defined(CONFIG_SPL_ETH) || defined(CONFIG_SPL_USB_ETHER)) \
                && defined(CONFIG_SPL_BUILD)) || \
        ((defined(CONFIG_DRIVER_TI_CPSW) || \
          defined(CONFIG_USB_ETHER) && defined(CONFIG_USB_MUSB_GADGET)) && \
@@ -450,7 +450,7 @@ int board_eth_init(struct bd_info *bis)
        mac_addr[5] = (mac_lo & 0xFF00) >> 8;
 
 #if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
-       (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
+       (defined(CONFIG_SPL_ETH) && defined(CONFIG_SPL_BUILD))
        if (!env_get("ethaddr")) {
                printf("<ethaddr> not set. Validating first E-fuse MAC\n");
 

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 41108350af0a57b26d27e43c2f60beda01ee0637..6d442652a50053251d5962e21bc0c91629d4ed9d 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -582,7 +582,7 @@ config SPL_SAVEENV
          "reboot_image" and act accordingly and change the reboot_image
          to default mode using setenv and save the environment.
 
-config SPL_ETH_SUPPORT
+config SPL_ETH
        bool "Support Ethernet"
        depends on SPL_ENV_SUPPORT
        help
@@ -926,7 +926,7 @@ config SPL_NET_SUPPORT
          This permits SPL to load U-Boot over a network link rather than
          from an on-board peripheral. Environment support is required since
          the network stack uses a number of environment variables. See also
-         SPL_ETH_SUPPORT.
+         SPL_ETH.
 
 if SPL_NET_SUPPORT
 config SPL_NET_VCI_STRING
@@ -1229,7 +1229,7 @@ config SPL_USB_ETHER
          USB-connected Ethernet link (such as a USB Ethernet dongle) rather
          than from an onboard peripheral. Environment support is required
          since the network stack uses a number of environment variables.
-         See also SPL_NET_SUPPORT and SPL_ETH_SUPPORT.
+         See also SPL_NET_SUPPORT and SPL_ETH.
 
 config SPL_DFU
        bool "Support DFU (Device Firmware Upgrade)"

diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
index e140a6306ffff8c8f7192855e7347656b97b8b7d..d23b395ab96096082cf616b8468190f989a2f0bd 100644 (file)
--- a/common/spl/spl_net.c
+++ b/common/spl/spl_net.c
@@ -15,7 +15,7 @@
 #include <net.h>
 #include <linux/libfdt.h>
 
-#if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USB_ETHER)
+#if defined(CONFIG_SPL_ETH) || defined(CONFIG_SPL_USB_ETHER)
 static ulong spl_net_load_read(struct spl_load_info *load, ulong sector,
                               ulong count, void *buf)
 {
@@ -69,7 +69,7 @@ static int spl_net_load_image(struct spl_image_info *spl_image,
 }
 #endif
 
-#ifdef CONFIG_SPL_ETH_SUPPORT
+#ifdef CONFIG_SPL_ETH
 int spl_net_load_image_cpgmac(struct spl_image_info *spl_image,
                              struct spl_boot_device *bootdev)
 {

diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
index c48be6bde14e8566f1e81248d16ec44a8a41b769..c18c1ec36d3c69cfcfc966a58b8bba510520c7aa 100644 (file)
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -14,7 +14,7 @@ CONFIG_LOGLEVEL=3
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 CONFIG_ARCH_MISC_INIT=y
 CONFIG_SPL_FIT_IMAGE_TINY=y
-CONFIG_SPL_ETH_SUPPORT=y
+CONFIG_SPL_ETH=y
 # CONFIG_SPL_FS_EXT4 is not set
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_MUSB_NEW_SUPPORT=y

diff --git a/configs/am335x_guardian_defconfig b/configs/am335x_guardian_defconfig
index 2e31f20f2550a4d4b1428c68213c80159fa15bd8..75c196b21b4c6fd92b30db41ef06b8644233daf3 100644 (file)
--- a/configs/am335x_guardian_defconfig
+++ b/configs/am335x_guardian_defconfig
@@ -29,7 +29,7 @@ CONFIG_ARCH_MISC_INIT=y
 CONFIG_SPL_SEPARATE_BSS=y
 # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
 CONFIG_SPL_ENV_SUPPORT=y
-CONFIG_SPL_ETH_SUPPORT=y
+CONFIG_SPL_ETH=y
 CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_MUSB_NEW_SUPPORT=y
 CONFIG_SPL_NAND_DRIVERS=y

diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
index ae1fffddb2160b80a084b7338f43ddcce333fe24..0ace38d785ed8888fd60056e53d1e56b0d7c9de9 100644 (file)
--- a/configs/am43xx_evm_defconfig
+++ b/configs/am43xx_evm_defconfig
@@ -15,7 +15,7 @@ CONFIG_SPL_LOAD_FIT=y
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_MISC_INIT_R is not set
-CONFIG_SPL_ETH_SUPPORT=y
+CONFIG_SPL_ETH=y
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_NAND_DRIVERS=y
 CONFIG_SPL_NAND_ECC=y

diff --git a/configs/am43xx_hs_evm_defconfig b/configs/am43xx_hs_evm_defconfig
index 62c1ecbfed81fa35c101f75cc43650a9ecb06e29..94b5fd7a3cce92d08f2683dd8c1ce4cb036629d4 100644 (file)
--- a/configs/am43xx_hs_evm_defconfig
+++ b/configs/am43xx_hs_evm_defconfig
@@ -24,7 +24,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_BOOTCOMMAND="run findfdt; run finduuid; run distro_bootcmd"
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
 # CONFIG_MISC_INIT_R is not set
-CONFIG_SPL_ETH_SUPPORT=y
+CONFIG_SPL_ETH=y
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_NAND_DRIVERS=y
 CONFIG_SPL_NAND_ECC=y

diff --git a/doc/SPL/README.am335x-network b/doc/SPL/README.am335x-network
index e3cf93f8dc6f78ecb661f5d37d56350fb553ad98..e05270673dbd947d9f0f2f5b16383aab76ba547d 100644 (file)
--- a/doc/SPL/README.am335x-network
+++ b/doc/SPL/README.am335x-network
@@ -8,7 +8,7 @@ NAND and bricked (empty) board with only a network cable.
  I. Building the required images
   1. You have to enable generic SPL configuration options (see
 doc/README.SPL) as well as CONFIG_SPL_NET_SUPPORT,
-CONFIG_ETH_SUPPORT, CONFIG_SPL_LIBGENERIC_SUPPORT and
+CONFIG_SPL_ETH, CONFIG_SPL_LIBGENERIC_SUPPORT and
 CONFIG_SPL_LIBCOMMON_SUPPORT in your board configuration file to build
 SPL with support for booting over the network. Also you have to enable
 the driver for the NIC used and CONFIG_SPL_BOARD_INIT option if your

diff --git a/drivers/Makefile b/drivers/Makefile
index edff823e050f417076562172a6176c3766cc17e6..10d28f47fc7b20248132dde628ad1741309323f5 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -50,8 +50,8 @@ obj-$(CONFIG_SPL_POWER) += power/regulator/
 obj-$(CONFIG_SPL_POWER_DOMAIN) += power/domain/
 obj-$(CONFIG_SPL_DM_RESET) += reset/
 obj-$(CONFIG_SPL_DMA) += dma/
-obj-$(CONFIG_SPL_ETH_SUPPORT) += net/
-obj-$(CONFIG_SPL_ETH_SUPPORT) += net/phy/
+obj-$(CONFIG_SPL_ETH) += net/
+obj-$(CONFIG_SPL_ETH) += net/phy/
 obj-$(CONFIG_SPL_USB_ETHER) += net/phy/
 obj-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += usb/musb-new/
 obj-$(CONFIG_SPL_USB_GADGET) += usb/gadget/

diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h
index b668817c6c8dd493424f3e8caaeb774936ba0cb4..18179e9b7e9162a0f86cab8efd5a41f1f782aae3 100644 (file)
--- a/include/configs/topic_miami.h
+++ b/include/configs/topic_miami.h
@@ -17,7 +17,7 @@
 /* Fixup settings */
 
 /* SPL settings */
-#undef CONFIG_SPL_ETH_SUPPORT
+#undef CONFIG_SPL_ETH
 #undef CONFIG_SPL_MAX_FOOTPRINT
 #define CONFIG_SPL_MAX_FOOTPRINT       CONFIG_SYS_SPI_U_BOOT_OFFS
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME     "u-boot.img"