From: Ciro Santilli <ciro.santilli@arm.com>
Date: Fri, 13 Mar 2020 12:45:15 +0000 (+0000)
Subject: configs: fix forwarding of --bootloader to fs.py
X-Git-Tag: v20.0.0.0~336
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5af26353b532d7b5988cf0f6f3d0fbc5087dd1df;p=gem5.git

configs: fix forwarding of --bootloader to fs.py

Since I02919207d6f175854017ae7b603d811da63d618e the fs.py --bootloader
option can be used to select a bootloader explicitly.

Ia3d863db276a023b6a2c7ee7a656d8142ff75589 forgot to pass that parameter
likely due to a rebase issue and it gets searched in M5_PATH.

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

diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index b58c27380..3ae00ad02 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -311,7 +311,7 @@ def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None,
 
         self.workload = workload
 
-        self.realview.setupBootLoader(self, binary)
+        self.realview.setupBootLoader(self, binary, bootloader)
 
     if external_memory:
         # I/O traffic enters iobus