From: Andreas Sandberg <andreas.sandberg@arm.com>
Date: Thu, 27 Jul 2017 12:55:57 +0000 (+0100)
Subject: arch-arm: Switch to DTOnly as the default machine type
X-Git-Tag: v19.0.0.0~2666
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c464f67955a131843cf232c5cd5430206e2494ab;p=gem5.git

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 2965f4757..a6110b520 100644
--- 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 9b6f68f55..2ca1cb800 100644
--- 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 c21b9c6ec..4fa9fd858 100644
--- 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")