From: Yu-hsin Wang <yuhsingw@google.com>
Date: Fri, 13 Mar 2020 04:40:43 +0000 (+0800)
Subject: dev-arm: Fix setupBootloader for VExpressFastmodel
X-Git-Tag: v20.0.0.0~349
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e9fea79dfc2ff0c2dcacc8eccd1f83551351d0ab;p=gem5.git

dev-arm: Fix setupBootloader for VExpressFastmodel

Previous fix setupBootloader for VExpress_GEM5_V2 didn't include
VExpressFastmodel. Fix it.

Change-Id: Ia720978848660be63bb788ffaf84b60a5b1b5db5
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/26684
Reviewed-by: Gabe Black <gabeblack@google.com>
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/dev/arm/VExpressFastmodel.py b/src/dev/arm/VExpressFastmodel.py
index 63a7d8931..8cf899436 100644
--- a/src/dev/arm/VExpressFastmodel.py
+++ b/src/dev/arm/VExpressFastmodel.py
@@ -46,7 +46,8 @@ class VExpressFastmodel(VExpress_GEM5_Base):
         devices.remove(self.generic_timer)
         return devices
 
-    def setupBootLoader(self, cur_sys, loc):
-        super(VExpressFastmodel,self).setupBootLoader(cur_sys, loc)
-        # Override the boot_loader setting
-        cur_sys.boot_loader = [ loc('boot_v2.arm64') ]
+    def setupBootLoader(self, cur_sys, loc, boot_loader=None):
+        if boot_loader is None:
+            boot_loader = [ loc('boot_v2.arm64') ]
+        super(VExpressFastmodel, self).setupBootLoader(
+                cur_sys, boot_loader)