Curtis Dunham has submitted this change and it was merged. (
https://gem5-review.googlesource.com/5969 )
Change subject: config, arm: enable device tree autogeneration for bigLITTLE
......................................................................
config, arm: enable device tree autogeneration for bigLITTLE
Change-Id: Iaa5eeb3504b3ff9e46b6f592a06d6b833c830d83
Reviewed-by: Andreas Sandberg <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/5969
Maintainer: Andreas Sandberg <[email protected]>
---
M configs/example/arm/fs_bigLITTLE.py
1 file changed, 14 insertions(+), 3 deletions(-)
Approvals:
Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
diff --git a/configs/example/arm/fs_bigLITTLE.py
b/configs/example/arm/fs_bigLITTLE.py
index 489bc53..7e0555c 100644
--- a/configs/example/arm/fs_bigLITTLE.py
+++ b/configs/example/arm/fs_bigLITTLE.py
@@ -57,7 +57,6 @@
from devices import AtomicCluster, KvmCluster
-default_dtb = 'armv8_gem5_v1_big_little_2_2.dtb'
default_kernel = 'vmlinux4.3.aarch64'
default_disk = 'aarch64-ubuntu-trusty-headless.img'
default_rcs = 'bootscript.rcS'
@@ -153,7 +152,7 @@
def addOptions(parser):
parser.add_argument("--restore-from", type=str, default=None,
help="Restore from checkpoint")
- parser.add_argument("--dtb", type=str, default=default_dtb,
+ parser.add_argument("--dtb", type=str, default=None,
help="DTB file to load")
parser.add_argument("--kernel", type=str, default=default_kernel,
help="Linux kernel")
@@ -249,7 +248,19 @@
_build_kvm(system, all_cpus)
# Linux device tree
- system.dtb_filename = SysPaths.binary(options.dtb)
+ if options.dtb is not None:
+ system.dtb_filename = SysPaths.binary(options.dtb)
+ else:
+ def create_dtb_for_system(system, filename):
+ state = FdtState(addr_cells=2, size_cells=2, cpu_cells=1)
+ rootNode = system.generateDeviceTree(state)
+
+ fdt = Fdt()
+ fdt.add_rootnode(rootNode)
+ dtb_filename = os.path.join(m5.options.outdir, filename)
+ return fdt.writeDtbFile(dtb_filename)
+
+ system.dtb_filename = create_dtb_for_system(system, 'system.dtb')
return root
--
To view, visit https://gem5-review.googlesource.com/5969
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: Iaa5eeb3504b3ff9e46b6f592a06d6b833c830d83
Gerrit-Change-Number: 5969
Gerrit-PatchSet: 3
Gerrit-Owner: Curtis Dunham <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Curtis Dunham <[email protected]>
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
