From bfb380b30ad2d678c09037560abb6f09a5e9c9b6 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 13 Nov 2016 21:59:52 +0100 Subject: [PATCH] cmd: move CMD_PXE to Kconfig Currently, CMD_PXE is forcibly enabled in config_distro_defaults.h, so that general purpose distributions can rely on it being defined. This header is included, under conditions or not, by various archs or famillies of archs / SoCs. However, it is very possible that boards based on those SoCs will not have a physical ethernet connector at all, even if the have a MAC; for example, the Nanopi Neo AIR (sunxi H3) does not. It is also possible that network booting is absolutely not necessary for a device. However, it is not possible to disable the PXE command, as it is forcibly enabled and is non-configurable. But it turns out we already have a config option to build a distro-ready image, in the name of DISTRO_DEFAULTS. Move CMD_PXE out of the hard-coded config_distro_defaults.h into a Kconfig option, that gets selected by DISTRO_DEFAULTS when it is set. Signed-off-by: "Yann E. MORIN" Cc: Joe Hershberger [trini: Make it select MENU, run moveconfig.py] Signed-off-by: Tom Rini --- Kconfig | 1 + cmd/Kconfig | 6 ++++++ configs/ls1043aqds_defconfig | 1 + configs/ls1043aqds_lpuart_defconfig | 1 + configs/ls1043aqds_nand_defconfig | 1 + configs/ls1043aqds_nor_ddr3_defconfig | 1 + configs/ls1043aqds_qspi_defconfig | 1 + configs/ls1043aqds_sdcard_ifc_defconfig | 1 + configs/ls1043aqds_sdcard_qspi_defconfig | 1 + configs/ls1043ardb_SECURE_BOOT_defconfig | 1 + configs/ls1043ardb_defconfig | 1 + configs/ls1043ardb_nand_defconfig | 1 + configs/ls1043ardb_sdcard_defconfig | 1 + include/config_distro_defaults.h | 2 -- include/configs/am335x_shc.h | 1 - include/configs/ls1043a_common.h | 1 - include/configs/s32v234evb.h | 1 - include/configs/vexpress_aemv8a.h | 1 - include/configs/xilinx_zynqmp.h | 3 --- 19 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Kconfig b/Kconfig index e09b9c3b03..26fd917759 100644 --- a/Kconfig +++ b/Kconfig @@ -61,6 +61,7 @@ config DISTRO_DEFAULTS select CMD_BOOTZ if ARM && !ARM64 select CMD_BOOTI if ARM64 select CMD_DHCP + select CMD_PXE select CMD_EXT2 select CMD_EXT4 select CMD_FAT diff --git a/cmd/Kconfig b/cmd/Kconfig index bafba6f61c..586a6456e4 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -524,6 +524,12 @@ config CMD_DHCP help Boot image via network using DHCP/TFTP protocol +config CMD_PXE + bool "pxe" + select MENU + help + Boot image via network using PXE protocol + config CMD_NFS bool "nfs" default y diff --git a/configs/ls1043aqds_defconfig b/configs/ls1043aqds_defconfig index 7ca27d7ab2..6ddd54c7f3 100644 --- a/configs/ls1043aqds_defconfig +++ b/configs/ls1043aqds_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y +CONFIG_CMD_PXE=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y diff --git a/configs/ls1043aqds_lpuart_defconfig b/configs/ls1043aqds_lpuart_defconfig index f6efe46a96..dce9bda43a 100644 --- a/configs/ls1043aqds_lpuart_defconfig +++ b/configs/ls1043aqds_lpuart_defconfig @@ -17,6 +17,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y +CONFIG_CMD_PXE=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y diff --git a/configs/ls1043aqds_nand_defconfig b/configs/ls1043aqds_nand_defconfig index de0780157c..ac6da0ea7a 100644 --- a/configs/ls1043aqds_nand_defconfig +++ b/configs/ls1043aqds_nand_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y +CONFIG_CMD_PXE=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y diff --git a/configs/ls1043aqds_nor_ddr3_defconfig b/configs/ls1043aqds_nor_ddr3_defconfig index 1f33c881df..454701a7dc 100644 --- a/configs/ls1043aqds_nor_ddr3_defconfig +++ b/configs/ls1043aqds_nor_ddr3_defconfig @@ -16,6 +16,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y +CONFIG_CMD_PXE=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y diff --git a/configs/ls1043aqds_qspi_defconfig b/configs/ls1043aqds_qspi_defconfig index 38abeaf395..f76a698877 100644 --- a/configs/ls1043aqds_qspi_defconfig +++ b/configs/ls1043aqds_qspi_defconfig @@ -19,6 +19,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y +CONFIG_CMD_PXE=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y diff --git a/configs/ls1043aqds_sdcard_ifc_defconfig b/configs/ls1043aqds_sdcard_ifc_defconfig index 48ea853b9a..22faf715ee 100644 --- a/configs/ls1043aqds_sdcard_ifc_defconfig +++ b/configs/ls1043aqds_sdcard_ifc_defconfig @@ -30,6 +30,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y +CONFIG_CMD_PXE=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y diff --git a/configs/ls1043aqds_sdcard_qspi_defconfig b/configs/ls1043aqds_sdcard_qspi_defconfig index fd0922da03..e8e31b66a5 100644 --- a/configs/ls1043aqds_sdcard_qspi_defconfig +++ b/configs/ls1043aqds_sdcard_qspi_defconfig @@ -31,6 +31,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y +CONFIG_CMD_PXE=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y diff --git a/configs/ls1043ardb_SECURE_BOOT_defconfig b/configs/ls1043ardb_SECURE_BOOT_defconfig index 6ee0ad05a9..6f93612b91 100644 --- a/configs/ls1043ardb_SECURE_BOOT_defconfig +++ b/configs/ls1043ardb_SECURE_BOOT_defconfig @@ -13,6 +13,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y +CONFIG_CMD_PXE=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y diff --git a/configs/ls1043ardb_defconfig b/configs/ls1043ardb_defconfig index 79a4eb2ecf..9042ac702a 100644 --- a/configs/ls1043ardb_defconfig +++ b/configs/ls1043ardb_defconfig @@ -12,6 +12,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y +CONFIG_CMD_PXE=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y diff --git a/configs/ls1043ardb_nand_defconfig b/configs/ls1043ardb_nand_defconfig index da69986010..9f0c491f9f 100644 --- a/configs/ls1043ardb_nand_defconfig +++ b/configs/ls1043ardb_nand_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y +CONFIG_CMD_PXE=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y diff --git a/configs/ls1043ardb_sdcard_defconfig b/configs/ls1043ardb_sdcard_defconfig index c0b0a9253e..0b3f247034 100644 --- a/configs/ls1043ardb_sdcard_defconfig +++ b/configs/ls1043ardb_sdcard_defconfig @@ -26,6 +26,7 @@ CONFIG_CMD_SF=y CONFIG_CMD_I2C=y CONFIG_CMD_USB=y CONFIG_CMD_DHCP=y +CONFIG_CMD_PXE=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y CONFIG_CMD_CACHE=y diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h index 2e24b17b84..f2e87ee2f3 100644 --- a/include/config_distro_defaults.h +++ b/include/config_distro_defaults.h @@ -20,8 +20,6 @@ #define CONFIG_BOOTP_PXE #define CONFIG_BOOTP_SUBNETMASK -#define CONFIG_CMD_PXE - #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_LONGHELP diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index 48353e9d3d..32f93d221f 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -21,7 +21,6 @@ #undef CONFIG_CMD_EXT4_WRITE #undef CONFIG_CMD_MMC_SPI #undef CONFIG_CMD_SPI -#undef CONFIG_CMD_PXE #define CONFIG_CMD_CACHE diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 9b20c56d7b..c1e3ec6784 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -145,7 +145,6 @@ /* Command line configuration */ #define CONFIG_CMD_ENV -#define CONFIG_CMD_PXE /* MMC */ #define CONFIG_MMC diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index 631656c0b9..9f85fdc11b 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -214,7 +214,6 @@ #if 0 /* Configure PXE */ -#define CONFIG_CMD_PXE #define CONFIG_BOOTP_PXE #define CONFIG_BOOTP_PXE_CLIENTARCH 0x100 #endif diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 733f01170e..f026f356f3 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -127,7 +127,6 @@ /*#define CONFIG_MENU_SHOW*/ #define CONFIG_CMD_UNZIP -#define CONFIG_CMD_PXE #define CONFIG_CMD_ENV #define CONFIG_DOS_PARTITION diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index d0b609549f..d480990d2d 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -80,9 +80,6 @@ #endif #define CONFIG_AUTO_COMPLETE -/* PXE */ -#define CONFIG_CMD_PXE - #if defined(CONFIG_ZYNQ_SDHCI) # define CONFIG_MMC # define CONFIG_GENERIC_MMC -- 2.39.5