diff options
| author | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2019-10-16 13:21:28 +0100 |
|---|---|---|
| committer | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2019-10-22 13:09:47 +0000 |
| commit | e77b9d042435d3ff59dcc747add340e41e10a478 (patch) | |
| tree | 0807fcc5372f272cd05bfc24706270f34859d2ff /configs | |
| parent | 62a70fc3cc20890bd98068f29a8d2a9e33caa7df (diff) | |
| download | gem5-e77b9d042435d3ff59dcc747add340e41e10a478.tar.xz | |
configs: Clean setupBootLoader signature
This is because the bus parameter is not used anymore
Change-Id: I27aa8cc064904a6e3e0376f61eb7db74ea1a4d6c
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/22002
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Jason Lowe-Power <jason@lowepower.com>
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/common/FSConfig.py | 12 | ||||
| -rw-r--r-- | configs/example/arm/fs_bigLITTLE.py | 2 | ||||
| -rw-r--r-- | configs/example/arm/starter_fs.py | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py index 1a4e3810b..b34db4e26 100644 --- a/configs/common/FSConfig.py +++ b/configs/common/FSConfig.py @@ -297,17 +297,7 @@ def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None, 'lpj=19988480 norandmaps rw loglevel=8 ' + \ 'mem=%(mem)s root=%(rootdev)s' - # When using external memory, gem5 writes the boot loader to nvmem - # and then SST will read from it, but SST can only get to nvmem from - # iobus, as gem5's membus is only used for initialization and - # SST doesn't use it. Attaching nvmem to iobus solves this issue. - # During initialization, system_port -> membus -> iobus -> nvmem. - if external_memory: - self.realview.setupBootLoader(self.iobus, self, binary) - elif ruby: - self.realview.setupBootLoader(None, self, binary) - else: - self.realview.setupBootLoader(self.membus, self, binary) + self.realview.setupBootLoader(self, binary) if hasattr(self.realview.gic, 'cpu_addr'): self.gic_cpu_addr = self.realview.gic.cpu_addr diff --git a/configs/example/arm/fs_bigLITTLE.py b/configs/example/arm/fs_bigLITTLE.py index 75567e145..36c5963cf 100644 --- a/configs/example/arm/fs_bigLITTLE.py +++ b/configs/example/arm/fs_bigLITTLE.py @@ -142,7 +142,7 @@ def createSystem(caches, kernel, bootscript, for dev in sys.pci_vio_block: sys.attach_pci(dev) - sys.realview.setupBootLoader(sys.membus, sys, SysPaths.binary) + sys.realview.setupBootLoader(sys, SysPaths.binary) return sys diff --git a/configs/example/arm/starter_fs.py b/configs/example/arm/starter_fs.py index 36c51d675..3a7f298b1 100644 --- a/configs/example/arm/starter_fs.py +++ b/configs/example/arm/starter_fs.py @@ -148,7 +148,7 @@ def create(args): system.addCaches(want_caches, last_cache_level=2) # Setup gem5's minimal Linux boot loader. - system.realview.setupBootLoader(system.membus, system, SysPaths.binary) + system.realview.setupBootLoader(system, SysPaths.binary) if args.dtb: system.dtb_filename = args.dtb |