diff options
Diffstat (limited to 'bsp/meta-freescale/recipes-bsp/imx-atf')
| -rw-r--r-- | bsp/meta-freescale/recipes-bsp/imx-atf/imx-atf_2.0.bb (renamed from bsp/meta-freescale/recipes-bsp/imx-atf/imx-atf_1.5.0.bb) | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/bsp/meta-freescale/recipes-bsp/imx-atf/imx-atf_1.5.0.bb b/bsp/meta-freescale/recipes-bsp/imx-atf/imx-atf_2.0.bb index 9d402dba..33ed6c62 100644 --- a/bsp/meta-freescale/recipes-bsp/imx-atf/imx-atf_1.5.0.bb +++ b/bsp/meta-freescale/recipes-bsp/imx-atf/imx-atf_2.0.bb @@ -1,17 +1,17 @@ -# Copyright 2017-2018 NXP +# Copyright (C) 2017-2019 NXP DESCRIPTION = "i.MX ARM Trusted Firmware" SECTION = "BSP" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" -PV = "1.5.0+git${SRCPV}" +PV .= "+git${SRCPV}" -SRCBRANCH = "imx_4.9.123_imx8mm_ga" +SRCBRANCH = "lf-5.4.y" SRC_URI = "git://source.codeaurora.org/external/imx/imx-atf.git;protocol=https;branch=${SRCBRANCH} \ file://0001-Allow-BUILD_STRING-to-be-set-in-.revision-file.patch \ " -SRCREV = "af3554fc6ea8c17710ffd37a14a25834fad19271" +SRCREV = "7b3389d49815f1e3f7942bd312a27ee665bd2e33" S = "${WORKDIR}/git" @@ -21,25 +21,35 @@ BOOT_TOOLS = "imx-boot-tools" PLATFORM ?= "INVALID" PLATFORM_mx8qm = "imx8qm" -PLATFORM_mx8qxp = "imx8qxp" +PLATFORM_mx8qxp = "imx8qx" PLATFORM_mx8mq = "imx8mq" PLATFORM_mx8mm = "imx8mm" +PLATFORM_mx8mn = "imx8mn" EXTRA_OEMAKE += " \ CROSS_COMPILE="${TARGET_PREFIX}" \ PLAT=${PLATFORM} \ " +BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}" + do_compile() { # Clear LDFLAGS to avoid the option -Wl recognize issue unset LDFLAGS oe_runmake bl31 + if ${BUILD_OPTEE}; then + oe_runmake clean BUILD_BASE=build-optee + oe_runmake BUILD_BASE=build-optee SPD=opteed bl31 + fi } do_install[noexec] = "1" do_deploy() { install -Dm 0644 ${S}/build/${PLATFORM}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-${PLATFORM}.bin + if ${BUILD_OPTEE}; then + install -m 0644 ${S}/build-optee/${PLATFORM}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-${PLATFORM}.bin-optee + fi } addtask deploy after do_compile |