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>

diff --git a/configs/common/FSConfig.py b/configs/common/FSConfig.py
index b1d87f26f968fa566a55d42253373b670d14b22b..c08353a231e15a92a350b034d33370c93dd593f2 100644 (file)
--- 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 052c6a8d38b1e5ab93cc43591c2059a5419dcf23..ea7c75bb77433be290d2d9feb5b0f4e6a0d91f1c 100644 (file)
--- 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 36365afa1f381289f84b8b2f46ebdbf9b886c38f..65079372c5b5ac9891f1711151a073a9d73c713b 100644 (file)
--- 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: