summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAdrian Herrera <adrian.herrera@arm.com>2020-01-03 12:49:27 +0000
committerGiacomo Travaglini <giacomo.travaglini@arm.com>2020-01-07 16:32:44 +0000
commit4732b6cdb7dc940abb709562427c2393c2e11cea (patch)
tree7c5462db830cb723f664708b22c4c8cb1f095495 /src
parent8f5b7e78239dec9d907ee0fc3e5aae00afff7484 (diff)
downloadgem5-4732b6cdb7dc940abb709562427c2393c2e11cea.tar.xz
misc: Reflect changes of arm bootloader name
With https://gem5-review.googlesource.com/c/public/gem5/+/22687 the VExpress_GEM5_Base platform is changing the required bootloader name by removing the _emm suffix. While this had been changed in the prebuilt binaries in gem5.org, it hadn't in the bootloader makefiles or in other utility functions. The patch is not completely removing the _emm bootloaders since those are still used by VExpress_EMM and VExpress_EMM64 platforms. Change-Id: Iea3148eab313ab06cf2e74660e11708e1a22ce5f Reviewed-by: Ciro Santilli <ciro.santilli@arm.com> Reviewed-by: Adrian Herrera <adrian.herrera@arm.com> Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23947 Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu> Reviewed-by: Jason Lowe-Power <jason@lowepower.com> Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu> Tested-by: kokoro <noreply+kokoro@google.com>
Diffstat (limited to 'src')
-rw-r--r--src/dev/arm/VExpressFastmodel.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dev/arm/VExpressFastmodel.py b/src/dev/arm/VExpressFastmodel.py
index 8a6fefceb..f43af3107 100644
--- a/src/dev/arm/VExpressFastmodel.py
+++ b/src/dev/arm/VExpressFastmodel.py
@@ -51,4 +51,4 @@ class VExpressFastmodel(VExpress_GEM5_Base):
def setupBootLoader(self, cur_sys, loc):
super(VExpressFastmodel,self).setupBootLoader(cur_sys, loc)
# Override the boot_loader setting
- cur_sys.boot_loader = [ loc('boot_emm_v2.arm64') ]
+ cur_sys.boot_loader = [ loc('boot_v2.arm64') ]