From dce63c49287c0aa34c3b6a4bd982cfdebcf67a4f Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 12 Sep 2016 23:18:50 -0600 Subject: Convert CONFIG_SPL_NET_SUPPORT to Kconfig Move this option to Kconfig and tidy up existing uses. Signed-off-by: Simon Glass --- configs/am335x_evm_usbspl_defconfig | 1 + configs/am43xx_evm_ethboot_defconfig | 1 + configs/pcm051_rev1_defconfig | 1 + configs/pcm051_rev3_defconfig | 1 + configs/pengwyn_defconfig | 1 + include/configs/am335x_evm.h | 2 -- include/configs/am335x_shc.h | 1 - include/configs/am335x_sl50.h | 2 -- include/configs/am43xx_evm.h | 1 - include/configs/baltos.h | 1 - include/configs/bav335x.h | 2 -- include/configs/draco.h | 2 -- include/configs/etamin.h | 2 -- include/configs/pcm051.h | 1 - include/configs/pengwyn.h | 3 --- include/configs/pxm2.h | 2 -- include/configs/rastaban.h | 2 -- include/configs/rut.h | 2 -- include/configs/thuban.h | 2 -- 19 files changed, 5 insertions(+), 25 deletions(-) diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig index e029717..c819384 100644 --- 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 4459e77..86c9a5b 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_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 249cccb..a187e07 100644 --- 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 b8b391d..e2a7549 100644 --- 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 88c5a2b..02b44fc 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_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 28fcbae..4431288 100644 --- 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 01e491a..2762d53 100644 --- 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 8bd9136..80140e7 100644 --- 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 0128e1f..67c3899 100644 --- 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 0c05864..3bce7a2 100644 --- 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 cfafc08..0a2ad52 100644 --- 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 302e189..04240c7 100644 --- 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 f8eaf9b..fda18b2 100644 --- 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 1f56f97..80df353 100644 --- 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 a2f6dab..40f9640 100644 --- 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 03d7b9d..99a201c 100644 --- 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 5e7f1eb..f8ed22a 100644 --- 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 ed1315f..5f62358 100644 --- 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 b9c687a..8d7b280 100644 --- 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 -- cgit v1.1