Browse Source

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" <yann.morin.1998@free.fr>
Cc: Joe Hershberger <joe.hershberger@ni.com>
[trini: Make it select MENU, run moveconfig.py]
Signed-off-by: Tom Rini <trini@konsulko.com>
tags/2020-06-01
Yann E. MORIN 4 years ago
committed by Tom Rini
parent
commit
bfb380b30a
19 changed files with 18 additions and 9 deletions
  1. +1
    -0
      Kconfig
  2. +6
    -0
      cmd/Kconfig
  3. +1
    -0
      configs/ls1043aqds_defconfig
  4. +1
    -0
      configs/ls1043aqds_lpuart_defconfig
  5. +1
    -0
      configs/ls1043aqds_nand_defconfig
  6. +1
    -0
      configs/ls1043aqds_nor_ddr3_defconfig
  7. +1
    -0
      configs/ls1043aqds_qspi_defconfig
  8. +1
    -0
      configs/ls1043aqds_sdcard_ifc_defconfig
  9. +1
    -0
      configs/ls1043aqds_sdcard_qspi_defconfig
  10. +1
    -0
      configs/ls1043ardb_SECURE_BOOT_defconfig
  11. +1
    -0
      configs/ls1043ardb_defconfig
  12. +1
    -0
      configs/ls1043ardb_nand_defconfig
  13. +1
    -0
      configs/ls1043ardb_sdcard_defconfig
  14. +0
    -2
      include/config_distro_defaults.h
  15. +0
    -1
      include/configs/am335x_shc.h
  16. +0
    -1
      include/configs/ls1043a_common.h
  17. +0
    -1
      include/configs/s32v234evb.h
  18. +0
    -1
      include/configs/vexpress_aemv8a.h
  19. +0
    -3
      include/configs/xilinx_zynqmp.h

+ 1
- 0
Kconfig View File

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


+ 6
- 0
cmd/Kconfig View File

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


+ 1
- 0
configs/ls1043aqds_defconfig View File

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


+ 1
- 0
configs/ls1043aqds_lpuart_defconfig View File

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


+ 1
- 0
configs/ls1043aqds_nand_defconfig View File

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


+ 1
- 0
configs/ls1043aqds_nor_ddr3_defconfig View File

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


+ 1
- 0
configs/ls1043aqds_qspi_defconfig View File

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


+ 1
- 0
configs/ls1043aqds_sdcard_ifc_defconfig View File

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


+ 1
- 0
configs/ls1043aqds_sdcard_qspi_defconfig View File

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


+ 1
- 0
configs/ls1043ardb_SECURE_BOOT_defconfig View File

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


+ 1
- 0
configs/ls1043ardb_defconfig View File

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


+ 1
- 0
configs/ls1043ardb_nand_defconfig View File

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


+ 1
- 0
configs/ls1043ardb_sdcard_defconfig View File

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


+ 0
- 2
include/config_distro_defaults.h View File

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


+ 0
- 1
include/configs/am335x_shc.h View File

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



+ 0
- 1
include/configs/ls1043a_common.h View File

@@ -145,7 +145,6 @@

/* Command line configuration */
#define CONFIG_CMD_ENV
#define CONFIG_CMD_PXE

/* MMC */
#define CONFIG_MMC


+ 0
- 1
include/configs/s32v234evb.h View File

@@ -214,7 +214,6 @@

#if 0
/* Configure PXE */
#define CONFIG_CMD_PXE
#define CONFIG_BOOTP_PXE
#define CONFIG_BOOTP_PXE_CLIENTARCH 0x100
#endif


+ 0
- 1
include/configs/vexpress_aemv8a.h View File

@@ -127,7 +127,6 @@

/*#define CONFIG_MENU_SHOW*/
#define CONFIG_CMD_UNZIP
#define CONFIG_CMD_PXE
#define CONFIG_CMD_ENV
#define CONFIG_DOS_PARTITION



+ 0
- 3
include/configs/xilinx_zynqmp.h View File

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