Convert CONFIG_SPL_NET_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/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig
index e029717784a4e18bf6789910fd4ad1256c1fca31..c81938417f94bf1fdf9fa35e0118178fe4ea3a16 100644 (file)
--- a/configs/am335x_evm_usbspl_defconfig
+++ b/configs/am335x_evm_usbspl_defconfig
@@ -9,6 +9,7 @@ CONFIG_SPL_STACK_R=y
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_MUSB_NEW_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
+CONFIG_SPL_NET_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig
index 4459e77f4ae5e158904ab4dcda5b7450e4f46fb1..86c9a5b69b83e5d4e0aca397bfee22ba147d8df4 100644 (file)
--- a/configs/am43xx_evm_ethboot_defconfig
+++ b/configs/am43xx_evm_ethboot_defconfig
@@ -7,6 +7,7 @@ CONFIG_SPL=y
 CONFIG_SPL_ETH_SUPPORT=y
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
+CONFIG_SPL_NET_SUPPORT=y
 CONFIG_SPL_NET_VCI_STRING="AM43xx U-Boot SPL"
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y

diff --git a/configs/pcm051_rev1_defconfig b/configs/pcm051_rev1_defconfig
index 249cccb8eca650a4bcb575607fbdcee86519332f..a187e07544ae69e4b99120198cf276c8a1caf1bc 100644 (file)
--- a/configs/pcm051_rev1_defconfig
+++ b/configs/pcm051_rev1_defconfig
@@ -14,6 +14,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_ETH_SUPPORT=y
 CONFIG_SPL_NET_VCI_STRING="pcm051 U-Boot SPL"
+CONFIG_SPL_NET_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 b8b391dea3b392212257852de40ff66a815e1053..e2a7549ad5f508bc0b08d000011731e5011f87e5 100644 (file)
--- a/configs/pcm051_rev3_defconfig
+++ b/configs/pcm051_rev3_defconfig
@@ -14,6 +14,7 @@ CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_ETH_SUPPORT=y
 CONFIG_SPL_NET_VCI_STRING="pcm051 U-Boot SPL"
+CONFIG_SPL_NET_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 88c5a2bbd20c6d1163b16e98cc0d496ffea2c2fa..02b44fc5b6ed37128aa7a303063a8080206f47bd 100644 (file)
--- a/configs/pengwyn_defconfig
+++ b/configs/pengwyn_defconfig
@@ -14,6 +14,7 @@ CONFIG_SPL=y
 CONFIG_SPL_ETH_SUPPORT=y
 CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
+CONFIG_SPL_NET_SUPPORT=y
 CONFIG_SPL_NET_VCI_STRING="AM335x U-Boot SPL"
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 28fcbaed81bfe4fd26952445e3131201e0115e22..4431288fdedc535d2fdd95b4a9ff51d3600e52be 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -332,8 +332,6 @@
 /* disable EFI partitions and partition UUID support */
 #undef CONFIG_PARTITION_UUIDS
 #undef CONFIG_EFI_PARTITION
-/* General network SPL  */
-#define CONFIG_SPL_NET_SUPPORT
 #endif
 
 /* USB Device Firmware Update support */

diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index 01e491a3892e7185038fa6283e5b7f2709c09220..2762d533238dce00ad6410c64ad63276402265e3 100644 (file)
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -326,7 +326,6 @@
 
 #if defined CONFIG_SHC_NETBOOT
 #ifdef CONFIG_SPL_BUILD
-#define CONFIG_SPL_NET_SUPPORT
 #define CONFIG_ENV_IS_NOWHERE
 #undef CONFIG_ENV_IS_IN_MMC
 #endif

diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h
index 8bd91367a0226117a3dcb5696e53531680d17b45..80140e7f27bb72482bbfbaeee1dfef0bb2629eb2 100644 (file)
--- a/include/configs/am335x_sl50.h
+++ b/include/configs/am335x_sl50.h
@@ -106,8 +106,6 @@
 /* disable EFI partitions and partition UUID support */
 #undef CONFIG_PARTITION_UUIDS
 #undef CONFIG_EFI_PARTITION
-/* General network SPL  */
-#define CONFIG_SPL_NET_SUPPORT
 #endif
 
 #if defined(CONFIG_EMMC_BOOT)

diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 0128e1f2e37512eda80ff94fa3f76100a2b9bc4f..67c3899de961e2f0527d388e74212da6735c5042 100644 (file)
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -321,7 +321,6 @@
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_ETH_SUPPORT)
 #undef CONFIG_ENV_IS_IN_FAT
 #define CONFIG_ENV_IS_NOWHERE
-#define CONFIG_SPL_NET_SUPPORT
 #endif
 
 #define CONFIG_SYS_RX_ETH_BUFFER       64

