diff options
| author | Tom Rini | 2022-08-11 08:47:20 -0400 |
|---|---|---|
| committer | Tom Rini | 2022-08-11 08:47:20 -0400 |
| commit | 157861e6afa5c26134639e8a8f34540141672a0a (patch) | |
| tree | afaa6663f819d0a0977bead78c61e6376ecf4a0a /boot | |
| parent | cdebee1fd9fa04cc4c972f826bae19b28c253eb0 (diff) | |
| parent | be43a35bff17550fa707795a06eaed6114eb1742 (diff) | |
Merge tag 'dm-pull-9aug22-take2' of https://source.denx.de/u-boot/custodians/u-boot-dm
dtoc fixes with pylint, tests
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/Kconfig | 8 | ||||
| -rw-r--r-- | boot/Makefile | 3 | ||||
| -rw-r--r-- | boot/pxe_utils.c | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/boot/Kconfig b/boot/Kconfig index eddb0c6b318..a294ad769ed 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -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 diff --git a/boot/Makefile b/boot/Makefile index a70674259c1..124065a03fa 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/boot/pxe_utils.c b/boot/pxe_utils.c index defbe465e40..a364fa8bb56 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -736,7 +736,8 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label) kernel_addr_r = genimg_get_kernel_addr(kernel_addr); buf = map_sysmem(kernel_addr_r, 0); /* Try bootm for legacy and FIT format image */ - if (genimg_get_format(buf) != IMAGE_FORMAT_INVALID) + if (genimg_get_format(buf) != IMAGE_FORMAT_INVALID && + IS_ENABLED(CONFIG_CMD_BOOTM)) do_bootm(ctx->cmdtp, 0, bootm_argc, bootm_argv); /* Try booting an AArch64 Linux kernel image */ else if (IS_ENABLED(CONFIG_CMD_BOOTI)) |