summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWeiping Liao <weipingliao@google.com>2017-01-12 18:12:20 -0800
committerGabe Black <gabeblack@google.com>2017-06-03 19:47:19 +0000
commit53679854bea00ba57d1a8c2f626cdd60364c39c3 (patch)
tree8f5874375172fd6cd5584a0c2333d3ff856b84c6
parent0ab6a43905a1a8ccab4a177ab4e7176e4f738c7b (diff)
downloadgem5-53679854bea00ba57d1a8c2f626cdd60364c39c3.tar.xz
config: Adjust load_addr_mask in VExpress_GEM5_V1
Fix load_addr_mask in VExpress_GEM5_V1 in order to boot with the 64-bit kernel. Change-Id: I13a0a752c60e53262a245cb24b16606071041397 Reviewed-on: https://gem5-review.googlesource.com/3643 Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com> Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
-rw-r--r--src/dev/arm/RealView.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/dev/arm/RealView.py b/src/dev/arm/RealView.py
index a2bac2bde..595020b8a 100644
--- a/src/dev/arm/RealView.py
+++ b/src/dev/arm/RealView.py
@@ -955,7 +955,9 @@ Interrupts:
self.nvmem.port = mem_bus.master
cur_sys.boot_loader = [ loc('boot_emm.arm64'), loc('boot_emm.arm') ]
cur_sys.atags_addr = 0x8000000
- cur_sys.load_addr_mask = 0xfffffff
+ # the old load_add_mask 0xfffffff works for 32-bit kernel
+ # but not the 64-bit one. The new value 0x7ffffff works for both
+ cur_sys.load_addr_mask = 0x7ffffff
cur_sys.load_offset = 0x80000000
# Setup m5ops. It's technically not a part of the boot