From: Simon Glass Date: Tue, 13 Sep 2016 05:18:49 +0000 (-0600) Subject: Convert CONFIG_SPL_NET_VCI_STRING to Kconfig X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8c24f9fcfdcd61d94aa3cd53adf6d5af67f8dc89;p=people%2Fms%2Fu-boot.git Convert CONFIG_SPL_NET_VCI_STRING to Kconfig This converts the following to Kconfig: CONFIG_SPL_NET_VCI_STRING Signed-off-by: Simon Glass --- diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index a59125c320..4459e77f4a 100644 --- 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 9deb0f67ea..249cccb8ec 100644 --- 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 f6ff370d93..b8b391dea3 100644 --- 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 9959c0ad2d..88c5a2bbd2 100644 --- 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 0b4d17f332..28fcbaed81 100644 --- 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 db3f88356e..01e491a389 100644 --- 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 3aaa91e730..8bd91367a0 100644 --- 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 889bfff81d..0128e1f2e3 100644 --- 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 da93d08fdd..cfafc08164 100644 --- 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 f4d933191e..302e1899ab 100644 --- 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 32334ad6a6..f8eaf9b326 100644 --- 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 d3c6a817a3..1f56f97eb3 100644 --- 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 6caa14b647..a2f6dab294 100644 --- 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 55b0bac2e2..03d7b9dfc2 100644 --- 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 c7919137d6..5e7f1eb651 100644 --- 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 5e5af035f9..ed1315fba7 100644 --- 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 7640d5eb8a..b9c687a164 100644 --- 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