diff options
| author | Tom Rini <[email protected]> | 2023-09-04 10:51:58 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2023-09-04 10:51:58 -0400 |
| commit | ddec4cae624e48c3678ea856fa7d6292a7104238 (patch) | |
| tree | bb04231fb05cf9d3fc018bf874bbb6e8373968d8 /boot | |
| parent | f2bb6d9ffd9ba0d0d89c00445a70cf81327a7af2 (diff) | |
| parent | b27eeca112c1b9eef6f06a320a4310d766ac5659 (diff) | |
Merge tag 'v2023.10-rc4' into next
Prepare v2023.10-rc4
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 86ccfd78031..0a98f1e2220 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -1442,7 +1442,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 6b2b8400383..aa2a4591ebd 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 a4050c384df..58c57a2d4b5 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, |