Changeset 739bc43 in mainline

Timestamp:

2019-04-19T11:50:25Z (6 years ago)

Author:

Petr Pavlu <setup@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6de65f3

Parents:

4099129

git-author:

Petr Pavlu <setup@…> (2019-04-18 20:07:06)

git-committer:

Petr Pavlu <setup@…> (2019-04-19 11:50:25)

Message:

Unify firmware search logic for arm64 and sun4v

Update tools/ew.py to first search for firmware binaries by checking an
environment variable, EW_QEMU_EFI_AARCH64 for arm64 and
OPENSPARC_BINARIES for sun4v. If this fails then try finding the
binaries in their expected default locations. If this also fails then
report an error on stderr and exit.

Files:

• .gitignore (modified) (1 diff)
• tools/ew.py (modified) (3 diffs)

.gitignore

@@ -14 +14 @@
 /Makefile.config
 /PKG
-/QEMU_EFI_ARM64.fd
 /common.h
 /config.h

tools/ew.py

@@ -89 +89 @@
         return '-cpu 4Kc'
 
+def find_firmware(name, environ_var, default_paths, extra_info=None):
+        """Find firmware image(s)."""
+
+        if environ_var in os.environ:
+                return os.environ[environ_var]
+
+        for path in default_paths:
+                if os.path.exists(path):
+                        return path
+
+        sys.stderr.write("Cannot find %s binary image(s)!\n" % name)
+        sys.stderr.write(
+            "Either set %s environment variable accordingly or place the image(s) in one of the default locations: %s.\n" %
+            (environ_var, ", ".join(default_paths)))
+        if extra_info is not None:
+                sys.stderr.write(extra_info)
+        return None
+
 def platform_to_qemu_options(platform, machine, processor):
         if platform == 'amd64':
@@ -95 +113 @@
                 return 'system-arm', '-M integratorcp'
         elif platform == 'arm64':
-                # Check that ROM image is present. Provide the user with
-                # appropriate steps to fix this problem.
-                if not os.path.exists('QEMU_EFI_ARM64.fd'):
-                        sys.stderr.write('Could not find ' +
-                            '\'QEMU_EFI_ARM64.fd\' which is expected to ' +
-                            'contain EDK2 firmware image.\n')
-                        sys.stderr.write('Pre-built image can be obtained by ' +
-                            'running the following command:\n')
-                        sys.stderr.write('$ wget http://snapshots.linaro.org/' +
-                            'components/kernel/leg-virt-tianocore-edk2-' +
-                            'upstream/latest/QEMU-AARCH64/RELEASE_GCC49/' +
-                            'QEMU_EFI.fd -O QEMU_EFI_ARM64.fd\n')
+                # 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_GCC49/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 QEMU_EFI_ARM64.fd'
+                    '-M virt -cpu cortex-a57 -m 1024 -bios %s' % efi_path
         elif platform == 'ia32':
                 return 'system-i386', pc_options(32)
@@ -124 +142 @@
                 if processor == 'us':
                         return 'system-sparc64', '-M sun4u --prom-env boot-args="console=devices/\\hw\\pci0\\01:01.0\\com1\\a"'
-                elif processor == 'sun4v':
-                        default_path = '/usr/local/opensparc/image/'
-                try:
-                        if os.path.exists(default_path):
-                                opensparc_bins = default_path
-                        elif os.path.exists(os.environ['OPENSPARC_BINARIES']):
-                                opensparc_bins = os.environ['OPENSPARC_BINARIES']
-                        else:
-                                raise Exception
-                except:
-                        print("Cannot find OpenSPARC binary images!")
-                        print("Either set OPENSPARC_BINARIES environment variable accordingly or place the images in %s." % (default_path))
+
+                # processor = 'sun4v'
+                opensparc_bins = find_firmware(
+                    "OpenSPARC", 'OPENSPARC_BINARIES',
+                    ('/usr/local/opensparc/image/', ))
+                if opensparc_bins is None:
                         raise Exception