From 49538a71186d98f5440c5db646e23507fc2e38d1 Mon Sep 17 00:00:00 2001
From: Curtis Dunham <Curtis.Dunham@arm.com>
Date: Tue, 2 Aug 2016 10:38:01 +0100
Subject: arm: enable EL2 support

Change-Id: I59fa4fae98c33d9e5c2185382e1411911d27d341
---
 src/arch/arm/system.hh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'src/arch/arm/system.hh')

diff --git a/src/arch/arm/system.hh b/src/arch/arm/system.hh
index 511118d4d..ee286d23a 100644
--- a/src/arch/arm/system.hh
+++ b/src/arch/arm/system.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010, 2012-2013, 2015 ARM Limited
+ * Copyright (c) 2010, 2012-2013, 2015-2016 ARM Limited
  * All rights reserved
  *
  * The license below extends only to copyright in the software and shall
@@ -184,9 +184,8 @@ class ArmSystem : public System
     {
         if (_haveSecurity)
             return EL3;
-        // @todo: uncomment this to enable Virtualization
-        // if (_haveVirtualization)
-        //     return EL2;
+        if (_haveVirtualization)
+            return EL2;
         return EL1;
     }
 
-- 
cgit v1.2.3