Convert CONFIG_SPL_NET_VCI_STRING to Kconfig

This converts the following to Kconfig:
   CONFIG_SPL_NET_VCI_STRING

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

diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig
index a59125c32074e7c7e7b566a79fbfe531268ad064..4459e77f4ae5e158904ab4dcda5b7450e4f46fb1 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_VCI_STRING="AM43xx U-Boot SPL"
 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 9deb0f67eab86321ec5dc54f6a3c9818bdd13280..249cccb8eca650a4bcb575607fbdcee86519332f 100644 (file)
--- a/configs/pcm051_rev1_defconfig
+++ b/configs/pcm051_rev1_defconfig
@@ -13,6 +13,7 @@ CONFIG_SYS_EXTRA_OPTIONS="REV1"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_ETH_SUPPORT=y
+CONFIG_SPL_NET_VCI_STRING="pcm051 U-Boot SPL"
 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 f6ff370d935fab81f614a5b9deb80294d7aa0c3f..b8b391dea3b392212257852de40ff66a815e1053 100644 (file)
--- a/configs/pcm051_rev3_defconfig
+++ b/configs/pcm051_rev3_defconfig
@@ -13,6 +13,7 @@ CONFIG_SYS_EXTRA_OPTIONS="REV3"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_ETH_SUPPORT=y
+CONFIG_SPL_NET_VCI_STRING="pcm051 U-Boot SPL"
 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 9959c0ad2dce4d62a9f1045d13fd004ad5c0044c..88c5a2bbd20c6d1163b16e98cc0d496ffea2c2fa 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_VCI_STRING="AM335x U-Boot SPL"
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_BOOTZ=y
 # CONFIG_CMD_IMLS is not set

diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 0b4d17f3328b99f7d825b2c07a932c68b2c96487..28fcbaed81bfe4fd26952445e3131201e0115e22 100644 (file)
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -334,7 +334,6 @@
 #undef CONFIG_EFI_PARTITION
 /* General network SPL  */
 #define CONFIG_SPL_NET_SUPPORT
-#define CONFIG_SPL_NET_VCI_STRING      "AM335x U-Boot SPL"
 #endif
 
 /* USB Device Firmware Update support */

diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index db3f88356ed9634068fd4070abc0a4dd29582866..01e491a3892e7185038fa6283e5b7f2709c09220 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_NET_VCI_STRING      "AM335x U-Boot SPL"
 #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 3aaa91e730ff48b3de9a4b2a3c8a726682f0e31d..8bd91367a0226117a3dcb5696e53531680d17b45 100644 (file)
--- a/include/configs/am335x_sl50.h
+++ b/include/configs/am335x_sl50.h
@@ -108,7 +108,6 @@
 #undef CONFIG_EFI_PARTITION
 /* General network SPL  */
 #define CONFIG_SPL_NET_SUPPORT
-#define CONFIG_SPL_NET_VCI_STRING      "AM335x U-Boot SPL"
 #endif
 
 #if defined(CONFIG_EMMC_BOOT)

diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 889bfff81d405b8cdaed88843c194028c11c86e3..0128e1f2e37512eda80ff94fa3f76100a2b9bc4f 100644 (file)
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -318,8 +318,6 @@
 #define CONFIG_PHYLIB
 #define PHY_ANEG_TIMEOUT       8000 /* PHY needs longer aneg time at 1G */
 
-#define CONFIG_SPL_NET_VCI_STRING      "AM43xx U-Boot SPL"
-
 #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_ETH_SUPPORT)
 #undef CONFIG_ENV_IS_IN_FAT
 #define CONFIG_ENV_IS_NOWHERE

diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h
index da93d08fddb64c27141dbf7fea3992985d1fcf00..cfafc081643794178e6ca220c610a1318ff9c0f1 100644 (file)
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -466,7 +466,6 @@ DEFAULT_LINUX_BOOT_ENV \
 #undef CONFIG_EFI_PARTITION
 /* General network SPL  */
 #define CONFIG_SPL_NET_SUPPORT
