arch-arm: Switch to DTOnly as the default machine type

Old ARM systems used to pass the machine type in the ATAGS list passed
to the kernel. This has been largely deprecated by the introduction of
device trees. Switch to the DTOnly machine type by default in gem5
since all new platforms and kernel will require this behavior.

Change-Id: Icfd085e4862863b4ef495566bfddbd11591866c3
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/4260
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>

diff --git a/configs/example/arm/fs_bigLITTLE.py b/configs/example/arm/fs_bigLITTLE.py
index 2965f47578f3887d2cadb13e6d506162a9336fcd..a6110b520b460f479b4aa565d99f7057ed1d33e9 100644 (file)
--- a/configs/example/arm/fs_bigLITTLE.py
+++ b/configs/example/arm/fs_bigLITTLE.py
@@ -115,8 +115,7 @@ class Ex5LittleCluster(devices.CpuCluster):
 def createSystem(caches, kernel, bootscript, disks=[]):
     sys = devices.SimpleSystem(caches, default_mem_size,
                                kernel=SysPaths.binary(kernel),
-                               readfile=bootscript,
-                               machine_type="DTOnly")
+                               readfile=bootscript)
 
     sys.mem_ctrls = SimpleMemory(range=sys._mem_range)
     sys.mem_ctrls.port = sys.membus.master

diff --git a/configs/example/arm/starter_fs.py b/configs/example/arm/starter_fs.py
index 9b6f68f551f8c654bc9509077ef459e56c4b747d..2ca1cb8003a84b29f14aedc25f49fffe085d707f 100644 (file)
--- a/configs/example/arm/starter_fs.py
+++ b/configs/example/arm/starter_fs.py
@@ -110,8 +110,7 @@ def create(args):
                                   mem_mode=mem_mode,
                                   dtb_filename=dtb_file,
                                   kernel=SysPaths.binary(args.kernel),
-                                  readfile=args.script,
-                                  machine_type="DTOnly")
+                                  readfile=args.script)
 
     MemConfig.config_mem(args, system)
 

diff --git a/src/arch/arm/ArmSystem.py b/src/arch/arm/ArmSystem.py
index c21b9c6ecdddb43ff9579c32ac2d079a8e408b8f..4fa9fd8587f02805f3d74c6b14b25e56632cd401 100644 (file)
--- a/src/arch/arm/ArmSystem.py
+++ b/src/arch/arm/ArmSystem.py
@@ -84,7 +84,7 @@ class GenericArmSystem(ArmSystem):
     type = 'GenericArmSystem'
     cxx_header = "arch/arm/system.hh"
     load_addr_mask = 0x0fffffff
-    machine_type = Param.ArmMachineType('VExpress_EMM',
+    machine_type = Param.ArmMachineType('DTOnly',
         "Machine id from http://www.arm.linux.org.uk/developer/machines/")
     atags_addr = Param.Addr("Address where default atags structure should " \
                                 "be written")