arm: Switch to vexpress-a15

The versatilepb thing wasn't really working, and vexpress-a15 is modern
and functional.

This will remain awkward to use until I add generic device tree support.

Signed-off-by: Andy Lutomirski <luto@kernel.org>

1 files changed, 8 insertions, 7 deletions

diff --git a/virtme/architectures.py b/virtme/architectures.py
index 455f143..6da4c22 100644
--- a/virtme/architectures.py
+++ b/virtme/architectures.py
@@ -99,24 +99,25 @@ class Arch_arm(Arch):
     def __init__(self, name):
         Arch.__init__(self, name)
 
-        self.defconfig_target = 'versatile_defconfig'
+        self.defconfig_target = 'vexpress_defconfig'
 
     @staticmethod
     def qemuargs(is_native):
         ret = Arch.qemuargs(is_native)
 
-        # Emulate a versatilepb.
-        ret.extend(['-M', 'versatilepb'])
+        # Emulate a vexpress-a15.
+        ret.extend(['-M', 'vexpress-a15'])
 
-        # Add a watchdog.  This is useful for testing.  Oddly, this works
-        # fine on ARM even though it's an Intel chipset device.
-        ret.extend(['-watchdog', 'i6300esb'])
+        # TODO: consider adding a PCI bus (and figuring out how)
+
+        # TODO: This won't boot unless -dtb is set, but we need to figure
+        # out how to find the dtb file.
 
         return ret
 
     @staticmethod
     def virtio_dev_type(virtiotype):
-        return 'virtio-%s-pci' % virtiotype
+        return 'virtio-%s-device' % virtiotype
 
     @staticmethod
     def earlyconsole_args():