imx-atf: remove our .bb file and add a .bbappend
Bitbake was using the imx-atf recipe inside of meta-freescale instead of ours. Said recipe was compiling a different tag, causing our kernel to stop loading when using our generated imx-boot images. Remove our .bb file and add a .bbappend that changes the source code revision to the tag compatible with the rest of the imx-boot files. Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
parent
e9e0bd965b
commit
8e4e77f200
|
|
@ -0,0 +1,5 @@
|
||||||
|
# Copyright (C) 2019 Digi International.
|
||||||
|
|
||||||
|
# Use the v4.14 ga BSP branch
|
||||||
|
SRCBRANCH = "imx_4.14.78_1.0.0_ga"
|
||||||
|
SRCREV = "d6451cc1e162eff89b03dd63e86d55b9baa8885b"
|
||||||
|
|
@ -1,82 +0,0 @@
|
||||||
# Copyright 2017-2018 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"
|
|
||||||
|
|
||||||
inherit fsl-eula-unpack pkgconfig deploy
|
|
||||||
|
|
||||||
PV = "1.5+git${SRCPV}"
|
|
||||||
|
|
||||||
ATF_SRC ?= "git://source.codeaurora.org/external/imx/imx-atf.git;protocol=https"
|
|
||||||
SRCBRANCH = "imx_4.14.78_1.0.0_ga"
|
|
||||||
|
|
||||||
SRC_URI = "${ATF_SRC};branch=${SRCBRANCH}"
|
|
||||||
SRCREV = "d6451cc1e162eff89b03dd63e86d55b9baa8885b"
|
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
|
||||||
|
|
||||||
BOOT_TOOLS = "imx-boot-tools"
|
|
||||||
|
|
||||||
SOC_ATF ?= "imx8qm"
|
|
||||||
SOC_ATF_mx8qm = "imx8qm"
|
|
||||||
SOC_ATF_mx8qxp = "imx8qxp"
|
|
||||||
SOC_ATF_mx8mq = "imx8mq"
|
|
||||||
SOC_ATF_mx8mm = "imx8mm"
|
|
||||||
|
|
||||||
SYSROOT_DIRS += "/boot"
|
|
||||||
|
|
||||||
BUILD_OPTEE = "${@bb.utils.contains('COMBINED_FEATURES', 'optee', 'true', 'false', d)}"
|
|
||||||
|
|
||||||
do_compile () {
|
|
||||||
export CROSS_COMPILE="${TARGET_PREFIX}"
|
|
||||||
cd ${S}
|
|
||||||
# Clear LDFLAGS to avoid the option -Wl recognize issue
|
|
||||||
unset LDFLAGS
|
|
||||||
|
|
||||||
echo "-> Build ${SOC_ATF} bl31.bin"
|
|
||||||
# Set BUIL_STRING with the revision info
|
|
||||||
BUILD_STRING=""
|
|
||||||
if [ -e ${S}/.revision ]; then
|
|
||||||
cur_rev=`cat ${S}/.revision`
|
|
||||||
echo " Current revision is ${cur_rev} ."
|
|
||||||
BUILD_STRING="BUILD_STRING=${cur_rev}"
|
|
||||||
else
|
|
||||||
echo " No .revision found! "
|
|
||||||
fi
|
|
||||||
oe_runmake clean PLAT=${SOC_ATF}
|
|
||||||
oe_runmake ${BUILD_STRING} PLAT=${SOC_ATF} bl31
|
|
||||||
|
|
||||||
# Build opteee version
|
|
||||||
if [ "${BUILD_OPTEE}" = "true" ]; then
|
|
||||||
oe_runmake clean PLAT=${SOC_ATF} BUILD_BASE=build-optee
|
|
||||||
oe_runmake ${BUILD_STRING} PLAT=${SOC_ATF} BUILD_BASE=build-optee SPD=opteed bl31
|
|
||||||
fi
|
|
||||||
unset CROSS_COMPILE
|
|
||||||
}
|
|
||||||
|
|
||||||
do_install () {
|
|
||||||
install -d ${D}/boot
|
|
||||||
install -m 0644 ${S}/build/${SOC_ATF}/release/bl31.bin ${D}/boot/bl31-${SOC_ATF}.bin
|
|
||||||
# Install opteee version
|
|
||||||
if [ "${BUILD_OPTEE}" = "true" ]; then
|
|
||||||
install -m 0644 ${S}/build-optee/${SOC_ATF}/release/bl31.bin ${D}/boot/bl31-${SOC_ATF}.bin-optee
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
do_deploy () {
|
|
||||||
install -d ${DEPLOYDIR}/${BOOT_TOOLS}
|
|
||||||
install -m 0644 ${S}/build/${SOC_ATF}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-${SOC_ATF}.bin
|
|
||||||
# Deploy opteee version
|
|
||||||
if [ "${BUILD_OPTEE}" = "true" ]; then
|
|
||||||
install -m 0644 ${S}/build-optee/${SOC_ATF}/release/bl31.bin ${DEPLOYDIR}/${BOOT_TOOLS}/bl31-${SOC_ATF}.bin-optee
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
addtask deploy before do_install after do_compile
|
|
||||||
|
|
||||||
FILES_${PN} = "/boot"
|
|
||||||
|
|
||||||
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
|
||||||
COMPATIBLE_MACHINE = "(mx8)"
|
|
||||||
Loading…
Reference in New Issue