dev-arm: Don't use args and kwargs on attachIO
authorGiacomo Travaglini <giacomo.travaglini@arm.com>
Wed, 25 Mar 2020 18:13:06 +0000 (18:13 +0000)
committerGiacomo Travaglini <giacomo.travaglini@arm.com>
Thu, 26 Mar 2020 16:08:51 +0000 (16:08 +0000)
This is matching the attachOnChipIO style, and fixing the error of the
dma_ports kwarg being forwarded to the _attach_mem

Change-Id: Ib3ecf2fc18c488d938bbbf63eab3d7693cdb7d06
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27086
Tested-by: Gem5 Cloud Project GCB service account <345032938727@cloudbuild.gserviceaccount.com>
Reviewed-by: Ciro Santilli <ciro.santilli@arm.com>
src/dev/arm/RealView.py

index f9b9cb2fd84f0e9ce5ae959f9c68b74b6bd96b9d..43d2b1553e86053b154b2a34f7070964e3bf2760 100644 (file)
@@ -625,9 +625,9 @@ class RealView(Platform):
         if bridge:
             bridge.ranges = self._off_chip_ranges
 
-    def attachIO(self, *args, **kwargs):
-        self._attach_mem(self._off_chip_memory(), *args, **kwargs)
-        self._attach_io(self._off_chip_devices(), *args, **kwargs)
+    def attachIO(self, bus, dma_ports=None, mem_ports=None):
+        self._attach_mem(self._off_chip_memory(), bus, mem_ports)
+        self._attach_io(self._off_chip_devices(), bus, dma_ports)
 
     def setupBootLoader(self, cur_sys, boot_loader, atags_addr, load_offset):
         cur_sys.workload.boot_loader = boot_loader