diff options
| author | Jose Marinho <jose.marinho@arm.com> | 2017-06-28 11:14:59 +0100 |
|---|---|---|
| committer | Andreas Sandberg <andreas.sandberg@arm.com> | 2017-07-10 08:32:03 +0000 |
| commit | 457f07c50736ff4ea7fcadc4e766b19e37ffc625 (patch) | |
| tree | e686edab7c537e036cfb1ecbd0004b16c9790e77 /src | |
| parent | 999c14894fd39367443656bd9dbb61fd8f3c7075 (diff) | |
| download | gem5-457f07c50736ff4ea7fcadc4e766b19e37ffc625.tar.xz | |
dev-arm: Don't unconditionally overwrite bootloader params
The bootloader arguments were previously defaulting to a predetermined
value even if initialized elsewhere in the platform config script.
This commit fixes this issue by not calling the default initialization
routine if the bootloader is already defined.
Change-Id: Id80af4762b52dc036da29430b2795bb30970a349
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/3967
Diffstat (limited to 'src')
| -rw-r--r-- | src/dev/arm/RealView.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/dev/arm/RealView.py b/src/dev/arm/RealView.py index 323c14c7a..51aa1cf3c 100644 --- a/src/dev/arm/RealView.py +++ b/src/dev/arm/RealView.py @@ -739,7 +739,8 @@ class VExpress_EMM(RealView): self.nvmem = SimpleMemory(range = AddrRange('64MB'), conf_table_reported = False) self.nvmem.port = mem_bus.master - cur_sys.boot_loader = loc('boot_emm.arm') + if not cur_sys.boot_loader: + cur_sys.boot_loader = loc('boot_emm.arm') cur_sys.atags_addr = 0x8000000 cur_sys.load_addr_mask = 0xfffffff cur_sys.load_offset = 0x80000000 @@ -756,7 +757,8 @@ class VExpress_EMM64(VExpress_EMM): self.nvmem = SimpleMemory(range=AddrRange(0, size='64MB'), conf_table_reported=False) self.nvmem.port = mem_bus.master - cur_sys.boot_loader = loc('boot_emm.arm64') + if not cur_sys.boot_loader: + cur_sys.boot_loader = loc('boot_emm.arm64') cur_sys.atags_addr = 0x8000000 cur_sys.load_addr_mask = 0xfffffff cur_sys.load_offset = 0x80000000 @@ -927,7 +929,8 @@ Interrupts: self.nvmem = SimpleMemory(range=AddrRange(0, size='64MB'), conf_table_reported=False) self.nvmem.port = mem_bus.master - cur_sys.boot_loader = [ loc('boot_emm.arm64'), loc('boot_emm.arm') ] + if not cur_sys.boot_loader: + cur_sys.boot_loader = [ loc('boot_emm.arm64'), loc('boot_emm.arm') ] cur_sys.atags_addr = 0x8000000 # the old load_add_mask 0xfffffff works for 32-bit kernel # but not the 64-bit one. The new value 0x7ffffff works for both |