diff options
| author | Haoran.Wang <elven.wang@nxp.com> | 2017-09-01 23:28:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-01 23:28:58 +0000 |
| commit | f5512a84f4ccd272f800127fc12628b27956f5b1 (patch) | |
| tree | 8e4dadfa34934260b0512b8123b924fe6fe4db0a | |
| parent | 167907405c39c671c88c739cae98dc3e9da16330 (diff) | |
| parent | 70b08aa1fa2c2b8a170baa7ac4ce5d9c8c871073 (diff) | |
| download | uboot-imx-f5512a84f4ccd272f800127fc12628b27956f5b1.tar.gz | |
[iot] Enable Trusty for pico-imx6ul
am: 70b08aa1fa
Change-Id: I9e04b4289647f3c1f10c57911ee472ff77c2ac63
| -rw-r--r-- | board/freescale/picosom-imx6ul/picosom-imx6ul.c | 4 | ||||
| -rw-r--r-- | configs/picosom-imx6ul-trusty_defconfig | 33 | ||||
| -rw-r--r-- | include/configs/picosom-imx6ul_android_things.h | 8 |
3 files changed, 45 insertions, 0 deletions
diff --git a/board/freescale/picosom-imx6ul/picosom-imx6ul.c b/board/freescale/picosom-imx6ul/picosom-imx6ul.c index c001163219..8793233cac 100644 --- a/board/freescale/picosom-imx6ul/picosom-imx6ul.c +++ b/board/freescale/picosom-imx6ul/picosom-imx6ul.c @@ -117,7 +117,11 @@ struct i2c_pads_info i2c_pad_info1 = { int dram_init(void) { +#ifdef CONFIG_IMX_TRUSTY_OS + gd->ram_size = PHYS_SDRAM_SIZE - TRUSTY_OS_RAM_SIZE; +#else gd->ram_size = PHYS_SDRAM_SIZE; +#endif return 0; } diff --git a/configs/picosom-imx6ul-trusty_defconfig b/configs/picosom-imx6ul-trusty_defconfig new file mode 100644 index 0000000000..c007fb7897 --- /dev/null +++ b/configs/picosom-imx6ul-trusty_defconfig @@ -0,0 +1,33 @@ +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/picosom-imx6ul/imximage.cfg,ANDROID_THINGS_SUPPORT,IMX_TRUSTY_OS,ARMV7_NONSEC" +CONFIG_ARM=y +CONFIG_ARCH_MX6=y +CONFIG_TARGET_PICOSOM_IMX6UL=y +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x400 +CONFIG_BOOTDELAY=3 +CONFIG_EFI_PARTITION=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_FLASH is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y +CONFIG_CMD_DFU=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_DFU_MMC=y +CONFIG_USB=y +CONFIG_USB_STORAGE=y +CONFIG_OF_LIBFDT=y +CONFIG_DM=y +CONFIG_DM_THERMAL=y diff --git a/include/configs/picosom-imx6ul_android_things.h b/include/configs/picosom-imx6ul_android_things.h index d4f2af42f2..ce6879a11e 100644 --- a/include/configs/picosom-imx6ul_android_things.h +++ b/include/configs/picosom-imx6ul_android_things.h @@ -8,6 +8,14 @@ #ifndef __PICOSOM_IMX6UL_ANDROID_THINGS_H #define __PICOSOM_IMX6UL_ANDROID_THINGS_H #include "mx_android_common.h" +#define TRUSTY_OS_ENTRY 0x9e000000 +#define TRUSTY_OS_RAM_SIZE 0x2000000 +#define TRUSTY_OS_MMC_BLKS 0xFFF +#define TEE_HWPARTITION_ID 2 + +#ifdef CONFIG_IMX_TRUSTY_OS +#define NON_SECURE_FASTBOOT +#endif /* For NAND we don't support lock/unlock */ #ifndef CONFIG_NAND_BOOT #define CONFIG_FASTBOOT_LOCK |