derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

configs: Clean setupBootLoader signature

Browse Source 
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>
This commit is contained in:
Giacomo Travaglini
2019-10-16 13:21:28 +01:00
parent 62a70fc3cc
commit e77b9d0424
4 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/dev/arm/RealView.py
View File

@@ -600,7 +600,7 @@ class RealView(Platform):
def attachIO(self, *args, **kwargs):
self._attach_io(self._off_chip_devices(), *args, **kwargs)
def setupBootLoader(self, mem_bus, cur_sys, loc):
def setupBootLoader(self, cur_sys, loc):
cur_sys.boot_loader = loc('boot.arm')
cur_sys.atags_addr = 0x100
cur_sys.load_offset = 0
@@ -751,7 +751,7 @@ class VExpress_EMM(RealView):
self.gicv2m = Gicv2m()
self.gicv2m.frames = [Gicv2mFrame(spi_base=256, spi_len=64, addr=0x2C1C0000)]
def setupBootLoader(self, mem_bus, cur_sys, loc):
def setupBootLoader(self, cur_sys, loc):
if not cur_sys.boot_loader:
cur_sys.boot_loader = loc('boot_emm.arm')
cur_sys.atags_addr = 0x8000000
@@ -766,7 +766,7 @@ class VExpress_EMM64(VExpress_EMM):
conf_base=0x30000000, conf_size='256MB', conf_device_bits=12,
pci_pio_base=0x2f000000)
def setupBootLoader(self, mem_bus, cur_sys, loc):
def setupBootLoader(self, cur_sys, loc):
if not cur_sys.boot_loader:
cur_sys.boot_loader = loc('boot_emm.arm64')
cur_sys.atags_addr = 0x8000000
@@ -951,7 +951,7 @@ Interrupts:
device.host = self.pci_host
self._attach_device(device, *args, **kwargs)
def setupBootLoader(self, mem_bus, cur_sys, loc):
def setupBootLoader(self, cur_sys, loc):
if not cur_sys.boot_loader:
cur_sys.boot_loader = [ loc('boot_emm.arm64'), loc('boot_emm.arm') ]
cur_sys.atags_addr = 0x8000000
@@ -1012,9 +1012,9 @@ class VExpress_GEM5_V2_Base(VExpress_GEM5_Base):
self.gic, self.gic.its
]
def setupBootLoader(self, mem_bus, cur_sys, loc):
def setupBootLoader(self, cur_sys, loc):
cur_sys.boot_loader = [ loc('boot_emm_v2.arm64') ]
super(VExpress_GEM5_V2_Base,self).setupBootLoader(mem_bus,
super(VExpress_GEM5_V2_Base,self).setupBootLoader(
cur_sys, loc)
class VExpress_GEM5_V2(VExpress_GEM5_V2_Base):