Skip to content

meta-gateway: optee: fix issues preventing optee-test build #33

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
lorc wants to merge 2 commits into
base: dunfell
Choose a base branch
from
Open

meta-gateway: optee: fix issues preventing optee-test build #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1e41935
rcar-gateway: optee: provide CXX definition in gcc.mk
lorc Feb 9, 2022
8f2dac5
rcar-gateway: optee: install TA dev kit
lorc Feb 9, 2022
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
4 changes: 3 additions & 1 deletion ...ar-gateway/recipes-bsp/optee/optee-os/0001-mk-gcc.mk-Change-the-path-to-the-library.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,17 @@ diff --git a/mk/gcc.mk b/mk/gcc.mk
index adc77a24f..e871699e2 100644
--- a/mk/gcc.mk
+++ b/mk/gcc.mk
@@ -1,8 +1,12 @@
@@ -1,8 +1,14 @@

-CC$(sm) := $(CROSS_COMPILE_$(sm))gcc
-CXX$(sm) := $(CROSS_COMPILE_$(sm))g++
+ifdef PKG_CONFIG_SYSROOT_DIR
+CC$(sm) := $(CROSS_COMPILE_$(sm))gcc --sysroot=$(PKG_CONFIG_SYSROOT_DIR)
+CXX$(sm) := $(CROSS_COMPILE_$(sm))g++ --sysroot=$(PKG_CONFIG_SYSROOT_DIR)
+LD$(sm) := $(CROSS_COMPILE_$(sm))ld.bfd --sysroot=$(PKG_CONFIG_SYSROOT_DIR)
+else
+CC$(sm) := $(CROSS_COMPILE_$(sm))gcc
+CXX$(sm) := $(CROSS_COMPILE_$(sm))g++
+LD$(sm) := $(CROSS_COMPILE_$(sm))ld.bfd
+endif
CPP$(sm) := $(CROSS_COMPILE_$(sm))cpp
Expand Down
12 changes: 10 additions & 2 deletions meta-rcar-gateway/recipes-bsp/optee/optee-os_git.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,14 @@ do_compile() {
oe_runmake PLATFORM=${PLATFORM} CFG_ARM64_core=y CFG_ARM_GICV3=y
}

# do_install() nothing
do_install[noexec] = "1"
do_install () {
#install TA devkit
install -d ${D}/usr/include/optee/export-user_ta/

for f in ${B}/out/arm-plat-${PLATFORM}/export-ta_arm64/* ; do
cp -aR $f ${D}/usr/include/optee/export-user_ta/
done
}

do_deploy() {
# Create deploy folder
Expand All @@ -56,3 +62,5 @@ do_deploy() {

addtask deploy before do_build after do_compile

INSANE_SKIP_${PN}-dev = "staticdev"
INHIBIT_PACKAGE_STRIP = "1"