Changeset 8a9a41e in mainline for tools/ew.py

Timestamp:

2021-10-24T08:28:43Z (4 years ago)

Author:

GitHub <noreply@…>

Children:

1b9fcd0

Parents:

2ce943a (diff), cd981f2a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

• tools/ew.py (modified) (1 diff)

tools/ew.py

@@ -144 +144 @@
                         return 'system-arm', '-M raspi1ap'
         elif platform == 'arm64':
-                # Search for the EDK2 firmware image
-                default_paths = (
-                        '/usr/local/qemu-efi-aarch64/QEMU_EFI.fd', # Custom
-                        '/usr/share/edk2/aarch64/QEMU_EFI.fd',     # Fedora
-                        '/usr/share/qemu-efi-aarch64/QEMU_EFI.fd', # Ubuntu
-                )
-                extra_info = ("Pre-compiled binary can be obtained from "
-                    "http://snapshots.linaro.org/components/kernel/leg-virt-tianocore-edk2-upstream/latest/QEMU-AARCH64/RELEASE_GCC5/QEMU_EFI.fd.\n")
-                efi_path = find_firmware(
-                    "EDK2", 'EW_QEMU_EFI_AARCH64', default_paths, extra_info)
-                if efi_path is None:
-                        raise Exception
-
-                return 'system-aarch64', \
-                    '-M virt -cpu cortex-a57 -m 1024 -bios %s' % efi_path
+                if machine == 'virt':
+                        # Search for the EDK2 firmware image
+                        default_paths = (
+                                '/usr/local/qemu-efi-aarch64/QEMU_EFI.fd', # Custom
+                                '/usr/share/edk2/aarch64/QEMU_EFI.fd',     # Fedora
+                                '/usr/share/qemu-efi-aarch64/QEMU_EFI.fd', # Ubuntu
+                        )
+                        extra_info = ("Pre-compiled binary can be obtained from "
+                            "http://snapshots.linaro.org/components/kernel/leg-virt-tianocore-edk2-upstream/latest/QEMU-AARCH64/RELEASE_GCC5/QEMU_EFI.fd.\n")
+                        efi_path = find_firmware(
+                            "EDK2", 'EW_QEMU_EFI_AARCH64', default_paths, extra_info)
+                        if efi_path is None:
+                                raise Exception
+
+                        return 'system-aarch64', \
+                            '-M virt -cpu cortex-a57 -m 1024 -bios %s' % efi_path
         elif platform == 'ia32':
                 return 'system-i386', pc_options(32)