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.
This commit is contained in:
parent
1e13f1b074
commit
16262a8fc3
|
@ -225,13 +225,9 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None,
|
||||||
# Attach any PCI devices this platform supports
|
# Attach any PCI devices this platform supports
|
||||||
self.realview.attachPciDevices()
|
self.realview.attachPciDevices()
|
||||||
# default to an IDE controller rather than a CF one
|
# default to an IDE controller rather than a CF one
|
||||||
# assuming we've got one; EMM64 is an exception for the moment
|
try:
|
||||||
if machine_type != "VExpress_EMM64":
|
self.realview.ide.disks = [self.cf0]
|
||||||
try:
|
except:
|
||||||
self.realview.ide.disks = [self.cf0]
|
|
||||||
except:
|
|
||||||
self.realview.cf_ctrl.disks = [self.cf0]
|
|
||||||
else:
|
|
||||||
self.realview.cf_ctrl.disks = [self.cf0]
|
self.realview.cf_ctrl.disks = [self.cf0]
|
||||||
|
|
||||||
if bare_metal:
|
if bare_metal:
|
||||||
|
@ -241,7 +237,7 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None,
|
||||||
size = mdesc.mem())]
|
size = mdesc.mem())]
|
||||||
else:
|
else:
|
||||||
if machine_type == "VExpress_EMM64":
|
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":
|
elif machine_type == "VExpress_EMM":
|
||||||
self.kernel = binary('vmlinux-3.3-arm-vexpress-emm-pcie')
|
self.kernel = binary('vmlinux-3.3-arm-vexpress-emm-pcie')
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in a new issue