Changeset 3e828ea in mainline for tools/ew.py

Timestamp:

2019-09-23T12:49:29Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9be2358

Parents:

9259d20 (diff), 1a4ec93f (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:

Jiri Svoboda <jiri@…> (2019-09-22 12:49:07)

git-committer:

Jiri Svoboda <jiri@…> (2019-09-23 12:49:29)

Message:

Merge changes from master, especially Meson build

File:

• tools/ew.py (modified) (12 diffs)

tools/ew.py

@@ -33 +33 @@
 """
 
+import inspect
 import os
+import platform
+import re
+import subprocess
 import sys
-import subprocess
-import autotool
-import platform
 import thread
 import time
 
 overrides = {}
+
+CONFIG = 'Makefile.config'
+
+TOOLS_DIR = os.path.dirname(inspect.getabsfile(inspect.currentframe()))
+
+def read_config():
+        "Read HelenOS build configuration"
+
+        inf = open(CONFIG, 'r')
+        config = {}
+
+        for line in inf:
+                res = re.match(r'^(?:#!# )?([^#]\w*)\s*=\s*(.*?)\s*$', line)
+                if (res):
+                        config[res.group(1)] = res.group(2)
+
+        inf.close()
+        return config
 
 def is_override(str):
@@ -57 +76 @@
 
 def termemu_detect():
-        for termemu in ['xfce4-terminal', 'xterm']:
+        emus = ['gnome-terminal', 'xfce4-terminal', 'xterm']
+        for termemu in emus:
                 try:
                         subprocess.check_output('which ' + termemu, shell = True)
@@ -64 +84 @@
                         pass
 
+        print('Could not find any of the terminal emulators %s.'%(emus))
+        sys.exit(1)
+
 def run_in_console(cmd, title):
-        ecmd = cmd.replace('"', '\\"')
-        cmdline = termemu_detect() + ' -T ' + '"' + title + '"' + ' -e "' + ecmd + '"'
+        temu = termemu_detect()
+        if temu == 'gnome-terminal':
+                cmdline = temu + ' -- ' + cmd
+        else:
+                ecmd = cmd.replace('"', '\\"')
+                cmdline = temu + ' -T ' + '"' + title + '"' + ' -e "' + ecmd + '"'
+
         print(cmdline)
         if not is_override('dryrun'):
@@ -87 +115 @@
 
 def malta_options():
-        return '-cpu 4Kc'
+        return '-cpu 4Kc -append "console=devices/\\hw\\pci0\\00:0a.0\\com1\\a"'
+
+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):
@@ -94 +140 @@
         elif platform == 'arm32':
                 return 'system-arm', '-M integratorcp'
+        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_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 %s' % efi_path
         elif platform == 'ia32':
                 return 'system-i386', pc_options(32)
@@ -108 +170 @@
                 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
 
@@ -127 +183 @@
 def hdisk_mk():
         if not os.path.exists('hdisk.img'):
-                subprocess.call('tools/mkfat.py 1048576 uspace/dist/data hdisk.img', shell = True)
+                subprocess.call(TOOLS_DIR + '/mkfat.py 1048576 dist/data hdisk.img', shell = True)
 
 def qemu_bd_options():
@@ -208 +264 @@
                 cmdline += ' ' + options
 
-        cmdline += qemu_bd_options()
-
+        if (not 'hdd' in cfg.keys() or cfg['hdd']):
+                cmdline += qemu_bd_options()
         if (not 'net' in cfg.keys()) or cfg['net']:
                 cmdline += qemu_net_options()
@@ -234 +290 @@
         if cfg['image'] == 'image.iso':
                 cmdline += ' -boot d -cdrom image.iso'
+        elif cfg['image'] == 'image.iso@arm64':
+                # Define image.iso cdrom backend.
+                cmdline += ' -drive if=none,file=image.iso,id=cdrom,media=cdrom'
+                # Define scsi bus.
+                cmdline += ' -device virtio-scsi-device'
+                # Define cdrom frontend connected to this scsi bus.
+                cmdline += ' -device scsi-cd,drive=cdrom'
         elif cfg['image'] == 'image.boot':
                 cmdline += ' -kernel image.boot'
@@ -254 +317 @@
 
 def ski_run(platform, machine, processor):
-        run_in_console('ski -i tools/conf/ski.conf', 'HelenOS/ia64 on ski')
+        run_in_console('ski -i ' + TOOLS_DIR + '/conf/ski.conf', 'HelenOS/ia64 on ski')
 
 def msim_run(platform, machine, processor):
         hdisk_mk()
-        run_in_console('msim -c tools/conf/msim.conf', 'HelenOS/mips32 on msim')
+        run_in_console('msim -c ' + TOOLS_DIR + '/conf/msim.conf', 'HelenOS/mips32 on msim')
 
 def spike_run(platform, machine, processor):
@@ -276 +339 @@
                         'xhci' : False,
                         'tablet' : False
+                }
+        },
+        'arm64' : {
+                'virt' : {
+                        'run' : qemu_run,
+                        'image' : 'image.iso@arm64',
+                        'audio' : False,
+                        'console' : True,
+                        'hdd' : False,
+                        'net' : False,
+                        'tablet' : False,
+                        'usb' : False,
+                        'xhci' : False
                 }
         },
@@ -438 +514 @@
                         exit()
 
-        config = {}
-        autotool.read_config(autotool.CONFIG, config)
+        config = read_config()
 
         if 'PLATFORM' in config.keys():