diff options
| author | Tom Rini <trini@konsulko.com> | 2023-08-29 10:06:08 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-08-29 10:06:08 -0400 |
| commit | 0fe0395922d859730eb7ddfcff6ed8d3ac4b2937 (patch) | |
| tree | 0249ca6a72069c709655a636fff70a931e5aa355 /boot | |
| parent | 6a1d3f64c201ed3f6df819cfcf08154b6ec1c02e (diff) | |
| parent | c91feda87ce33c81acc51cc4bf69d613c4fe89de (diff) | |
| download | u-boot-kii-pro-master.tar.gz | |
- A few platform-specific config/dts updates to fix issues, drop a
temporary change in binman, update the MAINTAINERS file to remove
Wolfgang Denk, fix a typo, fix a corner case with bootstd, update
Azure to not timeout so easily, and fix a case where we would omit
some files in SPL.
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/Kconfig | 2 | ||||
| -rw-r--r-- | boot/bootmeth_extlinux.c | 3 | ||||
| -rw-r--r-- | boot/bootmeth_script.c | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/boot/Kconfig b/boot/Kconfig index e8fb03b801..86c2787dc5 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -1439,7 +1439,7 @@ config AUTOBOOT_MENU_SHOW This enables the boot menu, controlled by environment variables defined by the board. The menu starts after running the 'preboot' environmnent variable (if enabled) and before handling the boot delay. - See README.bootmenu for more details. + See doc/usage/cmd/bootmenu.rst for more details. config BOOTMENU_DISABLE_UBOOT_CONSOLE bool "Disallow bootmenu to enter the U-Boot console" diff --git a/boot/bootmeth_extlinux.c b/boot/bootmeth_extlinux.c index 6b2b840038..aa2a4591eb 100644 --- a/boot/bootmeth_extlinux.c +++ b/boot/bootmeth_extlinux.c @@ -184,7 +184,8 @@ static const struct udevice_id extlinux_bootmeth_ids[] = { { } }; -U_BOOT_DRIVER(bootmeth_extlinux) = { +/* Put an number before 'extlinux' to provide a default ordering */ +U_BOOT_DRIVER(bootmeth_1extlinux) = { .name = "bootmeth_extlinux", .id = UCLASS_BOOTMETH, .of_match = extlinux_bootmeth_ids, diff --git a/boot/bootmeth_script.c b/boot/bootmeth_script.c index a4050c384d..58c57a2d4b 100644 --- a/boot/bootmeth_script.c +++ b/boot/bootmeth_script.c @@ -243,7 +243,8 @@ static const struct udevice_id script_bootmeth_ids[] = { { } }; -U_BOOT_DRIVER(bootmeth_script) = { +/* Put an number before 'script' to provide a default ordering */ +U_BOOT_DRIVER(bootmeth_2script) = { .name = "bootmeth_script", .id = UCLASS_BOOTMETH, .of_match = script_bootmeth_ids, |