diff options
| author | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2019-01-25 14:29:24 +0000 |
|---|---|---|
| committer | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2019-01-30 12:14:00 +0000 |
| commit | 00ef23b5700175830834f32cdd678e0b002a777d (patch) | |
| tree | 79795c398474d8aa7819b6c6de675e6a287c4af6 /configs/example | |
| parent | b2d24ff236dd3acd555579b260870538f309708c (diff) | |
| download | gem5-00ef23b5700175830834f32cdd678e0b002a777d.tar.xz | |
arch-arm, configs: Create single instance of DTB autogeneration
This patch is rewriting the DTB autogeneration functions available in
fs_bigLITTLE.py and fs.py as a single method in the GenericArmSystem
so that other configuration scripts can make use of it.
Change-Id: I492bbf77e6b0ac5c5fbdbc75c0eecba29bd63bda
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/15958
Reviewed-by: Ciro Santilli <ciro.santilli@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'configs/example')
| -rw-r--r-- | configs/example/arm/fs_bigLITTLE.py | 11 | ||||
| -rw-r--r-- | configs/example/fs.py | 11 |
2 files changed, 2 insertions, 20 deletions
diff --git a/configs/example/arm/fs_bigLITTLE.py b/configs/example/arm/fs_bigLITTLE.py index 8cf89e3c7..f363872a3 100644 --- a/configs/example/arm/fs_bigLITTLE.py +++ b/configs/example/arm/fs_bigLITTLE.py @@ -261,16 +261,7 @@ def build(options): 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') + system.generateDtb(m5.options.outdir, 'system.dtb') return root diff --git a/configs/example/fs.py b/configs/example/fs.py index 4d2165884..05eca87fb 100644 --- a/configs/example/fs.py +++ b/configs/example/fs.py @@ -360,19 +360,10 @@ if buildEnv['TARGET_ISA'] == "arm" and not options.bare_metal \ "with generation functionality.") # Generate a Device Tree - 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) - for sysname in ('system', 'testsys', 'drivesys'): if hasattr(root, sysname): sys = getattr(root, sysname) - sys.dtb_filename = create_dtb_for_system(sys, '%s.dtb' % sysname) + sys.generateDtb(m5.options.outdir, '%s.dtb' % sysname) Simulation.setWorkCountOptions(test_sys, options) Simulation.run(options, root, test_sys, FutureClass) |