diff options
| author | Anthony Gutierrez <atgutier@umich.edu> | 2014-04-14 19:30:24 -0400 |
|---|---|---|
| committer | Anthony Gutierrez <atgutier@umich.edu> | 2014-04-14 19:30:24 -0400 |
| commit | 5ab6bdc1ec760cf5b92a8ea1060c426638dc704f (patch) | |
| tree | 81c0505894f1f2cd5c7383166a9a7758a457203d /configs | |
| parent | c970c28af17f7e38a1c72ecfed78d14e271588da (diff) | |
| download | gem5-5ab6bdc1ec760cf5b92a8ea1060c426638dc704f.tar.xz | |
arm: set default kernels for VExpress_EMM and VExpress_EMM64
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/common/FSConfig.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index 735e3302c..57d6aa2b2 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -237,7 +237,13 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None, self.mem_ranges = [AddrRange(self.realview.mem_start_addr, size = mdesc.mem())] else: - self.kernel = binary('vmlinux.arm.smp.fb.2.6.38.8') + if machine_type == "VExpress_EMM64": + self.kernel = binary('vmlinux-3.14-aarch64-vexpress-emm64') + elif machine_type == "VExpress_EMM": + self.kernel = binary('vmlinux-3.3-arm-vexpress-emm-pcie') + else: + self.kernel = binary('vmlinux.arm.smp.fb.2.6.38.8') + if dtb_filename: self.dtb_filename = binary(dtb_filename) self.machine_type = machine_type |