-#define CONFIG_SPL_NET_VCI_STRING      "BAV335x U-Boot SPL"
 #endif
 
 /* USB Device Firmware Update support */

diff --git a/include/configs/draco.h b/include/configs/draco.h
index f4d933191e9a63a2622d536278339cf1f1f4ba81..302e1899abe540ef359cd4530a9060241795db05 100644 (file)
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -49,7 +49,6 @@
 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     0x300
 
 #undef CONFIG_SPL_NET_SUPPORT
-#undef CONFIG_SPL_NET_VCI_STRING
 
 #undef CONFIG_MII
 #undef CONFIG_PHY_GIGE

diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 32334ad6a6e3b87c5022ffb97ac695658e449aaf..f8eaf9b3268e4141ea7fe5fac24325f6ee99f1db 100644 (file)
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -107,7 +107,6 @@
 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     0x300
 
 #undef CONFIG_SPL_NET_SUPPORT
-#undef CONFIG_SPL_NET_VCI_STRING
 
 #undef CONFIG_MII
 #undef CONFIG_PHY_GIGE

diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
index d3c6a817a3d32f9c9d6479647b19411e437069db..1f56f97eb36aa4bce92ecbecc57511aab16e91d7 100644 (file)
--- a/include/configs/pcm051.h
+++ b/include/configs/pcm051.h
@@ -122,7 +122,6 @@
 
 #define CONFIG_SPL_YMODEM_SUPPORT
 #define CONFIG_SPL_NET_SUPPORT
-#define CONFIG_SPL_NET_VCI_STRING      "pcm051 U-Boot SPL"
 #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 6caa14b6474546c2ef79c6cf442feb24b5f6d9d5..a2f6dab294d4594162a3075ccef12fe81c91d9a3 100644 (file)
--- a/include/configs/pengwyn.h
+++ b/include/configs/pengwyn.h
@@ -119,7 +119,6 @@
 
 /* General network SPL */
 #define CONFIG_SPL_NET_SUPPORT
-#define CONFIG_SPL_NET_VCI_STRING      "AM335x U-Boot SPL"
 
 /* NAND support */
 #define CONFIG_CMD_NAND

diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 55b0bac2e200ddecd4bea16455dfb07cf3ba15b2..03d7b9dfc2f32bbaf3a0800045d40d93b3bc03b4 100644 (file)
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -43,7 +43,6 @@
 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     0x300
 
 #undef CONFIG_SPL_NET_SUPPORT
-#undef CONFIG_SPL_NET_VCI_STRING
 
 #define CONFIG_PHY_ATHEROS
 

diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h
index c7919137d63adf89ffe4baa23fa017f28a4d12a9..5e7f1eb65141b5223ec5509043d82c97640a2332 100644 (file)
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -52,7 +52,6 @@
 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     0x300
 
 #undef CONFIG_SPL_NET_SUPPORT
-#undef CONFIG_SPL_NET_VCI_STRING
 
 #undef CONFIG_MII
 #undef CONFIG_PHY_GIGE

diff --git a/include/configs/rut.h b/include/configs/rut.h
index 5e5af035f909688abf944d298783911d8d5cadbf..ed1315fba764dd24617a34b00cc0afa1c6c5419f 100644 (file)
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -38,7 +38,6 @@
 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     0x200
 
 #undef CONFIG_SPL_NET_SUPPORT
-#undef CONFIG_SPL_NET_VCI_STRING
 
 #define CONFIG_PHY_NATSEMI
 

diff --git a/include/configs/thuban.h b/include/configs/thuban.h
index 7640d5eb8a3d98ffb814694251e04cf0366829a1..b9c687a16491acaa840dc3b3337e5549bb8c6c91 100644 (file)
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -45,7 +45,6 @@
 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     0x300
 
 #undef CONFIG_SPL_NET_SUPPORT
-#undef CONFIG_SPL_NET_VCI_STRING
 
 #undef CONFIG_MII
 #undef CONFIG_PHY_GIGE