diff options
Diffstat (limited to 'meta-rcar-gen3')
7 files changed, 48 insertions, 89 deletions
diff --git a/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb b/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb index 504f0e4..a088c2f 100644 --- a/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb +++ b/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ARM Trusted Firmware" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://license.md;md5=829bdeb34c1d9044f393d5a16c068371" +LIC_FILES_CHKSUM = "file://license.rst;md5=33065335ea03d977d0569f270b39603e" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -12,9 +12,9 @@ S = "${WORKDIR}/git" BRANCH = "rcar_gen3" SRC_URI = "git://github.com/renesas-rcar/arm-trusted-firmware.git;branch=${BRANCH}" -SRCREV = "b15fefa8c485cb955170cb9b4c44386f82df14a9" +SRCREV = "b01e6aa3f22eaf4a769dc0be29ef69eb89911b60" -PV = "v1.3+renesas+git${SRCPV}" +PV = "v1.4+renesas+git${SRCPV}" COMPATIBLE_MACHINE = "(salvator-x|ulcb)" PLATFORM = "rcar" diff --git a/meta-rcar-gen3/recipes-bsp/optee/optee-client/0001-Add-LDFLAGS-option.patch b/meta-rcar-gen3/recipes-bsp/optee/optee-client/0001-Add-LDFLAGS-option.patch new file mode 100644 index 0000000..94d25ff --- /dev/null +++ b/meta-rcar-gen3/recipes-bsp/optee/optee-client/0001-Add-LDFLAGS-option.patch @@ -0,0 +1,39 @@ +From 2035e9a30a235204b3d96ec369ad601dfd93579d Mon Sep 17 00:00:00 2001 +From: Jun Miyauchi <jun.miyauchi.sr@hitachi.com> +Date: Fri, 22 Dec 2017 09:13:57 +0900 +Subject: [PATCH] Add LDFLAGS option + +--- + libteec/Makefile | 2 +- + tee-supplicant/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libteec/Makefile b/libteec/Makefile +index 568a2cd..a9cca19 100644 +--- a/libteec/Makefile ++++ b/libteec/Makefile +@@ -45,7 +45,7 @@ libteec: $(TEEC_LIBRARY) + + $(TEEC_LIBRARY): $(TEEC_OBJS) + @echo " LINK $@" +- $(VPREFIX)$(CC) -shared -Wl,-soname,$(LIB_MAJ_MIN) $(TEEC_LFLAGS) -o $@ $+ ++ $(VPREFIX)$(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIB_MAJ_MIN) $(TEEC_LFLAGS) -o $@ $+ + @echo "" + + $(TEEC_OBJ_DIR)/%.o: ${TEEC_SRC_DIR}/%.c +diff --git a/tee-supplicant/Makefile b/tee-supplicant/Makefile +index 737d39a..98e7408 100644 +--- a/tee-supplicant/Makefile ++++ b/tee-supplicant/Makefile +@@ -69,7 +69,7 @@ tee-supplicant: $(TEES_FILE) + + $(TEES_FILE): $(TEES_OBJS) + @echo " LINK $@" +- $(VPREFIX)$(CC) -o $@ $+ $(TEES_LDFLAGS) ++ $(VPREFIX)$(CC) $(LDFLAGS) -o $@ $+ $(TEES_LDFLAGS) + @echo "" + + $(TEES_OBJ_DIR)/%.o: $(TEES_SRC_DIR)/%.c +-- +2.14.1.windows.1 + diff --git a/meta-rcar-gen3/recipes-bsp/optee/optee-client/optee.service b/meta-rcar-gen3/recipes-bsp/optee/optee-client/optee.service index 4396f9f..37fc4f7 100644 --- a/meta-rcar-gen3/recipes-bsp/optee/optee-client/optee.service +++ b/meta-rcar-gen3/recipes-bsp/optee/optee-client/optee.service @@ -2,10 +2,8 @@ Description=optee services [Service] -ExecStartPre=/sbin/modprobe -q optee_armtz ExecStart=/usr/bin/tee-supplicant ExecStop=/usr/bin/killall -s KILL tee-supplicant -ExecStopPost=/sbin/modprobe -r optee_armtz [Install] WantedBy=multi-user.target diff --git a/meta-rcar-gen3/recipes-bsp/optee/optee-client_git.bb b/meta-rcar-gen3/recipes-bsp/optee/optee-client_git.bb index 9efbfb5..454f82b 100644 --- a/meta-rcar-gen3/recipes-bsp/optee/optee-client_git.bb +++ b/meta-rcar-gen3/recipes-bsp/optee/optee-client_git.bb @@ -3,12 +3,13 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b" PR = "r0" -PV = "1.1.0+renesas+git${SRCPV}" +PV = "2.6.0+renesas+git${SRCPV}" BRANCH = "master" SRC_URI = "git://github.com/OP-TEE/optee_client.git;branch=${BRANCH}" -SRCREV = "db9c64d45818d146200297eaaedbd421a8b59e3a" +SRCREV = "73b4e490a8ed0b4a7714818e80998b9d8a7da958" SRC_URI += " \ + file://0001-Add-LDFLAGS-option.patch \ file://optee.service \ " diff --git a/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb b/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb index 276c8ca..55eab8e 100644 --- a/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb +++ b/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb @@ -3,20 +3,18 @@ DESCRIPTION = "OP-TEE OS" LICENSE = "BSD-2-Clause & BSD-3-Clause" LIC_FILES_CHKSUM = " \ file://LICENSE;md5=69663ab153298557a59c67a60a743e5b \ - file://lib/libpng/LICENSE;md5=06a1b6fde6d93170bb72201c8000bf3d \ file://${WORKDIR}/git_official/LICENSE;md5=69663ab153298557a59c67a60a743e5b \ - file://${WORKDIR}/git_official/lib/libpng/LICENSE;md5=06a1b6fde6d93170bb72201c8000bf3d \ " PACKAGE_ARCH = "${MACHINE_ARCH}" inherit deploy pythonnative -PV = "2.2.0+renesas+git${SRCPV}" +PV = "2.6.0+renesas+git${SRCPV}" BRANCH = "rcar_gen3" -SRCREV_renesas = "9f55b367da9f5ba6966eb75383d2f6ff472a473f" -SRCREV_officialgit = "c0c5d399d81a0669f5c8e3bcb20039d65649a78d" +SRCREV_renesas = "d1e9802d537b9fe8d1b7cace09254049b3dfca3f" +SRCREV_officialgit = "6d57389f9eec0c213da917e35861a8eca4b205b3" SRCREV_FORMAT = "renesas_officialgit" SRC_URI = " \ diff --git a/meta-rcar-gen3/recipes-graphics/images/core-image-renesas-base.inc b/meta-rcar-gen3/recipes-graphics/images/core-image-renesas-base.inc index c1081ce..0b20fa2 100644 --- a/meta-rcar-gen3/recipes-graphics/images/core-image-renesas-base.inc +++ b/meta-rcar-gen3/recipes-graphics/images/core-image-renesas-base.inc @@ -9,8 +9,6 @@ IMAGE_INSTALL_append = " \ # Support secure environment IMAGE_INSTALL_append = " \ - optee-linuxdriver \ - optee-linuxdriver-armtz \ optee-client \ " diff --git a/meta-rcar-gen3/recipes-kernel/optee-linuxdriver/optee-linuxdriver_git.bb b/meta-rcar-gen3/recipes-kernel/optee-linuxdriver/optee-linuxdriver_git.bb deleted file mode 100644 index 642354d..0000000 --- a/meta-rcar-gen3/recipes-kernel/optee-linuxdriver/optee-linuxdriver_git.bb +++ /dev/null @@ -1,75 +0,0 @@ -DESCRIPTION = "OP-TEE Linux Driver" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ -" -inherit module - -PN = "optee-linuxdriver" -PR = "r0" -BRANCH = "rcar_gen3" -SRC_URI = " \ - git://github.com/renesas-rcar/optee_linuxdriver.git;branch=${BRANCH} \ -" -SRCREV = "3fd77f0dd8a070945f869ec706ebe48fc0d27c20" - -PV = "1.1.0+renesas+git${SRCPV}" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -S = "${WORKDIR}/git" - -LDFLAGS[unexport] = "1" - -do_configure[noexec] = "1" -# We need to be staged before do_complie. This recipe does not execute do_configure. -do_complile[depends] += "virtual/kernel:do_shared_workdir" - -do_compile() { - # Build kernel module - cd ${S}/ - make -C ${KBUILD_OUTPUT} M=${S} modules -} - -do_install() { - # Create shared directories - install -d ${D}/lib/modules/${KERNEL_VERSION}/extra/ - install -d ${STAGING_KERNEL_DIR}/include - install -d ${STAGING_KERNEL_DIR}/include/arm_common - install -d ${STAGING_KERNEL_DIR}/include/linux - - # Install kernel module - install -m 0644 ${S}/core/optee.ko ${D}/lib/modules/${KERNEL_VERSION}/extra/ - install -m 0644 ${S}/armtz/optee_armtz.ko ${D}/lib/modules/${KERNEL_VERSION}/extra/ - - - # Install shared library to STAGING_KERNEL_DIR for reference from other modules - # This file installed in SDK by kernel-devsrc pkg. - install -m 0644 ${S}/Module.symvers ${STAGING_KERNEL_DIR}/include/optee.symvers - - # Install shared header files to STAGING_KERNEL_DIR - # This file installed in SDK by kernel-devsrc pkg. - install -m 0644 ${S}/include/arm_common/optee_msg.h ${STAGING_KERNEL_DIR}/include/arm_common/ - install -m 0644 ${S}/include/arm_common/optee_smc.h ${STAGING_KERNEL_DIR}/include/arm_common/ - install -m 0644 ${S}/include/linux/tee_client_api.h ${STAGING_KERNEL_DIR}/include/linux/ - install -m 0644 ${S}/include/linux/tee_core.h ${STAGING_KERNEL_DIR}/include/linux/ - install -m 0644 ${S}/include/linux/tee_ioc.h ${STAGING_KERNEL_DIR}/include/linux/ - install -m 0644 ${S}/include/linux/tee_kernel_api.h ${STAGING_KERNEL_DIR}/include/linux/ -} - -PACKAGES = "\ - ${PN} \ - ${PN}-armtz \ -" - -FILES_${PN} = " \ - /lib/modules/${KERNEL_VERSION}/extra/optee.ko \ -" - -FILES_${PN}-armtz = " \ - /lib/modules/${KERNEL_VERSION}/extra/optee_armtz.ko \ -" - -RPROVIDES_${PN} += "optee-linuxdriver" -RPROVIDES_${PN} += "kernel-module-optee" -RPROVIDES_${PN} += "kernel-module-optee-armtz" |