arm: fix bare-metal memory setup.
The bare-metal configuration option still configured memory with the old scheme that no-longer works. This change unifies the code so there aren't any differences.
This commit is contained in:
parent
9900629f83
commit
3a5c975fd7
1 changed files with 18 additions and 21 deletions
|
@ -230,27 +230,6 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None,
|
|||
except:
|
||||
self.realview.cf_ctrl.disks = [self.cf0]
|
||||
|
||||
if bare_metal:
|
||||
# EOT character on UART will end the simulation
|
||||
self.realview.uart.end_on_eot = True
|
||||
self.mem_ranges = [AddrRange(self.realview.mem_start_addr,
|
||||
size = mdesc.mem())]
|
||||
else:
|
||||
if machine_type == "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:
|
||||
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
|
||||
# Ensure that writes to the UART actually go out early in the boot
|
||||
boot_flags = 'earlyprintk=pl011,0x1c090000 console=ttyAMA0 ' + \
|
||||
'lpj=19988480 norandmaps rw loglevel=8 ' + \
|
||||
'mem=%s root=/dev/sda1' % mdesc.mem()
|
||||
|
||||
self.mem_ranges = []
|
||||
size_remain = long(Addr(mdesc.mem()))
|
||||
for region in self.realview._mem_regions:
|
||||
|
@ -269,6 +248,24 @@ def makeArmSystem(mem_mode, machine_type, mdesc = None,
|
|||
" the amount of DRAM you've selected. Please try" \
|
||||
" another platform")
|
||||
|
||||
if bare_metal:
|
||||
# EOT character on UART will end the simulation
|
||||
self.realview.uart.end_on_eot = True
|
||||
else:
|
||||
if machine_type == "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:
|
||||
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
|
||||
# Ensure that writes to the UART actually go out early in the boot
|
||||
boot_flags = 'earlyprintk=pl011,0x1c090000 console=ttyAMA0 ' + \
|
||||
'lpj=19988480 norandmaps rw loglevel=8 ' + \
|
||||
'mem=%s root=/dev/sda1' % mdesc.mem()
|
||||
|
||||
self.realview.setupBootLoader(self.membus, self, binary)
|
||||
self.gic_cpu_addr = self.realview.gic.cpu_addr
|
||||
|
|
Loading…
Reference in a new issue