diff options
Diffstat (limited to 'bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp')
18 files changed, 0 insertions, 1189 deletions
diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb deleted file mode 100644 index 81f5cd98..00000000 --- a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_git.bb +++ /dev/null @@ -1,60 +0,0 @@ -DESCRIPTION = "ARM Trusted Firmware" - -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://license.rst;md5=e927e02bca647e14efd87e9e914b2443" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit deploy -require include/multimedia-control.inc -require include/arm-trusted-firmware-control.inc - -S = "${WORKDIR}/git" - -BRANCH = "rcar_gen3" -SRC_URI = "git://github.com/renesas-rcar/arm-trusted-firmware.git;branch=${BRANCH}" -SRCREV = "236f8fbb57af7f899980bbd5a03feb12d6462970" - -PV = "v1.5+renesas+git${SRCPV}" - -COMPATIBLE_MACHINE = "(salvator-x|ulcb|ebisu)" -PLATFORM = "rcar" -ATFW_OPT_LOSSY = "${@oe.utils.conditional("USE_MULTIMEDIA", "1", "RCAR_LOSSY_ENABLE=1", "", d)}" -ATFW_OPT_r8a7795 = "LSI=H3 RCAR_DRAM_SPLIT=1 RCAR_DRAM_LPDDR4_MEMCONF=0 ${ATFW_OPT_LOSSY}" -ATFW_OPT_r8a7796 = "LSI=M3 RCAR_DRAM_SPLIT=2 ${ATFW_OPT_LOSSY}" -ATFW_OPT_r8a77965 = "LSI=M3N ${ATFW_OPT_LOSSY}" -ATFW_OPT_r8a77990 = "LSI=E3 RCAR_SA0_SIZE=0 RCAR_AVS_SETTING_ENABLE=0 RCAR_DRAM_DDR3L_MEMCONF=0 RCAR_DRAM_DDR3L_MEMDUAL=0" -ATFW_OPT_append_ulcb = " RCAR_GEN3_ULCB=1 PMIC_LEVEL_MODE=0" - -# requires CROSS_COMPILE set by hand as there is no configure script -export CROSS_COMPILE="${TARGET_PREFIX}" - -# Let the Makefile handle setting up the CFLAGS and LDFLAGS as it is a standalone application -CFLAGS[unexport] = "1" -LDFLAGS[unexport] = "1" -AS[unexport] = "1" -LD[unexport] = "1" - -do_compile() { - oe_runmake distclean - oe_runmake bl2 bl31 dummytool PLAT=${PLATFORM} ${ATFW_OPT} -} - -# do_install() nothing -do_install[noexec] = "1" - -do_deploy() { - # Create deploy folder - install -d ${DEPLOYDIR} - - # Copy IPL to deploy folder - install -m 0644 ${S}/build/${PLATFORM}/release/bl2/bl2.elf ${DEPLOYDIR}/bl2-${MACHINE}.elf - install -m 0644 ${S}/build/${PLATFORM}/release/bl2.bin ${DEPLOYDIR}/bl2-${MACHINE}.bin - install -m 0644 ${S}/build/${PLATFORM}/release/bl2.srec ${DEPLOYDIR}/bl2-${MACHINE}.srec - install -m 0644 ${S}/build/${PLATFORM}/release/bl31/bl31.elf ${DEPLOYDIR}/bl31-${MACHINE}.elf - install -m 0644 ${S}/build/${PLATFORM}/release/bl31.bin ${DEPLOYDIR}/bl31-${MACHINE}.bin - install -m 0644 ${S}/build/${PLATFORM}/release/bl31.srec ${DEPLOYDIR}/bl31-${MACHINE}.srec - install -m 0644 ${S}/tools/dummy_create/bootparam_sa0.srec ${DEPLOYDIR}/bootparam_sa0.srec - install -m 0644 ${S}/tools/dummy_create/cert_header_sa6.srec ${DEPLOYDIR}/cert_header_sa6.srec -} -addtask deploy before do_build after do_compile diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-client/0001-Fix-for-teec_trace.c-snprintf-Werror-format-truncati.patch b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-client/0001-Fix-for-teec_trace.c-snprintf-Werror-format-truncati.patch deleted file mode 100644 index db8bdace..00000000 --- a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-client/0001-Fix-for-teec_trace.c-snprintf-Werror-format-truncati.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 30dd2986fb64aba7ee78d4e231c344e2c39d7999 Mon Sep 17 00:00:00 2001 -From: Simon Hughes <simon.hughes@arm.com> -Date: Thu, 21 Jun 2018 17:22:23 +0100 -Subject: [PATCH] Fix for teec_trace.c snprintf -Werror=format-truncation= - error. - -Signed-off-by: Simon Hughes <simon.hughes@arm.com> ---- - libteec/src/teec_trace.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libteec/src/teec_trace.c b/libteec/src/teec_trace.c -index 78b79d6..c91bc43 100644 ---- a/libteec/src/teec_trace.c -+++ b/libteec/src/teec_trace.c -@@ -106,7 +106,8 @@ int _dprintf(const char *function, int flen, int line, int level, - */ - int thread_id = syscall(SYS_gettid); /* perf issue ? */ - -- snprintf(prefixed, MAX_PRINT_SIZE, -+ int len = 0; -+ len = snprintf(prefixed+len, MAX_PRINT_SIZE, - "%s [%d] %s:%s:%d: %s", - trace_level_strings[level], thread_id, prefix, func, - line, raw); --- -2.7.4 - diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-client/0001-tee-supplicant-use-MMC_IOC_MULTI_CMD-for-RPMB-access.patch b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-client/0001-tee-supplicant-use-MMC_IOC_MULTI_CMD-for-RPMB-access.patch deleted file mode 100644 index fddc7fc1..00000000 --- a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-client/0001-tee-supplicant-use-MMC_IOC_MULTI_CMD-for-RPMB-access.patch +++ /dev/null @@ -1,208 +0,0 @@ -From 04a72e88f768722edff453694e70535d36a8b1b4 Mon Sep 17 00:00:00 2001 -From: Hiroki Negishi <hiroki.negishi.bx@renesas.com> -Date: Mon, 1 Apr 2019 13:10:57 +0900 -Subject: [PATCH] tee-supplicant: use MMC_IOC_MULTI_CMD for RPMB access - -To access RPMB, host should switch to RPMB partition. -And in RPMB partition, host should finish RPMB sequence. - -In case of using MMC_IOC_CMD as RPMB ioctl, eMMC driver switches -partition to user data area between WRITE command and READ command. -This may cause General failure. -In case of MMC_IOC_MULTI_CMD, eMMC driver keeps RPMB partition. - -This patch changes RPMB ioctl from MMC_IOC_CMD into MMC_IOC_MULTI_CMD -and changes ioctl parameters according to mmc utils. - -Signed-off-by: Hiroki Negishi <hiroki.negishi.bx@renesas.com> ---- - tee-supplicant/src/rpmb.c | 120 +++++++++++++++++++++++----------------------- - 1 file changed, 61 insertions(+), 59 deletions(-) - -diff --git a/tee-supplicant/src/rpmb.c b/tee-supplicant/src/rpmb.c -index cac9932..29da690 100644 ---- a/tee-supplicant/src/rpmb.c -+++ b/tee-supplicant/src/rpmb.c -@@ -114,6 +114,7 @@ static pthread_mutex_t rpmb_mutex = PTHREAD_MUTEX_INITIALIZER; - */ - - #define MMC_BLOCK_MAJOR 179 -+#define RPMB_MULTI_CMD_MAX_CMDS 3 - - /* mmc_ioc_cmd.opcode */ - #define MMC_SEND_EXT_CSD 8 -@@ -130,6 +131,9 @@ static pthread_mutex_t rpmb_mutex = PTHREAD_MUTEX_INITIALIZER; - - #define MMC_CMD_ADTC (1 << 5) /* Addressed data transfer command */ - -+#define MMC_RSP_SPI_S1 (1 << 7) /* one status byte */ -+#define MMC_RSP_SPI_R1 (MMC_RSP_SPI_S1) -+ - /* mmc_ioc_cmd.write_flag */ - #define MMC_CMD23_ARG_REL_WR (1 << 31) /* CMD23 reliable write */ - -@@ -610,26 +614,38 @@ static uint32_t read_ext_csd(int fd, uint8_t *ext_csd) - return TEEC_SUCCESS; - } - -+static inline void set_single_cmd(struct mmc_ioc_cmd *ioc, __u32 opcode, -+ int write_flag, unsigned int blocks) -+{ -+ ioc->opcode = opcode; -+ ioc->write_flag = write_flag; -+ ioc->arg = 0x0; -+ ioc->blksz = 512; -+ ioc->blocks = blocks; -+ ioc->flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC; -+} -+ - static uint32_t rpmb_data_req(int fd, struct rpmb_data_frame *req_frm, - size_t req_nfrm, struct rpmb_data_frame *rsp_frm, - size_t rsp_nfrm) - { -- int st; -+ int err; - size_t i; - uint16_t msg_type = ntohs(req_frm->msg_type); -- struct mmc_ioc_cmd cmd; -+ struct mmc_ioc_cmd *ioc; -+ struct mmc_ioc_multi_cmd *mioc; -+ struct rpmb_data_frame frame_status = {0}; - -- memset(&cmd, 0, sizeof(cmd)); -- cmd.blksz = 512; -- cmd.blocks = req_nfrm; -- cmd.data_ptr = (uintptr_t)req_frm; -- cmd.flags = MMC_RSP_R1 | MMC_CMD_ADTC; -- cmd.opcode = MMC_WRITE_MULTIPLE_BLOCK; -- cmd.write_flag = 1; -+ mioc = (struct mmc_ioc_multi_cmd *) -+ malloc(sizeof(struct mmc_ioc_multi_cmd) + -+ RPMB_MULTI_CMD_MAX_CMDS * sizeof(struct mmc_ioc_cmd)); -+ if (!mioc) -+ return -ENOMEM; - - for (i = 1; i < req_nfrm; i++) { - if (req_frm[i].msg_type != msg_type) { - EMSG("All request frames shall be of the same type"); -+ free(mioc); - return TEEC_ERROR_BAD_PARAMETERS; - } - } -@@ -642,77 +658,63 @@ static uint32_t rpmb_data_req(int fd, struct rpmb_data_frame *req_frm, - case RPMB_MSG_TYPE_REQ_AUTH_DATA_WRITE: - if (rsp_nfrm != 1) { - EMSG("Expected only one response frame"); -+ free(mioc); - return TEEC_ERROR_BAD_PARAMETERS; - } - -- /* Send write request frame(s) */ -- cmd.write_flag |= MMC_CMD23_ARG_REL_WR; -- /* -- * Black magic: tested on a HiKey board with a HardKernel eMMC -- * module. When postsleep values are zero, the kernel logs -- * random errors: "mmc_blk_ioctl_cmd: Card Status=0x00000E00" -- * and ioctl() fails. -- */ -- cmd.postsleep_min_us = 20000; -- cmd.postsleep_max_us = 50000; -- st = IOCTL(fd, MMC_IOC_CMD, &cmd); -- if (st < 0) -- return TEEC_ERROR_GENERIC; -- cmd.postsleep_min_us = 0; -- cmd.postsleep_max_us = 0; -- -- /* Send result request frame */ -- memset(rsp_frm, 0, 1); -- rsp_frm->msg_type = htons(RPMB_MSG_TYPE_REQ_RESULT_READ); -- cmd.data_ptr = (uintptr_t)rsp_frm; -- cmd.write_flag &= ~MMC_CMD23_ARG_REL_WR; -- st = IOCTL(fd, MMC_IOC_CMD, &cmd); -- if (st < 0) -- return TEEC_ERROR_GENERIC; -- -- /* Read response frame */ -- cmd.opcode = MMC_READ_MULTIPLE_BLOCK; -- cmd.write_flag = 0; -- cmd.blocks = rsp_nfrm; -- st = IOCTL(fd, MMC_IOC_CMD, &cmd); -- if (st < 0) -- return TEEC_ERROR_GENERIC; -+ mioc->num_of_cmds = 3; -+ -+ /* Write request */ -+ ioc = &mioc->cmds[0]; -+ set_single_cmd(ioc, MMC_WRITE_MULTIPLE_BLOCK, (1 << 31) | 1, 1); -+ mmc_ioc_cmd_set_data((*ioc), req_frm); -+ -+ /* Result request */ -+ ioc = &mioc->cmds[1]; -+ frame_status.msg_type = htobe16(RPMB_MSG_TYPE_REQ_RESULT_READ); -+ set_single_cmd(ioc, MMC_WRITE_MULTIPLE_BLOCK, 1, 1); -+ mmc_ioc_cmd_set_data((*ioc), &frame_status); -+ -+ /* Get response */ -+ ioc = &mioc->cmds[2]; -+ set_single_cmd(ioc, MMC_READ_MULTIPLE_BLOCK, 0, 1); -+ mmc_ioc_cmd_set_data((*ioc), rsp_frm); -+ - break; - - case RPMB_MSG_TYPE_REQ_WRITE_COUNTER_VAL_READ: - if (rsp_nfrm != 1) { - EMSG("Expected only one response frame"); -+ free(mioc); - return TEEC_ERROR_BAD_PARAMETERS; - } - - /* Fall through */ - case RPMB_MSG_TYPE_REQ_AUTH_DATA_READ: -- if (req_nfrm != 1) { -- EMSG("Expected only one request frame"); -- return TEEC_ERROR_BAD_PARAMETERS; -- } -+ mioc->num_of_cmds = 2; -+ -+ /* Read request */ -+ ioc = &mioc->cmds[0]; -+ set_single_cmd(ioc, MMC_WRITE_MULTIPLE_BLOCK, 1, 1); -+ mmc_ioc_cmd_set_data((*ioc), req_frm); -+ -+ /* Get response */ -+ ioc = &mioc->cmds[1]; -+ set_single_cmd(ioc, MMC_READ_MULTIPLE_BLOCK, 0, rsp_nfrm); -+ mmc_ioc_cmd_set_data((*ioc), rsp_frm); - -- /* Send request frame */ -- st = IOCTL(fd, MMC_IOC_CMD, &cmd); -- if (st < 0) -- return TEEC_ERROR_GENERIC; -- -- /* Read response frames */ -- cmd.data_ptr = (uintptr_t)rsp_frm; -- cmd.opcode = MMC_READ_MULTIPLE_BLOCK; -- cmd.write_flag = 0; -- cmd.blocks = rsp_nfrm; -- st = IOCTL(fd, MMC_IOC_CMD, &cmd); -- if (st < 0) -- return TEEC_ERROR_GENERIC; - break; - - default: - EMSG("Unsupported message type: %d", msg_type); -+ free(mioc); - return TEEC_ERROR_GENERIC; - } - -- return TEEC_SUCCESS; -+ err = ioctl(fd, MMC_IOC_MULTI_CMD, mioc); -+ -+ free(mioc); -+ return err; - } - - static uint32_t rpmb_get_dev_info(uint16_t dev_id, struct rpmb_dev_info *info) --- -2.7.4 - diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-client/optee.service b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-client/optee.service deleted file mode 100644 index 37fc4f75..00000000 --- a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-client/optee.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=optee services - -[Service] -ExecStart=/usr/bin/tee-supplicant -ExecStop=/usr/bin/killall -s KILL tee-supplicant - -[Install] -WantedBy=multi-user.target diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-client_git.bb b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-client_git.bb deleted file mode 100644 index 960c6141..00000000 --- a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-client_git.bb +++ /dev/null @@ -1,63 +0,0 @@ -DESCRIPTION = "OP-TEE Client" -LICENSE = "BSD-2-Clause" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b" -PR = "r0" -PV = "3.1.0+renesas+git${SRCPV}" -BRANCH = "master" -SRC_URI = "git://github.com/OP-TEE/optee_client.git;branch=${BRANCH}" -SRCREV = "3f16662284a69fdec97b1712064be94d1fed7ae7" - -SRC_URI += " \ - file://optee.service \ - file://0001-Fix-for-teec_trace.c-snprintf-Werror-format-truncati.patch \ - file://0001-tee-supplicant-use-MMC_IOC_MULTI_CMD-for-RPMB-access.patch \ -" - -inherit pythonnative systemd -SYSTEMD_SERVICE_${PN} = "optee.service" - -COMPATIBLE_MACHINE = "salvator-x|h3ulcb|m3ulcb|m3nulcb|ebisu" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -S = "${WORKDIR}/git" - -# Recipe which fail to compile when enabling _FORTIFY_SOURCE=2 option -SECURITY_CFLAGS_pn-optee-client = "" - -EXTRA_OEMAKE = "RPMB_EMU=0" - -do_install () { - # Create destination directories - install -d ${D}/${libdir} - install -d ${D}/${includedir} - - # Install library - install -m 0755 ${S}/out/export/lib/libteec.so.1.0 ${D}/${libdir} - - # Create symbolic link - cd ${D}/${libdir} - ln -sf libteec.so.1.0 libteec.so.1 - ln -sf libteec.so.1 libteec.so - - # Install header files - install -m 0644 ${S}/out/export/include/* ${D}/${includedir} - - # Install systemd service configure file for OP-TEE client - if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then - install -d ${D}/${systemd_system_unitdir} - install -m 0644 ${WORKDIR}/optee.service ${D}/${systemd_system_unitdir} - fi -} - -# install the tee-supplicant for 64 bit only. -do_install_append_aarch64 () { - # Create destination directory - install -d ${D}/${bindir} - - # Install binary to bindir - install -m 0755 ${S}/out/export/bin/tee-supplicant ${D}/${bindir} -} - -RPROVIDES_${PN} += "optee-client" diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-examples/0001-secure_storage-ta-Add-a-missing-include-file.patch b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-examples/0001-secure_storage-ta-Add-a-missing-include-file.patch deleted file mode 100644 index 7627a066..00000000 --- a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-examples/0001-secure_storage-ta-Add-a-missing-include-file.patch +++ /dev/null @@ -1,29 +0,0 @@ -From be7079678aeb1503e0f681d977c47c44fd7b4f8c Mon Sep 17 00:00:00 2001 -From: Pierre Marzin <pierre.marzin@iot.bzh> -Date: Mon, 19 Aug 2019 09:33:17 +0000 -Subject: [PATCH] secure_storage: ta: Add a missing include file - -The commit 9890a50d3c26b377dcb27f5db680018e15a5a3de fix a size type by -using a format macro contant 'PRIu32' into a printf. This needs the -inttypes.h header file to build correctly with aarch64-linux-gnu-gcc. - -Signed-off-by: Pierre Marzin <pierre.marzin@iot.bzh> ---- - secure_storage/ta/secure_storage_ta.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/secure_storage/ta/secure_storage_ta.c b/secure_storage/ta/secure_storage_ta.c -index 3ccc12d..cfdfbb6 100644 ---- a/secure_storage/ta/secure_storage_ta.c -+++ b/secure_storage/ta/secure_storage_ta.c -@@ -28,6 +28,7 @@ - #include <secure_storage_ta.h> - #include <tee_internal_api.h> - #include <tee_internal_api_extensions.h> -+#include <inttypes.h> - - static TEE_Result delete_object(uint32_t param_types, TEE_Param params[4]) - { --- -2.11.0 - diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-examples_git.bb b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-examples_git.bb deleted file mode 100644 index ccfe3fe3..00000000 --- a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-examples_git.bb +++ /dev/null @@ -1,61 +0,0 @@ -SUMMARY = "OP-TEE examples" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=cd95ab417e23b94f381dafc453d70c30" - - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit pythonnative - -PV = "3.6.0+git${SRCPV}" - -SRCREV = "292da2fd8db0176e0e96989268c63ef9ab910a6c" - -SRC_URI = " \ - git://github.com/linaro-swg/optee_examples;branch=master;name=master \ - file://0001-secure_storage-ta-Add-a-missing-include-file.patch \ -" - -COMPATIBLE_MACHINE = "(salvator-x|h3ulcb|m3ulcb|m3nulcb|ebisu)" -PLATFORM = "rcar" - -DEPENDS = "optee-os optee-client python-pycrypto-native" - -CFLAGS += "-Wno-extra -Wno-error=format" -TARGET_CFLAGS += "-Wno-extra -Wno-error=format" - -TARGET_CC_ARCH += "${LDFLAGS}" -INSANE_SKIP_${PN} = "ldflags" - -TA_DEV_KIT_DIR = "${STAGING_DIR_TARGET}/usr/share/optee/export-ta_arm64" - -OPTEE_CLIENT_EXPORT = "${STAGING_DIR_TARGET}/usr" - -TEEC_EXPORT = "${STAGING_DIR_TARGET}/usr" - -S = "${WORKDIR}/git" -EXTRA_OEMAKE = "\ - TEEC_EXPORT=${TEEC_EXPORT} \ - OPTEE_CLIENT_EXPORT=${OPTEE_CLIENT_EXPORT} \ - TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \ - HOST_CROSS_COMPILE=${TARGET_PREFIX} \ - TA_CROSS_COMPILE=${TARGET_PREFIX} \ - PLATFORM=${PLATFORM} \ - V=1 \ - " - -do_compile() { - oe_runmake -} - -do_install () { - mkdir -p ${D}${nonarch_base_libdir}/optee_armtz - mkdir -p ${D}${bindir} - install -D -p -m0755 ${S}/out/ca/* ${D}${bindir} - install -D -p -m0444 ${S}/out/ta/* ${D}${nonarch_base_libdir}/optee_armtz - mkdir -p ${D}${includedir} - cp ${S}/hello_world/ta/include/* ${D}${includedir} -} - -FILES_${PN} += "${nonarch_base_libdir}/optee_armtz/" diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-os/0001-core-define-syscall_t-as-void-void.patch b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-os/0001-core-define-syscall_t-as-void-void.patch deleted file mode 100644 index bad7b27c..00000000 --- a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-os/0001-core-define-syscall_t-as-void-void.patch +++ /dev/null @@ -1,75 +0,0 @@ -From f6d17e33e7b95c90a2521cfd37cd5cb511909fc4 Mon Sep 17 00:00:00 2001 -From: Jerome Forissier <jerome.forissier@linaro.org> -Date: Thu, 5 Jul 2018 13:07:52 +0200 -Subject: [PATCH] core: define syscall_t as void (*)(void) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -syscall_t is currently typedef'ed as TEE_Result (*)(void). It is used to -represent a pointer to any system call, in the syscall table for instance. -As such, the exact type behind syscall_t cannot reflect all the syscalls -since they have different prototypes. The current declaration with a -TEE_Result return type was probably chosen because it was a common -characteristic of all syscalls to return a TEE_Result. - -However, this type causes compilation warnings with GCC 8.1: - -core/arch/arm/tee/arch_svc.c:43:36: warning: cast between incompatible function types from ‘void (*)(long unsigned int)’ to ‘TEE_Result (*)(void)’ {aka ‘unsigned int (*)(void)’} [-Wcast-function-type] - #define SYSCALL_ENTRY(_fn) { .fn = (syscall_t)_fn } - ^ -core/arch/arm/tee/arch_svc.c:50:2: note: in expansion of macro ‘SYSCALL_ENTRY’ - SYSCALL_ENTRY(syscall_sys_return), - ^~~~~~~~~~~~~ - -The solution is to use 'void (*)(void)' instead, as explained in the GCC -documentation: - - -Wcast-function-type - - Warn when a function pointer is cast to an incompatible function - pointer. [...] The function type void (*) (void) is special and matches - everything, which can be used to suppress this warning. [...] - -Link: [1] https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html -Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org> -Acked-by: Jens Wiklander <jens.wiklander@linaro.org> ---- - core/arch/arm/tee/arch_svc.c | 2 +- - core/arch/arm/tee/arch_svc_private.h | 7 +++++-- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/core/arch/arm/tee/arch_svc.c b/core/arch/arm/tee/arch_svc.c -index eb142ec..b2dd193 100644 ---- a/core/arch/arm/tee/arch_svc.c -+++ b/core/arch/arm/tee/arch_svc.c -@@ -208,7 +208,7 @@ void __weak tee_svc_handler(struct thread_svc_regs *regs) - } - - if (scn > TEE_SCN_MAX) -- scf = syscall_not_supported; -+ scf = (syscall_t)syscall_not_supported; - else - scf = tee_svc_syscall_table[scn].fn; - -diff --git a/core/arch/arm/tee/arch_svc_private.h b/core/arch/arm/tee/arch_svc_private.h -index c0b3a73..695e733 100644 ---- a/core/arch/arm/tee/arch_svc_private.h -+++ b/core/arch/arm/tee/arch_svc_private.h -@@ -7,8 +7,11 @@ - - #include <tee_api_types.h> - --/* void argument but in reality it can be any number of arguments */ --typedef TEE_Result (*syscall_t)(void); -+/* -+ * Generic "pointer to function" type. Actual syscalls take zero or more -+ * arguments and return TEE_Result. -+ */ -+typedef void (*syscall_t)(void); - - /* Helper function for tee_svc_handler() */ - uint32_t tee_svc_do_call(struct thread_svc_regs *regs, syscall_t func); --- -2.7.4 - diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb deleted file mode 100644 index e338631b..00000000 --- a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-os_git.bb +++ /dev/null @@ -1,70 +0,0 @@ -DESCRIPTION = "OP-TEE OS" - -LICENSE = "BSD-2-Clause & BSD-3-Clause" -LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=69663ab153298557a59c67a60a743e5b \ - file://${WORKDIR}/git_official/LICENSE;md5=69663ab153298557a59c67a60a743e5b \ -" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit deploy pythonnative - -PV = "3.1.0+renesas+git${SRCPV}" - -BRANCH = "rcar_gen3" -SRCREV_renesas = "19fb6dcbf42631f23afed406e893310eb30cd548" -SRCREV_officialgit = "e77020396508fc086d7a4d6137388b116e4a662f" -SRCREV_FORMAT = "renesas_officialgit" - -SRC_URI = " \ - git://github.com/renesas-rcar/optee_os.git;branch=${BRANCH};name=renesas \ - git://github.com/OP-TEE/optee_os.git;branch=master;name=officialgit;destsuffix=git_official \ - file://0001-core-define-syscall_t-as-void-void.patch \ -" - -COMPATIBLE_MACHINE = "(salvator-x|h3ulcb|m3ulcb|m3nulcb|ebisu)" -PLATFORM = "rcar" - -DEPENDS = "python-pycrypto-native" - -export CROSS_COMPILE64="${TARGET_PREFIX}" - -# Let the Makefile handle setting up the flags as it is a standalone application -LD[unexport] = "1" -LDFLAGS[unexport] = "1" -export CCcore="${CC}" -export LDcore="${LD}" -libdir[unexport] = "1" - -S = "${WORKDIR}/git" -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -do_configure() { - git -C ${WORKDIR}/git_official checkout -B official 3.1.0 - git -C ${WORKDIR}/git_official cherry-pick -n ${SRCREV_officialgit} - cp -rn ${WORKDIR}/git_official/core/lib/libtomcrypt ${B}/core/lib/. -} - -do_compile() { - oe_runmake PLATFORM=${PLATFORM} CFG_ARM64_core=y -} - -do_install() { - install -d ${D}/usr/share/optee - cp -r ${S}/out/arm-plat-${PLATFORM}/export-ta_arm64 ${D}/usr/share/optee -} - -do_deploy() { - # Create deploy folder - install -d ${DEPLOYDIR} - - # Copy TEE OS to deploy folder - install -m 0644 ${S}/out/arm-plat-${PLATFORM}/core/tee.elf ${DEPLOYDIR}/tee-${MACHINE}.elf - install -m 0644 ${S}/out/arm-plat-${PLATFORM}/core/tee.bin ${DEPLOYDIR}/tee-${MACHINE}.bin - install -m 0644 ${S}/out/arm-plat-${PLATFORM}/core/tee.srec ${DEPLOYDIR}/tee-${MACHINE}.srec -} -addtask deploy before do_build after do_compile - -FILES_${PN}-staticdev += "${datadir}/optee/export-ta_arm64/lib/*.a" -FILES_${PN}-dev += "${datadir}/optee/export-ta_arm64" diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-test/optee_xtest_fix.diff b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-test/optee_xtest_fix.diff deleted file mode 100644 index 5067086f..00000000 --- a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-test/optee_xtest_fix.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/host/xtest/regression_6000.c b/host/xtest/regression_6000.c -index 336ea14..2379e43 100644 ---- a/host/xtest/regression_6000.c -+++ b/host/xtest/regression_6000.c -@@ -82,6 +82,8 @@ static uint32_t fs_id_for_tee_storage_private(void) - return TEE_STORAGE_PRIVATE_REE; - #elif defined(CFG_RPMB_FS) - return TEE_STORAGE_PRIVATE_RPMB; -+#else -+ return TEE_STORAGE_PRIVATE; - #endif - } - diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-test_git.bb b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-test_git.bb deleted file mode 100644 index ea58e24c..00000000 --- a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-test_git.bb +++ /dev/null @@ -1,55 +0,0 @@ -DESCRIPTION = "OP-TEE TEST" - -LICENSE = "GPLv2 & BSD-2-Clause" -LIC_FILES_CHKSUM = "file://${S}/host/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit pythonnative - -PV = "3.1.0+git${SRCPV}" - -SRCREV = "45218eb59b006ad20cc7610904f291dd85157a43" - -SRC_URI = " \ - git://github.com/OP-TEE/optee_test.git;branch=master;name=master \ - file://optee_xtest_fix.diff \ -" - -COMPATIBLE_MACHINE = "(salvator-x|h3ulcb|m3ulcb|m3nulcb|ebisu)" -PLATFORM = "rcar" - -DEPENDS = "optee-os optee-client python-pycrypto-native" - -export CROSS_COMPILE64="${TARGET_PREFIX}" - -# Let the Makefile handle setting up the flags as it is a standalone application -LD[unexport] = "1" -LDFLAGS[unexport] = "1" -export CCcore="${CC}" -export LDcore="${LD}" -libdir[unexport] = "1" - -CFLAGS += "-Wno-extra -Wno-error=stringop-overflow -Wno-error=array-bounds" -TARGET_CFLAGS += "-Wno-extra -Wno-error=stringop-overflow -Wno-error=array-bounds" - -TARGET_CC_ARCH += "${LDFLAGS}" -INSANE_SKIP_${PN} = "ldflags" - -S = "${WORKDIR}/git" -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -do_compile() { - oe_runmake CROSS_COMPILE=${CROSS_COMPILE64} PLATFORM=${PLATFORM} OPTEE_CLIENT_EXPORT=${STAGING_DIR_TARGET}/usr --no-builtin-variables TA_DEV_KIT_DIR="${STAGING_DIR_TARGET}/usr/share/optee/export-ta_arm64" -} - -do_install () { - install -D -p -m0755 ${S}/out/xtest/xtest ${D}${bindir}/xtest - - # install path should match the value set in optee-client/tee-supplicant - # default TEEC_LOAD_PATH is /lib - mkdir -p ${D}${nonarch_base_libdir}/optee_armtz/ - install -D -p -m0444 ${S}/out/ta/*/*.ta ${D}${nonarch_base_libdir}/optee_armtz/ -} - -FILES_${PN} += "${nonarch_base_libdir}/optee_armtz/" diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-user-app-template_git.bb b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-user-app-template_git.bb deleted file mode 100644 index 8d45a3c2..00000000 --- a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/optee/optee-user-app-template_git.bb +++ /dev/null @@ -1,57 +0,0 @@ -SUMMARY = "OP-TEE user_app_template" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=cd95ab417e23b94f381dafc453d70c30" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit pythonnative - -PV = "0.1+git${SRCPV}" - -SRCREV = "0.1" - -SRC_URI = " \ - git://github.com/iotbzh/optee_user_app_template;branch=master \ -" - -COMPATIBLE_MACHINE = "(salvator-x|h3ulcb|m3ulcb|m3nulcb|ebisu)" -PLATFORM = "rcar" - -DEPENDS = "optee-os optee-client python-pycrypto-native" - -CFLAGS += "-Wno-extra -Wno-error=format" -TARGET_CFLAGS += "-Wno-extra -Wno-error=format" - -TARGET_CC_ARCH += "${LDFLAGS}" -INSANE_SKIP_${PN} = "ldflags" - -TA_DEV_KIT_DIR = "${STAGING_DIR_TARGET}/usr/share/optee/export-ta_arm64" - -OPTEE_CLIENT_EXPORT = "${STAGING_DIR_TARGET}/usr" - -TEEC_EXPORT = "${STAGING_DIR_TARGET}/usr" - -S = "${WORKDIR}/git" -EXTRA_OEMAKE = "\ - TEEC_EXPORT=${TEEC_EXPORT} \ - OPTEE_CLIENT_EXPORT=${OPTEE_CLIENT_EXPORT} \ - TA_DEV_KIT_DIR=${TA_DEV_KIT_DIR} \ - HOST_CROSS_COMPILE=${TARGET_PREFIX} \ - TA_CROSS_COMPILE=${TARGET_PREFIX} \ - PLATFORM=${PLATFORM} \ - V=1 \ - " - -do_compile() { - oe_runmake -} - -do_install () { - mkdir -p ${D}${nonarch_base_libdir}/optee_armtz - mkdir -p ${D}${bindir} - install -D -p -m0755 ${S}/out/ca/* ${D}${bindir} - install -D -p -m0444 ${S}/out/ta/* ${D}${nonarch_base_libdir}/optee_armtz -} - -FILES_${PN} += "${nonarch_base_libdir}/optee_armtz/" diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/qos/qosif-tp-user-module.bb b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/qos/qosif-tp-user-module.bb deleted file mode 100644 index 8fb0198f..00000000 --- a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/qos/qosif-tp-user-module.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "QOS Interface test app for R-Car Gen3" - -require qosif.inc - -DEPENDS = "qosif-user-module" -PN = "qosif-tp-user-module" -PR = "r0" - -S = "${WORKDIR}/git" -QOSIF_TP_DIR = "qos_if-tp-user/files/qos_if" - -includedir = "${RENESAS_DATADIR}/include" - -do_compile() { - cd ${S}/${QOSIF_TP_DIR} - oe_runmake -} - -do_install() { - # Create destination directory - install -d ${D}${RENESAS_DATADIR}/bin/ - - # Copy user test program - install -m 755 ${S}/${QOSIF_TP_DIR}/qos_tp ${D}${RENESAS_DATADIR}/bin/ -} - -PACKAGES = " \ - ${PN} \ - ${PN}-dbg \ -" - -FILES_${PN} = "${RENESAS_DATADIR}/bin/qos_tp" - -FILES_${PN}-dbg = " \ - ${RENESAS_DATADIR}/bin/.debug/* \ -" diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/qos/qosif-user-module.bb b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/qos/qosif-user-module.bb deleted file mode 100644 index c836fe31..00000000 --- a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/qos/qosif-user-module.bb +++ /dev/null @@ -1,48 +0,0 @@ -DESCRIPTION = "QOS Interface library for R-Car Gen3" - -require qosif.inc - -DEPENDS = "kernel-module-qos" -PN = "qosif-user-module" -PR = "r0" - -S = "${WORKDIR}/git" -QOSIF_LIB_DIR = "qos_if-module/files/qos_if" - -EXTRA_OEMAKE = "ARCH=${TARGET_ARCH}" - -includedir = "${RENESAS_DATADIR}/include" - -do_compile() { - # Build shared library - cd ${S}/${QOSIF_LIB_DIR}/if - rm -rf ${S}/${QOSIF_LIB_DIR}/if/libqos.so* - oe_runmake -} - -do_install() { - # Create destination directories - install -d ${D}/${libdir} - install -d ${D}/${includedir} - - # Copy shared library - install -m 755 ${S}/${QOSIF_LIB_DIR}/if/libqos.so* ${D}/${libdir}/ - cd ${D}/${libdir}/ - ln -sf libqos.so.1.0.0 libqos.so.1 - ln -sf libqos.so.1 libqos.so - - # Install shared header file - install -m 644 ${S}/${QOSIF_LIB_DIR}/include/qos_public.h ${D}/${includedir}/ -} - -PACKAGES = " \ - ${PN} \ - ${PN}-dev \ - ${PN}-dbg \ -" - -FILES_${PN} = " \ - ${libdir}/libqos.so* \ -" - -INSANE_SKIP_${PN} = "dev-so" diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/qos/qosif.inc b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/qos/qosif.inc deleted file mode 100644 index 0b6cf905..00000000 --- a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/qos/qosif.inc +++ /dev/null @@ -1,15 +0,0 @@ -LICENSE = "MIT" -LIC_FILES_CHKSUM = " \ - file://COPYING.MIT;md5=96659f2a7571bfa27483882a653c3bb9 \ -" - -require include/rcar-gen3-modules-common.inc - -QOSIF_LIB_URL = "git://github.com/renesas-rcar/qos_lib.git" -BRANCH = "rcar-gen3" -SRCREV = "84ea8d562a55d1fbd7b6acf08a498d33a92dc392" - -SRC_URI = "${QOSIF_LIB_URL};branch=${BRANCH}" - -# This module is machine specific. -PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/u-boot/u-boot-common_2018.09.inc b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/u-boot/u-boot-common_2018.09.inc deleted file mode 100644 index f66ac8fb..00000000 --- a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/u-boot/u-boot-common_2018.09.inc +++ /dev/null @@ -1,9 +0,0 @@ -HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome" -SECTION = "bootloaders" -DEPENDS += "flex-native bison-native" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" -PE = "1" - -S = "${WORKDIR}/git" diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/u-boot/u-boot.inc b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/u-boot/u-boot.inc deleted file mode 100644 index 48fbc572..00000000 --- a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/u-boot/u-boot.inc +++ /dev/null @@ -1,310 +0,0 @@ -SUMMARY = "Universal Boot Loader for embedded devices" -PROVIDES = "virtual/bootloader" - -B = "${WORKDIR}/build" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit uboot-config uboot-extlinux-config uboot-sign deploy - -DEPENDS += "swig-native python-native" - -EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}" V=1' -EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}"' -EXTRA_OEMAKE += 'PYTHON=nativepython STAGING_INCDIR=${STAGING_INCDIR_NATIVE} STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE}' - -PACKAGECONFIG ??= "openssl" -# u-boot will compile its own tools during the build, with specific -# configurations (aka when CONFIG_FIT_SIGNATURE is enabled) openssl is needed as -# a host build dependency. -PACKAGECONFIG[openssl] = ",,openssl-native" - -# Allow setting an additional version string that will be picked up by the -# u-boot build system and appended to the u-boot version. If the .scmversion -# file already exists it will not be overwritten. -UBOOT_LOCALVERSION ?= "" - -# Some versions of u-boot use .bin and others use .img. By default use .bin -# but enable individual recipes to change this value. -UBOOT_SUFFIX ??= "bin" -UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_SUFFIX}" -UBOOT_MAKE_TARGET ?= "all" - -# Output the ELF generated. Some platforms can use the ELF file and directly -# load it (JTAG booting, QEMU) additionally the ELF can be used for debugging -# purposes. -UBOOT_ELF ?= "" -UBOOT_ELF_SUFFIX ?= "elf" -UBOOT_ELF_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_ELF_SUFFIX}" -UBOOT_ELF_BINARY ?= "u-boot.${UBOOT_ELF_SUFFIX}" -UBOOT_ELF_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_ELF_SUFFIX}" - -# Some versions of u-boot build an SPL (Second Program Loader) image that -# should be packaged along with the u-boot binary as well as placed in the -# deploy directory. For those versions they can set the following variables -# to allow packaging the SPL. -SPL_BINARY ?= "" -SPL_BINARYNAME ?= "${@os.path.basename(d.getVar("SPL_BINARY"))}" -SPL_IMAGE ?= "${SPL_BINARYNAME}-${MACHINE}-${PV}-${PR}" -SPL_SYMLINK ?= "${SPL_BINARYNAME}-${MACHINE}" - -# Additional environment variables or a script can be installed alongside -# u-boot to be used automatically on boot. This file, typically 'uEnv.txt' -# or 'boot.scr', should be packaged along with u-boot as well as placed in the -# deploy directory. Machine configurations needing one of these files should -# include it in the SRC_URI and set the UBOOT_ENV parameter. -UBOOT_ENV_SUFFIX ?= "txt" -UBOOT_ENV ?= "" -UBOOT_ENV_BINARY ?= "${UBOOT_ENV}.${UBOOT_ENV_SUFFIX}" -UBOOT_ENV_IMAGE ?= "${UBOOT_ENV}-${MACHINE}-${PV}-${PR}.${UBOOT_ENV_SUFFIX}" -UBOOT_ENV_SYMLINK ?= "${UBOOT_ENV}-${MACHINE}.${UBOOT_ENV_SUFFIX}" - -# U-Boot EXTLINUX variables. U-Boot searches for /boot/extlinux/extlinux.conf -# to find EXTLINUX conf file. -UBOOT_EXTLINUX_INSTALL_DIR ?= "/boot/extlinux" -UBOOT_EXTLINUX_CONF_NAME ?= "extlinux.conf" -UBOOT_EXTLINUX_SYMLINK ?= "${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE}-${PR}" - -do_compile () { - if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then - sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' ${S}/config.mk - fi - - unset LDFLAGS - unset CFLAGS - unset CPPFLAGS - - if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ] - then - echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion - echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion - fi - - if [ -n "${UBOOT_CONFIG}" ] - then - unset i j k - for config in ${UBOOT_MACHINE}; do - i=$(expr $i + 1); - for type in ${UBOOT_CONFIG}; do - j=$(expr $j + 1); - if [ $j -eq $i ] - then - oe_runmake -C ${S} O=${B}/${config} ${config} - oe_runmake -C ${S} O=${B}/${config} ${UBOOT_MAKE_TARGET} - for binary in ${UBOOT_BINARIES}; do - k=$(expr $k + 1); - if [ $k -eq $i ]; then - cp ${B}/${config}/${binary} ${B}/${config}/u-boot-${type}.${UBOOT_SUFFIX} - fi - done - unset k - fi - done - unset j - done - unset i - else - oe_runmake -C ${S} O=${B} ${UBOOT_MACHINE} - oe_runmake -C ${S} O=${B} ${UBOOT_MAKE_TARGET} - fi - -} - -do_install () { - if [ -n "${UBOOT_CONFIG}" ] - then - for config in ${UBOOT_MACHINE}; do - i=$(expr $i + 1); - for type in ${UBOOT_CONFIG}; do - j=$(expr $j + 1); - if [ $j -eq $i ] - then - install -d ${D}/boot - install -m 644 ${B}/${config}/u-boot-${type}.${UBOOT_SUFFIX} ${D}/boot/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY} - fi - done - unset j - done - unset i - else - install -d ${D}/boot - install -m 644 ${B}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} - ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} - fi - - if [ -n "${UBOOT_ELF}" ] - then - if [ -n "${UBOOT_CONFIG}" ] - then - for config in ${UBOOT_MACHINE}; do - i=$(expr $i + 1); - for type in ${UBOOT_CONFIG}; do - j=$(expr $j + 1); - if [ $j -eq $i ] - then - install -m 644 ${B}/${config}/${UBOOT_ELF} ${D}/boot/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY}-${type} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${D}/boot/${UBOOT_BINARY} - fi - done - unset j - done - unset i - else - install -m 644 ${B}/${UBOOT_ELF} ${D}/boot/${UBOOT_ELF_IMAGE} - ln -sf ${UBOOT_ELF_IMAGE} ${D}/boot/${UBOOT_ELF_BINARY} - fi - fi - - if [ -e ${WORKDIR}/fw_env.config ] ; then - install -d ${D}${sysconfdir} - install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config - fi - - if [ -n "${SPL_BINARY}" ] - then - if [ -n "${UBOOT_CONFIG}" ] - then - for config in ${UBOOT_MACHINE}; do - i=$(expr $i + 1); - for type in ${UBOOT_CONFIG}; do - j=$(expr $j + 1); - if [ $j -eq $i ] - then - install -m 644 ${B}/${config}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}-${type}-${PV}-${PR} - ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${D}/boot/${SPL_BINARYNAME}-${type} - ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${D}/boot/${SPL_BINARYNAME} - fi - done - unset j - done - unset i - else - install -m 644 ${B}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} - ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARYNAME} - fi - fi - - if [ -n "${UBOOT_ENV}" ] - then - install -m 644 ${WORKDIR}/${UBOOT_ENV_BINARY} ${D}/boot/${UBOOT_ENV_IMAGE} - ln -sf ${UBOOT_ENV_IMAGE} ${D}/boot/${UBOOT_ENV_BINARY} - fi - - if [ "${UBOOT_EXTLINUX}" = "1" ] - then - install -Dm 0644 ${UBOOT_EXTLINUX_CONFIG} ${D}/${UBOOT_EXTLINUX_INSTALL_DIR}/${UBOOT_EXTLINUX_CONF_NAME} - fi - -} - -FILES_${PN} = "/boot ${sysconfdir}" - -do_deploy () { - if [ -n "${UBOOT_CONFIG}" ] - then - for config in ${UBOOT_MACHINE}; do - i=$(expr $i + 1); - for type in ${UBOOT_CONFIG}; do - j=$(expr $j + 1); - if [ $j -eq $i ] - then - install -d ${DEPLOYDIR} - install -m 644 ${B}/${config}/u-boot-${type}.${UBOOT_SUFFIX} ${DEPLOYDIR}/u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} - cd ${DEPLOYDIR} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK}-${type} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY}-${type} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_SUFFIX} ${UBOOT_BINARY} - fi - done - unset j - done - unset i - else - install -d ${DEPLOYDIR} - install -m 644 ${B}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - cd ${DEPLOYDIR} - rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} - ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY} - fi - - if [ -n "${UBOOT_ELF}" ] - then - if [ -n "${UBOOT_CONFIG}" ] - then - for config in ${UBOOT_MACHINE}; do - i=$(expr $i + 1); - for type in ${UBOOT_CONFIG}; do - j=$(expr $j + 1); - if [ $j -eq $i ] - then - install -m 644 ${B}/${config}/${UBOOT_ELF} ${DEPLOYDIR}/u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY}-${type} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_BINARY} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK}-${type} - ln -sf u-boot-${type}-${PV}-${PR}.${UBOOT_ELF_SUFFIX} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK} - fi - done - unset j - done - unset i - else - install -m 644 ${B}/${UBOOT_ELF} ${DEPLOYDIR}/${UBOOT_ELF_IMAGE} - ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_BINARY} - ln -sf ${UBOOT_ELF_IMAGE} ${DEPLOYDIR}/${UBOOT_ELF_SYMLINK} - fi - fi - - - if [ -n "${SPL_BINARY}" ] - then - if [ -n "${UBOOT_CONFIG}" ] - then - for config in ${UBOOT_MACHINE}; do - i=$(expr $i + 1); - for type in ${UBOOT_CONFIG}; do - j=$(expr $j + 1); - if [ $j -eq $i ] - then - install -m 644 ${B}/${config}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}-${type}-${PV}-${PR} - rm -f ${DEPLOYDIR}/${SPL_BINARYNAME} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} - ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_BINARYNAME}-${type} - ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_BINARYNAME} - ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_SYMLINK}-${type} - ln -sf ${SPL_IMAGE}-${type}-${PV}-${PR} ${DEPLOYDIR}/${SPL_SYMLINK} - fi - done - unset j - done - unset i - else - install -m 644 ${B}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE} - rm -f ${DEPLOYDIR}/${SPL_BINARYNAME} ${DEPLOYDIR}/${SPL_SYMLINK} - ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARYNAME} - ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK} - fi - fi - - - if [ -n "${UBOOT_ENV}" ] - then - install -m 644 ${WORKDIR}/${UBOOT_ENV_BINARY} ${DEPLOYDIR}/${UBOOT_ENV_IMAGE} - rm -f ${DEPLOYDIR}/${UBOOT_ENV_BINARY} ${DEPLOYDIR}/${UBOOT_ENV_SYMLINK} - ln -sf ${UBOOT_ENV_IMAGE} ${DEPLOYDIR}/${UBOOT_ENV_BINARY} - ln -sf ${UBOOT_ENV_IMAGE} ${DEPLOYDIR}/${UBOOT_ENV_SYMLINK} - fi - - if [ "${UBOOT_EXTLINUX}" = "1" ] - then - install -m 644 ${UBOOT_EXTLINUX_CONFIG} ${DEPLOYDIR}/${UBOOT_EXTLINUX_SYMLINK} - ln -sf ${UBOOT_EXTLINUX_SYMLINK} ${DEPLOYDIR}/${UBOOT_EXTLINUX_CONF_NAME}-${MACHINE} - ln -sf ${UBOOT_EXTLINUX_SYMLINK} ${DEPLOYDIR}/${UBOOT_EXTLINUX_CONF_NAME} - fi -} - -addtask deploy before do_build after do_compile diff --git a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2018.09.bb b/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2018.09.bb deleted file mode 100644 index da155ce2..00000000 --- a/bsp/meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2018.09.bb +++ /dev/null @@ -1,43 +0,0 @@ -require u-boot-common_${PV}.inc -require u-boot.inc - -DEPENDS += "bc-native dtc-native" - -UBOOT_URL = "git://github.com/renesas-rcar/u-boot.git" -BRANCH = "v2018.09/rcar-3.9.5" - -SRC_URI = "${UBOOT_URL};branch=${BRANCH}" -SRCREV = "33049e0f28708289ade19d09a51ba278f6ddbe1c" -PV = "v2018.09+git${SRCPV}" - -UBOOT_SREC_SUFFIX = "srec" -UBOOT_SREC ?= "u-boot-elf.${UBOOT_SREC_SUFFIX}" -UBOOT_SREC_IMAGE ?= "u-boot-elf-${MACHINE}-${PV}-${PR}.${UBOOT_SREC_SUFFIX}" -UBOOT_SREC_SYMLINK ?= "u-boot-elf-${MACHINE}.${UBOOT_SREC_SUFFIX}" - -do_deploy_append() { - if [ -n "${UBOOT_CONFIG}" ] - then - for config in ${UBOOT_MACHINE}; do - i=$(expr $i + 1); - for type in ${UBOOT_CONFIG}; do - j=$(expr $j + 1); - if [ $j -eq $i ] - then - type=${type#*_} - install -m 644 ${B}/${config}/${UBOOT_SREC} ${DEPLOYDIR}/u-boot-elf-${type}-${PV}-${PR}.${UBOOT_SREC_SUFFIX} - cd ${DEPLOYDIR} - ln -sf u-boot-elf-${type}-${PV}-${PR}.${UBOOT_SREC_SUFFIX} u-boot-elf-${type}.${UBOOT_SREC_SUFFIX} - fi - done - unset j - done - unset i - else - install -m 644 ${B}/${UBOOT_SREC} ${DEPLOYDIR}/${UBOOT_SREC_IMAGE} - cd ${DEPLOYDIR} - rm -f ${UBOOT_SREC} ${UBOOT_SREC_SYMLINK} - ln -sf ${UBOOT_SREC_IMAGE} ${UBOOT_SREC_SYMLINK} - ln -sf ${UBOOT_SREC_IMAGE} ${UBOOT_SREC} - fi -} |