1c1
< # Copyright (c) 2016-2017 ARM Limited
---
> # Copyright (c) 2016-2017, 2019 ARM Limited
56a57
> from common import PlatformConfig
63d63
< default_kernel = 'vmlinux4.3.aarch64'
117,118c117,122
< def createSystem(caches, kernel, bootscript, disks=[]):
< sys = devices.SimpleSystem(caches, default_mem_size,
---
> def createSystem(caches, kernel, bootscript,
> machine_type="VExpress_GEM5", disks=[]):
> platform = PlatformConfig.get(machine_type)
> m5.util.inform("Simulated platform: %s", platform.__name__)
>
> sys = devices.SimpleSystem(caches, default_mem_size, platform(),
160c164
< parser.add_argument("--kernel", type=str, default=default_kernel,
---
> parser.add_argument("--kernel", type=str, required=True,
161a166,171
> parser.add_argument("--root", type=str, default="/dev/vda1",
> help="Specify the kernel CLI root= argument")
> parser.add_argument("--machine-type", type=str,
> choices=PlatformConfig.platform_names(),
> default="VExpress_GEM5",
> help="Hardware platform class")
206c216
< "root=/dev/vda1",
---
> "root=%s" % options.root,
217a228
> options.machine_type,