Convert CONFIG_SPL_ETH_SUPPORT to Kconfig

Move this option to Kconfig and tidy up existing uses.

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

diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig
index b49e12a986af514e24725d2eab3549a0dde7f2f0..6596fa3e6a3ced7159d55ed033bb144d17777f39 100644 (file)
--- a/configs/am43xx_evm_ethboot_defconfig
+++ b/configs/am43xx_evm_ethboot_defconfig
@@ -1,9 +1,10 @@
 CONFIG_ARM=y
 CONFIG_AM43XX=y
 CONFIG_TARGET_AM43XX_EVM=y
-CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND,SPL_ETH_SUPPORT"
+CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
+CONFIG_SPL_ETH_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig
index e31ec60bc4854aeffeacceecb3257527d6fe0607..a35222b3f51cb840b4a371dc09c03b8ee940bd33 100644 (file)
--- a/configs/pcm051_rev1_defconfig
+++ b/configs/pcm051_rev1_defconfig
@@ -4,6 +4,7 @@ CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="REV1"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
+CONFIG_SPL_ETH_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig
index 5774d6bd8ed3e628dc73f936ef22cccfb93ae839..8377398a6250f3c66f09a725d1acb8f181262ee6 100644 (file)
--- a/configs/pcm051_rev3_defconfig
+++ b/configs/pcm051_rev3_defconfig
@@ -4,6 +4,7 @@ CONFIG_SPL_ENV_SUPPORT=y
 CONFIG_SYS_EXTRA_OPTIONS="REV3"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
+CONFIG_SPL_ETH_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/pengwyn_defconfig b/configs/pengwyn_defconfig
index 804c821b8f56ffce0cf1a4d09ad8eecc87c10099..681672ee462b76532c83fb6533f9dbc168eda6c9 100644 (file)
--- a/configs/pengwyn_defconfig
+++ b/configs/pengwyn_defconfig
@@ -1,8 +1,9 @@
 CONFIG_ARM=y
 CONFIG_TARGET_PENGWYN=y
 CONFIG_SPL_ENV_SUPPORT=y
-CONFIG_SPL=y
 CONFIG_VERSION_VARIABLE=y
+CONFIG_SPL=y
+CONFIG_SPL_ETH_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index 184bb763a509e7e751a9072e33f38fa7aff74f8f..bd7b28eeb9dda44ad5ba01c509b82649d93d1c5f 100644 (file)
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -327,7 +327,6 @@
 #if defined CONFIG_SHC_NETBOOT
 #ifdef CONFIG_SPL_BUILD
 #define CONFIG_SPL_NET_SUPPORT
-#define CONFIG_SPL_ETH_SUPPORT
 #define CONFIG_SPL_NET_VCI_STRING      "AM335x U-Boot SPL"
 #define CONFIG_SPL_MMC_SUPPORT
 #define CONFIG_ENV_IS_NOWHERE

diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index db826534fca9a989a7fc4adc09fa1a0123b12d0c..ea3bd549570398e8e125a8a0db81bff8e44812eb 100644 (file)
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -290,7 +290,6 @@
 /*
  * Disable CPSW SPL support so we fit within the 101KiB limit.
  */
-#undef CONFIG_SPL_ETH_SUPPORT
 #endif
 
 /* Network. */

diff --git a/include/configs/draco.h b/include/configs/draco.h
index 889178c2834bf77cbec258b23ce439f290fadab5..f4d933191e9a63a2622d536278339cf1f1f4ba81 100644 (file)
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -50,7 +50,6 @@
 
 #undef CONFIG_SPL_NET_SUPPORT
 #undef CONFIG_SPL_NET_VCI_STRING
-#undef CONFIG_SPL_ETH_SUPPORT
 
 #undef CONFIG_MII
 #undef CONFIG_PHY_GIGE

diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 4919cfe3536462fa3a8d62a90f660d6ff5e0bf14..32334ad6a6e3b87c5022ffb97ac695658e449aaf 100644 (file)
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -108,7 +108,6 @@
 
 #undef CONFIG_SPL_NET_SUPPORT
 #undef CONFIG_SPL_NET_VCI_STRING
-#undef CONFIG_SPL_ETH_SUPPORT
 
 #undef CONFIG_MII
 #undef CONFIG_PHY_GIGE

diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
index ae927750b6e9122d3f64c519ff33fe66c5b7e457..d3c6a817a3d32f9c9d6479647b19411e437069db 100644 (file)
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@@ -123,7 +123,6 @@
 #define CONFIG_SPL_YMODEM_SUPPORT
 #define CONFIG_SPL_NET_SUPPORT
 #define CONFIG_SPL_NET_VCI_STRING      "pcm051 U-Boot SPL"
-#define CONFIG_SPL_ETH_SUPPORT
 #define CONFIG_SPL_LDSCRIPT            "$(CPUDIR)/am33xx/u-boot-spl.lds"
 
 #ifdef CONFIG_SPI_BOOT

diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h
index 3409fe9e8cf19f9d4478c0f10f34dcfa9c58bef3..6caa14b6474546c2ef79c6cf442feb24b5f6d9d5 100644 (file)
--- a/include/configs/pengwyn.h
+++ b/include/configs/pengwyn.h
@@ -200,7 +200,6 @@
 #if defined(CONFIG_SPL_BUILD)
 /* disable host part of MUSB in SPL */
 /* Disable CPSW SPL support so we fit within the 101KiB limit. */
-#undef CONFIG_SPL_ETH_SUPPORT
 #endif
 
 /* CPSW ethernet */
@@ -213,7 +212,6 @@
 #define CONFIG_PHY_REALTEK
 
 /* CPSW support */
-#define CONFIG_SPL_ETH_SUPPORT
 
 #define CONFIG_SPL_LDSCRIPT            "$(CPUDIR)/am33xx/u-boot-spl.lds"
 

diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 990fd84b32af263d9084f48604c56b3960356621..55b0bac2e200ddecd4bea16455dfb07cf3ba15b2 100644 (file)
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -44,7 +44,6 @@
 
 #undef CONFIG_SPL_NET_SUPPORT
 #undef CONFIG_SPL_NET_VCI_STRING
-#undef CONFIG_SPL_ETH_SUPPORT
 
 #define CONFIG_PHY_ATHEROS
 

diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index 55be46bcf2caf1a8e7e0ab5ee282fdad166ee1e0..c7919137d63adf89ffe4baa23fa017f28a4d12a9 100644 (file)
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -53,7 +53,6 @@
 
 #undef CONFIG_SPL_NET_SUPPORT
 #undef CONFIG_SPL_NET_VCI_STRING
-#undef CONFIG_SPL_ETH_SUPPORT
 
 #undef CONFIG_MII
 #undef CONFIG_PHY_GIGE

diff --git a/include/configs/rut.h b/include/configs/rut.h
index aea8e217d019eafc0b3e174451f0e917f43ee36a..5e5af035f909688abf944d298783911d8d5cadbf 100644 (file)
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -39,7 +39,6 @@
 
 #undef CONFIG_SPL_NET_SUPPORT
 #undef CONFIG_SPL_NET_VCI_STRING
-#undef CONFIG_SPL_ETH_SUPPORT
 
 #define CONFIG_PHY_NATSEMI
 

diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 25ac2cba4b56b58a201d5989345e78e8b9069c66..7640d5eb8a3d98ffb814694251e04cf0366829a1 100644 (file)
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -46,7 +46,6 @@
 
 #undef CONFIG_SPL_NET_SUPPORT
 #undef CONFIG_SPL_NET_VCI_STRING
-#undef CONFIG_SPL_ETH_SUPPORT
 
 #undef CONFIG_MII
 #undef CONFIG_PHY_GIGE