github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 02:24:24 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Combine TEE config and menu in one line

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCgA4FiEEFV+gSSXZJY9ZyuB5LinzTIcAHJcFAmJxfW4aHGplbnMud2lr
 bGFuZGVyQGxpbmFyby5vcmcACgkQLinzTIcAHJeplA//bo1BqeyXWjyls+nAMKQR
 jF/jtCceoUUrsE9Xtd5w/3yaA5iJJsp/hUcR35bhl93SZxRJ8r8gGj5qY1FNqzAi
 hoTkp1QCiSaDbdO2kUFpzFkl5mtv8A84McgUA4U9zmFED+h485m2/4igThu9NgSC
 ekmMRKdxrl483u4IBf5nPPbGhCtxDFcRbs3GpWBxKwzbi+GCTUYSSdbagn6XWV/D
 8tTxTKU0vv570oapb9Yg3u0V8Efmy/PtxYeEWMIXGroN6AIiniz/MvKAZUcpLfar
 z8SFCo+qgrgjCvXxdRqleDQqZ19DVoaqlVoAx7G0BmDyysOmq+DdZd33HQeBHrNM
 uwA5DaYnM26wFtkNLMSwR60rmWIf0rpiCjUq25jq6VT8SiSkhTU2s37cSRNZ4vF4
 FH5J8pMUrUq5klxCI06YvjVPctlbbIYKXxwb1SuCj2M5VTSJ8htSI7+a6+5oX9s/
 pUyYyZYHOv9m1E2yHUwckQArdOBnSl9klSENA134hEi797nSI5YiDwmb3p0INMPK
 oZhLUHv9MBRmG4uj2MBkzZELqBGgKUhIF+Qwa+MEcCegBGvzJINphyCGR8LjbcA/
 LXVZnbHk/L4tEA27XlNyPjt76F4PjyU38bzMyKIosnN2l3LRXSdnhgnbEJYZmB9r
 qxv4ZfYLqzUUWWjEekd4t+E=
 =pRcc
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmJz1bEACgkQmmx57+YA
 GNnGJg//TgSk6GAPzpBXAwOROropiEpJTrgXrKvwdvdvOg1MAuhcne6c9pF+9TH3
 cEtBcOaepXqIqa16nx1mnPkAQlFvzitJwnu+1+CN5z+3I2P1214OLxtWFXa8cDAb
 AKmPPsHxvVcwARiBiFvTnD2yvRk6MgJS0osB+5IyDBOZd8p46RymLeu2rxVoQctY
 IETs1kIp05DdShylN1CkNu76HUWqARkzY/AHLkcjKr8Z9K6OGz2VUArRFauO180y
 i3iOQKSVgFXDii4gCTvJe2pffC51q/3aBvasjVVtWeJfsHskQ4jDDZXQ+SG7n9og
 BItVZ+akprOAIVB9Iv4+j6u4Q3UoKpQAKS2aYmBeg83+EnYkpRp33G37UTmDZYXB
 gqnpYPVGJJRUNOXhIPP2jZrp3RfwPCbxfYZkJ1TidcD/p/KTrjCLRV9cXxSNi7DA
 k9RSL66WB9bXCd/QuifeLkhhoYquG8XwyPZRxJuUEw5a3ntXnWUxl3sGjR671UIP
 tEFMD0k33cKlAhGod7UdXLgXY2h2bngk6aodFlSbxzlqVJmE+uw+Spb+S1Deg4DF
 QE9ysxrKnTigY8OuRrPEGAAGfqhpmmw5Q+ogZYv0OpXaTNyZuxnma4xc6WBFVyTo
 cUX0oPJ9s3EjQY1eCtpK1U2sYiKEPOtlCyWdHcTuHNRskZ6oBRs=
 =atkj
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2022-05-05 15:48:31 +02:00
commit a964ecd8a7
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/tee/Kconfig
View File

@ -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