Merge branch 'hyp-boot-mode-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable

1 files changed, 17 insertions, 0 deletions

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index 101b9681c08c..c9a4963b5c3d 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -624,6 +624,23 @@ config ARM_THUMBEE
           Say Y here if you have a CPU with the ThumbEE extension and code to
           make use of it. Say N for code that can run on CPUs without ThumbEE.
 
+config ARM_VIRT_EXT
+        bool "Native support for the ARM Virtualization Extensions"
+        depends on MMU && CPU_V7
+        help
+          Enable the kernel to make use of the ARM Virtualization
+          Extensions to install hypervisors without run-time firmware
+          assistance.
+
+          A compliant bootloader is required in order to make maximum
+          use of this feature.  Refer to Documentation/arm/Booting for
+          details.
+
+          It is safe to enable this option even if the kernel may not be
+          booted in HYP mode, may not have support for the
+          virtualization extensions, or may be booted with a
+          non-compliant bootloader.
+
 config SWP_EMULATE
         bool "Emulate SWP/SWPB instructions"
         depends on !CPU_USE_DOMAINS && CPU_V7