Unverified Commit a964ecd8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'tee-menu-for-v5.19' of...

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 89c500b1 a4b75fe8
Loading
Loading
Loading
Loading
+1 −4
Original line number Diff line number Diff line
# 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