meta-digi-arm: remove overlayed recipes

meta-freescale started updating the recipes to NXP's
rel_imx_5.15.71_2.2.0 release, so now we have a bunch of overlayed
recipes we can clean up.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2023-01-10 14:26:33 +01:00
parent 2bdfdc92e1
commit 0fbed2bfb6
15 changed files with 12 additions and 459 deletions

View File

@ -1,17 +0,0 @@
# Copyright (C) 2012-2016 Freescale Semiconductor
# Copyright 2017-2022 NXP
# Copyright (C) 2018 O.S. Systems Software LTDA.
SECTION = "base"
LICENSE = "Proprietary"
LIC_FILES_CHKSUM = "file://COPYING;md5=5a0bf11f745e68024f37b4724a5364fe"
SRC_URI = " \
${FSL_MIRROR}/firmware-imx-${PV}.bin;fsl-eula=true \
"
SRC_URI[md5sum] = "436501f8e67c10eed6bba88457e701a2"
SRC_URI[sha256sum] = "f050f60351a54fd75954fdeb133ddd014a5576040c72616e216b63db0e242dd4"
S = "${WORKDIR}/firmware-imx-${PV}"
inherit fsl-eula-unpack

View File

@ -1,23 +0,0 @@
# Copyright 2018-2021 NXP
SUMMARY = "Freescale i.MX firmware for 8 family"
DESCRIPTION = "Freescale i.MX firmware for 8 family"
require firmware-imx-${PV}.inc
inherit deploy
do_install[noexec] = "1"
do_deploy() {
# Cadence HDMI
install -m 0644 ${S}/firmware/hdmi/cadence/hdmitxfw.bin ${DEPLOYDIR}
install -m 0644 ${S}/firmware/hdmi/cadence/hdmirxfw.bin ${DEPLOYDIR}
install -m 0644 ${S}/firmware/hdmi/cadence/dpfw.bin ${DEPLOYDIR}
}
addtask deploy after do_install before do_build
PACKAGE_ARCH = "${MACHINE_SOCARCH}"
COMPATIBLE_MACHINE = "(mx8-nxp-bsp)"
COMPATIBLE_MACHINE:mx8m-nxp-bsp = "(^$)"
COMPATIBLE_MACHINE:mx8x-nxp-bsp = "(^$)"

View File

@ -1,24 +0,0 @@
# Copyright 2018-2021 NXP
SUMMARY = "Freescale i.MX firmware for 8M and 8M Mini family"
DESCRIPTION = "Freescale i.MX firmware for 8M and 8M Mini family"
require firmware-imx-${PV}.inc
inherit deploy
do_install[noexec] = "1"
do_deploy() {
# Synopsys DDR
for ddr_firmware in ${DDR_FIRMWARE_NAME}; do
install -m 0644 ${S}/firmware/ddr/synopsys/${ddr_firmware} ${DEPLOYDIR}
done
# Cadence DP and HDMI
install -m 0644 ${S}/firmware/hdmi/cadence/signed_dp_imx8m.bin ${DEPLOYDIR}
install -m 0644 ${S}/firmware/hdmi/cadence/signed_hdmi_imx8m.bin ${DEPLOYDIR}
}
addtask deploy after do_install before do_build
PACKAGE_ARCH = "${MACHINE_SOCARCH}"
COMPATIBLE_MACHINE = "(mx8m-generic-bsp)"

View File

@ -2,7 +2,7 @@
SUMMARY = "Freescale i.MX firmware for i.MX 9 family"
DESCRIPTION = "Freescale i.MX firmware for i.MX 9 family"
require firmware-imx-${PV}.inc
require recipes-bsp/firmware-imx/firmware-imx-${PV}.inc
inherit deploy

View File

