diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-05-05 15:48:31 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-05-05 15:48:33 +0200 |
| commit | a964ecd8a70a72577a5e1ca3ec4b74029e953ee9 (patch) | |
| tree | c2a5271f083a1f020131b5a511738a9ad09b1eb6 /drivers/tee | |
| parent | 89c500b1fa6d1b6066342290f0abe3feec834b69 (diff) | |
| parent | a4b75fe8e1c15c96c4eb083e211ccbbfd56599f9 (diff) | |
Merge tag 'tee-menu-for-v5.19' of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/drivers
Combine TEE config and menu in one line
* tag 'tee-menu-for-v5.19' of https://git.linaro.org/people/jens.wiklander/linux-tee:
tee: combine "config" and "menu" for TEE's menuconfig
Link: https://lore.kernel.org/r/20220503191626.GA3278203@jade
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/tee')
| -rw-r--r-- | drivers/tee/Kconfig | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/tee/Kconfig b/drivers/tee/Kconfig index e99d840c2511..73a147202e88 100644 --- a/drivers/tee/Kconfig +++ b/drivers/tee/Kconfig @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only # Generic Trusted Execution Environment Configuration -config TEE +menuconfig TEE tristate "Trusted Execution Environment support" depends on HAVE_ARM_SMCCC || COMPILE_TEST || CPU_SUP_AMD select CRYPTO @@ -13,10 +13,7 @@ config TEE if TEE -menu "TEE drivers" - source "drivers/tee/optee/Kconfig" source "drivers/tee/amdtee/Kconfig" -endmenu endif |