stats: update stats for mmap() change.

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

diff --git a/src/arch/arm/ArmSystem.py b/src/arch/arm/ArmSystem.py
index f40458ca56853a0f2dc03ea0c54f5241ee21d451..9bb939c5e1cfa903a4c80fe714099c170f5003c0 100644 (file)
--- a/src/arch/arm/ArmSystem.py
+++ b/src/arch/arm/ArmSystem.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2012-2013 ARM Limited
+# Copyright (c) 2009, 2012-2013, 2015 ARM Limited
 # All rights reserved.
 #
 # The license below extends only to copyright in the software and shall
@@ -40,17 +40,23 @@ from m5.params import *
 from System import System
 
 class ArmMachineType(Enum):
-    map = {'RealView_EB' : 827,
-           'RealView_PBX' : 1901,
-           'VExpress_EMM' : 2272,
-           'VExpress_EMM64' : 2272}
+    map = {
+        'RealViewEB' : 827,
+        'RealViewPBX' : 1901,
+        'VExpress_EMM' : 2272,
+        'VExpress_EMM64' : 2272,
+        'DTOnly' : -1,
+    }
 
 class ArmSystem(System):
     type = 'ArmSystem'
     cxx_header = "arch/arm/system.hh"
     load_addr_mask = 0xffffffff
     multi_proc = Param.Bool(True, "Multiprocessor system?")
-    boot_loader = Param.String("", "File that contains the boot loader code if any")
+    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 "
+        "architecture will be used.")
     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,
@@ -58,8 +64,6 @@ class ArmSystem(System):
     have_virtualization = Param.Bool(False,
         "True if Virtualization Extensions are implemented")
     have_lpae = Param.Bool(False, "True if LPAE is implemented")
-    have_generic_timer = Param.Bool(False,
-        "True if the Generic Timer extension is implemented")
     highest_el_is_64 = Param.Bool(False,
         "True if the register width of the highest implemented exception level "
         "is 64 bits (ARMv8)")
@@ -79,8 +83,6 @@ class GenericArmSystem(ArmSystem):
         "Machine id from http://www.arm.linux.org.uk/developer/machines/")
     atags_addr = Param.Addr("Address where default atags structure should " \
                                 "be written")
-    boot_release_addr = Param.Addr(0xfff8, "Address where secondary CPUs " \
-                                       "spin waiting boot in the loader")
     dtb_filename = Param.String("",
         "File that contains the Device Tree Blob. Don't use DTB if empty.")
     early_kernel_symbols = Param.Bool(False,