summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Saidi <Ali.Saidi@ARM.com>2014-09-03 07:43:04 -0400
committerAli Saidi <Ali.Saidi@ARM.com>2014-09-03 07:43:04 -0400
commit16262a8fc3668d67d5eeb634e9b1a0de418e7162 (patch)
tree5771a29e8f5784379f39a50e9afc7fb9a8cc2a81
parent1e13f1b074db8bf82601c45c400350be947cdefa (diff)
downloadgem5-16262a8fc3668d67d5eeb634e9b1a0de418e7162.tar.xz
arm: Assume we have a kernel that supports pci devices
Change the default kernel for AArch64 and since it supports PCI devices remove the hack that made it use CF. Unfortunately, there isn't really a half-way here and we need to switch. Current users will get an error message that the kernel isn't found and hopefully go download a new kernel that supports PCI.
-rw-r--r--configs/common/FSConfig.py12
1 files changed, 4 insertions, 8 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 89f05c92c..a89c2a571 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -225,13 +225,9 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None,
# Attach any PCI devices this platform supports
self.realview.attachPciDevices()
# default to an IDE controller rather than a CF one
- # assuming we've got one; EMM64 is an exception for the moment
- if machine_type != "VExpress_EMM64":
- try:
- self.realview.ide.disks = [self.cf0]
- except:
- self.realview.cf_ctrl.disks = [self.cf0]
- else:
+ try:
+ self.realview.ide.disks = [self.cf0]
+ except:
self.realview.cf_ctrl.disks = [self.cf0]
if bare_metal:
@@ -241,7 +237,7 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None,
size = mdesc.mem())]
else:
if machine_type == "VExpress_EMM64":
- self.kernel = binary('vmlinux-3.14-aarch64-vexpress-emm64')
+ self.kernel = binary('vmlinux-3.16-aarch64-vexpress-emm64-pcie')
elif machine_type == "VExpress_EMM":
self.kernel = binary('vmlinux-3.3-arm-vexpress-emm-pcie')
else: