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>

diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig
index 059e65879c5cccefd714545aa063deef35248efb..0cad825287c042a6e2f302dcd148230fe9711400 100644 (file)
--- 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 e6834d4d3e1fe700d15ae57984ccc2716955ba2d..517136a4485de9522fd90358a0bbbece8a056af7 100644 (file)
--- 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