From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michal Simek Date: Mon, 26 Feb 2018 16:01:02 +0100 Subject: [U-Boot] [PATCH v2] Kconfig: cmd: Make networking command dependent on NET Message-ID: List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Enable networking command only when NET is enabled. And remove selecting NET for CMD_NET Signed-off-by: Michal Simek --- Changes in v2: - Check several boards by hand. There is a huge impact on defconfigs because of select NET. But this change makes sense to do but it just needs to be syncup properly. Do we have a tool for this kind of change? --- cmd/Kconfig | 5 ++++- configs/aspenite_defconfig | 2 -- configs/at91sam9rlek_dataflash_defconfig | 2 -- configs/at91sam9rlek_mmc_defconfig | 2 -- configs/at91sam9rlek_nandflash_defconfig | 2 -- configs/bcm23550_w1d_defconfig | 2 -- configs/bcm28155_ap_defconfig | 2 -- configs/cairo_defconfig | 5 ++--- configs/mx23evk_defconfig | 2 -- configs/omap3_pandora_defconfig | 2 -- configs/origen_defconfig | 4 ++-- configs/s5p_goni_defconfig | 2 -- configs/s5pc210_universal_defconfig | 5 ++--- configs/thunderx_88xx_defconfig | 4 +--- configs/topic_miami_defconfig | 2 -- configs/topic_miamilite_defconfig | 2 -- configs/trats2_defconfig | 5 ++--- configs/trats_defconfig | 5 ++--- configs/tricorder_defconfig | 2 -- configs/tricorder_flash_defconfig | 2 -- configs/warp_defconfig | 2 -- configs/zynq_zc770_xm011_defconfig | 2 -- configs/zynq_zc770_xm011_x16_defconfig | 2 -- 23 files changed, 15 insertions(+), 50 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index 18aac7f7d4c3..83a36bc1927e 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. @@ -1091,6 +1092,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/configs/aspenite_defconfig b/configs/aspenite_defconfig index 7503fec2c976..3ecc55cbd620 100644 --- a/configs/aspenite_defconfig +++ b/configs/aspenite_defconfig @@ -7,8 +7,6 @@ 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_MMC is not set CONFIG_SYS_NS16550=y CONFIG_OF_LIBFDT=y diff --git a/configs/at91sam9rlek_dataflash_defconfig b/configs/at91sam9rlek_dataflash_defconfig index ac929ff3c1a2..4908eceb0d0c 100644 --- a/configs/at91sam9rlek_dataflash_defconfig +++ b/configs/at91sam9rlek_dataflash_defconfig @@ -23,8 +23,6 @@ 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 diff --git a/configs/at91sam9rlek_mmc_defconfig b/configs/at91sam9rlek_mmc_defconfig index 1d4928f20c59..200667b1f2bd 100644 --- a/configs/at91sam9rlek_mmc_defconfig +++ b/configs/at91sam9rlek_mmc_defconfig @@ -23,8 +23,6 @@ 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 diff --git a/configs/at91sam9rlek_nandflash_defconfig b/configs/at91sam9rlek_nandflash_defconfig index f5f3b9bbfff0..a9874146bf00 100644 --- a/configs/at91sam9rlek_nandflash_defconfig +++ b/configs/at91sam9rlek_nandflash_defconfig @@ -23,8 +23,6 @@ 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 diff --git a/configs/bcm23550_w1d_defconfig b/configs/bcm23550_w1d_defconfig index d8ea336adff9..b5b10aeb93f4 100644 --- a/configs/bcm23550_w1d_defconfig +++ b/configs/bcm23550_w1d_defconfig @@ -19,8 +19,6 @@ 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 diff --git a/configs/bcm28155_ap_defconfig b/configs/bcm28155_ap_defconfig index 49605cc85770..eb96771c5c1c 100644 --- a/configs/bcm28155_ap_defconfig +++ b/configs/bcm28155_ap_defconfig @@ -20,8 +20,6 @@ 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 diff --git a/configs/cairo_defconfig b/configs/cairo_defconfig index 7369d578e066..edd37cb64a21 100644 --- a/configs/cairo_defconfig +++ b/configs/cairo_defconfig @@ -23,16 +23,15 @@ 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 +CONFIG_NET=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y 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/mx23evk_defconfig b/configs/mx23evk_defconfig index a6fd9c384687..1343c121c32b 100644 --- a/configs/mx23evk_defconfig +++ b/configs/mx23evk_defconfig @@ -20,8 +20,6 @@ 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 diff --git a/configs/omap3_pandora_defconfig b/configs/omap3_pandora_defconfig index 47371f24e6e1..2805ec50c884 100644 --- a/configs/omap3_pandora_defconfig +++ b/configs/omap3_pandora_defconfig @@ -17,8 +17,6 @@ CONFIG_CMD_MMC=y 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_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" diff --git a/configs/origen_defconfig b/configs/origen_defconfig index eabc160fd660..c8e61e9314e7 100644 --- a/configs/origen_defconfig +++ b/configs/origen_defconfig @@ -19,13 +19,12 @@ 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 CONFIG_OF_CONTROL=y +CONFIG_NET=y CONFIG_DFU_MMC=y CONFIG_DM_MMC=y CONFIG_MMC_DW=y @@ -41,3 +40,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 5c2921a3fd1d..e0788d1aab8b 100644 --- a/configs/s5p_goni_defconfig +++ b/configs/s5p_goni_defconfig @@ -20,8 +20,6 @@ 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 diff --git a/configs/s5pc210_universal_defconfig b/configs/s5pc210_universal_defconfig index 453ed7a57612..4e19820ac2e9 100644 --- a/configs/s5pc210_universal_defconfig +++ b/configs/s5pc210_universal_defconfig @@ -19,15 +19,13 @@ 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 CONFIG_MTDPARTS_DEFAULT="mtdparts=samsung-onenand:128k(s-boot),896k(bootloader),256k(params),2816k(config),8m(csa),7m(kernel),1m(log),12m(modem),60m(qboot),-(UBI)" CONFIG_OF_CONTROL=y +CONFIG_NET=y CONFIG_DFU_MMC=y CONFIG_SYS_I2C_S3C24X0=y CONFIG_DM_MMC=y @@ -46,3 +44,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/thunderx_88xx_defconfig b/configs/thunderx_88xx_defconfig index 4b25c0814c81..2d6eefc82395 100644 --- a/configs/thunderx_88xx_defconfig +++ b/configs/thunderx_88xx_defconfig @@ -18,8 +18,7 @@ CONFIG_SYS_PROMPT="ThunderX_88XX> " # CONFIG_CMD_SAVEENV is not set # CONFIG_CMD_ENV_EXISTS is not set # CONFIG_CMD_FLASH is not set -# CONFIG_CMD_NET is not set -# CONFIG_CMD_NFS is not set +CONFIG_NET=y CONFIG_DM=y # CONFIG_MMC is not set CONFIG_DM_SERIAL=y @@ -27,4 +26,3 @@ CONFIG_DEBUG_UART_PL011=y CONFIG_DEBUG_UART_BASE=0x87e024000000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART_SKIP_INIT=y -CONFIG_REGEX=y diff --git a/configs/topic_miami_defconfig b/configs/topic_miami_defconfig index d5929a1801af..e937acff0881 100644 --- a/configs/topic_miami_defconfig +++ b/configs/topic_miami_defconfig @@ -23,8 +23,6 @@ CONFIG_CMD_MMC=y 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_CACHE=y CONFIG_OF_EMBED=y CONFIG_SPL_DM_SEQ_ALIAS=y diff --git a/configs/topic_miamilite_defconfig b/configs/topic_miamilite_defconfig index a318e50f8f29..cea7c5cae5eb 100644 --- a/configs/topic_miamilite_defconfig +++ b/configs/topic_miamilite_defconfig @@ -23,8 +23,6 @@ CONFIG_CMD_MMC=y 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_CACHE=y CONFIG_OF_EMBED=y CONFIG_SPL_DM_SEQ_ALIAS=y diff --git a/configs/trats2_defconfig b/configs/trats2_defconfig index a266325bcb5a..67a6c1fc437d 100644 --- a/configs/trats2_defconfig +++ b/configs/trats2_defconfig @@ -22,14 +22,12 @@ 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 CONFIG_OF_CONTROL=y +CONFIG_NET=y CONFIG_DFU_MMC=y CONFIG_DM_I2C_GPIO=y CONFIG_SYS_I2C_S3C24X0=y @@ -49,4 +47,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 670a916c4547..f24c65f1450b 100644 --- a/configs/trats_defconfig +++ b/configs/trats_defconfig @@ -21,14 +21,12 @@ 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 CONFIG_OF_CONTROL=y +CONFIG_NET=y CONFIG_DFU_MMC=y CONFIG_DM_I2C_GPIO=y CONFIG_SYS_I2C_S3C24X0=y @@ -48,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/tricorder_defconfig b/configs/tricorder_defconfig index fffd9ed1ee25..b3111945ba83 100644 --- a/configs/tricorder_defconfig +++ b/configs/tricorder_defconfig @@ -15,8 +15,6 @@ 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" diff --git a/configs/tricorder_flash_defconfig b/configs/tricorder_flash_defconfig index 1be58211a4ef..095bc2e57353 100644 --- a/configs/tricorder_flash_defconfig +++ b/configs/tricorder_flash_defconfig @@ -15,8 +15,6 @@ 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" diff --git a/configs/warp_defconfig b/configs/warp_defconfig index 5d1dfe481b97..a729c11a869f 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 diff --git a/configs/zynq_zc770_xm011_defconfig b/configs/zynq_zc770_xm011_defconfig index e78d18d244b5..b9fd74b5d941 100644 --- a/configs/zynq_zc770_xm011_defconfig +++ b/configs/zynq_zc770_xm011_defconfig @@ -24,8 +24,6 @@ CONFIG_CMD_FPGA_LOADP=y 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 8018831074e1..ef6f46e73c73 100644 --- a/configs/zynq_zc770_xm011_x16_defconfig +++ b/configs/zynq_zc770_xm011_x16_defconfig @@ -24,8 +24,6 @@ CONFIG_CMD_FPGA_LOADP=y 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 -- 1.9.1