mirrors/meta-arm
1
0
Fork 0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-05-30 12:30:14 +00:00
Code Issues Projects Releases Wiki Activity

arm-bsp/optee-os: add a rule in optee-os Makefile for secure partitions

Browse Source 
These changes are to add a rule in optee-os Makefile to include
secure partitions as part of optee-os image

Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com>
Change-Id: I2f6f93ffca9a2332cbe9ffe4e9903b8ec524df51
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Vishnu Banavath
2021-11-29 12:39:58 +00:00
committed by Jon Mason
parent b6551e85a6
commit 2677e682d2
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0003-plat-corstone1000-add-a-rule-in-Makefile-to-SP_MAKEF.patch
+38
View File
@@ -0,0 +1,38 @@
Upstream-Status: Pending [Not submitted to upstream yet]
Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com>
From 327290faefe16440c4975c9539b11d43c92bcf48 Mon Sep 17 00:00:00 2001
From: Vishnu Banavath <vishnu.banavath@arm.com>
Date: Thu, 25 Nov 2021 06:20:48 +0000
Subject: [PATCH] plat-corstone1000: add a rule in Makefile to SP_MAKEFILE_PATH
This change is to provide an option to user to include
secure manifest into optee-os Makefile so that the secure
partition is part of optee-os image
Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com>
diff --git a/Makefile b/Makefile
index f6fcea8b..21722939 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,16 @@ unexport MAKEFILE_LIST
# nonzero status). Useful since a few recipes use shell redirection.
.DELETE_ON_ERROR:
+# include secure partition make file and manifest file
+ifdef CFG_SP_MKFILE_PATH
+ifdef CFG_EMBED_DTB_SOURCE_FILE
+include $(CFG_SP_MKFILE_PATH)
+$(info Loading secure partitions manifest ${CFG_EMBED_DTB_SOURCE_FILE})
+CFG_EMBED_DTB_SOURCE_FILE :=${CFG_EMBED_DTB_SOURCE_FILE}
+OPTEE_OS_COMMON_EXTRA_FLAGS+=${CFG_EMBED_DTB_SOURCE_FILE}
+endif
+endif
+
include mk/checkconf.mk
.PHONY: all
--
2.17.1
meta-arm-bsp/recipes-security/optee/optee-os_corstone1000_common.inc
+2 -1
View File
@@ -8,7 +8,8 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files/optee-os/corstone1000:"
SRC_URI:append = " \ SRC_URI:append = " \
file://0001-plat-corstone1000-add-corstone1000-platform.patch \ file://0001-plat-corstone1000-add-corstone1000-platform.patch \
file://0002-plat-corstone1000-reserve-3MB-CVM-memory-for-optee.patch" file://0002-plat-corstone1000-reserve-3MB-CVM-memory-for-optee.patch \
file://0003-plat-corstone1000-add-a-rule-in-Makefile-to-SP_MAKEF.patch"
COMPATIBLE_MACHINE = "corstone1000" COMPATIBLE_MACHINE = "corstone1000"