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

arm/scp-firmware: fix intermittent compile failures

Browse Source 
scp-firmware passes -I/core/include to the compiler which doesn't exist,
and sometimes gcc emits a fatal error.  It's unclear why this doesn't
happen for everyone, but this workaround appears to be the correct
solution.

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Ross Burton
2023-07-10 14:09:16 +01:00
committed by Jon Mason
parent 6947632e0b
commit 249b534ce7
2 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-arm/recipes-bsp/scp-firmware/files/optee-private-includes.patch
+34
View File
@@ -0,0 +1,34 @@
Change the optee module includes to be private instead of public, so they don't get used
in every build, which can result in compile failures as /core/include/ doesn't exit.
For some reason this behaviour isn't deterministic, a ticket has been filed with upstream.
Upstream-Status: Pending
Signed-off-by: Ross Burton <ross.burton@arm.com>
diff --git a/module/optee/console/CMakeLists.txt b/module/optee/console/CMakeLists.txt
index aebb7cc79..942aa98c8 100644
--- a/module/optee/console/CMakeLists.txt
+++ b/module/optee/console/CMakeLists.txt
@@ -14,7 +14,7 @@ target_include_directories(${SCP_MODULE_TARGET}
# Those includes are needed for mutex definitnion that is used in optee_smt
# notification
target_include_directories(${SCP_MODULE_TARGET}
- PUBLIC "${SCP_OPTEE_DIR}/core/arch/arm/include/"
+ PRIVATE "${SCP_OPTEE_DIR}/core/arch/arm/include/"
"${SCP_OPTEE_DIR}/core/include/"
"${SCP_OPTEE_DIR}/lib/libutils/ext/include/"
"${SCP_OPTEE_DIR}/lib/libutee/include/")
diff --git a/module/optee/mbx/CMakeLists.txt b/module/optee/mbx/CMakeLists.txt
index 305fa42b7..783a7970c 100644
--- a/module/optee/mbx/CMakeLists.txt
+++ b/module/optee/mbx/CMakeLists.txt
@@ -15,7 +15,7 @@ target_include_directories(${SCP_MODULE_TARGET}
# Those includes are needed for mutex defifitnion that is used in optee_smt
# notification
target_include_directories(${SCP_MODULE_TARGET}
- PUBLIC "${SCP_OPTEE_DIR}/core/include/"
+ PRIVATE "${SCP_OPTEE_DIR}/core/include/"
"${SCP_OPTEE_DIR}/lib/libutils/ext/include/"
"${SCP_OPTEE_DIR}/lib/libutee/include/")
meta-arm/recipes-bsp/scp-firmware/scp-firmware_2.12.0.bb
+3 -2
View File
@@ -7,9 +7,10 @@ LIC_FILES_CHKSUM = "file://license.md;beginline=5;md5=9db9e3d2fb8d9300a6c3d15101
file://contrib/cmsis/git/LICENSE.txt;md5=e3fc50a88d0a364313df4b21ef20c29e" file://contrib/cmsis/git/LICENSE.txt;md5=e3fc50a88d0a364313df4b21ef20c29e"
SRC_URI_SCP_FIRMWARE ?= "gitsm://github.com/ARM-software/SCP-firmware.git;protocol=https" SRC_URI_SCP_FIRMWARE ?= "gitsm://github.com/ARM-software/SCP-firmware.git;protocol=https"
SRC_URI = "${SRC_URI_SCP_FIRMWARE};branch=${SRCBRANCH}" SRC_URI = "${SRC_URI_SCP_FIRMWARE};branch=${SRCBRANCH} \
SRCBRANCH = "master" file://optee-private-includes.patch"
SRCBRANCH = "master"
SRCREV = "0c7236b1851d90124210a0414fd982dc55322c7c" SRCREV = "0c7236b1851d90124210a0414fd982dc55322c7c"
PROVIDES += "virtual/control-processor-firmware" PROVIDES += "virtual/control-processor-firmware"