changeset 1aff1376921e in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=1aff1376921e
description:
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.
diffstat:
configs/common/FSConfig.py | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diffs (29 lines):
diff -r 198dfef33403 -r 1aff1376921e configs/common/FSConfig.py
--- a/configs/common/FSConfig.py Wed Sep 03 07:43:04 2014 -0400
+++ b/configs/common/FSConfig.py Wed Sep 03 07:43:04 2014 -0400
@@ -225,13 +225,9 @@
# 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 @@
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:
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
