Andreas Sandberg has submitted this change and it was merged. (
https://gem5-review.googlesource.com/4260 )
Change subject: arch-arm: Switch to DTOnly as the default machine type
......................................................................
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 <[email protected]>
Reviewed-by: Nikos Nikoleris <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/4260
Reviewed-by: Jason Lowe-Power <[email protected]>
---
M configs/example/arm/fs_bigLITTLE.py
M configs/example/arm/starter_fs.py
M src/arch/arm/ArmSystem.py
3 files changed, 3 insertions(+), 5 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved
Andreas Sandberg: Looks good to me, approved
diff --git a/configs/example/arm/fs_bigLITTLE.py
b/configs/example/arm/fs_bigLITTLE.py
index 2965f47..a6110b5 100644
--- a/configs/example/arm/fs_bigLITTLE.py
+++ b/configs/example/arm/fs_bigLITTLE.py
@@ -115,8 +115,7 @@
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 9b6f68f..2ca1cb8 100644
--- a/configs/example/arm/starter_fs.py
+++ b/configs/example/arm/starter_fs.py
@@ -110,8 +110,7 @@
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 c21b9c6..4fa9fd8 100644
--- a/src/arch/arm/ArmSystem.py
+++ b/src/arch/arm/ArmSystem.py
@@ -84,7 +84,7 @@
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")
--
To view, visit https://gem5-review.googlesource.com/4260
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Icfd085e4862863b4ef495566bfddbd11591866c3
Gerrit-Change-Number: 4260
Gerrit-PatchSet: 2
Gerrit-Owner: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Nikos Nikoleris <[email protected]>
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
