summaryrefslogtreecommitdiff
path: root/test/boot
diff options
context:
space:
mode:
authorHeinrich Schuchardt <heinrich.schuchardt@canonical.com>2024-04-03 23:39:48 +0200
committerHeinrich Schuchardt <heinrich.schuchardt@canonical.com>2024-04-08 13:05:21 +0200
commit92f4cb6f9ac36242826186593fddec3c53ef1dbe (patch)
tree1635d081de2381e4dcf38418d1b61589851554d2 /test/boot
parenta0a749787aa4cebd8a1b919ee04cc8f450796fcb (diff)
downloadu-boot-92f4cb6f9ac36242826186593fddec3c53ef1dbe.tar.gz
u-boot-92f4cb6f9ac36242826186593fddec3c53ef1dbe.tar.bz2
u-boot-92f4cb6f9ac36242826186593fddec3c53ef1dbe.zip
boot: correct finding the default EFI binary
* The sandbox must not use an arbitrary file name bootsbox.efi but the file name matching the host architecture to properly boot the respective file. We already have an include which provides a macro with the name of the EFI binary. Use it. * The path to the EFI binary should be absolute. * The path and the file name must be capitalized to conform to the UEFI specification. This is important when reading from case sensitive file systems. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org> Tested-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Diffstat (limited to 'test/boot')
-rw-r--r--test/boot/bootflow.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/test/boot/bootflow.c b/test/boot/bootflow.c
index e60e9309fa..674d4c05f8 100644
--- a/test/boot/bootflow.c
+++ b/test/boot/bootflow.c
@@ -13,6 +13,7 @@
#include <bootstd.h>
#include <cli.h>
#include <dm.h>
+#include <efi_default_filename.h>
#include <expo.h>
#ifdef CONFIG_SANDBOX
#include <asm/test.h>
@@ -179,7 +180,8 @@ static int bootflow_cmd_scan_e(struct unit_test_state *uts)
ut_assert_nextline(" 3 efi media mmc 0 mmc1.bootdev.whole ");
ut_assert_nextline(" ** No partition found, err=-2: No such file or directory");
ut_assert_nextline(" 4 extlinux ready mmc 1 mmc1.bootdev.part_1 /extlinux/extlinux.conf");
- ut_assert_nextline(" 5 efi fs mmc 1 mmc1.bootdev.part_1 efi/boot/bootsbox.efi");
+ ut_assert_nextline(" 5 efi fs mmc 1 mmc1.bootdev.part_1 /EFI/BOOT/"
+ BOOTEFI_NAME);
ut_assert_skip_to_line("Scanning bootdev 'mmc0.bootdev':");
ut_assert_skip_to_line(