Revert "arm: imx: mx7: Move CONFIG_OPTEE_TZDRAM_SIZE from lib/optee"

This reverts commit c5b68ef8af3c2f515c1f5b8d63a69359a85d753b.

CONFIG_OPTEE_TZDRAM_SIZE is used by imx6-based SoCs as well. Move the
option back.

Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@foundries.io>

diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig
index 0bb18f652009a9243de32cbb85efb2f78736edde..3c0208e13ddabcd30dd263931389cd1f7b29c741 100644 (file)
--- a/arch/arm/mach-imx/mx7/Kconfig
+++ b/arch/arm/mach-imx/mx7/Kconfig
@@ -24,14 +24,6 @@ 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 517136a4485de9522fd90358a0bbbece8a056af7..e6834d4d3e1fe700d15ae57984ccc2716955ba2d 100644 (file)
--- a/lib/optee/Kconfig
+++ b/lib/optee/Kconfig
@@ -11,6 +11,14 @@ 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