config: Adjust load_addr_mask in VExpress_GEM5_V1
authorWeiping Liao <weipingliao@google.com>
Fri, 13 Jan 2017 02:12:20 +0000 (18:12 -0800)
committerGabe Black <gabeblack@google.com>
Sat, 3 Jun 2017 19:47:19 +0000 (19:47 +0000)
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>

src/dev/arm/RealView.py

index a2bac2bde618bd7fba25d28590a10872c552726a..595020b8a7aca82e59d7270ca80be174c505a8d3 100644 (file)
@@ -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