diff options
| author | Tom Rini <[email protected]> | 2023-06-14 15:50:04 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-06-14 15:50:04 -0400 |
| commit | 2f4664f5c3edc55b18d8906f256a4c8e303243c0 (patch) | |
| tree | 438153aa69df3c1af0dc04848b507f5a833787dd /boot | |
| parent | 19b77d3d23966a0d6dbb3c86187765f11100fb6f (diff) | |
| parent | 2f7c7159ea4c0e5c2aa7671c5b5a2889d0abe7ce (diff) | |
Merge branch '2023-06-14-assorted-fixes'
- Fix some issues Coverity Scan reported in IPv6, SPL EXTn support fix,
two small bootstd fixes, one Kconfig dependency fix, and fix booting
on Pinephone Pro
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/Kconfig | 26 | ||||
| -rw-r--r-- | boot/bootmeth_extlinux.c | 2 |
2 files changed, 14 insertions, 14 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/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); |