misc: Merged release-staging-v19.0.0.0 into develop

[gem5.git] / src / dev / arm / RealView.py

diff --git a/src/dev/arm/RealView.py b/src/dev/arm/RealView.py
index 3cd81d1a9b0397aa968e1e00c0f7471330ef8bd0..8b03a1dfaeed01aa1392277c8c0bc8d2f1a039ea 100644 (file)
--- a/src/dev/arm/RealView.py
+++ b/src/dev/arm/RealView.py
@@ -1075,9 +1075,7 @@ Interrupts:
             self._attach_device(dev, bus, dma_ports)
             self.smmu.connect(dev, bus)
 
-    def setupBootLoader(self, cur_sys, loc, boot_loader=None):
-        if boot_loader is None:
-            boot_loader = [ loc('boot.arm64'), loc('boot.arm') ]
+    def setupBootLoader(self, cur_sys, boot_loader):
         super(VExpress_GEM5_Base, self).setupBootLoader(
                 cur_sys, boot_loader, 0x8000000, 0x80000000)
 
@@ -1109,6 +1107,12 @@ class VExpress_GEM5_V1_Base(VExpress_GEM5_Base):
         Gicv2mFrame(spi_base=256, spi_len=64, addr=0x2c1c0000),
     ]
 
+    def setupBootLoader(self, cur_sys, loc, boot_loader=None):
+        if boot_loader is None:
+            boot_loader = [ loc('boot.arm64'), loc('boot.arm') ]
+        super(VExpress_GEM5_V1_Base, self).setupBootLoader(
+                cur_sys, boot_loader)
+
     def _on_chip_devices(self):
         return super(VExpress_GEM5_V1_Base,self)._on_chip_devices() + [
                 self.gic, self.vgic, self.gicv2m,