From: Anthony Gutierrez Date: Mon, 14 Apr 2014 23:30:24 +0000 (-0400) Subject: arm: set default kernels for VExpress_EMM and VExpress_EMM64 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5ab6bdc1ec760cf5b92a8ea1060c426638dc704f;p=gem5.git arm: set default kernels for VExpress_EMM and VExpress_EMM64 --- 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