Convert CONFIG_SPL_NET_SUPPORT to Kconfig

Move this option to Kconfig and tidy up existing uses.

Signed-off-by: Simon Glass <sjg@chromium.org>
master
Simon Glass 8 years ago committed by Tom Rini
parent 8c24f9fcfd
commit dce63c4928
  1. 1
      configs/am335x_evm_usbspl_defconfig
  2. 1
      configs/am43xx_evm_ethboot_defconfig
  3. 1
      configs/pcm051_rev1_defconfig
  4. 1
      configs/pcm051_rev3_defconfig
  5. 1
      configs/pengwyn_defconfig
  6. 2
      include/configs/am335x_evm.h
  7. 1
      include/configs/am335x_shc.h
  8. 2
      include/configs/am335x_sl50.h
  9. 1
      include/configs/am43xx_evm.h
  10. 1
      include/configs/baltos.h
  11. 2
      include/configs/bav335x.h
  12. 2
      include/configs/draco.h
  13. 2
      include/configs/etamin.h
  14. 1
      include/configs/pcm051.h
  15. 3
      include/configs/pengwyn.h
  16. 2
      include/configs/pxm2.h
  17. 2
      include/configs/rastaban.h
  18. 2
      include/configs/rut.h
  19. 2
      include/configs/thuban.h

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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 */

@ -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

@ -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)

@ -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

@ -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"

@ -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 */

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

Loading…
Cancel
Save