diff options
| author | Tom Rini <[email protected]> | 2023-07-05 11:28:55 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-07-05 11:28:55 -0400 |
| commit | e80f4079b3a3db0961b73fa7a96e6c90242d8d25 (patch) | |
| tree | 5352d65d18b44e0982152654dc9f8018047e65ae /boot | |
| parent | 45f77b807c2f6b8da88ae897b7eb2238e25df36b (diff) | |
| parent | e1bebc16e1d9aa0ddd56c53c0b781f7186dce557 (diff) | |
Merge tag 'v2023.07-rc6' into next
Prepare v2023.07-rc6
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/Kconfig | 26 | ||||
| -rw-r--r-- | boot/bootm.c | 3 | ||||
| -rw-r--r-- | boot/bootmeth_extlinux.c | 2 |
3 files changed, 16 insertions, 15 deletions
diff --git a/boot/Kconfig b/boot/Kconfig index eea5ed6040f..a643a3d1286 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -397,19 +397,6 @@ config BOOTSTD U-Boot) - bootflow - a description of how to boot (owned by the distro) -config BOOTSTD_FULL - bool "Enhanced features for standard boot" - default y if SANDBOX - help - This enables various useful features for standard boot, which are not - essential for operation: - - - bootdev, bootmeth commands - - extra features in the bootflow command - - support for selecting the ordering of bootmeths ("bootmeth order") - - support for selecting the ordering of bootdevs using the devicetree - as well as the "boot_targets" environment variable - config SPL_BOOTSTD bool "Standard boot support in SPL" depends on SPL && SPL_DM && SPL_OF_CONTROL && SPL_BLK @@ -432,6 +419,19 @@ config VPL_BOOTSTD if BOOTSTD +config BOOTSTD_FULL + bool "Enhanced features for standard boot" + default y if SANDBOX + help + This enables various useful features for standard boot, which are not + essential for operation: + + - bootdev, bootmeth commands + - extra features in the bootflow command + - support for selecting the ordering of bootmeths ("bootmeth order") + - support for selecting the ordering of bootdevs using the devicetree + as well as the "boot_targets" environment variable + config BOOTSTD_DEFAULTS bool "Select some common defaults for standard boot" depends on BOOTSTD diff --git a/boot/bootm.c b/boot/bootm.c index 4144ff3b031..75f0b4a9af8 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -240,7 +240,8 @@ static int bootm_find_os(struct cmd_tbl *cmdtp, int flag, int argc, if (images.os.type == IH_TYPE_KERNEL_NOLOAD) { if (IS_ENABLED(CONFIG_CMD_BOOTI) && - images.os.arch == IH_ARCH_ARM64) { + images.os.arch == IH_ARCH_ARM64 && + images.os.os == IH_OS_LINUX) { ulong image_addr; ulong image_size; diff --git a/boot/bootmeth_extlinux.c b/boot/bootmeth_extlinux.c index 24be0760229..6b2b8400383 100644 --- a/boot/bootmeth_extlinux.c +++ b/boot/bootmeth_extlinux.c @@ -150,7 +150,7 @@ static int extlinux_boot(struct udevice *dev, struct bootflow *bflow) info.dev = dev; info.bflow = bflow; ret = pxe_setup_ctx(&ctx, &cmdtp, extlinux_getfile, &info, true, - bflow->subdir, false); + bflow->fname, false); if (ret) return log_msg_ret("ctx", -EINVAL); |