diff options
| author | Ricardo Salveti <ricardo@foundries.io> | 2023-08-25 16:47:11 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-08-28 15:59:22 -0400 |
| commit | c91feda87ce33c81acc51cc4bf69d613c4fe89de (patch) | |
| tree | 0249ca6a72069c709655a636fff70a931e5aa355 | |
| parent | bbbf04cc7da1b60ed6b342700ec366f27d49546e (diff) | |
| download | u-boot-WIP/2023-08-28-assorted-important-fixes.zip u-boot-WIP/2023-08-28-assorted-important-fixes.tar.gz u-boot-WIP/2023-08-28-assorted-important-fixes.tar.bz2 | |
Revert "arm: imx: mx7: Move CONFIG_OPTEE_TZDRAM_SIZE from lib/optee"WIP/2023-08-28-assorted-important-fixes
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>
| -rw-r--r-- | arch/arm/mach-imx/mx7/Kconfig | 8 | ||||
| -rw-r--r-- | lib/optee/Kconfig | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig index 0bb18f6..3c0208e 100644 --- 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 517136a..e6834d4 100644 --- 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 |