efi-direct is much faster and riscv makes a lot of use of environment
variables, which can't be as easily used without '-initrd'. When efi
is configured for riscv, assume efi-direct is also desired. Users
can switch to running from the UEFI shell by configuring with
--disable-efi-direct.
Signed-off-by: Andrew Jones <andrew.jones@xxxxxxxxx>
---
configure | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 94b243fd1b26..10728773eb3b 100755
--- a/configure
+++ b/configure
@@ -93,7 +93,8 @@ usage() {
--[enable|disable]-efi-direct
Select whether to run EFI tests directly with QEMU's -kernel
option. When not enabled, tests will be placed in an EFI file
- system and run from the UEFI shell. Ignored when efi isn't enabled.
+ system and run from the UEFI shell. Ignored when efi isn't enabled
+ and defaults to enabled when efi is enabled for riscv64.
(arm64 and riscv64 only)
EOF
exit 1
@@ -236,6 +237,10 @@ if [ "$efi" ] && [ "$arch" != "x86_64" ] &&
usage
fi
+if [ "$efi" ] && [ "$arch" = "riscv64" ] && [ -z "$efi_direct" ]; then
+ efi_direct=y
+fi
+
if [ -z "$page_size" ]; then
if [ "$efi" = 'y' ] && [ "$arch" = "arm64" ]; then
page_size="4096"
--
2.43.0
