Browse Source

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>
Ricardo Salveti 9 months ago
parent
commit
c91feda87c
2 changed files with 8 additions and 8 deletions
  1. 0 8
      arch/arm/mach-imx/mx7/Kconfig
  2. 8 0
      lib/optee/Kconfig

+ 0 - 8
arch/arm/mach-imx/mx7/Kconfig

@@ -24,14 +24,6 @@ config SPL_TEXT_BASE
 	depends on SPL
 	depends on SPL
 	default 0x00912000
 	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
 choice
 	prompt "MX7 board select"
 	prompt "MX7 board select"
 	optional
 	optional

+ 8 - 0
lib/optee/Kconfig

@@ -11,6 +11,14 @@ config OPTEE_IMAGE
 	  This option enable the OPTEE specific checks done before booting
 	  This option enable the OPTEE specific checks done before booting
 	  an OPTEE image created with mkimage
 	  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
 config BOOTM_OPTEE
 	bool "Support OPTEE bootm command"
 	bool "Support OPTEE bootm command"
 	select BOOTM_LINUX
 	select BOOTM_LINUX