MLK-19628: imx6ulz: configs: adding optee support

Adding new config file and uTee file name to enable OP-TEE support
on imx6ulz EVK.

Signed-off-by: Silvano di Ninno <silvano.dininno@nxp.com>
(cherry picked from commit e3c26a7b908a6a3591ab2e619735c44a85e23972)
Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit 6f6c9a9a838981eb9c6c0dd3558125039250c319)

diff --git a/configs/mx6ulz_14x14_evk_optee_defconfig b/configs/mx6ulz_14x14_evk_optee_defconfig
new file mode 100644 (file)
index 0000000..6458617
--- /dev/null
+++ b/configs/mx6ulz_14x14_evk_optee_defconfig
@@ -0,0 +1,63 @@
+CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
+CONFIG_TARGET_MX6ULL_14X14_EVK=y
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ullevk/imximage.cfg"
+CONFIG_SUPPORT_RAW_INITRD=y
+CONFIG_BOUNCE_BUFFER=y
+CONFIG_VIDEO=y
+CONFIG_IMX_OPTEE=y
+CONFIG_BOOTDELAY=3
+CONFIG_BOARD_EARLY_INIT_F=y
+CONFIG_HUSH_PARSER=y
+CONFIG_CMD_BOOTZ=y
+# CONFIG_CMD_IMLS is not set
+CONFIG_CMD_MEMTEST=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
+CONFIG_CMD_SF=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_BMP=y
+CONFIG_CMD_CACHE=y
+CONFIG_CMD_NET=y
+CONFIG_CMD_EXT2=y
+CONFIG_CMD_EXT4=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_CMD_FAT=y
+CONFIG_CMD_FS_GENERIC=y
+CONFIG_OF_CONTROL=y
+CONFIG_DEFAULT_DEVICE_TREE="imx6ulz-14x14-evk"
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
+CONFIG_DM_GPIO=y
+CONFIG_DM_74X164=y
+CONFIG_DM_I2C=y
+CONFIG_DM_MMC=y
+CONFIG_FSL_ESDHC=y
+CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH=y
+CONFIG_SF_DEFAULT_MODE=0
+CONFIG_SF_DEFAULT_SPEED=40000000
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_MICREL=y
+CONFIG_DM_ETH=y
+CONFIG_MII=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_IMX6=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_FIXED=y
+CONFIG_DM_REGULATOR_GPIO=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_SOFT_SPI=y
+CONFIG_FSL_QSPI=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_HOST_ETHER=y
+CONFIG_USB_ETHER_ASIX=y
+CONFIG_USB_ETHER_RTL8152=y

diff --git a/include/configs/mx6ullevk.h b/include/configs/mx6ullevk.h
index 266f3f4..edb0e1e 100644 (file)
--- a/include/configs/mx6ullevk.h
+++ b/include/configs/mx6ullevk.h
@@ -120,7 +120,7 @@
        "fdt_file=undefined\0" \
        "fdt_addr=0x83000000\0" \
        "tee_addr=0x84000000\0" \
-       "tee_file=uTee-6ullevk\0" \
+       "tee_file=undefined\0" \
        "boot_fdt=try\0" \
        "ip_dyn=yes\0" \
        "panel=TFT43AB\0" \
@@ -201,6 +201,18 @@
                                        "echo WARNING: Could not determine dtb to use; " \
                                "fi; " \
                        "fi;\0" \
+               "findtee="\
+                       "if test $tee_file = undefined; then " \
+                               "if test $board_name = ULZ-EVK && test $board_rev = 14X14; then " \
+                                       "setenv tee_file uTee-6ulzevk; fi; " \
+                               "if test $board_name = EVK && test $board_rev = 9X9; then " \
+                                       "setenv tee_file uTee-6ullevk; fi; " \
+                               "if test $board_name = EVK && test $board_rev = 14X14; then " \
+                                       "setenv tee_file uTee-6ullevk; fi; " \
+                               "if test $tee_file = undefined; then " \
+                                       "echo WARNING: Could not determine tee to use; " \
+                               "fi; " \
+                       "fi;\0" \
 
 #define CONFIG_BOOTCOMMAND \
           "run findfdt;" \