From: Simon Gerber <simon.gerber@inf.ethz.ch>
Date: Tue, 29 Aug 2017 14:14:14 +0000 (+0200)
Subject: harness: machines: define custom buildall targets for armv7/armv8 machines
X-Git-Tag: release2017-10-12~52
X-Git-Url: http://git.barrelfish.org/?p=barrelfish;a=commitdiff_plain;h=88949a8f0adcf1657af8a4d6a738751c01ecd80e;hp=fbb2887d949c53a98e88f1c35ec91a708f069415

harness: machines: define custom buildall targets for armv7/armv8 machines

Signed-off-by: Simon Gerber <simon.gerber@inf.ethz.ch>
---

diff --git a/tools/harness/machines/__init__.py b/tools/harness/machines/__init__.py
index e560d0a..937363a 100644
--- a/tools/harness/machines/__init__.py
+++ b/tools/harness/machines/__init__.py
@@ -74,7 +74,8 @@ class Machine(object):
         self._tick_rate = tickrate
 
         if bool(kwargs):
-            debug.error("Fix machine definition, unknown args: %s" % str(kwargs))
+            debug.warning("Machine base class does not understand the " +
+                    "following machine arguments: %s" % str(kwargs))
 
     def get_machine_name(self):
         return self._machine_name
diff --git a/tools/harness/machines/eth.py b/tools/harness/machines/eth.py
index dee33fc..f93b9c9 100644
--- a/tools/harness/machines/eth.py
+++ b/tools/harness/machines/eth.py
@@ -100,6 +100,8 @@ class ETHMachine(ETHBaseMachine):
         super(ETHMachine, self).__init__(options, ETHMachineOperations(self), **kwargs)
 
     def get_buildall_target(self):
+        if 'buildall_target' in self._machines[self.name]:
+            return self._machines[self.name]['buildall_target']
         return self.get_bootarch().upper() + "_Full"
 
     def get_xphi_ncores(self):
diff --git a/tools/harness/machines/eth_machinedata.py b/tools/harness/machines/eth_machinedata.py
index 3ae4ae9..3b5d39a 100644
--- a/tools/harness/machines/eth_machinedata.py
+++ b/tools/harness/machines/eth_machinedata.py
@@ -393,6 +393,7 @@ machines = dict({
                  'tickrate'    : 2400,
                  'boot_timeout': 360,
                  'platform': 'apm88xxxx',
+                 'buildall_target': 'APM88xxxx',
                  'serial_binary': 'serial_kernel',
                  'boot_driver' : 'boot_armv8_generic'},
 
@@ -405,6 +406,7 @@ machines = dict({
                     'tickrate'    : 1950,
                     'boot_timeout': 360,
                     'platform': 'cn88xx',
+                    'buildall_target': 'ThunderX',
                     'serial_binary': 'serial_kernel',
                     'boot_driver' : 'boot_armv8_generic'},
     'gorgonzola2': {'ncores'      : 48,
@@ -416,6 +418,7 @@ machines = dict({
                     'tickrate'    : 1950,
                     'boot_timeout': 360,
                     'platform': 'cn88xx',
+                    'buildall_target': 'ThunderX',
                     'serial_binary': 'serial_kernel',
                     'boot_driver' : 'boot_armv8_generic'},
     'roquefort':    {'ncores'      : 96,
@@ -427,6 +430,7 @@ machines = dict({
                      'tickrate'    : 1950,
                      'boot_timeout': 720,
                      'platform': 'cn88xx',
+                     'buildall_target': 'ThunderX',
                      'serial_binary': 'serial_kernel',
                      'boot_driver' : 'boot_armv8_generic'},
 
diff --git a/tools/harness/machines/fvp.py b/tools/harness/machines/fvp.py
index 222c848..c48828f 100644
--- a/tools/harness/machines/fvp.py
+++ b/tools/harness/machines/fvp.py
@@ -129,6 +129,10 @@ class FVPMachineEFI(FVPMachineBase):
         efi.addFile("/home/netos/tftpboot/Hagfish.efi", "Hagfish.efi")
         efi.addFile(menulst_fullpath, "hagfish.cfg")
 
+    def get_buildall_target(self):
+        # XXX: this is a misnomer in hake for the a57v platform
+        return "QEMU"
+
 class FVPMachineEFIOperations(FVPMachineBaseOperations):
 
 
diff --git a/tools/harness/machines/qemu.py b/tools/harness/machines/qemu.py
index d9ee14d..66ffb77 100644
--- a/tools/harness/machines/qemu.py
+++ b/tools/harness/machines/qemu.py
@@ -164,6 +164,9 @@ class QEMUMachineARMv7Uniproc(ARMMachineBase):
     def get_ncores(self):
         return 1
 
+    def get_buildall_target(self):
+        return "VExpressEMM-A15"
+
     def get_bootarch(self):
         return "armv7"
 
@@ -208,6 +211,9 @@ class QEMUMachineZynq7(ARMMachineBase):
         # XXX: change this once we have proper zynq7 configurations
         self.menulst_template = "menu.lst.armv7_zynq7"
 
+    def get_buildall_target(self):
+        return "Zynq7000"
+
     def get_ncores(self):
         return 1