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

[platform/kernel/u-boot.git] / arch / arm / mach-imx / mx7 / Kconfig

diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig
index 7053697..0cad825 100644 (file)
--- a/arch/arm/mach-imx/mx7/Kconfig
+++ b/arch/arm/mach-imx/mx7/Kconfig
@@ -2,57 +2,116 @@ if ARCH_MX7
 
 config MX7
        bool
-       select ROM_UNIFIED_SECTIONS
-       select CPU_V7_HAS_VIRT
-       select CPU_V7_HAS_NONSEC
+       default y
        select ARCH_SUPPORT_PSCI
+       select CPU_V7_HAS_NONSEC
+       select CPU_V7_HAS_VIRT
+       select ROM_UNIFIED_SECTIONS
+       select SYSCOUNTER_TIMER
        imply CMD_FUSE
-       default y
 
 config MX7D
+       bool
+       select HAS_CAAM
        select ROM_UNIFIED_SECTIONS
        imply CMD_FUSE
-       bool
-       imply ENV_IS_IN_MMC
+
+config SYS_TEXT_BASE
+       default 0x87800000
+
+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
 
+config TARGET_CL_SOM_IMX7
+       bool "CL-SOM-iMX7"
+       select DM
+       select DM_THERMAL
+       select MX7D
+       select SUPPORT_SPL
+       imply CMD_DM
+
+config TARGET_IMX7_CM
+       bool "Ronetix iMX7-CM"
+       select BOARD_LATE_INIT
+       select DM
+       select DM_THERMAL
+       select MX7D
+       select SUPPORT_SPL
+       imply CMD_DM
+
+config TARGET_MEERKAT96
+       bool "NovTech Meerkat96 board"
+       select BOARD_LATE_INIT
+       select DM
+       select DM_SERIAL
+       select DM_THERMAL
+       select MX7D
+       imply CMD_DM
+
 config TARGET_MX7DSABRESD
        bool "mx7dsabresd"
        select BOARD_LATE_INIT
-       select MX7D
        select DM
        select DM_THERMAL
+       select MX7D
+       imply CMD_DM
 
 config TARGET_PICO_IMX7D
        bool "pico-imx7d"
        select BOARD_LATE_INIT
+       select DM
+       select DM_THERMAL
        select MX7D
+       select SUPPORT_SPL
+       imply CMD_DM
+
+config TARGET_SMEGW01
+       bool "smegw01"
+       select BOARD_LATE_INIT
        select DM
        select DM_THERMAL
+       select MX7D
+       imply CMD_DM
 
 config TARGET_WARP7
        bool "warp7"
        select BOARD_LATE_INIT
-       select MX7D
        select DM
        select DM_THERMAL
+       select MX7D
+       imply CMD_DM
 
 config TARGET_COLIBRI_IMX7
        bool "Support Colibri iMX7S/iMX7D modules"
-       select BOARD_LATE_INIT
        select DM
        select DM_SERIAL
        select DM_THERMAL
+       select MX7D
+       imply CMD_DM
 
 endchoice
 
 config SYS_SOC
        default "mx7"
 
+source "board/compulab/cl-som-imx7/Kconfig"
+source "board/ronetix/imx7-cm/Kconfig"
 source "board/freescale/mx7dsabresd/Kconfig"
+source "board/novtech/meerkat96/Kconfig"
+source "board/storopack/smegw01/Kconfig"
 source "board/technexion/pico-imx7d/Kconfig"
 source "board/toradex/colibri_imx7/Kconfig"
 source "board/warp7/Kconfig"