diff options
| author | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2024-04-03 20:34:15 +0200 |
|---|---|---|
| committer | Heinrich Schuchardt <heinrich.schuchardt@canonical.com> | 2024-04-08 13:03:40 +0200 |
| commit | 08c51a715a47defc770fd8922d5efb01b12e304e (patch) | |
| tree | 6af84cd4eeeb66b70e60601d1ca16a640b063aa2 /boot | |
| parent | 6b0f194648f0f11281c01fb570d30931e6c3a13e (diff) | |
| download | u-boot-08c51a715a47defc770fd8922d5efb01b12e304e.zip u-boot-08c51a715a47defc770fd8922d5efb01b12e304e.tar.gz u-boot-08c51a715a47defc770fd8922d5efb01b12e304e.tar.bz2 | |
boot: correct the default sequence of boot methods
The default sequence of boot methods is determined by alphabetical sorting
during linkage.
* efi_mgr must run before efi to be UEFI compliant
* pxe should run as last resort
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/bootmeth_efi.c | 2 | ||||
| -rw-r--r-- | boot/bootmeth_efi_mgr.c | 2 | ||||
| -rw-r--r-- | boot/bootmeth_pxe.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/boot/bootmeth_efi.c b/boot/bootmeth_efi.c index c4eb331..a46b6c9 100644 --- a/boot/bootmeth_efi.c +++ b/boot/bootmeth_efi.c @@ -489,7 +489,7 @@ static const struct udevice_id distro_efi_bootmeth_ids[] = { { } }; -U_BOOT_DRIVER(bootmeth_efi) = { +U_BOOT_DRIVER(bootmeth_4efi) = { .name = "bootmeth_efi", .id = UCLASS_BOOTMETH, .of_match = distro_efi_bootmeth_ids, diff --git a/boot/bootmeth_efi_mgr.c b/boot/bootmeth_efi_mgr.c index ed29d7e..b7d429f 100644 --- a/boot/bootmeth_efi_mgr.c +++ b/boot/bootmeth_efi_mgr.c @@ -114,7 +114,7 @@ static const struct udevice_id efi_mgr_bootmeth_ids[] = { { } }; -U_BOOT_DRIVER(bootmeth_efi_mgr) = { +U_BOOT_DRIVER(bootmeth_3efi_mgr) = { .name = "bootmeth_efi_mgr", .id = UCLASS_BOOTMETH, .of_match = efi_mgr_bootmeth_ids, diff --git a/boot/bootmeth_pxe.c b/boot/bootmeth_pxe.c index 8d489a1..70f693a 100644 --- a/boot/bootmeth_pxe.c +++ b/boot/bootmeth_pxe.c @@ -184,7 +184,7 @@ static const struct udevice_id extlinux_bootmeth_pxe_ids[] = { { } }; -U_BOOT_DRIVER(bootmeth_pxe) = { +U_BOOT_DRIVER(bootmeth_zpxe) = { .name = "bootmeth_pxe", .id = UCLASS_BOOTMETH, .of_match = extlinux_bootmeth_pxe_ids, |