summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGedare Bloom <gedare@rtems.org>2017-02-23 15:53:06 -0500
committerGedare Bloom <gedare@rtems.org>2017-06-19 12:34:51 +0000
commit09faca2b3fa4a489f1769c912b8f05fea2fcd45b (patch)
tree919c6595754d656309f8805276b2c431df201df6
parentb49b8cef7b450a885d4db896f6d21ab715425d89 (diff)
downloadgem5-09faca2b3fa4a489f1769c912b8f05fea2fcd45b.tar.xz
configs, arm: add option to enable security extensions
Change-Id: I0c839bb649a5d2d73080b7e718da3c9b5839cf8c Signed-off-by: Gedare Bloom <gedare@rtems.org> Reviewed-on: https://gem5-review.googlesource.com/3264 Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com> Reviewed-by: Jason Lowe-Power <jason@lowepower.com> Maintainer: Jason Lowe-Power <jason@lowepower.com>
-rw-r--r--configs/common/FSConfig.py4
-rw-r--r--configs/common/Options.py2
-rw-r--r--configs/example/fs.py3
3 files changed, 7 insertions, 2 deletions
diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index b1d87f26f..c08353a23 100644
--- a/configs/common/FSConfig.py
+++ b/configs/common/FSConfig.py
@@ -204,7 +204,7 @@ def makeSparcSystem(mem_mode, mdesc=None, cmdline=None):
def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None,
dtb_filename=None, bare_metal=False, cmdline=None,
- external_memory="", ruby=False):
+ external_memory="", ruby=False, security=False):
assert machine_type
default_dtbs = {
@@ -296,6 +296,8 @@ def makeArmSystem(mem_mode, machine_type, num_cpus=1, mdesc=None,
" the amount of DRAM you've selected. Please try" \
" another platform")
+ self.have_security = security
+
if bare_metal:
# EOT character on UART will end the simulation
self.realview.uart.end_on_eot = True
diff --git a/configs/common/Options.py b/configs/common/Options.py
index 052c6a8d3..ea7c75bb7 100644
--- a/configs/common/Options.py
+++ b/configs/common/Options.py
@@ -338,6 +338,8 @@ def addFSOptions(parser):
parser.add_option("--dtb-filename", action="store", type="string",
help="Specifies device tree blob file to use with device-tree-"\
"enabled kernels")
+ parser.add_option("--enable-security-extensions", action="store_true",
+ help="Turn on the ARM Security Extensions")
parser.add_option("--enable-context-switch-stats-dump", \
action="store_true", help="Enable stats dump at context "\
"switches and dump tasks file (required for Streamline)")
diff --git a/configs/example/fs.py b/configs/example/fs.py
index 36365afa1..65079372c 100644
--- a/configs/example/fs.py
+++ b/configs/example/fs.py
@@ -100,7 +100,8 @@ def build_test_system(np):
bare_metal=options.bare_metal,
cmdline=cmdline,
external_memory=options.external_memory_system,
- ruby=options.ruby)
+ ruby=options.ruby,
+ security=options.enable_security_extensions)
if options.enable_context_switch_stats_dump:
test_sys.enable_context_switch_stats_dump = True
else: