| Message ID | 20240227192109.487402-27-andrew.jones@linux.dev (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | arm64: EFI improvements | expand |
On 27/02/2024 19:21, Andrew Jones wrote: > We don't need two variables for one boolean property. Just use > !EFI_USE_ACPI to infer efi-use-dtb. > > Signed-off-by: Andrew Jones <andrew.jones@linux.dev> Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com> Thanks, Nikos > --- > arm/efi/run | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/arm/efi/run b/arm/efi/run > index 494ba9e7efe7..b7a8418a07f8 100755 > --- a/arm/efi/run > +++ b/arm/efi/run > @@ -27,8 +27,6 @@ fi > : "${EFI_CASE_DIR:="$EFI_TEST/$EFI_TESTNAME"}" > : "${EFI_VAR_GUID:=97ef3e03-7329-4a6a-b9ba-6c1fdcc5f823}" > > -[ "$EFI_USE_ACPI" = "y" ] || EFI_USE_DTB=y > - > if [ ! -f "$EFI_UEFI" ]; then > echo "UEFI firmware not found." > echo "Please specify the path with the env variable EFI_UEFI" > @@ -68,7 +66,7 @@ uefi_shell_run() > mkdir -p "$EFI_CASE_DIR" > cp "$EFI_SRC/$EFI_CASE.efi" "$EFI_CASE_DIR/" > echo "@echo -off" > "$EFI_CASE_DIR/startup.nsh" > - if [ "$EFI_USE_DTB" = "y" ]; then > + if [ "$EFI_USE_ACPI" != "y" ]; then > qemu_args+=(-machine acpi=off) > FDT_BASENAME="dtb" > UEFI_SHELL_RUN=y $TEST_DIR/run -machine dumpdtb="$EFI_CASE_DIR/$FDT_BASENAME" "${qemu_args[@]}" IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
diff --git a/arm/efi/run b/arm/efi/run index 494ba9e7efe7..b7a8418a07f8 100755 --- a/arm/efi/run +++ b/arm/efi/run @@ -27,8 +27,6 @@ fi : "${EFI_CASE_DIR:="$EFI_TEST/$EFI_TESTNAME"}" : "${EFI_VAR_GUID:=97ef3e03-7329-4a6a-b9ba-6c1fdcc5f823}" -[ "$EFI_USE_ACPI" = "y" ] || EFI_USE_DTB=y - if [ ! -f "$EFI_UEFI" ]; then echo "UEFI firmware not found." echo "Please specify the path with the env variable EFI_UEFI" @@ -68,7 +66,7 @@ uefi_shell_run() mkdir -p "$EFI_CASE_DIR" cp "$EFI_SRC/$EFI_CASE.efi" "$EFI_CASE_DIR/" echo "@echo -off" > "$EFI_CASE_DIR/startup.nsh" - if [ "$EFI_USE_DTB" = "y" ]; then + if [ "$EFI_USE_ACPI" != "y" ]; then qemu_args+=(-machine acpi=off) FDT_BASENAME="dtb" UEFI_SHELL_RUN=y $TEST_DIR/run -machine dumpdtb="$EFI_CASE_DIR/$FDT_BASENAME" "${qemu_args[@]}"
We don't need two variables for one boolean property. Just use !EFI_USE_ACPI to infer efi-use-dtb. Signed-off-by: Andrew Jones <andrew.jones@linux.dev> --- arm/efi/run | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)