summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorJairo Balart <jairo.balart@metempsy.com>2018-11-13 10:58:31 +0100
committerGiacomo Travaglini <giacomo.travaglini@arm.com>2019-01-10 16:29:30 +0000
commit815dc6590ff70186a9b7915cf59987e57fef0ca4 (patch)
treece5d91fd104b8e4381ea1cf7f621af30c0ab25a5 /configs
parent93c7fa573116aade8e8d6b0646e85874e6003567 (diff)
downloadgem5-815dc6590ff70186a9b7915cf59987e57fef0ca4.tar.xz
dev-arm: Add a VExpress_GEM5_V2 platform with GICv3 support
Change-Id: I6fd14138d94654e8e60cde08239ea9a50fc19eb7 Reviewed-on: https://gem5-review.googlesource.com/c/14255 Maintainer: Andreas Sandberg <andreas.sandberg@arm.com> Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com> Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Diffstat (limited to 'configs')
-rw-r--r--configs/common/FSConfig.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index 674761634..e4babbcb6 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -330,7 +330,10 @@ def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None,
self.realview.setupBootLoader(None, self, binary)
else:
self.realview.setupBootLoader(self.membus, self, binary)
- self.gic_cpu_addr = self.realview.gic.cpu_addr
+
+ if hasattr(self.realview.gic, 'cpu_addr'):
+ self.gic_cpu_addr = self.realview.gic.cpu_addr
+
self.flags_addr = self.realview.realview_io.pio_addr + 0x30
# This check is for users who have previously put 'android' in