@ -0,0 +1,8 @@
# Copyright (C) 2023, Digi International Inc.
do_install:append() {
# meta-freescale deletes the SDMA firmware provided by the firmware-imx package,
# in favor of the generic one provided by the linux-firmware package. The one
# provided by NXP is more up-to-date, so we want it back.
install -m 0644 ${S}/firmware/sdma/* ${D}${nonarch_base_libdir}/firmware/imx/sdma
}

View File

@ -1,158 +0,0 @@
# Copyright (C) 2012-2016 Freescale Semiconductor
# Copyright 2017-2021 NXP
# Copyright (C) 2018 O.S. Systems Software LTDA.
SUMMARY = "Freescale i.MX firmware"
DESCRIPTION = "Freescale i.MX firmware such as for the VPU"
require firmware-imx-${PV}.inc
PE = "1"
inherit allarch
do_install() {
install -d ${D}${nonarch_base_libdir}/firmware/imx
# SDMA Firmware section
install -d ${D}${nonarch_base_libdir}/firmware/imx/sdma
install -m 0644 ${S}/firmware/sdma/* ${D}${nonarch_base_libdir}/firmware/imx/sdma
# Comment these lines to use sdma-imx6q/7d.bin from here and not linux-firmware
#rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx6q.bin
#rm -f ${D}${nonarch_base_libdir}/firmware/imx/sdma/sdma-imx7d.bin
# EASRC Firmware section
install -d ${D}${nonarch_base_libdir}/firmware/imx/easrc
install -m 0644 ${S}/firmware/easrc/* ${D}${nonarch_base_libdir}/firmware/imx/easrc/
# XCVR Firmware section
install -d ${D}${nonarch_base_libdir}/firmware/imx/xcvr
install -m 0644 ${S}/firmware/xcvr/* ${D}${nonarch_base_libdir}/firmware/imx/xcvr/
# XUVI Firmware section
install -d ${D}${nonarch_base_libdir}/firmware/imx/xuvi
install -m 0644 ${S}/firmware/xuvi/* ${D}${nonarch_base_libdir}/firmware/imx/xuvi/
# EPDC Firmware section
# NOTE:
# epdc_ED060XH2C1.fw file has .nonrestricted suffix in the source archive, hence it should
# be installed with a different name
install -d ${D}${nonarch_base_libdir}/firmware/imx/epdc
install -m 0644 ${S}/firmware/epdc/*.fw ${D}${nonarch_base_libdir}/firmware/imx/epdc/
install -m 0644 ${S}/firmware/epdc/epdc_ED060XH2C1.fw.nonrestricted ${D}${nonarch_base_libdir}/firmware/imx/epdc/epdc_ED060XH2C1.fw
# HDMI Firmware section
# NOTE:
# Only install pre-defined list of firmware files, since the source archive contains
# also HDMI binary files for imx8m derivatives, which are taken care of by another recipe
install -m 0644 ${S}/firmware/hdmi/cadence/hdmitxfw.bin ${D}${nonarch_base_libdir}/firmware
install -m 0644 ${S}/firmware/hdmi/cadence/hdmirxfw.bin ${D}${nonarch_base_libdir}/firmware
install -m 0644 ${S}/firmware/hdmi/cadence/dpfw.bin ${D}${nonarch_base_libdir}/firmware
# VPU Firmware section
# NOTE:
# Do the same thing as above for HDMI - only install a pre-defined list of firmware files,
# as some of other files are provided by packages from other recipes.
install -d ${D}${nonarch_base_libdir}/firmware/vpu
install -m 0644 ${S}/firmware/vpu/vpu_fw_imx*.bin ${D}${nonarch_base_libdir}/firmware/vpu
}
#
# This prepend is here to produce separate packages containing firmware,
# which could be included separately based on the machine definition.
#
# It operates similar to the FILES mechanism by travesing through
# ${D} + folder supplied as a first parameter, matches the regexp supplied
# as second one, and for every file match - it creates a separate package,
# which contains only files that matches the pattern.
#
python populate_packages:prepend() {
# CODA driver tries to locate VPU firmwares directly in ${nonarch_base_libdir}/firmware, to
# avoid fallback loading which is usually 40-60 seconds later after system boots up, let's
# create symbolic links in ${nonarch_base_libdir}/firmware for VPU firmwares.
def coda_vpu_links(file, pkg, pattern, format, basename):
# Only CODA VPU firmwares need this procedure
if 'imx8' in basename:
return
dir = os.path.dirname(file)
dir = os.path.abspath(os.path.join(dir, os.pardir))
cwd = os.getcwd()
os.chdir(dir)
name = os.path.basename(file)
os.symlink(os.path.join("vpu", name), name)
oldfiles = d.getVar('FILES:' + pkg)
newfile = os.path.join(d.getVar('nonarch_base_libdir'), "firmware", name)
d.setVar('FILES:' + pkg, oldfiles + " " + newfile)
os.chdir(cwd)
easrcdir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/easrc', d)
do_split_packages(d, easrcdir, '^easrc-([^_]*).*\.bin',
output_pattern='firmware-imx-easrc-%s',
description='Freescale IMX EASRC Firmware [%s]',
extra_depends='',
prepend=True)
vpudir = bb.data.expand('${nonarch_base_libdir}/firmware/vpu', d)
do_split_packages(d, vpudir, '^vpu_fw_([^_]*).*\.bin',
output_pattern='firmware-imx-vpu-%s',
description='Freescale IMX VPU Firmware [%s]',
hook=coda_vpu_links,
extra_depends='',
prepend=True)
sdmadir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/sdma', d)
do_split_packages(d, sdmadir, '^sdma-([^-]*).*\.bin',
output_pattern='firmware-imx-sdma-%s',
description='Freescale IMX SDMA Firmware [%s]',
extra_depends='',
prepend=True)
xcvrdir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/xcvr', d)
do_split_packages(d, xcvrdir, '^xcvr-([^_]*).*\.bin',
output_pattern='firmware-imx-xcvr-%s',
description='Freescale IMX XCVR Firmware [%s]',
extra_depends='',
prepend=True)
xuvidir = bb.data.expand('${nonarch_base_libdir}/firmware/imx/xuvi', d)
do_split_packages(d, xuvidir, '^vpu_fw_([^_]*).*\.bin',
output_pattern='firmware-imx-xuvi-%s',
description='Freescale IMX XUVI Firmware [%s]',
extra_depends='',
prepend=True)
}
# Declare a contract that we would provide packages produced by prepend above
PACKAGES_DYNAMIC = "${PN}-vpu-* ${PN}-sdma-* ${PN}-easrc-* ${PN}-xcvr-* ${PN}-xuvi-*"
#
# Deal with the rest of Firmware packages here
#
# Provide EPDC and HDMI Firmware in common packages as they tend to be special in
# terms of the content.
#
# NOTE: PACKAGES are defined explicitly here in order to remove the auto-generated
# complimentary packages (-dev and -dbg).
# This is done in order to be able to keep the main package empty and fail when
# somebody tries to install it in the image.
# If -dev package is present in that setup, and dev-pkgs is enabled in
# IMAGE_FEATURES - this leads to a failure during do_rootfs() while all -dev
# packages would be installed, and -dev package would fail because the main one
# is empty.
# Therefore, we opt-out from producing -dev package here, since also for firmware
# files it makes no sense.
PACKAGES = "${PN} ${PN}-epdc ${PN}-hdmi"
FILES:${PN}-epdc = "${nonarch_base_libdir}/firmware/imx/epdc/"
FILES:${PN}-hdmi = " \
${nonarch_base_libdir}/firmware/hdmitxfw.bin \
${nonarch_base_libdir}/firmware/hdmirxfw.bin \
${nonarch_base_libdir}/firmware/dpfw.bin \
"
COMPATIBLE_MACHINE = "(imx-generic-bsp)"

View File

@ -10,9 +10,6 @@ SRC_URI:append = " \
file://0005-ccimx93-use-UART6-for-the-default-console.patch \
"
# Release "lf-5.15.71-2.2.0"
SRCREV = "3c1583ba0a5d11e5116332e91065cb3740153a46"
BOOT_TOOLS = "imx-boot-tools"
do_deploy:append() {

View File

@ -1,19 +1,5 @@
# Copyright 2017,2021 NXP
# Copyright (C) 2023 Digi International
PV = "5.9+${SRCPV}"
PLATFORM:mx9-nxp-bsp = "IMX8ULP"
SRCBRANCH = "lf-5.10.72_2.2.0"
IMXLIB_SRC ?= "git://source.codeaurora.org/external/imx/imx-lib.git;protocol=https"
SRC_URI = " \
${IMXLIB_SRC};branch=${SRCBRANCH} \
"
SRCREV = "87ddd80953835eb29027d1d5a12044a08e809e40"
PLATFORM:mx8ulp-nxp-bsp = "IMX8ULP"
do_install:append () {
# Remove .go file for Android
find ${D}/ -name *.go -exec rm {} \;
}
COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8ulp-nxp-bsp)"
COMPATIBLE_MACHINE = "(mx6-nxp-bsp|mx7-nxp-bsp|mx8ulp-nxp-bsp|mx9-nxp-bsp)"

View File

@ -1,40 +0,0 @@
# Copyright (C) 2017-2022 NXP
SUMMARY = "OPTEE Client libs"
HOMEPAGE = "http://www.optee.org/"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=69663ab153298557a59c67a60a743e5b"
OPTEE_CLIENT_SRC ?= "git://github.com/nxp-imx/imx-optee-client.git;protocol=https"
SRC_URI = " \
${OPTEE_CLIENT_SRC};branch=${SRCBRANCH} \
file://tee-supplicant.service \
"
FILESEXTRAPATHS:append := ":${THISDIR}/optee-client"
S = "${WORKDIR}/git"
B = "${WORKDIR}/build"
inherit python3native systemd features_check pkgconfig
DEPENDS = "util-linux-libuuid"
REQUIRED_MACHINE_FEATURES = "optee"
SYSTEMD_SERVICE:${PN} = "tee-supplicant.service"
EXTRA_OEMAKE = " \
-C ${S} O=${B} \
"
do_install () {
oe_runmake install DESTDIR=${D}
install -D -p -m0644 ${WORKDIR}/tee-supplicant.service ${D}${systemd_system_unitdir}/tee-supplicant.service
sed -i \
-e s:/etc:${sysconfdir}:g \
-e s:/usr/sbin:${sbindir}:g \
${D}${systemd_system_unitdir}/tee-supplicant.service
}
COMPATIBLE_MACHINE = "(imx-nxp-bsp)"

View File

@ -1,10 +0,0 @@
[Unit]
Description=TEE Supplicant
[Service]
User=root
EnvironmentFile=-/etc/default/tee-supplicant
ExecStart=/usr/sbin/tee-supplicant $OPTARGS
[Install]
WantedBy=basic.target

View File

@ -1,5 +0,0 @@
# Copyright (C) 2022 NXP
require optee-client.imx.inc
SRCBRANCH = "lf-5.15.71_2.2.0"
SRCREV = "644022f8970c832a40be00747fcec70c7b5d488c"

View File

@ -1,100 +0,0 @@
# Copyright (C) 2017-2022 NXP
SUMMARY = "OPTEE OS"
DESCRIPTION = "OPTEE OS"
HOMEPAGE = "http://www.optee.org/"
LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=c1f21c4f72f372ef38a5a4aee55ec173"
DEPENDS = "python3-pyelftools-native u-boot-mkimage-native \
python3-cryptography-native"
OPTEE_OS_SRC ?= "git://github.com/nxp-imx/imx-optee-os.git;protocol=https"
SRC_URI = "${OPTEE_OS_SRC};branch=${SRCBRANCH}"
S = "${WORKDIR}/git"
B = "${WORKDIR}/build"
inherit deploy python3native autotools features_check
REQUIRED_MACHINE_FEATURES = "optee"
# The platform flavor corresponds to the Yocto machine without the leading 'i'.
PLATFORM_FLAVOR = "${@d.getVar('MACHINE')[1:]}"
PLATFORM_FLAVOR:imx6qpdlsolox = "mx6qsabresd"
PLATFORM_FLAVOR:mx6ul-nxp-bsp = "mx6ulevk"
PLATFORM_FLAVOR:mx6ull-nxp-bsp = "mx6ullevk"
PLATFORM_FLAVOR:mx6ulz-nxp-bsp = "mx6ulzevk"
PLATFORM_FLAVOR:mx8mq-nxp-bsp = "mx8mqevk"
PLATFORM_FLAVOR:mx8mm-nxp-bsp = "mx8mmevk"
PLATFORM_FLAVOR:mx8mn-nxp-bsp = "mx8mnevk"
PLATFORM_FLAVOR:mx8mp-nxp-bsp = "mx8mpevk"
PLATFORM_FLAVOR:mx8mpul-nxp-bsp = "mx8mpevk"
PLATFORM_FLAVOR:mx8qm-nxp-bsp = "mx8qmmek"
PLATFORM_FLAVOR:mx8qxp-nxp-bsp = "mx8qxpmek"
PLATFORM_FLAVOR:mx8dx-nxp-bsp = "mx8dxmek"
PLATFORM_FLAVOR:mx8dxl-nxp-bsp = "mx8dxlevk"
PLATFORM_FLAVOR:mx8mnul-nxp-bsp = "mx8mnevk"
PLATFORM_FLAVOR:mx8ulp-nxp-bsp = "mx8ulpevk"
PLATFORM_FLAVOR:mx93-nxp-bsp = "mx93evk"
EXTRA_OEMAKE = " \
PLATFORM=imx-${PLATFORM_FLAVOR} \
CROSS_COMPILE=${HOST_PREFIX} \
CROSS_COMPILE64=${HOST_PREFIX} \
CFG_TEE_TA_LOG_LEVEL=0 \
CFG_TEE_CORE_LOG_LEVEL=0 \
OPENSSL_MODULES=${STAGING_LIBDIR_NATIVE}/ossl-modules \
-C ${S} O=${B} \
"
LDFLAGS[unexport] = "1"
CFLAGS += "--sysroot=${STAGING_DIR_HOST}"
CXXFLAGS += "--sysroot=${STAGING_DIR_HOST}"
OPTEE_ARCH:arm = "arm32"
OPTEE_ARCH:aarch64 = "arm64"
do_configure[noexec] = "1"
do_compile:arm () {
oe_runmake all uTee
}
do_compile:aarch64 () {
oe_runmake all
}
do_compile[cleandirs] = "${B}"
do_deploy () {
install -d ${DEPLOYDIR}
cp ${B}/core/tee-raw.bin ${DEPLOYDIR}/tee.${PLATFORM_FLAVOR}.bin
ln -sf tee.${PLATFORM_FLAVOR}.bin ${DEPLOYDIR}/tee.bin
}
do_deploy:append:arm () {
cp ${B}/core/uTee ${DEPLOYDIR}/uTee-${OPTEE_BIN_EXT}
}
do_install () {
install -d ${D}${nonarch_base_libdir}/firmware/
install -m 644 ${B}/core/*.bin ${D}${nonarch_base_libdir}/firmware/
# Install embedded TAs
install -d ${D}${nonarch_base_libdir}/optee_armtz/
install -m 444 ${B}/ta/*/*.ta ${D}${nonarch_base_libdir}/optee_armtz/
# Install TA devkit
install -d ${D}${includedir}/optee/export-user_ta_${OPTEE_ARCH}/
cp -aR ${B}/export-ta_${OPTEE_ARCH}/* \
${D}${includedir}/optee/export-user_ta_${OPTEE_ARCH}/
}
addtask deploy after do_compile before do_install
FILES:${PN} = "${nonarch_base_libdir}/firmware/ ${nonarch_base_libdir}/optee_armtz/"
FILES:${PN}-staticdev = "${includedir}/optee/"
RDEPENDS:${PN}-dev += "${PN}-staticdev"
PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "(imx-nxp-bsp)"

View File

@ -1,5 +0,0 @@
# Copyright (C) 2022 NXP
require optee-os.imx.inc
SRCBRANCH = "lf-5.15.71_2.2.0"
SRCREV = "00919403f040fad4f8603e605932281ff8451b1d"

View File

@ -1,51 +0,0 @@
# Copyright (C) 2017-2022 NXP
SUMMARY = "OPTEE test"
HOMEPAGE = "http://www.optee.org/"
LICENSE = "BSD-2-Clause & GPL-2.0-only"
LIC_FILES_CHKSUM = "file://LICENSE.md;md5=daa2bcccc666345ab8940aab1315a4fa"
DEPENDS = "python3-cryptography-native optee-os optee-client openssl"
OPTEE_TEST_SRC ?= "git://github.com/nxp-imx/imx-optee-test.git;protocol=https"
SRC_URI = "${OPTEE_TEST_SRC};branch=${SRCBRANCH}"
S = "${WORKDIR}/git"
B = "${WORKDIR}/build"
inherit python3native features_check
REQUIRED_MACHINE_FEATURES = "optee"
OPTEE_ARCH:arm = "arm32"
OPTEE_ARCH:aarch64 = "arm64"
CFLAGS += "--sysroot=${STAGING_DIR_HOST}"
CXXFLAGS += "--sysroot=${STAGING_DIR_HOST}"
EXTRA_OEMAKE = " \
TA_DEV_KIT_DIR=${STAGING_INCDIR}/optee/export-user_ta_${OPTEE_ARCH}/ \
OPTEE_CLIENT_EXPORT=${STAGING_DIR_HOST}${exec_prefix} \
CROSS_COMPILE_HOST=${HOST_PREFIX} \
CROSS_COMPILE_TA=${HOST_PREFIX} \
CROSS_COMPILE=${HOST_PREFIX} \
OPENSSL_MODULES=${STAGING_LIBDIR_NATIVE}/ossl-modules \
-C ${S} O=${B} \
"
do_compile() {
oe_runmake all
}
do_compile[cleandirs] = "${B}"
do_install () {
oe_runmake install DESTDIR=${D}
}
FILES:${PN} += "${nonarch_base_libdir}/optee_armtz/ ${libdir}/tee-supplicant/plugins/"
RDEPENDS:${PN} = "optee-os"
COMPATIBLE_MACHINE = "(imx-nxp-bsp)"

View File

@ -1,5 +0,0 @@
# Copyright (C) 2022 NXP
require optee-test.imx.inc
SRCBRANCH = "lf-5.15.71_2.2.0"
SRCREV = "5c1dbb531b304f7ae100958f6261b6cefea49b62"