diff options
| author | Simon Glass <sjg@chromium.org> | 2023-08-19 16:49:35 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-08-28 15:59:22 -0400 |
| commit | 5986d46f8efb20532d494242fccb051267f92e1a (patch) | |
| tree | f63b239fb16ae1f72580d96ae8304e40364d2ef3 /boot | |
| parent | d389efc44898f9b5b3d07e810253b6fb73c55e3c (diff) | |
| download | u-boot-5986d46f8efb20532d494242fccb051267f92e1a.zip u-boot-5986d46f8efb20532d494242fccb051267f92e1a.tar.gz u-boot-5986d46f8efb20532d494242fccb051267f92e1a.tar.bz2 | |
bootstd: Adjust the default bootmeth order
The existing distro scripts check extlinux and scripts before EFI. Adjust
the default ordering to do the same, to avoid breaking existing flows.
Add some documentation, mentioning that this order will likely change in
future.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reported-by: Da Xue <da@libre.computer>
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/bootmeth_extlinux.c | 3 | ||||
| -rw-r--r-- | boot/bootmeth_script.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/boot/bootmeth_extlinux.c b/boot/bootmeth_extlinux.c index 6b2b840..aa2a459 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 a4050c3..58c57a2 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, |