misc: Merge branch v20.1.0.3 hotfix into develop

[gem5.git] / src / arch / arm / ArmSystem.py

diff --git a/src/arch/arm/ArmSystem.py b/src/arch/arm/ArmSystem.py
index b2e58a3e7e163b7004c774927d8d82bac5718832..142d6c7ac096c744640c8fa873a8be4946d14a7c 100644 (file)
--- a/src/arch/arm/ArmSystem.py
+++ b/src/arch/arm/ArmSystem.py
@@ -48,7 +48,6 @@ class ArmSystem(System):
     cxx_header = "arch/arm/system.hh"
     multi_proc = Param.Bool(True, "Multiprocessor system?")
     gic_cpu_addr = Param.Addr(0, "Addres of the GIC CPU interface")
-    flags_addr = Param.Addr(0, "Address of the flags register for MP booting")
     have_security = Param.Bool(False,
         "True if Security Extensions are implemented")
     have_virtualization = Param.Bool(False,
@@ -60,7 +59,7 @@ class ArmSystem(System):
         "Reset address (ARMv8)")
     auto_reset_addr = Param.Bool(True,
         "Determine reset address from kernel entry point if no boot loader")
-    highest_el_is_64 = Param.Bool(False,
+    highest_el_is_64 = Param.Bool(True,
         "True if the register width of the highest implemented exception level "
         "is 64 bits (ARMv8)")
     phys_addr_range_64 = Param.UInt8(40,
@@ -111,7 +110,7 @@ class ArmSystem(System):
         # root instead of appended.
 
         def generateMemNode(mem_range):
-            node = FdtNode("memory@%x" % long(mem_range.start))
+            node = FdtNode("memory@%x" % int(mem_range.start))
             node.append(FdtPropertyStrings("device_type", ["memory"]))
             node.append(FdtPropertyWords("reg",
                 state.addrCells(mem_range.start) +