MLK-16753-8 imx: mx6ul/ull: add optee support

Add different defconfigs. Enable Trustzone. Update env to runtime boot OP-TEE. Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit af4e26c34e091994615ec721bc357b45e43c89e9) (cherry picked from commit cd8397e9c973ac31766adf9565b2af18db9f9606) (cherry picked from commit 79e2e2fbe7ddf376619efb43c4b4e6c4285a6f5c)

MLK-16753-8 imx: mx6ul/ull: add optee support
Add different defconfigs. Enable Trustzone. Update env to runtime boot OP-TEE. Signed-off-by: Peng Fan <peng.fan@nxp.com> (cherry picked from commit af4e26c34e091994615ec721bc357b45e43c89e9) (cherry picked from commit cd8397e9c973ac31766adf9565b2af18db9f9606) (cherry picked from commit 79e2e2fbe7ddf376619efb43c4b4e6c4285a6f5c)
Peng Fan · Ye Li · Eric Lee · Eric Lee · Eric Lee · Eric Lee
1 parent c86df3e535
Showing 13 changed files with 358 additions and 47 deletions Side-by-side Diff
board/freescale/mx6ul_14x14_evk/imximage.cfg
board/freescale/mx6ul_14x14_evk/imximage_lpddr2.cfg
board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c
board/freescale/mx6ul_14x14_evk/plugin.S
board/freescale/mx6ullevk/imximage.cfg
board/freescale/mx6ullevk/imximage_lpddr2.cfg
board/freescale/mx6ullevk/mx6ullevk.c
board/freescale/mx6ullevk/plugin.S
configs/mx6ul_14x14_evk_optee_defconfig
configs/mx6ul_9x9_evk_optee_defconfig
configs/mx6ull_14x14_evk_optee_defconfig
include/configs/mx6ul_14x14_evk.h
include/configs/mx6ullevk.h
@@ -64,6 +64,11 @@
 DATA 4 0x020c407c 0xffffffff
 DATA 4 0x020c4080 0xffffffff
  
+#ifdef CONFIG_IMX_OPTEE
+DATA 4 0x20e4024 0x00000001
+CHECK_BITS_SET 4 0x20e4024 0x1
+#endif
+
 DATA 4 0x020E04B4 0x000C0000
 DATA 4 0x020E04AC 0x00000000
 DATA 4 0x020E027C 0x00000030
@@ -129,6 +134,11 @@
 DATA 4 0x020c4078 0xffffffff
 DATA 4 0x020c407c 0xffffffff
 DATA 4 0x020c4080 0xffffffff
+
+#ifdef CONFIG_IMX_OPTEE
+DATA 4 0x20e4024 0x00000001
+CHECK_BITS_SET 4 0x20e4024 0x1
+#endif
  
 DATA 4 0x020E04B4 0x000C0000
 DATA 4 0x020E04AC 0x00000000
@@ -60,6 +60,11 @@
 DATA 4 0x020c4080 0xffffffff
 DATA 4 0x020c4084 0xffffffff
  
+#ifdef CONFIG_IMX_OPTEE
+DATA 4 0x20e4024 0x00000001
+CHECK_BITS_SET 4 0x20e4024 0x1
+#endif
+
 DATA 4 0x020E04B4 0x00080000
 DATA 4 0x020E04AC 0x00000000
 DATA 4 0x020E027C 0x00000030
@@ -666,6 +666,11 @@
 	add_board_boot_modes(board_boot_modes);
 #endif
  
+	env_set("tee", "no");
+#ifdef CONFIG_IMX_OPTEE
+	env_set("tee", "yes");
+#endif
+
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 	env_set("board_name", "EVK");
  
