From 3b3ea2c56ec4bc5588281fd103c744e608f8b25c Mon Sep 17 00:00:00 2001 From: Michal Simek Date: Mon, 26 Feb 2018 16:01:02 +0100 Subject: [PATCH] Kconfig: cmd: Make networking command dependent on NET Enable networking command only when NET is enabled. And remove selecting NET for CMD_NET Signed-off-by: Michal Simek Signed-off-by: Tom Rini --- Kconfig | 18 +++++++++--------- cmd/Kconfig | 7 ++++++- cmd/bootefi.c | 4 ++-- configs/M52277EVB_defconfig | 3 +-- configs/M52277EVB_stmicro_defconfig | 3 +-- configs/M5249EVB_defconfig | 2 +- configs/M5253EVBE_defconfig | 2 +- configs/am335x_pdu001_defconfig | 3 +-- configs/am3517_crane_defconfig | 2 +- configs/amcore_defconfig | 3 +-- configs/ap143_defconfig | 3 +-- configs/aspenite_defconfig | 3 +-- configs/astro_mcf5373l_defconfig | 3 +-- configs/at91sam9rlek_dataflash_defconfig | 3 +-- configs/at91sam9rlek_mmc_defconfig | 3 +-- configs/at91sam9rlek_nandflash_defconfig | 3 +-- configs/bcm11130_defconfig | 3 +-- configs/bcm11130_nand_defconfig | 3 +-- configs/bcm23550_w1d_defconfig | 3 +-- configs/bcm28155_ap_defconfig | 3 +-- configs/cairo_defconfig | 4 +--- configs/comtrend_ar5315u_ram_defconfig | 3 +-- configs/comtrend_ar5387un_ram_defconfig | 3 +-- configs/comtrend_ct5361_ram_defconfig | 3 +-- configs/comtrend_vr3032u_ram_defconfig | 3 +-- configs/comtrend_wap5813n_ram_defconfig | 3 +-- configs/efi-x86_defconfig | 1 + configs/huawei_hg556a_ram_defconfig | 3 +-- configs/mpr2_defconfig | 3 +-- configs/ms7720se_defconfig | 3 +-- configs/ms7750se_defconfig | 3 +-- configs/mx23evk_defconfig | 3 +-- configs/mx6memcal_defconfig | 3 +-- configs/netgear_cg3100d_ram_defconfig | 3 +-- configs/nokia_rx51_defconfig | 3 +-- configs/omap3_pandora_defconfig | 3 ++- configs/omap4_sdp4430_defconfig | 2 -- configs/origen_defconfig | 3 +-- configs/s5p_goni_defconfig | 3 +-- configs/s5pc210_universal_defconfig | 4 +--- configs/sagem_f@st1704_ram_defconfig | 3 +-- configs/sfr_nb4-ser_ram_defconfig | 3 +-- configs/stm32h743-disco_defconfig | 3 +-- configs/stm32h743-eval_defconfig | 3 +-- configs/stmark2_defconfig | 3 +-- configs/topic_miami_defconfig | 3 ++- configs/topic_miamilite_defconfig | 3 ++- configs/trats2_defconfig | 4 +--- configs/trats_defconfig | 4 +--- configs/tricorder_defconfig | 3 +-- configs/tricorder_flash_defconfig | 3 +-- configs/vct_platinum_onenand_small_defconfig | 3 +-- configs/vct_platinum_small_defconfig | 3 +-- configs/vct_platinumavc_defconfig | 1 + configs/vct_platinumavc_onenand_defconfig | 1 + .../vct_platinumavc_onenand_small_defconfig | 3 +-- configs/vct_platinumavc_small_defconfig | 3 +-- configs/vct_premium_onenand_small_defconfig | 3 +-- configs/vct_premium_small_defconfig | 3 +-- configs/warp_defconfig | 3 +-- configs/xilinx_zynqmp_mini_emmc_defconfig | 3 +-- configs/xilinx_zynqmp_mini_nand_defconfig | 3 +-- configs/zipitz2_defconfig | 3 +-- configs/zynq_cse_qspi_defconfig | 3 +-- configs/zynq_zc770_xm011_defconfig | 1 - configs/zynq_zc770_xm011_x16_defconfig | 1 - include/configs/topic_miami.h | 3 --- include/env_callback.h | 2 +- lib/efi_loader/Makefile | 2 +- lib/efi_loader/efi_device_path.c | 2 +- net/Kconfig | 11 +++++++++++ 71 files changed, 94 insertions(+), 134 deletions(-) diff --git a/Kconfig b/Kconfig index efd77f3129..43540614ce 100644 --- a/Kconfig +++ b/Kconfig @@ -69,22 +69,22 @@ config DISTRO_DEFAULTS imply USE_BOOTCOMMAND select CMD_BOOTZ if ARM && !ARM64 select CMD_BOOTI if ARM64 - select CMD_DHCP if NET - select CMD_PXE if NET + select CMD_DHCP if NET && CMD_NET + select CMD_PXE if NET && CMD_NET select CMD_EXT2 select CMD_EXT4 select CMD_FAT select CMD_FS_GENERIC - select CMD_MII if NET + imply CMD_MII if NET select CMD_PING if NET select CMD_PART if PARTITIONS select HUSH_PARSER - select BOOTP_BOOTPATH if NET - select BOOTP_DNS if NET - select BOOTP_GATEWAY if NET - select BOOTP_HOSTNAME if NET - select BOOTP_PXE if NET - select BOOTP_SUBNETMASK if NET + select BOOTP_BOOTPATH if NET && CMD_NET + select BOOTP_DNS if NET && CMD_NET + select BOOTP_GATEWAY if NET && CMD_NET + select BOOTP_HOSTNAME if NET && CMD_NET + select BOOTP_PXE if NET && CMD_NET + select BOOTP_SUBNETMASK if NET && CMD_NET select CMDLINE_EDITING select AUTO_COMPLETE select SYS_LONGHELP diff --git a/cmd/Kconfig b/cmd/Kconfig index 18aac7f7d4..136836d146 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1012,9 +1012,10 @@ endmenu menu "Network commands" +if NET + config CMD_NET bool "bootp, tftpboot" - select NET default y help Network commands. @@ -1038,11 +1039,13 @@ config CMD_RARP config CMD_DHCP bool "dhcp" + depends on CMD_NET help Boot image via network using DHCP/TFTP protocol config CMD_PXE bool "pxe" + depends on CMD_NET select MENU help Boot image via network using PXE protocol @@ -1091,6 +1094,8 @@ config CMD_ETHSW operations such as enabling / disabling a port and viewing/maintaining the filtering database (FDB) +endif + endmenu menu "Misc commands" diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 2106ed9c8c..c17fa2ca23 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -42,7 +42,7 @@ static void efi_init_obj_list(void) #if defined(CONFIG_LCD) || defined(CONFIG_DM_VIDEO) efi_gop_register(); #endif -#ifdef CONFIG_NET +#ifdef CONFIG_CMD_NET efi_net_register(); #endif #ifdef CONFIG_GENERATE_SMBIOS_TABLE @@ -450,7 +450,7 @@ void efi_set_bootdev(const char *dev, const char *devnr, const char *path) bootefi_device_path = efi_dp_from_part(desc, part); } else { -#ifdef CONFIG_NET +#ifdef CONFIG_CMD_NET bootefi_device_path = efi_dp_from_eth(); #endif } diff --git a/configs/M52277EVB_defconfig b/configs/M52277EVB_defconfig index c5978468d7..fc6ee0ec5b 100644 --- a/configs/M52277EVB_defconfig +++ b/configs/M52277EVB_defconfig @@ -12,12 +12,11 @@ CONFIG_CMD_I2C=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_JFFS2=y CONFIG_ENV_IS_IN_FLASH=y +# CONFIG_NET is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/M52277EVB_stmicro_defconfig b/configs/M52277EVB_stmicro_defconfig index 962a96e46f..9000208262 100644 --- a/configs/M52277EVB_stmicro_defconfig +++ b/configs/M52277EVB_stmicro_defconfig @@ -11,12 +11,11 @@ CONFIG_CMD_I2C=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_JFFS2=y CONFIG_ENV_IS_IN_SPI_FLASH=y +# CONFIG_NET is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y diff --git a/configs/M5249EVB_defconfig b/configs/M5249EVB_defconfig index d61422f5b5..8478136c6b 100644 --- a/configs/M5249EVB_defconfig +++ b/configs/M5249EVB_defconfig @@ -8,6 +8,6 @@ CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_CMD_IMLS=y CONFIG_LOOPW=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set CONFIG_CMD_CACHE=y +# CONFIG_NET is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/M5253EVBE_defconfig b/configs/M5253EVBE_defconfig index 7383c65263..754787c7d8 100644 --- a/configs/M5253EVBE_defconfig +++ b/configs/M5253EVBE_defconfig @@ -8,9 +8,9 @@ CONFIG_BOOTDELAY=5 CONFIG_CMD_IMLS=y CONFIG_CMD_IDE=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_MAC_PARTITION=y +# CONFIG_NET is not set CONFIG_MTD_NOR_FLASH=y diff --git a/configs/am335x_pdu001_defconfig b/configs/am335x_pdu001_defconfig index c6bffe0fa3..58d7676fa9 100644 --- a/configs/am335x_pdu001_defconfig +++ b/configs/am335x_pdu001_defconfig @@ -28,13 +28,12 @@ CONFIG_CMD_MEMINFO=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_PMIC=y CONFIG_CMD_REGULATOR=y CONFIG_OF_CONTROL=y CONFIG_SPL_OF_CONTROL=y CONFIG_OF_EMBED=y +# CONFIG_NET is not set CONFIG_SPL_DM=y CONFIG_DM_GPIO=y CONFIG_DM_I2C=y diff --git a/configs/am3517_crane_defconfig b/configs/am3517_crane_defconfig index 0fce9e3659..b70e54d714 100644 --- a/configs/am3517_crane_defconfig +++ b/configs/am3517_crane_defconfig @@ -20,7 +20,6 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set CONFIG_CMD_DHCP=y -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_CMD_JFFS2=y @@ -34,3 +33,4 @@ CONFIG_USB=y CONFIG_USB_MUSB_HCD=y CONFIG_USB_AM35X=y CONFIG_USB_STORAGE=y +# CONFIG_REGEX is not set diff --git a/configs/amcore_defconfig b/configs/amcore_defconfig index f884eb6aca..ce61e16c8d 100644 --- a/configs/amcore_defconfig +++ b/configs/amcore_defconfig @@ -13,12 +13,11 @@ CONFIG_CMD_IMLS=y # CONFIG_CMD_XIMG is not set CONFIG_LOOPW=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_TIMER=y CONFIG_CMD_DIAG=y CONFIG_ENV_IS_IN_FLASH=y +# CONFIG_NET is not set CONFIG_DM=y CONFIG_MTD_NOR_FLASH=y CONFIG_DM_SERIAL=y diff --git a/configs/ap143_defconfig b/configs/ap143_defconfig index 656ab7c3b1..7848b9d2fc 100644 --- a/configs/ap143_defconfig +++ b/configs/ap143_defconfig @@ -22,13 +22,12 @@ CONFIG_SYS_PROMPT="ap143 # " # CONFIG_CMD_FLASH is not set CONFIG_CMD_SF=y CONFIG_CMD_SPI=y -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nor0=spi-flash.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash.0:256k(u-boot),64k(u-boot-env),6336k(rootfs),1472k(uImage),64k(ART)" # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_SPI_FLASH=y +# CONFIG_NET is not set CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y diff --git a/configs/aspenite_defconfig b/configs/aspenite_defconfig index 7503fec2c9..59dd24f63e 100644 --- a/configs/aspenite_defconfig +++ b/configs/aspenite_defconfig @@ -7,8 +7,7 @@ CONFIG_BOOTDELAY=3 CONFIG_BOARD_EARLY_INIT_F=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set +# CONFIG_NET is not set # CONFIG_MMC is not set CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/astro_mcf5373l_defconfig b/configs/astro_mcf5373l_defconfig index 1da339c93f..2302b1f1f3 100644 --- a/configs/astro_mcf5373l_defconfig +++ b/configs/astro_mcf5373l_defconfig @@ -12,11 +12,10 @@ CONFIG_CMD_IMLS=y CONFIG_CMD_FPGA_LOADMK=y CONFIG_CMD_I2C=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_DATE=y CONFIG_CMD_JFFS2=y +# CONFIG_NET is not set CONFIG_FPGA_ALTERA=y CONFIG_FPGA_CYCLON2=y CONFIG_FPGA_XILINX=y diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig index ac929ff3c1..e80d43c79d 100644 --- a/configs/at91sam9rlek_dataflash_defconfig +++ b/configs/at91sam9rlek_dataflash_defconfig @@ -23,11 +23,10 @@ CONFIG_CMD_NAND=y CONFIG_CMD_SF=y # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y +# CONFIG_NET is not set CONFIG_DM=y CONFIG_CLK=y CONFIG_CLK_AT91=y diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig index 1d4928f20c..b18f2d42b0 100644 --- a/configs/at91sam9rlek_mmc_defconfig +++ b/configs/at91sam9rlek_mmc_defconfig @@ -23,11 +23,10 @@ CONFIG_CMD_NAND=y CONFIG_CMD_SF=y # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_FAT=y +# CONFIG_NET is not set CONFIG_DM=y CONFIG_CLK=y CONFIG_CLK_AT91=y diff --git a/configs/at91sam9rlek_nandflash_defconfig b/configs/at91sam9rlek_nandflash_defconfig index f5f3b9bbff..5e8c97d6f7 100644 --- a/configs/at91sam9rlek_nandflash_defconfig +++ b/configs/at91sam9rlek_nandflash_defconfig @@ -23,11 +23,10 @@ CONFIG_CMD_NAND=y CONFIG_CMD_SF=y # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_NAND=y +# CONFIG_NET is not set CONFIG_DM=y CONFIG_CLK=y CONFIG_CLK_AT91=y diff --git a/configs/bcm11130_defconfig b/configs/bcm11130_defconfig index 810120216a..640d4accba 100644 --- a/configs/bcm11130_defconfig +++ b/configs/bcm11130_defconfig @@ -14,13 +14,12 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_EFI_PARTITION=y # CONFIG_PARTITION_UUIDS is not set CONFIG_ENV_IS_IN_MMC=y +# CONFIG_NET is not set CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_KONA=y diff --git a/configs/bcm11130_nand_defconfig b/configs/bcm11130_nand_defconfig index e09940d109..064def01db 100644 --- a/configs/bcm11130_nand_defconfig +++ b/configs/bcm11130_nand_defconfig @@ -13,13 +13,12 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_EFI_PARTITION=y # CONFIG_PARTITION_UUIDS is not set CONFIG_ENV_IS_IN_MMC=y +# CONFIG_NET is not set CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_KONA=y diff --git a/configs/bcm23550_w1d_defconfig b/configs/bcm23550_w1d_defconfig index d8ea336adf..9a986ca9ae 100644 --- a/configs/bcm23550_w1d_defconfig +++ b/configs/bcm23550_w1d_defconfig @@ -19,13 +19,12 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_EFI_PARTITION=y # CONFIG_PARTITION_UUIDS is not set CONFIG_ENV_IS_IN_MMC=y +# CONFIG_NET is not set CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_KONA=y diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig index 49605cc857..d26cde5b0e 100644 --- a/configs/bcm28155_ap_defconfig +++ b/configs/bcm28155_ap_defconfig @@ -20,13 +20,12 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_EFI_PARTITION=y # CONFIG_PARTITION_UUIDS is not set CONFIG_ENV_IS_IN_MMC=y +# CONFIG_NET is not set CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_MMC_SDHCI_KONA=y diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index 7369d578e0..70540fb50d 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -23,9 +23,6 @@ CONFIG_CMD_NAND=y CONFIG_CMD_NAND_LOCK_UNLOCK=y CONFIG_CMD_SPI=y # CONFIG_CMD_NET is not set -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y CONFIG_ENV_IS_IN_NAND=y @@ -35,4 +32,5 @@ CONFIG_SPL_NAND_SIMPLE=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_FAT_WRITE=y +# CONFIG_REGEX is not set CONFIG_OF_LIBFDT=y diff --git a/configs/comtrend_ar5315u_ram_defconfig b/configs/comtrend_ar5315u_ram_defconfig index d9e869342a..892977a649 100644 --- a/configs/comtrend_ar5315u_ram_defconfig +++ b/configs/comtrend_ar5315u_ram_defconfig @@ -27,9 +27,8 @@ CONFIG_CMD_MEMINFO=y # CONFIG_CMD_LOADS is not set CONFIG_CMD_SF=y CONFIG_CMD_SPI=y -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set +# CONFIG_NET is not set # CONFIG_DM_DEVICE_REMOVE is not set CONFIG_DM_GPIO=y CONFIG_LED=y diff --git a/configs/comtrend_ar5387un_ram_defconfig b/configs/comtrend_ar5387un_ram_defconfig index 16edbd2192..12dbf0bc27 100644 --- a/configs/comtrend_ar5387un_ram_defconfig +++ b/configs/comtrend_ar5387un_ram_defconfig @@ -27,9 +27,8 @@ CONFIG_CMD_MEMINFO=y # CONFIG_CMD_LOADS is not set CONFIG_CMD_SF=y CONFIG_CMD_SPI=y -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set +# CONFIG_NET is not set # CONFIG_DM_DEVICE_REMOVE is not set CONFIG_DM_GPIO=y CONFIG_LED=y diff --git a/configs/comtrend_ct5361_ram_defconfig b/configs/comtrend_ct5361_ram_defconfig index 55787afca5..108e8ea267 100644 --- a/configs/comtrend_ct5361_ram_defconfig +++ b/configs/comtrend_ct5361_ram_defconfig @@ -24,9 +24,8 @@ CONFIG_CMD_LICENSE=y # CONFIG_CMD_CRC32 is not set CONFIG_CMD_MEMINFO=y # CONFIG_CMD_LOADS is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set +# CONFIG_NET is not set # CONFIG_DM_DEVICE_REMOVE is not set CONFIG_DM_GPIO=y CONFIG_BCM6345_GPIO=y diff --git a/configs/comtrend_vr3032u_ram_defconfig b/configs/comtrend_vr3032u_ram_defconfig index f85c6bfdb6..8149fabbc3 100644 --- a/configs/comtrend_vr3032u_ram_defconfig +++ b/configs/comtrend_vr3032u_ram_defconfig @@ -25,9 +25,8 @@ CONFIG_CMD_LICENSE=y CONFIG_CMD_MEMINFO=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_LOADS is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set +# CONFIG_NET is not set # CONFIG_DM_DEVICE_REMOVE is not set CONFIG_DM_GPIO=y CONFIG_LED=y diff --git a/configs/comtrend_wap5813n_ram_defconfig b/configs/comtrend_wap5813n_ram_defconfig index b123eae8ce..6112725a81 100644 --- a/configs/comtrend_wap5813n_ram_defconfig +++ b/configs/comtrend_wap5813n_ram_defconfig @@ -24,9 +24,8 @@ CONFIG_CMD_LICENSE=y # CONFIG_CMD_CRC32 is not set CONFIG_CMD_MEMINFO=y # CONFIG_CMD_LOADS is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set +# CONFIG_NET is not set # CONFIG_DM_DEVICE_REMOVE is not set CONFIG_DM_GPIO=y CONFIG_BCM6345_GPIO=y diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig index ed4faee030..83850d478f 100644 --- a/configs/efi-x86_defconfig +++ b/configs/efi-x86_defconfig @@ -33,5 +33,6 @@ CONFIG_DEBUG_EFI_CONSOLE=y CONFIG_DEBUG_UART_BASE=0 CONFIG_DEBUG_UART_CLOCK=0 CONFIG_ICH_SPI=y +# CONFIG_REGEX is not set CONFIG_EFI=y # CONFIG_EFI_LOADER is not set diff --git a/configs/huawei_hg556a_ram_defconfig b/configs/huawei_hg556a_ram_defconfig index 36a85f3cf5..b9208ff325 100644 --- a/configs/huawei_hg556a_ram_defconfig +++ b/configs/huawei_hg556a_ram_defconfig @@ -24,9 +24,8 @@ CONFIG_CMD_LICENSE=y # CONFIG_CMD_CRC32 is not set CONFIG_CMD_MEMINFO=y # CONFIG_CMD_LOADS is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set +# CONFIG_NET is not set # CONFIG_DM_DEVICE_REMOVE is not set CONFIG_DM_GPIO=y CONFIG_BCM6345_GPIO=y diff --git a/configs/mpr2_defconfig b/configs/mpr2_defconfig index 63ad21ded5..238f8f5287 100644 --- a/configs/mpr2_defconfig +++ b/configs/mpr2_defconfig @@ -21,10 +21,9 @@ CONFIG_VERSION_VARIABLE=y # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y # CONFIG_CMD_MISC is not set +# CONFIG_NET is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SCIF_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/ms7720se_defconfig b/configs/ms7720se_defconfig index 0a35891947..7434a1ff86 100644 --- a/configs/ms7720se_defconfig +++ b/configs/ms7720se_defconfig @@ -24,12 +24,11 @@ CONFIG_CMD_SDRAM=y # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y # CONFIG_CMD_MISC is not set CONFIG_CMD_EXT2=y CONFIG_DOS_PARTITION=y +# CONFIG_NET is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SCIF_CONSOLE=y CONFIG_USE_PRIVATE_LIBGCC=y diff --git a/configs/ms7750se_defconfig b/configs/ms7750se_defconfig index 9d7eb462bf..db2d6b03a3 100644 --- a/configs/ms7750se_defconfig +++ b/configs/ms7750se_defconfig @@ -21,10 +21,9 @@ CONFIG_BOOTARGS="console=ttySC0,38400" # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set CONFIG_ENV_IS_IN_FLASH=y +# CONFIG_NET is not set CONFIG_MTD_NOR_FLASH=y CONFIG_BAUDRATE=38400 CONFIG_SCIF_CONSOLE=y diff --git a/configs/mx23evk_defconfig b/configs/mx23evk_defconfig index a6fd9c3846..ebdc108ebc 100644 --- a/configs/mx23evk_defconfig +++ b/configs/mx23evk_defconfig @@ -20,13 +20,12 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_BMP=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y +# CONFIG_NET is not set CONFIG_MMC_MXS=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/mx6memcal_defconfig b/configs/mx6memcal_defconfig index 35759374b7..bf0b4f2978 100644 --- a/configs/mx6memcal_defconfig +++ b/configs/mx6memcal_defconfig @@ -30,9 +30,8 @@ CONFIG_CMD_MEMTEST=y # CONFIG_CMD_FLASH is not set # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y +# CONFIG_NET is not set # CONFIG_MMC is not set CONFIG_USB=y CONFIG_USB_GADGET=y diff --git a/configs/netgear_cg3100d_ram_defconfig b/configs/netgear_cg3100d_ram_defconfig index 0fe786ed2d..595ad6cfaf 100644 --- a/configs/netgear_cg3100d_ram_defconfig +++ b/configs/netgear_cg3100d_ram_defconfig @@ -26,9 +26,8 @@ CONFIG_CMD_MEMINFO=y # CONFIG_CMD_LOADS is not set CONFIG_CMD_SF=y CONFIG_CMD_SPI=y -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set +# CONFIG_NET is not set # CONFIG_DM_DEVICE_REMOVE is not set CONFIG_DM_GPIO=y CONFIG_BCM6345_GPIO=y diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 7b6e6ce730..2d28e0aafe 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -17,11 +17,10 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y +# CONFIG_NET is not set CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index 47371f24e6..649a57458f 100644 --- a/configs/omap3_pandora_defconfig +++ b/configs/omap3_pandora_defconfig @@ -18,7 +18,7 @@ CONFIG_CMD_NAND=y CONFIG_CMD_SPI=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set +# CONFIG_CMD_MII is not set CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" @@ -32,3 +32,4 @@ CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_FAT_WRITE=y CONFIG_OF_LIBFDT=y +# CONFIG_REGEX is not set diff --git a/configs/omap4_sdp4430_defconfig b/configs/omap4_sdp4430_defconfig index 59526fd1dc..0c7c80b67b 100644 --- a/configs/omap4_sdp4430_defconfig +++ b/configs/omap4_sdp4430_defconfig @@ -20,13 +20,11 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_SPI=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set # CONFIG_CMD_NFS is not set CONFIG_CMD_EXT4_WRITE=y # CONFIG_EFI_PARTITION is not set CONFIG_SPL_PARTITION_UUIDS=y CONFIG_ENV_IS_IN_MMC=y -CONFIG_NET=y CONFIG_MMC_OMAP_HS=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y diff --git a/configs/origen_defconfig b/configs/origen_defconfig index eabc160fd6..884ee8993d 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -19,9 +19,7 @@ CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_NET is not set -CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set -CONFIG_CMD_MII=y CONFIG_CMD_CACHE=y # CONFIG_CMD_MISC is not set CONFIG_CMD_EXT4_WRITE=y @@ -41,3 +39,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x6601 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_FUNCTION_THOR=y +# CONFIG_REGEX is not set diff --git a/configs/s5p_goni_defconfig b/configs/s5p_goni_defconfig index 5c2921a3fd..237b590ad7 100644 --- a/configs/s5p_goni_defconfig +++ b/configs/s5p_goni_defconfig @@ -20,14 +20,13 @@ CONFIG_CMD_MMC=y CONFIG_CMD_ONENAND=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y # CONFIG_CMD_MISC is not set CONFIG_CMD_EXT4=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_MMC=y +# CONFIG_NET is not set CONFIG_DFU_MMC=y CONFIG_DM_I2C_GPIO=y CONFIG_MMC_SDHCI=y diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index 453ed7a576..5014216c9b 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -19,10 +19,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_NET is not set -CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y # CONFIG_CMD_MISC is not set CONFIG_CMD_EXT4_WRITE=y @@ -46,3 +43,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x6601 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_FUNCTION_THOR=y +# CONFIG_REGEX is not set diff --git a/configs/sagem_f@st1704_ram_defconfig b/configs/sagem_f@st1704_ram_defconfig index dc227424d5..886e3676af 100644 --- a/configs/sagem_f@st1704_ram_defconfig +++ b/configs/sagem_f@st1704_ram_defconfig @@ -27,9 +27,8 @@ CONFIG_CMD_MEMINFO=y # CONFIG_CMD_LOADS is not set CONFIG_CMD_SF=y CONFIG_CMD_SPI=y -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set +# CONFIG_NET is not set # CONFIG_DM_DEVICE_REMOVE is not set CONFIG_DM_GPIO=y CONFIG_BCM6345_GPIO=y diff --git a/configs/sfr_nb4-ser_ram_defconfig b/configs/sfr_nb4-ser_ram_defconfig index dba8aff66a..57ca22c4d6 100644 --- a/configs/sfr_nb4-ser_ram_defconfig +++ b/configs/sfr_nb4-ser_ram_defconfig @@ -25,9 +25,8 @@ CONFIG_CMD_LICENSE=y # CONFIG_CMD_CRC32 is not set CONFIG_CMD_MEMINFO=y # CONFIG_CMD_LOADS is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set +# CONFIG_NET is not set # CONFIG_DM_DEVICE_REMOVE is not set CONFIG_DM_GPIO=y CONFIG_BCM6345_GPIO=y diff --git a/configs/stm32h743-disco_defconfig b/configs/stm32h743-disco_defconfig index ea1405d8ca..c6a0d10bdb 100644 --- a/configs/stm32h743-disco_defconfig +++ b/configs/stm32h743-disco_defconfig @@ -19,8 +19,6 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_TIMER=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y @@ -29,6 +27,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y +# CONFIG_NET is not set CONFIG_DM_MMC=y CONFIG_STM32_SDMMC2=y # CONFIG_PINCTRL_FULL is not set diff --git a/configs/stm32h743-eval_defconfig b/configs/stm32h743-eval_defconfig index 521089fb06..ab5273ba90 100644 --- a/configs/stm32h743-eval_defconfig +++ b/configs/stm32h743-eval_defconfig @@ -19,8 +19,6 @@ CONFIG_CMD_BOOTZ=y CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_TIMER=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y @@ -29,6 +27,7 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y +# CONFIG_NET is not set CONFIG_DM_MMC=y CONFIG_STM32_SDMMC2=y # CONFIG_PINCTRL_FULL is not set diff --git a/configs/stmark2_defconfig b/configs/stmark2_defconfig index 5226de4525..5728272000 100644 --- a/configs/stmark2_defconfig +++ b/configs/stmark2_defconfig @@ -15,13 +15,12 @@ CONFIG_SYS_PROMPT="stmark2 $ " CONFIG_CMD_SF=y CONFIG_CMD_SPI=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nor0=spi-flash.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash.0:1m(u-boot),7m(kernel),-(rootfs)" CONFIG_ENV_IS_IN_SPI_FLASH=y +# CONFIG_NET is not set CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_MTD=y CONFIG_CF_SPI=y diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig index d5929a1801..945431c77b 100644 --- a/configs/topic_miami_defconfig +++ b/configs/topic_miami_defconfig @@ -24,7 +24,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set +# CONFIG_CMD_MII is not set CONFIG_CMD_CACHE=y CONFIG_OF_EMBED=y CONFIG_SPL_DM_SEQ_ALIAS=y @@ -54,3 +54,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x0300 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_FUNCTION_THOR=y +# CONFIG_REGEX is not set diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig index a318e50f8f..c6a3f54543 100644 --- a/configs/topic_miamilite_defconfig +++ b/configs/topic_miamilite_defconfig @@ -24,7 +24,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set +# CONFIG_CMD_MII is not set CONFIG_CMD_CACHE=y CONFIG_OF_EMBED=y CONFIG_SPL_DM_SEQ_ALIAS=y @@ -55,3 +55,4 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x0300 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_FUNCTION_THOR=y +# CONFIG_REGEX is not set diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index a266325bcb..3ca154b1fa 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -22,10 +22,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_NET is not set -CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y # CONFIG_CMD_MISC is not set CONFIG_CMD_EXT4_WRITE=y @@ -49,4 +46,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x6601 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_FUNCTION_THOR=y +# CONFIG_REGEX is not set CONFIG_LIB_HW_RAND=y diff --git a/configs/trats_defconfig b/configs/trats_defconfig index 670a916c45..019dca3602 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -21,10 +21,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_NET is not set -CONFIG_CMD_DHCP=y # CONFIG_CMD_NFS is not set -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y # CONFIG_CMD_MISC is not set CONFIG_CMD_EXT4_WRITE=y @@ -48,4 +45,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0x6601 CONFIG_USB_GADGET_DWC2_OTG=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_FUNCTION_THOR=y +# CONFIG_REGEX is not set CONFIG_LIB_HW_RAND=y diff --git a/configs/tricorder_defconfig b/configs/tricorder_defconfig index fffd9ed1ee..480b0aa190 100644 --- a/configs/tricorder_defconfig +++ b/configs/tricorder_defconfig @@ -15,14 +15,13 @@ CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_NAND_LOCK_UNLOCK=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(SPL),1m(u-boot),384k(u-boot-env1),1152k(mtdoops),384k(u-boot-env2),5m(kernel),2m(fdt),-(ubi)" CONFIG_CMD_UBI=y CONFIG_ENV_IS_IN_NAND=y +# CONFIG_NET is not set CONFIG_LED_STATUS=y CONFIG_LED_STATUS0=y CONFIG_LED_STATUS_BIT=1 diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig index 1be58211a4..aeedbb28e5 100644 --- a/configs/tricorder_flash_defconfig +++ b/configs/tricorder_flash_defconfig @@ -15,13 +15,12 @@ CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y CONFIG_CMD_NAND_LOCK_UNLOCK=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(SPL),1m(u-boot),384k(u-boot-env1),1152k(mtdoops),384k(u-boot-env2),5m(kernel),2m(fdt),-(ubi)" CONFIG_CMD_UBI=y +# CONFIG_NET is not set CONFIG_LED_STATUS=y CONFIG_LED_STATUS0=y CONFIG_LED_STATUS_BIT=1 diff --git a/configs/vct_platinum_onenand_small_defconfig b/configs/vct_platinum_onenand_small_defconfig index c5a413fadf..f941f2d29c 100644 --- a/configs/vct_platinum_onenand_small_defconfig +++ b/configs/vct_platinum_onenand_small_defconfig @@ -19,8 +19,6 @@ CONFIG_CMD_ONENAND=y # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set CONFIG_CMD_JFFS2=y CONFIG_MTDIDS_DEFAULT="onenand0=onenand" @@ -29,4 +27,5 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_ONENAND=y +# CONFIG_NET is not set CONFIG_SYS_NS16550=y diff --git a/configs/vct_platinum_small_defconfig b/configs/vct_platinum_small_defconfig index ec7b849706..79f0811bfb 100644 --- a/configs/vct_platinum_small_defconfig +++ b/configs/vct_platinum_small_defconfig @@ -17,10 +17,9 @@ CONFIG_CMD_IMLS=y # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_FLASH=y +# CONFIG_NET is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y diff --git a/configs/vct_platinumavc_defconfig b/configs/vct_platinumavc_defconfig index 32624c3d53..57b3077939 100644 --- a/configs/vct_platinumavc_defconfig +++ b/configs/vct_platinumavc_defconfig @@ -16,3 +16,4 @@ CONFIG_CMD_DHCP=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y +# CONFIG_REGEX is not set diff --git a/configs/vct_platinumavc_onenand_defconfig b/configs/vct_platinumavc_onenand_defconfig index 8f0f551c5d..de1c1e8589 100644 --- a/configs/vct_platinumavc_onenand_defconfig +++ b/configs/vct_platinumavc_onenand_defconfig @@ -22,3 +22,4 @@ CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_ONENAND=y CONFIG_SYS_NS16550=y +# CONFIG_REGEX is not set diff --git a/configs/vct_platinumavc_onenand_small_defconfig b/configs/vct_platinumavc_onenand_small_defconfig index 24413de7f4..21d4c2db08 100644 --- a/configs/vct_platinumavc_onenand_small_defconfig +++ b/configs/vct_platinumavc_onenand_small_defconfig @@ -19,8 +19,6 @@ CONFIG_CMD_ONENAND=y # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set CONFIG_CMD_JFFS2=y CONFIG_MTDIDS_DEFAULT="onenand0=onenand" @@ -29,4 +27,5 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_ONENAND=y +# CONFIG_NET is not set CONFIG_SYS_NS16550=y diff --git a/configs/vct_platinumavc_small_defconfig b/configs/vct_platinumavc_small_defconfig index 157597ce50..f3cab1c1c3 100644 --- a/configs/vct_platinumavc_small_defconfig +++ b/configs/vct_platinumavc_small_defconfig @@ -17,10 +17,9 @@ CONFIG_CMD_IMLS=y # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_FLASH=y +# CONFIG_NET is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y diff --git a/configs/vct_premium_onenand_small_defconfig b/configs/vct_premium_onenand_small_defconfig index 6175bb615c..7b2d7152ee 100644 --- a/configs/vct_premium_onenand_small_defconfig +++ b/configs/vct_premium_onenand_small_defconfig @@ -19,8 +19,6 @@ CONFIG_CMD_ONENAND=y # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set CONFIG_CMD_JFFS2=y CONFIG_MTDIDS_DEFAULT="onenand0=onenand" @@ -29,4 +27,5 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_ONENAND=y +# CONFIG_NET is not set CONFIG_SYS_NS16550=y diff --git a/configs/vct_premium_small_defconfig b/configs/vct_premium_small_defconfig index 33364fefa9..93bb30568c 100644 --- a/configs/vct_premium_small_defconfig +++ b/configs/vct_premium_small_defconfig @@ -17,10 +17,9 @@ CONFIG_CMD_IMLS=y # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set # CONFIG_ISO_PARTITION is not set CONFIG_ENV_IS_IN_FLASH=y +# CONFIG_NET is not set CONFIG_MTD_NOR_FLASH=y CONFIG_SYS_NS16550=y diff --git a/configs/warp_defconfig b/configs/warp_defconfig index 5d1dfe481b..bddf4bcf1d 100644 --- a/configs/warp_defconfig +++ b/configs/warp_defconfig @@ -18,8 +18,6 @@ CONFIG_CMD_PART=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_EXT4=y @@ -27,6 +25,7 @@ CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_ENV_IS_IN_MMC=y +# CONFIG_NET is not set CONFIG_DFU_MMC=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/configs/xilinx_zynqmp_mini_emmc_defconfig b/configs/xilinx_zynqmp_mini_emmc_defconfig index 0e4bd2d3bf..b15120e0fa 100644 --- a/configs/xilinx_zynqmp_mini_emmc_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc_defconfig @@ -35,11 +35,10 @@ CONFIG_CMD_MMC=y # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_EMBED=y +# CONFIG_NET is not set # CONFIG_DM_WARN is not set # CONFIG_DM_DEVICE_REMOVE is not set CONFIG_DM_MMC=y diff --git a/configs/xilinx_zynqmp_mini_nand_defconfig b/configs/xilinx_zynqmp_mini_nand_defconfig index 6474167d37..55200bcb05 100644 --- a/configs/xilinx_zynqmp_mini_nand_defconfig +++ b/configs/xilinx_zynqmp_mini_nand_defconfig @@ -35,10 +35,9 @@ CONFIG_SYS_PROMPT="ZynqMP> " # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set # CONFIG_PARTITIONS is not set CONFIG_OF_EMBED=y +# CONFIG_NET is not set # CONFIG_DM_WARN is not set # CONFIG_DM_DEVICE_REMOVE is not set # CONFIG_MMC is not set diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig index 548327f349..9f78de3d72 100644 --- a/configs/zipitz2_defconfig +++ b/configs/zipitz2_defconfig @@ -13,12 +13,11 @@ CONFIG_CMD_MMC=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y CONFIG_CMD_EXT2=y CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_FLASH=y +# CONFIG_NET is not set CONFIG_MTD_NOR_FLASH=y CONFIG_PXA_SERIAL=y CONFIG_USB=y diff --git a/configs/zynq_cse_qspi_defconfig b/configs/zynq_cse_qspi_defconfig index 1d08dd2ba2..80bb26c69f 100644 --- a/configs/zynq_cse_qspi_defconfig +++ b/configs/zynq_cse_qspi_defconfig @@ -40,11 +40,10 @@ CONFIG_CMD_SF=y # CONFIG_CMD_ITEST is not set # CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set # CONFIG_CMD_MISC is not set # CONFIG_PARTITIONS is not set CONFIG_OF_EMBED=y +# CONFIG_NET is not set # CONFIG_DM_WARN is not set # CONFIG_DM_DEVICE_REMOVE is not set CONFIG_SPL_DM_SEQ_ALIAS=y diff --git a/configs/zynq_zc770_xm011_defconfig b/configs/zynq_zc770_xm011_defconfig index e78d18d244..59db4c5f62 100644 --- a/configs/zynq_zc770_xm011_defconfig +++ b/configs/zynq_zc770_xm011_defconfig @@ -25,7 +25,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_NAND_LOCK_UNLOCK=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set diff --git a/configs/zynq_zc770_xm011_x16_defconfig b/configs/zynq_zc770_xm011_x16_defconfig index 8018831074..d67f78163e 100644 --- a/configs/zynq_zc770_xm011_x16_defconfig +++ b/configs/zynq_zc770_xm011_x16_defconfig @@ -25,7 +25,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_NAND_LOCK_UNLOCK=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set CONFIG_CMD_CACHE=y # CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_ISO_PARTITION is not set diff --git a/include/configs/topic_miami.h b/include/configs/topic_miami.h index 400a7fc4a4..e32fab2513 100644 --- a/include/configs/topic_miami.h +++ b/include/configs/topic_miami.h @@ -133,7 +133,4 @@ "fi; fi; run $modeboot" #undef CONFIG_DISPLAY_BOARDINFO -/* Further tweaks to reduce image size */ -#undef CONFIG_CMD_NET - #endif /* __CONFIG_TOPIC_MIAMI_H */ diff --git a/include/env_callback.h b/include/env_callback.h index 5c4a30c2de..48da32a67b 100644 --- a/include/env_callback.h +++ b/include/env_callback.h @@ -45,7 +45,7 @@ #define DNS_CALLBACK #endif -#ifdef CONFIG_NET +#ifdef CONFIG_CMD_NET #define NET_CALLBACKS \ "bootfile:bootfile," \ "ipaddr:ipaddr," \ diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index 2722265ee3..2a87d9ed77 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -21,5 +21,5 @@ obj-y += efi_file.o efi_variable.o efi_bootmgr.o efi_watchdog.o obj-$(CONFIG_LCD) += efi_gop.o obj-$(CONFIG_DM_VIDEO) += efi_gop.o obj-$(CONFIG_PARTITIONS) += efi_disk.o -obj-$(CONFIG_NET) += efi_net.o +obj-$(CONFIG_CMD_NET) += efi_net.o obj-$(CONFIG_GENERATE_SMBIOS_TABLE) += efi_smbios.o diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c index ecc4eda3f8..3c735e60d3 100644 --- a/lib/efi_loader/efi_device_path.c +++ b/lib/efi_loader/efi_device_path.c @@ -746,7 +746,7 @@ struct efi_device_path *efi_dp_from_file(struct blk_desc *desc, int part, return start; } -#ifdef CONFIG_NET +#ifdef CONFIG_CMD_NET struct efi_device_path *efi_dp_from_eth(void) { struct efi_device_path_mac_addr *ndp; diff --git a/net/Kconfig b/net/Kconfig index 184b7c15d4..143c4416cd 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -4,6 +4,7 @@ menuconfig NET bool "Networking support" + default y if NET @@ -23,6 +24,7 @@ config NETCONSOLE config NET_TFTP_VARS bool "Control TFTP timeout and count through environment" + depends on CMD_NET default y help If set, allows controlling the TFTP timeout through the @@ -33,30 +35,39 @@ config NET_TFTP_VARS config BOOTP_BOOTPATH bool "Enable BOOTP BOOTPATH" + depends on CMD_NET config BOOTP_DNS bool "Enable bootp DNS" + depends on CMD_NET config BOOTP_GATEWAY bool "Enable BOOTP gateway" + depends on CMD_NET config BOOTP_HOSTNAME bool "Enable BOOTP hostname" + depends on CMD_NET config BOOTP_PXE bool "Enable BOOTP PXE" + depends on CMD_NET config BOOTP_SUBNETMASK bool "Enable BOOTP subnetmask" + depends on CMD_NET + depends on CMD_NET config BOOTP_PXE_CLIENTARCH hex + depends on CMD_NET default 0x16 if ARM64 default 0x15 if ARM default 0 if X86 config BOOTP_VCI_STRING string + depends on CMD_NET default "U-Boot.armv7" if CPU_V7 || CPU_V7M default "U-Boot.armv8" if ARM64 default "U-Boot.arm" if ARM -- 2.39.5