configs: fix forwarding of --bootloader to fs.py
authorCiro Santilli <ciro.santilli@arm.com>
Fri, 13 Mar 2020 12:45:15 +0000 (12:45 +0000)
committerCiro Santilli <ciro.santilli@gmail.com>
Mon, 16 Mar 2020 12:09:29 +0000 (12:09 +0000)
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>
configs/common/FSConfig.py

index b58c273804cf2adf89a39e08f59b4d925586691b..3ae00ad0261a7f84d8b71e1bed88e841d8b9a868 100644 (file)
@@ -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