Skip to content

Integrate OP-TEE with minimal effort #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Integrate OP-TEE with minimal effort #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions system_common/patches/buildroot/0014-use-tee-binary-without-header.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/boot/uboot/uboot.mk b/boot/uboot/uboot.mk
index 2796b0a310..4d86167af1 100644
--- a/boot/uboot/uboot.mk
+++ b/boot/uboot/uboot.mk
@@ -205,7 +205,7 @@ UBOOT_DEPENDENCIES += optee-os
ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE_ELF),y)
UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.elf
else ifeq ($(BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE_BIN),y)
-UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee.bin
+UBOOT_MAKE_OPTS += TEE=$(BINARIES_DIR)/tee-raw.bin
endif
endif

17 changes: 15 additions & 2 deletions system_kontron-albl-imx8mm/defconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,33 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE=y
BR2_TARGET_UBOOT_NEEDS_OPTEE_TEE_BIN=y
BR2_TARGET_UBOOT_NEEDS_GNUTLS=y
BR2_TARGET_UBOOT_NEEDS_UTIL_LINUX=y
BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin u-boot-spl.bin u-boot-spl-ddr.bin u-boot-nodtb.bin u-boot.bin"
BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="flash.bin u-boot-spl.bin u-boot-spl-ddr.bin u-boot-nodtb.bin u-boot.bin u-boot.itb"
BR2_TARGET_UBOOT_SPL=y
BR2_TARGET_UBOOT_DEFAULT_ENV_FILE="${GRISP_TARGET_SYSTEM_DIR}/uboot/uboot.env"
BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="${GRISP_TARGET_SYSTEM_DIR}/uboot/uboot.config"
BR2_TARGET_UBOOT_USE_BINMAN=y

BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2"
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.6"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="IMX_BOOT_UART_BASE=0x30880000 BL32_BASE=0x7e000000"
BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE=y

BR2_TARGET_OPTEE_OS=y
BR2_TARGET_OPTEE_OS_PLATFORM="imx-mx8mmevk"
BR2_TARGET_OPTEE_OS_NEEDS_PYTHON_CRYPTOGRAPHY=y
BR2_TARGET_OPTEE_OS_CORE_IMAGES="tee.bin tee-raw.bin tee-*_v2.bin"
BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES="CFG_UART_BASE=UART3_BASE CFG_INSECURE=y CFG_DDR_SIZE=0x40000000 CFG_TZDRAM_START=0x7e000000 CFG_TEE_CORE_LOG_LEVEL=2 CFG_TEE_TA_LOG_LEVEL=2"

BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y

Expand All @@ -78,6 +89,8 @@ BR2_PACKAGE_IMX_GPU_VIV=y
BR2_PACKAGE_IPROUTE2=y
BR2_PACKAGE_LIBSOCKETCAN=y
BR2_PACKAGE_CAN_UTILS=y
BR2_PACKAGE_OPTEE_CLIENT=y
BR2_PACKAGE_OPTEE_EXAMPLES=y

# For flashing the bootloader
BR2_PACKAGE_MTD=y
Expand Down
35 changes: 35 additions & 0 deletions system_kontron-albl-imx8mm/patches/uboot/0002-enable-optee-integration-in-device-tree.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
diff --git a/arch/arm/dts/imx8mm-u-boot.dtsi b/arch/arm/dts/imx8mm-u-boot.dtsi
index 06f2f73a03..70d0a195a1 100644
--- a/arch/arm/dts/imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-u-boot.dtsi
@@ -132,6 +132,21 @@
};
#endif

+ tee {
+ description = "OP-TEE";
+ type = "firmware";
+ arch = "arm64";
+ os = "tee";
+ compression = "none";
+ load = <0x7e000000>;
+ entry = <0x7e000000>;
+
+ tee-blob {
+ filename = "tee-raw.bin";
+ type = "blob-ext";
+ };
+ };
+
binman_fip: fip {
arch = "arm64";
compression = "none";
@@ -160,7 +175,7 @@
fdt = "fdt-SEQ";
firmware = "uboot";
#ifndef CONFIG_ARMV8_PSCI
- loadables = "atf";
+ loadables = "atf", "tee";
#endif
};
};
2 changes: 2 additions & 0 deletions system_kontron-albl-imx8mm/uboot/uboot.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ CONFIG_ENV_IS_IN_SPI_FLASH=n
CONFIG_ENV_SIZE=0x00010000
CONFIG_ENV_OFFSET=0x00428400
CONFIG_ENV_OFFSET_REDUND=0x00438400
CONFIG_TEE=y
CONFIG_OPTEE=y