arch-arm: Make load_addr_mask=0 for ArmFsLinux only

This is restoring the situaton pre:

https://gem5-review.googlesource.com/c/public/gem5/+/26466

Where load_addr_mask was set to 0 (forcing the loader to discard
the kernel entry point) for LinuxArmSystem only.

With this patch the masking is done for ArmFsLinux workloads
only and it is using the default 0xffffffffffffffff (no masking)
for common ArmFsWorkload

Change-Id: I68970edcac61ad0de79433ffd84fef580a94b480
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27024
Tested-by: Gem5 Cloud Project GCB service account <345032938727@cloudbuild.gserviceaccount.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Gabe Black <gabeblack@google.com>

diff --git a/src/arch/arm/ArmFsWorkload.py b/src/arch/arm/ArmFsWorkload.py
index 6064d81e98df92be84644e704a85e40d53e82d02..459f83095a0c2382e73d43fc026c10e5d95b0ae6 100644 (file)
--- a/src/arch/arm/ArmFsWorkload.py
+++ b/src/arch/arm/ArmFsWorkload.py
@@ -50,8 +50,6 @@ class ArmFsWorkload(OsKernel):
     cxx_header = "arch/arm/fs_workload.hh"
     cxx_class = "ArmISA::FsWorkload"
 
-    load_addr_mask = 0
-
     boot_loader = VectorParam.String([],
         "File that contains the boot loader code. Zero or more files may be "
         "specified. The first boot loader that matches the kernel's "
@@ -79,6 +77,8 @@ class ArmFsLinux(ArmFsWorkload):
     cxx_header = "arch/arm/linux/fs_workload.hh"
     cxx_class = "ArmISA::FsLinux"
 
+    load_addr_mask = 0
+
     @cxxMethod
     def dumpDmesg(self):
         """Dump dmesg from the simulated kernel to standard out"""