summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandru Gagniuc <mr.nuke.me@gmail.com>2021-09-07 12:07:09 -0500
committerTom Rini <trini@konsulko.com>2021-10-05 08:50:14 -0400
commitc5b68ef8af3c2f515c1f5b8d63a69359a85d753b (patch)
treef2b8ff50d78215c78010d0e17deb3648a29d0dea
parentf6953047cb99d50cca0dc73740337b08fbdc1bf8 (diff)
arm: imx: mx7: Move CONFIG_OPTEE_TZDRAM_SIZE from lib/optee
This config is only used by three boards with this SOC. Most other platforms derive this information from devicetree, and are unlikely to ever need this config. Moreover, it is confusing when Kconfig asks for this value under "Support OPTEE images", but does not do anything with the value. Move it to imx7 for those boards who still make use of it. Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
-rw-r--r--arch/arm/mach-imx/mx7/Kconfig8
-rw-r--r--lib/optee/Kconfig8
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig
index 059e65879c5..0cad825287c 100644
--- a/arch/arm/mach-imx/mx7/Kconfig
+++ b/arch/arm/mach-imx/mx7/Kconfig
@@ -23,6 +23,14 @@ config SPL_TEXT_BASE
depends on SPL
default 0x00912000
+config OPTEE_TZDRAM_SIZE
+ hex "Amount of Trust-Zone RAM for the OPTEE image"
+ default 0x0000000
+ depends on OPTEE_LIB
+ help
+ The size of pre-allocated Trust Zone DRAM to allocate for the OPTEE
+ runtime.
+
choice
prompt "MX7 board select"
optional
diff --git a/lib/optee/Kconfig b/lib/optee/Kconfig
index e6834d4d3e1..517136a4485 100644
--- a/lib/optee/Kconfig
+++ b/lib/optee/Kconfig
@@ -11,14 +11,6 @@ config OPTEE_IMAGE
This option enable the OPTEE specific checks done before booting
an OPTEE image created with mkimage
-config OPTEE_TZDRAM_SIZE
- hex "Amount of Trust-Zone RAM for the OPTEE image"
- default 0x0000000
- depends on OPTEE_LIB
- help
- The size of pre-allocated Trust Zone DRAM to allocate for the OPTEE
- runtime.
-
config BOOTM_OPTEE
bool "Support OPTEE bootm command"
select BOOTM_LINUX