Commit c52e5ba4 authored by Haoran.Wang's avatar Haoran.Wang Committed by Jason Liu

MA-9478-1 [iot] Enable Trusty for iopb6ul and pico7d

Change-Id: I0aa12c5092953804e724c0534f2e81abd9ee47d5
Signed-off-by: default avatarHaoran.Wang <elven.wang@nxp.com>
parent c6b4183d
......@@ -113,8 +113,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;
}
......
......@@ -124,7 +124,11 @@ struct i2c_pads_info i2c_pad_info4 = {
int dram_init(void)
{
#ifdef CONFIG_IMX_TRUSTY_OS
gd->ram_size = ((ulong)CONFIG_DDR_MB * 1024 * 1024) - TRUSTY_OS_RAM_SIZE;
#else
gd->ram_size = ((ulong)CONFIG_DDR_MB * 1024 * 1024);
#endif
return 0;
}
......
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6ul_nxpu_iopb/imximage.cfg,MX6UL,ANDROID_THINGS_SUPPORT,IMX_TRUSTY_OS,ARMV7_NONSEC"
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_TARGET_MX6UL_NXPU_IOPB=y
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_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/pico-imx7d/imximage_512mb.cfg,MX7D,ANDROID_THINGS_SUPPORT,DDR_MB=512,IMX_TRUSTY_OS,ARMV7_NONSEC"
CONFIG_ARM=y
CONFIG_ARCH_MX7=y
CONFIG_TARGET_PICO_IMX7D=y
CONFIG_ARMV7_BOOT_SEC_DEFAULT=y
CONFIG_SYS_MALLOC_F=y
CONFIG_SYS_MALLOC_F_LEN=0x400
CONFIG_BOOTDELAY=3
CONFIG_EFI_PARTITION=y
CONFIG_VIDEO=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
......@@ -8,6 +8,15 @@
#ifndef __MX6UL_NXPU_IOPB_ANDROID_THINGS_H
#define __MX6UL_NXPU_IOPB_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
......@@ -36,5 +45,4 @@
#define CONFIG_AVB_FUSE_BANK_END 15
#endif
#endif
......@@ -6,6 +6,15 @@
#ifndef __PICO_IMX7DANDROIDTHINGS_H
#define __PICO_IMX7DANDROIDTHINGS_H
#define TRUSTY_OS_ENTRY 0x9e000000
#define TRUSTY_OS_RAM_SIZE 0x2000000
#define TEE_HWPARTITION_ID 2
#define TRUSTY_OS_MMC_BLKS 0xFFF
#ifdef CONFIG_IMX_TRUSTY_OS
#define NON_SECURE_FASTBOOT
#endif
#include "mx_android_common.h"
......
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