diff --git a/include/configs/baltos.h b/include/configs/baltos.h
index 0c0586453726ef90a1731593df6fc1720ac79287..3bce7a2c8748b6d844cbbbf70e92791610fb5b9f 100644 (file)
--- a/include/configs/baltos.h
+++ b/include/configs/baltos.h
@@ -227,7 +227,6 @@
 /* USB gadget RNDIS */
 
 /* General network SPL, both CPSW and USB gadget RNDIS */
-/*#define CONFIG_SPL_NET_SUPPORT
 #define CONFIG_SPL_NET_VCI_STRING      "AM335x U-Boot SPL"*/
 
 #define CONFIG_SPL_LDSCRIPT            "$(CPUDIR)/am33xx/u-boot-spl.lds"

diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
index cfafc081643794178e6ca220c610a1318ff9c0f1..0a2ad5243eb6fabd826886da90845a2ada63a74c 100644 (file)
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -464,8 +464,6 @@ DEFAULT_LINUX_BOOT_ENV \
 /* disable EFI partitions and partition UUID support */
 #undef CONFIG_PARTITION_UUIDS
 #undef CONFIG_EFI_PARTITION
-/* General network SPL  */
-#define CONFIG_SPL_NET_SUPPORT
 #endif
 
 /* USB Device Firmware Update support */

diff --git a/include/configs/draco.h b/include/configs/draco.h
index 302e1899abe540ef359cd4530a9060241795db05..04240c789949ff6d19bb151efba99e2960274d75 100644 (file)
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -48,8 +48,6 @@
 
 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     0x300
 
-#undef CONFIG_SPL_NET_SUPPORT
-
 #undef CONFIG_MII
 #undef CONFIG_PHY_GIGE
 #define CONFIG_PHY_SMSC

diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index f8eaf9b3268e4141ea7fe5fac24325f6ee99f1db..fda18b206dcc1745d6455d683314f6a5169d1fec 100644 (file)
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -106,8 +106,6 @@
 
 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     0x300
 
-#undef CONFIG_SPL_NET_SUPPORT
-
 #undef CONFIG_MII
 #undef CONFIG_PHY_GIGE
 #define CONFIG_PHY_SMSC

diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
index 1f56f97eb36aa4bce92ecbecc57511aab16e91d7..80df3538ed7438df5d900b0a37ba1c4454a4f692 100644 (file)
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@@ -121,7 +121,6 @@
 #define CONFIG_ENV_IS_NOWHERE
 
 #define CONFIG_SPL_YMODEM_SUPPORT
-#define CONFIG_SPL_NET_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 a2f6dab294d4594162a3075ccef12fe81c91d9a3..40f96401d26267362f161b84b129cf7fccc76bbc 100644 (file)
--- a/include/configs/pengwyn.h
+++ b/include/configs/pengwyn.h
@@ -117,9 +117,6 @@
 #define CONFIG_SPL_POWER_SUPPORT
 #define CONFIG_SPL_YMODEM_SUPPORT
 
-/* General network SPL */
-#define CONFIG_SPL_NET_SUPPORT
-
 /* NAND support */
 #define CONFIG_CMD_NAND
 #define CONFIG_NAND_OMAP_GPMC

diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 03d7b9dfc2f32bbaf3a0800045d40d93b3bc03b4..99a201c4035e37eae887c680e3f1300a1cdd6423 100644 (file)
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -42,8 +42,6 @@
 
 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     0x300
 
-#undef CONFIG_SPL_NET_SUPPORT
-
 #define CONFIG_PHY_ATHEROS
 
 #define CONFIG_FACTORYSET

diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index 5e7f1eb65141b5223ec5509043d82c97640a2332..f8ed22a4366380342fd52dc5b673bbd5e9e19990 100644 (file)
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -51,8 +51,6 @@
 
 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     0x300
 
-#undef CONFIG_SPL_NET_SUPPORT
-
 #undef CONFIG_MII
 #undef CONFIG_PHY_GIGE
 #define CONFIG_PHY_SMSC

diff --git a/include/configs/rut.h b/include/configs/rut.h
index ed1315fba764dd24617a34b00cc0afa1c6c5419f..5f62358507212d6d76388aabe6517d687361ae79 100644 (file)
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -37,8 +37,6 @@
 
 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     0x200
 
-#undef CONFIG_SPL_NET_SUPPORT
-
 #define CONFIG_PHY_NATSEMI
 
 #define CONFIG_FACTORYSET

diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index b9c687a16491acaa840dc3b3337e5549bb8c6c91..8d7b280f564a817a429c4bbabfb2419aa6afbf86 100644 (file)
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -44,8 +44,6 @@
 
 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     0x300
 
-#undef CONFIG_SPL_NET_SUPPORT
-
 #undef CONFIG_MII
 #undef CONFIG_PHY_GIGE
 #define CONFIG_PHY_SMSC