[xen master] xen/arm: Move TEE mediators in a kconfig submenu

[patchbot@xxxxxxx]

commit 48b52e9428167ae33ca04ba66bb07dbd04a9585e
Author:     Bertrand Marquis <bertrand.marquis@xxxxxxx>
AuthorDate: Tue Jul 25 16:42:37 2023 +0100
Commit:     Julien Grall <julien@xxxxxxx>
CommitDate: Thu Jul 27 22:59:57 2023 +0100

    xen/arm: Move TEE mediators in a kconfig submenu
    
    Rework TEE mediators to put them under a submenu in Kconfig.
    The submenu is only visible if UNSUPPORTED is activated as all currently
    existing mediators are UNSUPPORTED.
    
    While there rework a bit the configuration so that OP-TEE and FF-A
    mediators are selecting the generic TEE interface instead of depending
    on it.
    Make the TEE option hidden as it is of no interest for anyone to select
    it without one of the mediators so having them select it instead should
    be enough.
    
    Signed-off-by: Bertrand Marquis <bertrand.marquis@xxxxxxx>
    Reviewed-by: Julien Grall <jgrall@xxxxxxxxxx>
---
 xen/arch/arm/Kconfig     |  7 -------
 xen/arch/arm/tee/Kconfig | 17 ++++++++++++++---
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig
index 439cc94f33..fd57a82dd2 100644
--- a/xen/arch/arm/Kconfig
+++ b/xen/arch/arm/Kconfig
@@ -175,13 +175,6 @@ config ARM64_BTI
          Branch Target Identification support.
          This feature is not supported in Xen.
 
-config TEE
-       bool "Enable TEE mediators support (UNSUPPORTED)" if UNSUPPORTED
-       default n
-       help
-         This option enables generic TEE mediators support. It allows guests
-         to access real TEE via one of TEE mediators implemented in XEN.
-
 source "arch/arm/tee/Kconfig"
 
 config STATIC_SHM
diff --git a/xen/arch/arm/tee/Kconfig b/xen/arch/arm/tee/Kconfig
index db3ea78faa..c5b0f88d75 100644
--- a/xen/arch/arm/tee/Kconfig
+++ b/xen/arch/arm/tee/Kconfig
@@ -1,7 +1,14 @@
+menu "TEE mediators"
+       visible if UNSUPPORTED
+
+config TEE
+       bool
+       default n
+
 config OPTEE
-       bool "Enable OP-TEE mediator"
+       bool "Enable OP-TEE mediator (UNSUPPORTED)" if UNSUPPORTED
        default n
-       depends on TEE
+       select TEE
        help
          Enable the OP-TEE mediator. It allows guests to access
          OP-TEE running on your platform. This requires
@@ -12,10 +19,14 @@ config OPTEE
 config FFA
        bool "Enable FF-A mediator support (UNSUPPORTED)" if UNSUPPORTED
        default n
-       depends on ARM_64 && TEE
+       depends on ARM_64
+       select TEE
        help
          This option enables a minimal FF-A mediator. The mediator is
          generic as it follows the FF-A specification [1], but it only
          implements a small subset of the specification.
 
          [1] https://developer.arm.com/documentation/den0077/latest
+
+endmenu
+
--
generated by git-patchbot for /home/xen/git/xen.git#master