[U-Boot] [PATCH v2 31/44] Convert CONFIG_SPL_NET_SUPPORT to Kconfig
Simon Glass
sjg at chromium.org
Tue Aug 30 02:21:39 CEST 2016
Move this option to Kconfig and tidy up existing uses.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
Changes in v2: None
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 | 1 -
include/configs/am335x_shc.h | 1 -
include/configs/am335x_sl50.h | 1 -
include/configs/am43xx_evm.h | 1 -
include/configs/baltos.h | 1 -
include/configs/bav335x.h | 1 -
include/configs/draco.h | 1 -
include/configs/etamin.h | 1 -
include/configs/pcm051.h | 1 -
include/configs/pengwyn.h | 1 -
include/configs/pxm2.h | 1 -
include/configs/rastaban.h | 1 -
include/configs/rut.h | 1 -
include/configs/thuban.h | 1 -
19 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/configs/am335x_evm_usbspl_defconfig b/configs/am335x_evm_usbspl_defconfig
index ed48e82..96df852 100644
--- a/configs/am335x_evm_usbspl_defconfig
+++ b/configs/am335x_evm_usbspl_defconfig
@@ -8,6 +8,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 436c94c..14f520c 100644
--- a/configs/am43xx_evm_ethboot_defconfig
+++ b/configs/am43xx_evm_ethboot_defconfig
@@ -6,6 +6,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_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 41031d4..8e7e64d 100644
--- a/configs/pcm051_rev1_defconfig
+++ b/configs/pcm051_rev1_defconfig
@@ -12,6 +12,7 @@ CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SYS_EXTRA_OPTIONS="REV1"
CONFIG_SPL=y
CONFIG_SPL_ETH_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/pcm051_rev3_defconfig b/configs/pcm051_rev3_defconfig
index 4c0e426..6cd4ef9 100644
--- a/configs/pcm051_rev3_defconfig
+++ b/configs/pcm051_rev3_defconfig
@@ -12,6 +12,7 @@ CONFIG_SPL_ENV_SUPPORT=y
CONFIG_SYS_EXTRA_OPTIONS="REV3"
CONFIG_SPL=y
CONFIG_SPL_ETH_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/pengwyn_defconfig b/configs/pengwyn_defconfig
index c695e7a..3edc5eb 100644
--- a/configs/pengwyn_defconfig
+++ b/configs/pengwyn_defconfig
@@ -13,6 +13,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_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 0b63a4a..3ad17aa 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -337,7 +337,6 @@
#undef CONFIG_PARTITION_UUIDS
#undef CONFIG_EFI_PARTITION
/* General network SPL */
-#define CONFIG_SPL_NET_SUPPORT
#define CONFIG_SPL_NET_VCI_STRING "AM335x U-Boot SPL"
#endif
diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h
index bc9123c..907775c 100644
--- a/include/configs/am335x_shc.h
+++ b/include/configs/am335x_shc.h
@@ -328,7 +328,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
diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h
index 3aaa91e..c559758 100644
--- a/include/configs/am335x_sl50.h
+++ b/include/configs/am335x_sl50.h
@@ -107,7 +107,6 @@
#undef CONFIG_PARTITION_UUIDS
#undef CONFIG_EFI_PARTITION
/* General network SPL */
-#define CONFIG_SPL_NET_SUPPORT
#define CONFIG_SPL_NET_VCI_STRING "AM335x U-Boot SPL"
#endif
diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 9334c67..fb578d4 100644
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -329,7 +329,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 f30af66..ff03a38 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 a435f2c..9980d44 100644
--- a/include/configs/bav335x.h
+++ b/include/configs/bav335x.h
@@ -469,7 +469,6 @@ DEFAULT_LINUX_BOOT_ENV \
#undef CONFIG_PARTITION_UUIDS
#undef CONFIG_EFI_PARTITION
/* General network SPL */
-#define CONFIG_SPL_NET_SUPPORT
#define CONFIG_SPL_NET_VCI_STRING "BAV335x U-Boot SPL"
#endif
diff --git a/include/configs/draco.h b/include/configs/draco.h
index f4d9331..b1745db 100644
--- a/include/configs/draco.h
+++ b/include/configs/draco.h
@@ -48,7 +48,6 @@
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x300
-#undef CONFIG_SPL_NET_SUPPORT
#undef CONFIG_SPL_NET_VCI_STRING
#undef CONFIG_MII
diff --git a/include/configs/etamin.h b/include/configs/etamin.h
index 32334ad..7690749 100644
--- a/include/configs/etamin.h
+++ b/include/configs/etamin.h
@@ -106,7 +106,6 @@
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x300
-#undef CONFIG_SPL_NET_SUPPORT
#undef CONFIG_SPL_NET_VCI_STRING
#undef CONFIG_MII
diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h
index ddb36f5..c14653c 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_NET_VCI_STRING "pcm051 U-Boot SPL"
#define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/am33xx/u-boot-spl.lds"
diff --git a/include/configs/pengwyn.h b/include/configs/pengwyn.h
index 447d02b..6090df8 100644
--- a/include/configs/pengwyn.h
+++ b/include/configs/pengwyn.h
@@ -118,7 +118,6 @@
#define CONFIG_SPL_YMODEM_SUPPORT
/* General network SPL */
-#define CONFIG_SPL_NET_SUPPORT
#define CONFIG_SPL_NET_VCI_STRING "AM335x U-Boot SPL"
/* NAND support */
diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index 55b0bac..41d6344 100644
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -42,7 +42,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 c791913..ecf98a8 100644
--- a/include/configs/rastaban.h
+++ b/include/configs/rastaban.h
@@ -51,7 +51,6 @@
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x300
-#undef CONFIG_SPL_NET_SUPPORT
#undef CONFIG_SPL_NET_VCI_STRING
#undef CONFIG_MII
diff --git a/include/configs/rut.h b/include/configs/rut.h
index 5e5af03..6eb7960 100644
--- a/include/configs/rut.h
+++ b/include/configs/rut.h
@@ -37,7 +37,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 7640d5e..a37ee44 100644
--- a/include/configs/thuban.h
+++ b/include/configs/thuban.h
@@ -44,7 +44,6 @@
#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x300
-#undef CONFIG_SPL_NET_SUPPORT
#undef CONFIG_SPL_NET_VCI_STRING
#undef CONFIG_MII
--
2.8.0.rc3.226.g39d4020
More information about the U-Boot
mailing list