@@ -348,6 +348,12 @@
 	str r1, [r0, #0x78]
 	str r1, [r0, #0x7C]
 	str r1, [r0, #0x80]
+
+#ifdef CONFIG_IMX_OPTEE
+	ldr r0, =0x20e4024
+	ldr r1, =1
+	str r1, [r0]
+#endif
 .endm
  
 .macro imx6_qos_setting
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
  *
  * Refer doc/README.imximage for more details about how-to configure
  * and create imximage boot image
@@ -57,6 +58,11 @@
 DATA 4 0x020c4078 0xffffffff
 DATA 4 0x020c407c 0xffffffff
 DATA 4 0x020c4080 0xffffffff
+
+#ifdef CONFIG_IMX_OPTEE
+DATA 4 0x20e4024 0x00000001
+CHECK_BITS_SET 4 0x20e4024 0x1
+#endif
  
 DATA 4 0x020E04B4 0x000C0000
 DATA 4 0x020E04AC 0x00000000
 /*
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
  *
  * SPDX-License-Identifier:	GPL-2.0+
  *
@@ -57,6 +58,11 @@
 DATA 4 0x020c4078 0xffffffff
 DATA 4 0x020c407c 0xffffffff
 DATA 4 0x020c4080 0xffffffff
+
+#ifdef CONFIG_IMX_OPTEE
+DATA 4 0x20e4024 0x00000001
+CHECK_BITS_SET 4 0x20e4024 0x1
+#endif
  
 DATA 4 0x020E04B4 0x00080000
 DATA 4 0x020E04AC 0x00000000
 // SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
  */
  
 #include <asm/arch/clock.h>
@@ -380,6 +381,11 @@
 {
 #ifdef CONFIG_CMD_BMODE
 	add_board_boot_modes(board_boot_modes);
+#endif
+
+	env_set("tee", "no");
+#ifdef CONFIG_IMX_OPTEE
+	env_set("tee", "yes");
 #endif
  
 #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
  */
  
 #include <config.h>
@@ -239,6 +240,12 @@
 	str r1, [r0, #0x78]
 	str r1, [r0, #0x7C]
 	str r1, [r0, #0x80]
+
+#ifdef CONFIG_IMX_OPTEE
+	ldr r0, =0x20e4024
+	ldr r1, =0x1
+	str r1, [r0]
+#endif
 .endm
  
 .macro imx6_qos_setting
+CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
+CONFIG_TARGET_MX6UL_14X14_EVK=y
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ul_14x14_evk/imximage.cfg"
+CONFIG_IMX_OPTEE=y
+CONFIG_BOOTDELAY=3
+# CONFIG_CONSOLE_MUX is not set
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SUPPORT_RAW_INITRD=y
+CONFIG_BOUNCE_BUFFER=y
+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="imx6ul-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_VIDEO=y
+CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
+CONFIG_TARGET_MX6UL_9X9_EVK=y
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ul_14x14_evk/imximage_lpddr2.cfg"
+CONFIG_IMX_OPTEE=y
+CONFIG_BOOTDELAY=3
+# CONFIG_CONSOLE_MUX is not set
+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_SUPPORT_RAW_INITRD=y
+CONFIG_BOUNCE_BUFFER=y
+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="imx6ul-9x9-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_PMIC=y
+CONFIG_DM_PMIC_PFUZE100=y
+CONFIG_DM_REGULATOR=y
+CONFIG_DM_REGULATOR_PFUZE100=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_VIDEO=y
+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="imx6ull-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
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ * Copyright (C) 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
  *
  * Configuration settings for the Freescale i.MX6UL 14x14 EVK board.
  */
@@ -60,7 +61,7 @@
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
  
 #ifdef CONFIG_NAND_BOOT
-#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs) "
+#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),16m(tee),-(rootfs) "
 #else
 #define MFG_NAND_PARTITION ""
 #endif
  
@@ -78,11 +79,17 @@
 		"\0" \
 	"initrd_addr=0x83800000\0" \
 	"initrd_high=0xffffffff\0" \
-	"bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
+	"bootcmd_mfg=run mfgtool_args; " \
+		"if test ${tee} = yes; then " \
+			"bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
+		"else " \
+			"bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
+		"fi;\0"
  
 #if defined(CONFIG_NAND_BOOT)
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
+	TEE_ENV \
 	"panel=TFT43AB\0" \
 	"fdt_addr=0x83000000\0" \
 	"fdt_high=0xffffffff\0"	  \
  
  
@@ -90,14 +97,21 @@
 	"bootargs=console=ttymxc0,115200 ubi.mtd=4 "  \
 		"root=ubi0:rootfs rootfstype=ubifs "		     \
 		BOOTARGS_CMA_SIZE \
-		"mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs)\0"\
+		MFG_NAND_PARTITION \
+		"\0" \
 	"bootcmd=nand read ${loadaddr} 0x4000000 0x800000;"\
 		"nand read ${fdt_addr} 0x5000000 0x100000;"\
-		"bootz ${loadaddr} - ${fdt_addr}\0"
+		"if test ${tee} = yes; then " \
+			"nand read ${tee_addr} 0x6000000 0x400000;"\
+			"bootm ${teeaddr} - ${fdt_addr};" \
+		"else " \
+			"bootz ${loadaddr} - ${fdt_addr};" \
+		"fi\0"
  
 #else
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
+	TEE_ENV \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
@@ -105,6 +119,8 @@
 	"initrd_high=0xffffffff\0" \
 	"fdt_file=undefined\0" \
 	"fdt_addr=0x83000000\0" \
+	"tee_addr=0x84000000\0" \
+	"tee_file=undefined\0" \
 	"boot_fdt=try\0" \
 	"ip_dyn=yes\0" \
 	"panel=TFT43AB\0" \
  
  
  
  
@@ -121,20 +137,25 @@
 		"source\0" \
 	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
 	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+	"loadtee=fatload mmc ${mmcdev}:${mmcpart} ${tee_addr} ${tee_file}\0" \
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
-		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-			"if run loadfdt; then " \
-				"bootz ${loadaddr} - ${fdt_addr}; " \
-			"else " \
-				"if test ${boot_fdt} = try; then " \
-					"bootz; " \
+		"if test ${tee} = yes; then " \
+			"run loadfdt; run loadtee; bootm ${tee_addr} - ${fdt_addr}; " \
+		"else " \
+			"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+				"if run loadfdt; then " \
+					"bootz ${loadaddr} - ${fdt_addr}; " \
 				"else " \
-					"echo WARN: Cannot load the DT; " \
+					"if test ${boot_fdt} = try; then " \
+						"bootz; " \
+					"else " \
+						"echo WARN: Cannot load the DT; " \
+					"fi; " \
 				"fi; " \
+			"else " \
+				"bootz; " \
 			"fi; " \
-		"else " \
-			"bootz; " \
 		"fi;\0" \
 	"netargs=setenv bootargs console=${console},${baudrate} " \
 		BOOTARGS_CMA_SIZE \
  
  
  
  
@@ -148,19 +169,34 @@
 			"setenv get_cmd tftp; " \
 		"fi; " \
 		"${get_cmd} ${image}; " \
-		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
-				"bootz ${loadaddr} - ${fdt_addr}; " \
-			"else " \
-				"if test ${boot_fdt} = try; then " \
-					"bootz; " \
+		"if test ${tee} = yes; then " \
+			"${get_cmd} ${tee_addr} ${tee_file}; " \
+			"${get_cmd} ${fdt_addr} ${fdt_file}; " \
+			"bootm ${tee_addr} - ${fdt_addr}; " \
+		"else " \
+			"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+				"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
+					"bootz ${loadaddr} - ${fdt_addr}; " \
 				"else " \
-					"echo WARN: Cannot load the DT; " \
+					"if test ${boot_fdt} = try; then " \
+						"bootz; " \
+					"else " \
+						"echo WARN: Cannot load the DT; " \
+					"fi; " \
 				"fi; " \
+			"else " \
+				"bootz; " \
 			"fi; " \
-		"else " \
-			"bootz; " \
 		"fi;\0" \
+		"findtee="\
+			"if test $tee_file = undefined; then " \
+				"if test $board_name = EVK && test $board_rev = 9X9; then " \
+					"setenv tee_file uTee-6ul9x9; fi; " \
+				"if test $board_name = EVK && test $board_rev = 14X14; then " \
+					"setenv tee_file uTee-6ulevk; fi; " \
+				"if test $fdt_file = undefined; then " \
+					"echo WARNING: Could not determine tee to use; fi; " \
+			"fi;\0" \
 		"findfdt="\
 			"if test $fdt_file = undefined; then " \
 				"if test $board_name = EVK && test $board_rev = 9X9; then " \
  
@@ -168,11 +204,13 @@
 				"if test $board_name = EVK && test $board_rev = 14X14; then " \
 					"setenv fdt_file imx6ul-14x14-evk.dtb; fi; " \
 				"if test $fdt_file = undefined; then " \
-					"echo WARNING: Could not determine dtb to use; fi; " \
+					"echo WARNING: Could not determine dtb to use; " \
+				"fi; " \
 			"fi;\0" \
  
 #define CONFIG_BOOTCOMMAND \
 	   "run findfdt;" \
+	   "run findtee;" \
 	   "mmc dev ${mmcdev};" \
 	   "mmc dev ${mmcdev}; if mmc rescan; then " \
 		   "if run loadbootscript; then " \
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
  *
  * Configuration settings for the Freescale i.MX6UL 14x14 EVK board.
  */
@@ -60,7 +61,7 @@
 #define CONFIG_SYS_MMC_IMG_LOAD_PART	1
  
 #ifdef CONFIG_NAND_BOOT
-#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs) "
+#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),16m(tee),-(rootfs) "
 #else
 #define MFG_NAND_PARTITION ""
 #endif
  
@@ -78,11 +79,17 @@
 		"\0" \
 	"initrd_addr=0x83800000\0" \
 	"initrd_high=0xffffffff\0" \
-	"bootcmd_mfg=run mfgtool_args;bootz ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
+	"bootcmd_mfg=run mfgtool_args; " \
+		"if test ${tee} = yes; then " \
+			"bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
+		"else " \
+			"bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
+		"fi;\0"
  
 #if defined(CONFIG_NAND_BOOT)
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
+	TEE_ENV \
 	"panel=TFT43AB\0" \
 	"fdt_addr=0x83000000\0" \
 	"fdt_high=0xffffffff\0"	  \
  
  
@@ -90,14 +97,21 @@
 	"bootargs=console=ttymxc0,115200 ubi.mtd=4 "  \
 		"root=ubi0:rootfs rootfstype=ubifs "		     \
 		BOOTARGS_CMA_SIZE \
-		"mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs)\0"\
+		MFG_NAND_PARTITION \
+		"\0" \
 	"bootcmd=nand read ${loadaddr} 0x4000000 0x800000;"\
 		"nand read ${fdt_addr} 0x5000000 0x100000;"\
-		"bootz ${loadaddr} - ${fdt_addr}\0"
+		"if test ${tee} = yes; then " \
+			"nand read ${tee_addr} 0x6000000 0x400000;"\
+			"bootm ${teeaddr} - ${fdt_addr};" \
+		"else " \
+			"bootz ${loadaddr} - ${fdt_addr};" \
+		"fi\0"
  
 #else
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	CONFIG_MFG_ENV_SETTINGS \
+	TEE_ENV \
 	"script=boot.scr\0" \
 	"image=zImage\0" \
 	"console=ttymxc0\0" \
@@ -105,6 +119,8 @@
 	"initrd_high=0xffffffff\0" \
 	"fdt_file=undefined\0" \
 	"fdt_addr=0x83000000\0" \
+	"tee_addr=0x84000000\0" \
+	"tee_file=uTee-6ullevk\0" \
 	"boot_fdt=try\0" \
 	"ip_dyn=yes\0" \
 	"panel=TFT43AB\0" \
  
  
  
  
@@ -121,20 +137,25 @@
 		"source\0" \
 	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
 	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+	"loadtee=fatload mmc ${mmcdev}:${mmcpart} ${tee_addr} ${tee_file}\0" \
 	"mmcboot=echo Booting from mmc ...; " \
 		"run mmcargs; " \
-		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-			"if run loadfdt; then " \
-				"bootz ${loadaddr} - ${fdt_addr}; " \
-			"else " \
-				"if test ${boot_fdt} = try; then " \
-					"bootz; " \
+		"if test ${tee} = yes; then " \
+			"run loadfdt; run loadtee; bootm ${tee_addr} - ${fdt_addr}; " \
+		"else " \
+			"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+				"if run loadfdt; then " \
+					"bootz ${loadaddr} - ${fdt_addr}; " \
 				"else " \
-					"echo WARN: Cannot load the DT; " \
+					"if test ${boot_fdt} = try; then " \
+						"bootz; " \
+					"else " \
+						"echo WARN: Cannot load the DT; " \
+					"fi; " \
 				"fi; " \
+			"else " \
+				"bootz; " \
 			"fi; " \
-		"else " \
-			"bootz; " \
 		"fi;\0" \
 	"netargs=setenv bootargs console=${console},${baudrate} " \
 		BOOTARGS_CMA_SIZE \
  
  
  
@@ -148,18 +169,24 @@
 			"setenv get_cmd tftp; " \
 		"fi; " \
 		"${get_cmd} ${image}; " \
-		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
-				"bootz ${loadaddr} - ${fdt_addr}; " \
-			"else " \
-				"if test ${boot_fdt} = try; then " \
-					"bootz; " \
+		"if test ${tee} = yes; then " \
+			"${get_cmd} ${tee_addr} ${tee_file}; " \
+			"${get_cmd} ${fdt_addr} ${fdt_file}; " \
+			"bootm ${tee_addr} - ${fdt_addr}; " \
+		"else " \
+			"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+				"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
+					"bootz ${loadaddr} - ${fdt_addr}; " \
 				"else " \
-					"echo WARN: Cannot load the DT; " \
+					"if test ${boot_fdt} = try; then " \
+						"bootz; " \
+					"else " \
+						"echo WARN: Cannot load the DT; " \
+					"fi; " \
 				"fi; " \
+			"else " \
+				"bootz; " \
 			"fi; " \
-		"else " \
-			"bootz; " \
 		"fi;\0" \
 		"findfdt="\
 			"if test $fdt_file = undefined; then " \
  
@@ -168,11 +195,13 @@
 				"if test $board_name = EVK && test $board_rev = 14X14; then " \
 					"setenv fdt_file imx6ull-14x14-evk.dtb; fi; " \
 				"if test $fdt_file = undefined; then " \
-					"echo WARNING: Could not determine dtb to use; fi; " \
+					"echo WARNING: Could not determine dtb to use; " \
+				"fi; " \
 			"fi;\0" \
  
 #define CONFIG_BOOTCOMMAND \
 	   "run findfdt;" \
+	   "run findtee;" \
 	   "mmc dev ${mmcdev};" \
 	   "mmc dev ${mmcdev}; if mmc rescan; then " \
 		   "if run loadbootscript; then " \
...	...	@@ -64,6 +64,11 @@
64	64	DATA 4 0x020c407c 0xffffffff
65	65	DATA 4 0x020c4080 0xffffffff
66	66
	67	+#ifdef CONFIG_IMX_OPTEE
	68	+DATA 4 0x20e4024 0x00000001
	69	+CHECK_BITS_SET 4 0x20e4024 0x1
	70	+#endif
	71	+
67	72	DATA 4 0x020E04B4 0x000C0000
68	73	DATA 4 0x020E04AC 0x00000000
69	74	DATA 4 0x020E027C 0x00000030
...	...	@@ -129,6 +134,11 @@
129	134	DATA 4 0x020c4078 0xffffffff
130	135	DATA 4 0x020c407c 0xffffffff
131	136	DATA 4 0x020c4080 0xffffffff
	137	+
	138	+#ifdef CONFIG_IMX_OPTEE
	139	+DATA 4 0x20e4024 0x00000001
	140	+CHECK_BITS_SET 4 0x20e4024 0x1
	141	+#endif
132	142
133	143	DATA 4 0x020E04B4 0x000C0000
134	144	DATA 4 0x020E04AC 0x00000000
...	...	@@ -60,6 +60,11 @@
60	60	DATA 4 0x020c4080 0xffffffff
61	61	DATA 4 0x020c4084 0xffffffff
62	62
	63	+#ifdef CONFIG_IMX_OPTEE
	64	+DATA 4 0x20e4024 0x00000001
	65	+CHECK_BITS_SET 4 0x20e4024 0x1
	66	+#endif
	67	+
63	68	DATA 4 0x020E04B4 0x00080000
64	69	DATA 4 0x020E04AC 0x00000000
65	70	DATA 4 0x020E027C 0x00000030
...	...	@@ -666,6 +666,11 @@
666	666	add_board_boot_modes(board_boot_modes);
667	667	#endif
668	668
	669	+ env_set("tee", "no");
	670	+#ifdef CONFIG_IMX_OPTEE
	671	+ env_set("tee", "yes");
	672	+#endif
	673	+
669	674	#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
670	675	env_set("board_name", "EVK");
671	676
...	...	@@ -348,6 +348,12 @@
348	348	str r1, [r0, #0x78]
349	349	str r1, [r0, #0x7C]
350	350	str r1, [r0, #0x80]
	351	+
	352	+#ifdef CONFIG_IMX_OPTEE
	353	+ ldr r0, =0x20e4024
	354	+ ldr r1, =1
	355	+ str r1, [r0]
	356	+#endif
351	357	.endm
352	358
353	359	.macro imx6_qos_setting
1	1	/* SPDX-License-Identifier: GPL-2.0+ */
2	2	/*
3	3	* Copyright (C) 2016 Freescale Semiconductor, Inc.
	4	+ * Copyright 2017 NXP
4	5	*
5	6	* Refer doc/README.imximage for more details about how-to configure
6	7	* and create imximage boot image
...	...	@@ -57,6 +58,11 @@
57	58	DATA 4 0x020c4078 0xffffffff
58	59	DATA 4 0x020c407c 0xffffffff
59	60	DATA 4 0x020c4080 0xffffffff
	61	+
	62	+#ifdef CONFIG_IMX_OPTEE
	63	+DATA 4 0x20e4024 0x00000001
	64	+CHECK_BITS_SET 4 0x20e4024 0x1
	65	+#endif
60	66
61	67	DATA 4 0x020E04B4 0x000C0000
62	68	DATA 4 0x020E04AC 0x00000000
1	1	/*
2	2	* Copyright (C) 2016 Freescale Semiconductor, Inc.
	3	+ * Copyright 2017 NXP
3	4	*
4	5	* SPDX-License-Identifier: GPL-2.0+
5	6	*
...	...	@@ -57,6 +58,11 @@
57	58	DATA 4 0x020c4078 0xffffffff
58	59	DATA 4 0x020c407c 0xffffffff
59	60	DATA 4 0x020c4080 0xffffffff
	61	+
	62	+#ifdef CONFIG_IMX_OPTEE
	63	+DATA 4 0x20e4024 0x00000001
	64	+CHECK_BITS_SET 4 0x20e4024 0x1
	65	+#endif
60	66
61	67	DATA 4 0x020E04B4 0x00080000
62	68	DATA 4 0x020E04AC 0x00000000
1	1	// SPDX-License-Identifier: GPL-2.0+
2	2	/*
3	3	* Copyright (C) 2016 Freescale Semiconductor, Inc.
	4	+ * Copyright 2017 NXP
4	5	*/
5	6
6	7	#include <asm/arch/clock.h>
...	...	@@ -380,6 +381,11 @@
380	381	{
381	382	#ifdef CONFIG_CMD_BMODE
382	383	add_board_boot_modes(board_boot_modes);
	384	+#endif
	385	+
	386	+ env_set("tee", "no");
	387	+#ifdef CONFIG_IMX_OPTEE
	388	+ env_set("tee", "yes");
383	389	#endif
384	390
385	391	#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
	1	+CONFIG_ARM=y
	2	+CONFIG_ARCH_MX6=y
	3	+CONFIG_TARGET_MX6UL_14X14_EVK=y
	4	+CONFIG_NR_DRAM_BANKS=1
	5	+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ul_14x14_evk/imximage.cfg"
	6	+CONFIG_IMX_OPTEE=y
	7	+CONFIG_BOOTDELAY=3
	8	+# CONFIG_CONSOLE_MUX is not set
	9	+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
	10	+CONFIG_SUPPORT_RAW_INITRD=y
	11	+CONFIG_BOUNCE_BUFFER=y
	12	+CONFIG_BOARD_EARLY_INIT_F=y
	13	+CONFIG_HUSH_PARSER=y
	14	+CONFIG_CMD_BOOTZ=y
	15	+# CONFIG_CMD_IMLS is not set
	16	+CONFIG_CMD_MEMTEST=y
	17	+CONFIG_CMD_GPIO=y
	18	+CONFIG_CMD_I2C=y
	19	+CONFIG_CMD_MMC=y
	20	+CONFIG_CMD_SF=y
	21	+CONFIG_CMD_USB=y
	22	+CONFIG_CMD_DHCP=y
	23	+CONFIG_CMD_PING=y
	24	+CONFIG_CMD_BMP=y
	25	+CONFIG_CMD_CACHE=y
	26	+CONFIG_CMD_NET=y
	27	+CONFIG_CMD_EXT2=y
	28	+CONFIG_CMD_EXT4=y
	29	+CONFIG_CMD_EXT4_WRITE=y
	30	+CONFIG_CMD_FAT=y
	31	+CONFIG_CMD_FS_GENERIC=y
	32	+CONFIG_OF_CONTROL=y
	33	+CONFIG_DEFAULT_DEVICE_TREE="imx6ul-14x14-evk"
	34	+CONFIG_ENV_IS_IN_MMC=y
	35	+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
	36	+CONFIG_DM_GPIO=y
	37	+CONFIG_DM_74X164=y
	38	+CONFIG_DM_I2C=y
	39	+CONFIG_DM_MMC=y
	40	+CONFIG_FSL_ESDHC=y
	41	+CONFIG_DM_SPI_FLASH=y
	42	+CONFIG_SPI_FLASH=y
	43	+CONFIG_SF_DEFAULT_MODE=0
	44	+CONFIG_SF_DEFAULT_SPEED=40000000
	45	+CONFIG_SPI_FLASH_STMICRO=y
	46	+CONFIG_PHYLIB=y
	47	+CONFIG_PHY_MICREL=y
	48	+CONFIG_DM_ETH=y
	49	+CONFIG_MII=y
	50	+CONFIG_PINCTRL=y
	51	+CONFIG_PINCTRL_IMX6=y
	52	+CONFIG_DM_REGULATOR=y
	53	+CONFIG_DM_REGULATOR_FIXED=y
	54	+CONFIG_DM_REGULATOR_GPIO=y
	55	+CONFIG_SPI=y
	56	+CONFIG_DM_SPI=y
	57	+CONFIG_SOFT_SPI=y
	58	+CONFIG_FSL_QSPI=y
	59	+CONFIG_USB=y
	60	+CONFIG_DM_USB=y
	61	+CONFIG_USB_STORAGE=y
	62	+CONFIG_USB_HOST_ETHER=y
	63	+CONFIG_USB_ETHER_ASIX=y
	64	+CONFIG_VIDEO=y
	1	+CONFIG_ARM=y
	2	+CONFIG_ARCH_MX6=y
	3	+CONFIG_TARGET_MX6UL_9X9_EVK=y
	4	+CONFIG_NR_DRAM_BANKS=1
	5	+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ul_14x14_evk/imximage_lpddr2.cfg"
	6	+CONFIG_IMX_OPTEE=y
	7	+CONFIG_BOOTDELAY=3
	8	+# CONFIG_CONSOLE_MUX is not set
	9	+CONFIG_SYS_CONSOLE_IS_IN_ENV=y
	10	+CONFIG_SUPPORT_RAW_INITRD=y
	11	+CONFIG_BOUNCE_BUFFER=y
	12	+CONFIG_BOARD_EARLY_INIT_F=y
	13	+CONFIG_HUSH_PARSER=y
	14	+CONFIG_CMD_BOOTZ=y
	15	+# CONFIG_CMD_IMLS is not set
	16	+CONFIG_CMD_MEMTEST=y
	17	+CONFIG_CMD_GPIO=y
	18	+CONFIG_CMD_I2C=y
	19	+CONFIG_CMD_MMC=y
	20	+CONFIG_CMD_SF=y
	21	+CONFIG_CMD_USB=y
	22	+CONFIG_CMD_DHCP=y
	23	+CONFIG_CMD_PING=y
	24	+CONFIG_CMD_BMP=y
	25	+CONFIG_CMD_CACHE=y
	26	+CONFIG_CMD_NET=y
	27	+CONFIG_CMD_EXT2=y
	28	+CONFIG_CMD_EXT4=y
	29	+CONFIG_CMD_EXT4_WRITE=y
	30	+CONFIG_CMD_FAT=y
	31	+CONFIG_CMD_FS_GENERIC=y
	32	+CONFIG_OF_CONTROL=y
	33	+CONFIG_DEFAULT_DEVICE_TREE="imx6ul-9x9-evk"
	34	+CONFIG_ENV_IS_IN_MMC=y
	35	+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
	36	+CONFIG_DM_GPIO=y
	37	+CONFIG_DM_74X164=y
	38	+CONFIG_DM_I2C=y
	39	+CONFIG_DM_MMC=y
	40	+CONFIG_FSL_ESDHC=y
	41	+CONFIG_DM_SPI_FLASH=y
	42	+CONFIG_SPI_FLASH=y
	43	+CONFIG_SF_DEFAULT_MODE=0
	44	+CONFIG_SF_DEFAULT_SPEED=40000000
	45	+CONFIG_SPI_FLASH_STMICRO=y
	46	+CONFIG_PHYLIB=y
	47	+CONFIG_PHY_MICREL=y
	48	+CONFIG_DM_ETH=y
	49	+CONFIG_MII=y
	50	+CONFIG_PINCTRL=y
	51	+CONFIG_PINCTRL_IMX6=y
	52	+CONFIG_DM_PMIC=y
	53	+CONFIG_DM_PMIC_PFUZE100=y
	54	+CONFIG_DM_REGULATOR=y
	55	+CONFIG_DM_REGULATOR_PFUZE100=y
	56	+CONFIG_DM_REGULATOR_FIXED=y
	57	+CONFIG_DM_REGULATOR_GPIO=y
	58	+CONFIG_SPI=y
	59	+CONFIG_DM_SPI=y
	60	+CONFIG_SOFT_SPI=y
	61	+CONFIG_FSL_QSPI=y
	62	+CONFIG_USB=y
	63	+CONFIG_DM_USB=y
	64	+CONFIG_USB_STORAGE=y
	65	+CONFIG_USB_HOST_ETHER=y
	66	+CONFIG_USB_ETHER_ASIX=y
	67	+CONFIG_VIDEO=y
	1	+CONFIG_ARM=y
	2	+CONFIG_ARCH_MX6=y
	3	+CONFIG_TARGET_MX6ULL_14X14_EVK=y
	4	+CONFIG_NR_DRAM_BANKS=1
	5	+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ullevk/imximage.cfg"
	6	+CONFIG_SUPPORT_RAW_INITRD=y
	7	+CONFIG_BOUNCE_BUFFER=y
	8	+CONFIG_VIDEO=y
	9	+CONFIG_IMX_OPTEE=y
	10	+CONFIG_BOOTDELAY=3
	11	+CONFIG_BOARD_EARLY_INIT_F=y
	12	+CONFIG_HUSH_PARSER=y
	13	+CONFIG_CMD_BOOTZ=y
	14	+# CONFIG_CMD_IMLS is not set
	15	+CONFIG_CMD_MEMTEST=y
	16	+CONFIG_CMD_GPIO=y
	17	+CONFIG_CMD_I2C=y
	18	+CONFIG_CMD_MMC=y
	19	+CONFIG_CMD_SF=y
	20	+CONFIG_CMD_USB=y
	21	+CONFIG_CMD_DHCP=y
	22	+CONFIG_CMD_PING=y
	23	+CONFIG_CMD_BMP=y
	24	+CONFIG_CMD_CACHE=y
	25	+CONFIG_CMD_NET=y
	26	+CONFIG_CMD_EXT2=y
	27	+CONFIG_CMD_EXT4=y
	28	+CONFIG_CMD_EXT4_WRITE=y
	29	+CONFIG_CMD_FAT=y
	30	+CONFIG_CMD_FS_GENERIC=y
	31	+CONFIG_OF_CONTROL=y
	32	+CONFIG_DEFAULT_DEVICE_TREE="imx6ull-14x14-evk"
	33	+CONFIG_ENV_IS_IN_MMC=y
	34	+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
	35	+CONFIG_DM_GPIO=y
	36	+CONFIG_DM_74X164=y
	37	+CONFIG_DM_I2C=y
	38	+CONFIG_DM_MMC=y
	39	+CONFIG_FSL_ESDHC=y
	40	+CONFIG_DM_SPI_FLASH=y
	41	+CONFIG_SPI_FLASH=y
	42	+CONFIG_SF_DEFAULT_MODE=0
	43	+CONFIG_SF_DEFAULT_SPEED=40000000
	44	+CONFIG_SPI_FLASH_STMICRO=y
	45	+CONFIG_PHYLIB=y
	46	+CONFIG_PHY_MICREL=y
	47	+CONFIG_DM_ETH=y
	48	+CONFIG_MII=y
	49	+CONFIG_PINCTRL=y
	50	+CONFIG_PINCTRL_IMX6=y
	51	+CONFIG_DM_REGULATOR=y
	52	+CONFIG_DM_REGULATOR_FIXED=y
	53	+CONFIG_DM_REGULATOR_GPIO=y
	54	+CONFIG_SPI=y
	55	+CONFIG_DM_SPI=y
	56	+CONFIG_SOFT_SPI=y
	57	+CONFIG_FSL_QSPI=y
	58	+CONFIG_USB=y
	59	+CONFIG_DM_USB=y
	60	+CONFIG_USB_STORAGE=y
	61	+CONFIG_USB_HOST_ETHER=y
	62	+CONFIG_USB_ETHER_ASIX=y