Move this option to Kconfig and tidy up existing uses.
Signed-off-by: Simon Glass sjg@chromium.org ---
Changes in v3: None Changes in v2: None
configs/am43xx_evm_ethboot_defconfig | 3 ++- configs/pcm051_rev1_defconfig | 1 + configs/pcm051_rev3_defconfig | 1 + configs/pengwyn_defconfig | 3 ++- include/configs/am335x_shc.h | 1 - include/configs/baltos.h | 1 - include/configs/draco.h | 1 - include/configs/etamin.h | 1 - include/configs/pcm051.h | 1 - include/configs/pengwyn.h | 2 -- include/configs/pxm2.h | 1 - include/configs/rastaban.h | 1 - include/configs/rut.h | 1 - include/configs/thuban.h | 1 - 14 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig index b49e12a..6596fa3 100644 --- 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 e31ec60..a35222b 100644 --- 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 5774d6b..8377398 100644 --- 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 804c821..681672e 100644 --- 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 184bb76..bd7b28e 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_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 db82653..ea3bd54 100644 --- 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 889178c..f4d9331 100644 --- 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 4919cfe..32334ad 100644 --- 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 ae92775..d3c6a81 100644 --- 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 3409fe9..6caa14b 100644 --- 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 990fd84..55b0bac 100644 --- 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 55be46b..c791913 100644 --- 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 aea8e21..5e5af03 100644 --- 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 25ac2cb..7640d5e 100644 --- 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