[PATCH] boot: allow bootmeth-distro without CONFIG_NET
John Keeping
john at metanate.com
Thu Jul 21 18:56:02 CEST 2022
Remove the dependency on CMD_PXE from BOOTMETH_DISTRO by introducing a
new hidden kconfig symbol to control whether pxe_utils is compiled,
allowing bootstd's distro method to be compiled without needing
networking support enabled.
Signed-off-by: John Keeping <john at metanate.com>
---
boot/Kconfig | 7 ++++++-
boot/Makefile | 3 +--
cmd/Kconfig | 2 ++
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/boot/Kconfig b/boot/Kconfig
index 17438b566d..24cebd6d20 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -294,6 +294,11 @@ endif # SPL
endif # FIT
+config PXE_UTILS
+ bool
+ help
+ Utilities for parsing PXE file formats.
+
config BOOTSTD
bool "Standard boot support"
default y
@@ -345,7 +350,7 @@ config BOOTSTD_BOOTCOMMAND
config BOOTMETH_DISTRO
bool "Bootdev support for distro boot"
- depends on CMD_PXE
+ select PXE_UTILS
default y
help
Enables support for distro boot using bootdevs. This makes the
diff --git a/boot/Makefile b/boot/Makefile
index a70674259c..124065a03f 100644
--- a/boot/Makefile
+++ b/boot/Makefile
@@ -10,8 +10,7 @@ obj-$(CONFIG_CMD_BOOTM) += bootm.o bootm_os.o
obj-$(CONFIG_CMD_BOOTZ) += bootm.o bootm_os.o
obj-$(CONFIG_CMD_BOOTI) += bootm.o bootm_os.o
-obj-$(CONFIG_CMD_PXE) += pxe_utils.o
-obj-$(CONFIG_CMD_SYSBOOT) += pxe_utils.o
+obj-$(CONFIG_PXE_UTILS) += pxe_utils.o
endif
diff --git a/cmd/Kconfig b/cmd/Kconfig
index d5f842136c..d2cc7318e0 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -1823,6 +1823,7 @@ config CMD_ETHSW
config CMD_PXE
bool "pxe"
select MENU
+ select PXE_UTILS
help
Boot image via network using PXE protocol
@@ -2004,6 +2005,7 @@ config CMD_SOUND
config CMD_SYSBOOT
bool "sysboot"
select MENU
+ select PXE_UTILS
help
Boot image via local extlinux.conf file
--
2.37.1
More information about the U-Boot
mailing list