Skip to contentSkip to conversation

boot: allow bootmeth-distro without CONFIG_NET

PATCH In review John Keeping 3 participants 5 messages Jul 28, 2022 – Aug 7, 2022

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 boot: allow bootmeth-distro without CONFIG_NET

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.

---
v2:
- Fix MENU dependency for PXE_UTILS

 boot/Kconfig  | 8 +++++++-
 boot/Makefile | 3 +--
 cmd/Kconfig   | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)
boot/Kconfig +7 -1
index 59d0c65c94..460f13e5cb 100644
@@ -294,6 +294,12 @@ endif # SPL
 
 endif # FIT
 
+config PXE_UTILS
+	bool
+	select MENU
+	help
+	  Utilities for parsing PXE file formats.
+
 config BOOTSTD
 	bool "Standard boot support"
 	default y
@@ -345,7 +351,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
boot/Makefile +1 -2
index a70674259c..124065a03f 100644
@@ -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
 
cmd/Kconfig +2 -2
index a8260aa170..29d9b4008b 100644
@@ -1825,7 +1825,7 @@ config CMD_ETHSW
 
 config CMD_PXE
 	bool "pxe"
-	select MENU
+	select PXE_UTILS
 	help
 	  Boot image via network using PXE protocol
 
@@ -2006,7 +2006,7 @@ config CMD_SOUND
 
 config CMD_SYSBOOT
 	bool "sysboot"
-	select MENU
+	select PXE_UTILS
 	help
 	  Boot image via local extlinux.conf file
 
Signature · 1 line
2.37.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 6 lines · John Keeping

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.

Signature · 1 line
Tom
Reviewed-by on v2 1/1
#2 lore raw
In reply to John Keeping
Quoted 7 lines · John Keeping

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.

Quoted 8 lines

---
v2:
- Fix MENU dependency for PXE_UTILS

 boot/Kconfig  | 8 +++++++-
 boot/Makefile | 3 +--
 cmd/Kconfig   | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)
Reviewed-by
#3 lore raw
Quoted 7 lines · John Keeping

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.

Quoted 8 lines

---
v2:
- Fix MENU dependency for PXE_UTILS

 boot/Kconfig  | 8 +++++++-
 boot/Makefile | 3 +--
 cmd/Kconfig   | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

Applied to u-boot-dm, thanks!

#4 lore raw

Hi,

Quoted 13 lines · Simon Glass
Quoted 11 lines · John Keeping

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.

---
v2:
- Fix MENU dependency for PXE_UTILS

Quoted 8 lines
Quoted 4 lines
 boot/Kconfig  | 8 +++++++-
 boot/Makefile | 3 +--
 cmd/Kconfig   | 4 ++--
 3 files changed, 10 insertions(+), 5 deletions(-)

Applied to u-boot-dm, thanks!

Note that I had to fix a few build errors by adding a CMD_BOOTM condition as noted in the commit message.

Regards,
Simon