Commit 7c93e616 authored by Peng Fan's avatar Peng Fan

MLK-16753-7 imx: mx6sx: add optee support

Add different defconfigs.
Enable Trustzone.
Update env to runtime boot OP-TEE.
Signed-off-by: 's avatarPeng Fan <peng.fan@nxp.com>
parent 1ee9ba89
...@@ -55,6 +55,11 @@ DATA 4 0x020c407c 0xffffffff ...@@ -55,6 +55,11 @@ DATA 4 0x020c407c 0xffffffff
DATA 4 0x020c4080 0xffffffff DATA 4 0x020c4080 0xffffffff
DATA 4 0x020c4084 0xffffffff DATA 4 0x020c4084 0xffffffff
#ifdef CONFIG_IMX_OPTEE
DATA 4 0x20e4024 0x00000001
CHECK_BITS_SET 4 0x20e4024 0x1
#endif
/* IOMUX - DDR IO Type */ /* IOMUX - DDR IO Type */
DATA 4 0x020e0618 0x000c0000 DATA 4 0x020e0618 0x000c0000
DATA 4 0x020e05fc 0x00000000 DATA 4 0x020e05fc 0x00000000
......
...@@ -541,6 +541,11 @@ int board_late_init(void) ...@@ -541,6 +541,11 @@ int board_late_init(void)
add_board_boot_modes(board_boot_modes); add_board_boot_modes(board_boot_modes);
#endif #endif
setenv("tee", "no");
#ifdef CONFIG_IMX_OPTEE
setenv("tee", "yes");
#endif
#ifdef CONFIG_ENV_IS_IN_MMC #ifdef CONFIG_ENV_IS_IN_MMC
board_late_mmc_env_init(); board_late_mmc_env_init();
#endif #endif
......
...@@ -130,6 +130,11 @@ ...@@ -130,6 +130,11 @@
str r1, [r0, #0x07c] str r1, [r0, #0x07c]
str r1, [r0, #0x080] str r1, [r0, #0x080]
str r1, [r0, #0x084] str r1, [r0, #0x084]
#ifdef CONFIG_IMX_OPTEE
ldr r0, =0x20e4024
ldr r1, =0x1
str r1, [r0]
#endif
.endm .endm
.macro imx6_qos_setting .macro imx6_qos_setting
......
...@@ -53,6 +53,11 @@ DATA 4 0x020c407c 0xffffffff ...@@ -53,6 +53,11 @@ DATA 4 0x020c407c 0xffffffff
DATA 4 0x020c4080 0xffffffff DATA 4 0x020c4080 0xffffffff
DATA 4 0x020c4084 0xffffffff DATA 4 0x020c4084 0xffffffff
#ifdef CONFIG_IMX_OPTEE
DATA 4 0x20e4024 0x00000001
CHECK_BITS_SET 4 0x20e4024 0x1
#endif
/* IOMUX - DDR IO Type */ /* IOMUX - DDR IO Type */
DATA 4 0x020e0618 0x000c0000 DATA 4 0x020e0618 0x000c0000
DATA 4 0x020e05fc 0x00000000 DATA 4 0x020e05fc 0x00000000
......
...@@ -963,6 +963,11 @@ int board_late_init(void) ...@@ -963,6 +963,11 @@ int board_late_init(void)
add_board_boot_modes(board_boot_modes); add_board_boot_modes(board_boot_modes);
#endif #endif
setenv("tee", "no");
#ifdef CONFIG_IMX_OPTEE
setenv("tee", "yes");
#endif
#ifdef CONFIG_ENV_IS_IN_MMC #ifdef CONFIG_ENV_IS_IN_MMC
board_late_mmc_env_init(); board_late_mmc_env_init();
#endif #endif
......
...@@ -122,6 +122,12 @@ ...@@ -122,6 +122,12 @@
str r1, [r0, #0x07c] str r1, [r0, #0x07c]
str r1, [r0, #0x080] str r1, [r0, #0x080]
str r1, [r0, #0x084] str r1, [r0, #0x084]
#ifdef CONFIG_IMX_OPTEE
ldr r0, =0x20e4024
ldr r1, =0x1
str r1, [r0]
#endif
.endm .endm
.macro imx6_qos_setting .macro imx6_qos_setting
......
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TARGET_MX6SXSABREAUTO=y
CONFIG_DEFAULT_DEVICE_TREE="imx6sx-sabreauto"
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabreauto/imximage.cfg"
CONFIG_BOOTDELAY=3
CONFIG_IMX_OPTEE=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_MEMTEST=y
CONFIG_CMD_MMC=y
CONFIG_CMD_SF=y
CONFIG_CMD_I2C=y
CONFIG_CMD_USB=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_TIME=y
CONFIG_CMD_REGULATOR=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_BLK is not set
CONFIG_DM_GPIO=y
CONFIG_DM_PCA953X=y
CONFIG_DM_I2C=y
CONFIG_DM_MMC=y
# CONFIG_DM_MMC_OPS is not set
CONFIG_DM_SPI=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_BAR=y
CONFIG_SPI_FLASH_STMICRO=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_DM_ETH=y
CONFIG_DM_USB=y
CONFIG_FSL_QSPI=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
CONFIG_IMX_BOOTAUX=y
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TARGET_MX6SXSABRESD=y
CONFIG_VIDEO=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg"
CONFIG_BOOTDELAY=3
CONFIG_IMX_OPTEE=y
# CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
# CONFIG_CMD_IMLS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_MEMTEST=y
CONFIG_CMD_MMC=y
CONFIG_CMD_SF=y
CONFIG_CMD_I2C=y
CONFIG_CMD_USB=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_TIME=y
CONFIG_CMD_REGULATOR=y
CONFIG_CMD_EXT2=y
CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_DM_SPI=y
CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_BAR=y
CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_SPANSION=y
CONFIG_USB=y
CONFIG_USB_STORAGE=y
# CONFIG_OF_LIBFDT=y
CONFIG_DEFAULT_DEVICE_TREE="imx6sx-sdb"
CONFIG_OF_CONTROL=y
# CONFIG_BLK is not set
CONFIG_DM_GPIO=y
CONFIG_DM_I2C=y
CONFIG_DM_MMC=y
# CONFIG_DM_MMC_OPS is not set
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_DM_ETH=y
CONFIG_DM_USB=y
CONFIG_FSL_QSPI=y
CONFIG_IMX_BOOTAUX=y
...@@ -19,11 +19,20 @@ ...@@ -19,11 +19,20 @@
#define CONFIG_MXC_UART #define CONFIG_MXC_UART
#define CONFIG_MXC_UART_BASE UART1_BASE #define CONFIG_MXC_UART_BASE UART1_BASE
#ifdef CONFIG_IMX_OPTEE
#ifdef CONFIG_NAND_BOOT
#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(tee),16m(kernel),16m(dtb),1m(misc),-(rootfs) "
#else
#define MFG_NAND_PARTITION ""
#endif
#else
#ifdef CONFIG_NAND_BOOT #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),1m(misc),-(rootfs) "
#else #else
#define MFG_NAND_PARTITION "" #define MFG_NAND_PARTITION ""
#endif #endif
#endif
#ifdef CONFIG_IMX_BOOTAUX #ifdef CONFIG_IMX_BOOTAUX
...@@ -68,7 +77,11 @@ ...@@ -68,7 +77,11 @@
"\0" \ "\0" \
"initrd_addr=0x83800000\0" \ "initrd_addr=0x83800000\0" \
"initrd_high=0xffffffff\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};\0" \
#if defined(CONFIG_NAND_BOOT) #if defined(CONFIG_NAND_BOOT)
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
...@@ -79,10 +92,16 @@ ...@@ -79,10 +92,16 @@
"console=ttymxc0\0" \ "console=ttymxc0\0" \
"bootargs=console=ttymxc0,115200 ubi.mtd=6 " \ "bootargs=console=ttymxc0,115200 ubi.mtd=6 " \
"root=ubi0:rootfs rootfstype=ubifs " \ "root=ubi0:rootfs rootfstype=ubifs " \
"mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),1m(misc),-(rootfs)\0"\ MFG_NAND_PARTITION \
"bootcmd=nand read ${loadaddr} 0x4000000 0x800000;"\ "\0" \
"nand read ${fdt_addr} 0x5000000 0x100000;"\ "bootcmd=nand read ${loadaddr} 0x5000000 0x800000;"\
"bootz ${loadaddr} - ${fdt_addr}\0" "nand read ${fdt_addr} 0x6000000 0x100000;"\
"if test ${tee} = yes; then " \
"nand read ${tee_addr} 0x4000000 0x400000;"\
"bootm ${teeaddr} - ${fdt_addr};" \
"else " \
"bootz ${loadaddr} - ${fdt_addr};" \
"fi\0"
#else #else
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
...@@ -95,6 +114,8 @@ ...@@ -95,6 +114,8 @@
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
"fdt_file=imx6sx-sabreauto.dtb\0" \ "fdt_file=imx6sx-sabreauto.dtb\0" \
"fdt_addr=0x83000000\0" \ "fdt_addr=0x83000000\0" \
"tee_addr=0x84000000\0" \
"tee_file=uTee-6sxauto\0" \
"boot_fdt=try\0" \ "boot_fdt=try\0" \
"ip_dyn=yes\0" \ "ip_dyn=yes\0" \
"panel=Hannstar-XGA\0" \ "panel=Hannstar-XGA\0" \
...@@ -110,20 +131,25 @@ ...@@ -110,20 +131,25 @@
"source\0" \ "source\0" \
"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\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 ...; " \ "mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \ "run mmcargs; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if test ${tee} = yes; then " \
"if run loadfdt; then " \ "run loadfdt; run loadtee; bootm ${tee_addr} - ${fdt_addr}; " \
"bootz ${loadaddr} - ${fdt_addr}; " \ "else " \
"else " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if test ${boot_fdt} = try; then " \ "if run loadfdt; then " \
"bootz; " \ "bootz ${loadaddr} - ${fdt_addr}; " \
"else " \ "else " \
"echo WARN: Cannot load the DT; " \ "if test ${boot_fdt} = try; then " \
"bootz; " \
"else " \
"echo WARN: Cannot load the DT; " \
"fi; " \
"fi; " \ "fi; " \
"else " \
"bootz; " \
"fi; " \ "fi; " \
"else " \
"bootz; " \
"fi;\0" \ "fi;\0" \
"netargs=setenv bootargs console=${console},${baudrate} " \ "netargs=setenv bootargs console=${console},${baudrate} " \
"root=/dev/nfs " \ "root=/dev/nfs " \
...@@ -136,18 +162,24 @@ ...@@ -136,18 +162,24 @@
"setenv get_cmd tftp; " \ "setenv get_cmd tftp; " \
"fi; " \ "fi; " \
"${get_cmd} ${image}; " \ "${get_cmd} ${image}; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if test ${tee} = yes; then " \
"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ "${get_cmd} ${tee_addr} ${tee_file}; " \
"bootz ${loadaddr} - ${fdt_addr}; " \ "${get_cmd} ${fdt_addr} ${fdt_file}; " \
"else " \ "bootm ${tee_addr} - ${fdt_addr}; " \
"if test ${boot_fdt} = try; then " \ "else " \
"bootz; " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
"bootz ${loadaddr} - ${fdt_addr}; " \
"else " \ "else " \
"echo WARN: Cannot load the DT; " \ "if test ${boot_fdt} = try; then " \
"bootz; " \
"else " \
"echo WARN: Cannot load the DT; " \
"fi; " \
"fi; " \ "fi; " \
"fi; " \ "else " \
"else " \ "bootz; " \
"bootz; " \ "fi;" \
"fi;\0" "fi;\0"
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \
......
...@@ -71,7 +71,11 @@ ...@@ -71,7 +71,11 @@
"\0" \ "\0" \
"initrd_addr=0x83800000\0" \ "initrd_addr=0x83800000\0" \
"initrd_high=0xffffffff\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};\0" \
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
CONFIG_MFG_ENV_SETTINGS \ CONFIG_MFG_ENV_SETTINGS \
...@@ -83,6 +87,8 @@ ...@@ -83,6 +87,8 @@
"initrd_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \
"fdt_file=imx6sx-sdb.dtb\0" \ "fdt_file=imx6sx-sdb.dtb\0" \
"fdt_addr=0x83000000\0" \ "fdt_addr=0x83000000\0" \
"tee_addr=0x84000000\0" \
"tee_file=uTee-6sxsdb\0" \
"boot_fdt=try\0" \ "boot_fdt=try\0" \
"ip_dyn=yes\0" \ "ip_dyn=yes\0" \
"panel=Hannstar-XGA\0" \ "panel=Hannstar-XGA\0" \
...@@ -98,20 +104,25 @@ ...@@ -98,20 +104,25 @@
"source\0" \ "source\0" \
"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\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 ...; " \ "mmcboot=echo Booting from mmc ...; " \
"run mmcargs; " \ "run mmcargs; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if test ${tee} = yes; then " \
"if run loadfdt; then " \ "run loadfdt; run loadtee; bootm ${tee_addr} - ${fdt_addr}; " \
"bootz ${loadaddr} - ${fdt_addr}; " \ "else " \
"else " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if test ${boot_fdt} = try; then " \ "if run loadfdt; then " \
"bootz; " \ "bootz ${loadaddr} - ${fdt_addr}; " \
"else " \ "else " \
"echo WARN: Cannot load the DT; " \ "if test ${boot_fdt} = try; then " \
"bootz; " \
"else " \
"echo WARN: Cannot load the DT; " \
"fi; " \
"fi; " \ "fi; " \
"else " \
"bootz; " \
"fi; " \ "fi; " \
"else " \
"bootz; " \
"fi;\0" \ "fi;\0" \
"netargs=setenv bootargs console=${console},${baudrate} " \ "netargs=setenv bootargs console=${console},${baudrate} " \
"root=/dev/nfs " \ "root=/dev/nfs " \
...@@ -124,18 +135,24 @@ ...@@ -124,18 +135,24 @@
"setenv get_cmd tftp; " \ "setenv get_cmd tftp; " \
"fi; " \ "fi; " \
"${get_cmd} ${image}; " \ "${get_cmd} ${image}; " \
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if test ${tee} = yes; then " \
"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ "${get_cmd} ${tee_addr} ${tee_file}; " \
"bootz ${loadaddr} - ${fdt_addr}; " \ "${get_cmd} ${fdt_addr} ${fdt_file}; " \
"else " \ "bootm ${tee_addr} - ${fdt_addr}; " \
"if test ${boot_fdt} = try; then " \ "else " \
"bootz; " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
"bootz ${loadaddr} - ${fdt_addr}; " \
"else " \ "else " \
"echo WARN: Cannot load the DT; " \ "if test ${boot_fdt} = try; then " \
"bootz; " \
"else " \
"echo WARN: Cannot load the DT; " \
"fi; " \
"fi; " \ "fi; " \
"else " \
"bootz; " \
"fi; " \ "fi; " \
"else " \
"bootz; " \
"fi;\0" "fi;\0"
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment