From ee26f14423a9a85622d73388291bf5ff6ae7a96f Mon Sep 17 00:00:00 2001 From: Francisco Gil Date: Tue, 2 Jul 2024 10:33:08 +0200 Subject: [PATCH 01/27] meta-digi: revert revisions to AUTOREV Signed-off-by: Francisco Gil --- .../recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend | 4 ++-- .../recipes-security/optee/optee-os-stm32mp_%.bbappend | 4 ++-- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb | 2 +- .../trustfence/nativesdk-trustfence-sign-tools_2023.04.bb | 2 +- .../trustfence/trustfence-sign-tools-native_2023.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools.inc | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb | 2 +- meta-digi-dey/recipes-digi/cccs/cccs_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 17 files changed, 25 insertions(+), 25 deletions(-) diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend index 7c89d3056..7f1acace1 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend @@ -8,10 +8,10 @@ TFA_URI_GITHUB = "${DIGI_GITHUB_GIT}/arm-trusted-firmware.git;protocol=https" TFA_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${TFA_URI_STASH}', '${TFA_URI_GITHUB}', d)}" SRCBRANCH = "v2.6/stm32mp/maint" -SRCREV = "ed19ce45f72ec7fb0f1bd752ecdf46041d581ccb" +SRCREV = "${AUTOREV}" SRC_URI = " \ - ${TFA_GIT_URI};nobranch=1 \ + ${TFA_GIT_URI};branch=${SRCBRANCH} \ " TF_A_CONFIG[nand] = "${DEVICE_BOARD_ENABLE:NAND},STM32MP_RAW_NAND=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_NAND}' if ${TF_A_MTD_START_OFFSET_NAND} else ''} STM32MP_USB_PROGRAMMER=1" diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend index 1fe0af5c3..d3367b5ec 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend @@ -8,9 +8,9 @@ OPTEE_URI_GITHUB = "${DIGI_GITHUB_GIT}/optee_os.git;protocol=https" OPTEE_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${OPTEE_URI_STASH}', '${OPTEE_URI_GITHUB}', d)}" SRCBRANCH = "3.16.0/stm/maint" -SRCREV = "084bea4f5aed10b1c0d9204cbaeea631335ca6ce" +SRCREV = "${AUTOREV}" SRC_URI = " \ - ${OPTEE_GIT_URI};nobranch=1;name=os \ + ${OPTEE_GIT_URI};branch=${SRCBRANCH};name=os \ file://fonts.tar.gz;subdir=git;name=fonts \ " diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc index 2e9e79c70..6ccfd5c15 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc @@ -27,7 +27,7 @@ INSTALL_FW_UBOOT_SCRIPTS = " \ " SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://boot.txt \ ${INSTALL_FW_UBOOT_SCRIPTS} \ " diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index ff3de034b..1a3fa59a3 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,7 +3,7 @@ require u-boot-dey.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "1ef810133fcecacf14e09155bee10aa66fc6ade7" +SRCREV = "${AUTOREV}" # Disable support to initial environment for U-Boot UBOOT_INITIAL_ENV = "" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb index d946385f5..4f845bdd2 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2020.04/maint" -SRCREV = "d6e1da4a6b0a5407b39e5705ed4e845737c38536" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8m|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb index 57e7ffd62..22ee05f7d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb @@ -7,7 +7,7 @@ DEPENDS += "flex-native bison-native" DEPENDS += "python3-setuptools-native" SRCBRANCH = "v2021.10/maint" -SRCREV = "8b6b6d30aff53b926fad3c038dba398b15d3ca6a" +SRCREV = "${AUTOREV}" SRC_URI += " \ ${@oe.utils.conditional('TRUSTFENCE_SIGN_FIT_STM', '1', 'file://fit_signature.cfg', '', d)} \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb index 8332bfa38..ca022b584 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2023.04/maint" -SRCREV = "e4793a0c54e04af31498443a21f74a5add55fa52" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx93)" diff --git a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb index 4f239cd7d..0ff254752 100644 --- a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb +++ b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb @@ -3,4 +3,4 @@ require nativesdk-trustfence-sign-tools_git.bb SRCBRANCH = "v2023.04/maint" -SRCREV = "e4793a0c54e04af31498443a21f74a5add55fa52" +SRCREV = "${AUTOREV}" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb index 6fe495704..955934262 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb @@ -3,4 +3,4 @@ require trustfence-sign-tools-native_git.bb SRCBRANCH = "v2023.04/maint" -SRCREV = "e4793a0c54e04af31498443a21f74a5add55fa52" +SRCREV = "${AUTOREV}" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc index 0e4d9a184..676122560 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc @@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2020.04/maint" -SRCREV = "d6e1da4a6b0a5407b39e5705ed4e845737c38536" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -15,7 +15,7 @@ UBOOT_URI_GITHUB = "${DIGI_GITHUB_GIT}/u-boot.git;protocol=https" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${UBOOT_URI_STASH}', '${UBOOT_URI_GITHUB}', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-artifact-nxp.sh \ file://trustfence-sign-artifact-stm.sh \ file://trustfence-gen-pki-stm.sh \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index b229c413a..29213a4a1 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-4.0/maint" -SRCREV = "7ba1cdedd456928ac77c1f11e0d070abaf505e95" +SRCREV = "${AUTOREV}" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}/linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};nobranch=1 \ + ${QCOM_GIT_URI};branch=${SRCBRANCH} \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index 04da853ee..3aa8c98d7 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -15,7 +15,7 @@ LINUX_URI_STASH = "${DIGI_MTK_GIT}/linux/linux.git;protocol=ssh" LINUX_URI_GITHUB = "${DIGI_GITHUB_GIT}/linux.git;protocol=https" LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1', '${LINUX_URI_STASH}', '${LINUX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LINUX_GIT_URI};nobranch=1 \ + ${LINUX_GIT_URI};branch=${SRCBRANCH} \ ${@oe.utils.conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'file://docker_conf.cfg', '', d)} \ ${@oe.utils.vartrue('TRUSTFENCE_FILE_BASED_ENCRYPT', 'file://fscrypt.cfg', '', d)} \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb index 5e3e485c9..799c39143 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb @@ -4,8 +4,8 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v5.15/nxp/dey-4.0/maint" SRCBRANCH:stm32mpcommon = "v5.15/stm/dey-4.0/maint" -SRCREV = "479d8256f51cc583e386ea910f35d4a1eed6339b" -SRCREV:stm32mpcommon = "9d17bc8271e7ba53d8d2b6aee7c4e70d924402db" +SRCREV = "${AUTOREV}" +SRCREV:stm32mpcommon = "${AUTOREV}" STM_RT_PATCHES = " \ file://patch-5.15.119-rt65.patch \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb index 915f271b7..cecbac7ce 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb @@ -23,7 +23,7 @@ SRC_URI:append = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'tsn', 'file://tsn_conf.cfg', '', d)} \ " -SRCREV = "0f687b135fed7694e0a2007fe2ab73cd4a6ef81c" +SRCREV = "${AUTOREV}" # Blacklist btnxpuart module. It will be managed by the bluetooth-init script KERNEL_MODULE_PROBECONF += "btnxpuart" diff --git a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb index 48d67ce6d..997ea2ad2 100644 --- a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb +++ b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "libconfuse libdigiapix openssl recovery-utils swupdate zlib json-c" SRCBRANCH = "dey-4.0/maint" -SRCREV = "a9908413e2389009a10fd4f33366d694f55a59d3" +SRCREV = "${AUTOREV}" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" @@ -19,7 +19,7 @@ CCCS_DEVICE_TYPE ?= "${MACHINE}" CCCS_CONF_PATH ?= "" SRC_URI = " \ - ${CC_GIT_URI};nobranch=1 \ + ${CC_GIT_URI};branch=${SRCBRANCH} \ file://cccsd-init \ file://cccsd.service \ file://cccs-gs-demo-init \ diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index f7c3be174..97a2d77b4 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc @@ -1,11 +1,11 @@ # Copyright (C) 2019-2022 Digi International Inc. SRCBRANCH = "dey-4.0/maint" -SRCREV = "78402f0e3e138023f70d9577faa11212a9dc3f61" +SRCREV = "${AUTOREV}" DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}/dey/dey-examples.git;protocol=ssh" DEY_EXAMPLES_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=https" DEY_EXAMPLES_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DEY_EXAMPLES_STASH}', '${DEY_EXAMPLES_GITHUB}', d)}" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};nobranch=1" +SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index f44742e78..f0f12c259 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -7,7 +7,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d" SRCBRANCH ?= "dey-4.0/maint" -SRCREV = "305fabdf3dbb7efd5630c40519dd18ce28ec7108" +SRCREV = "${AUTOREV}" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}/dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -15,7 +15,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ + ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From bbb94ced74a9d012c6e229c926e99443423b786e Mon Sep 17 00:00:00 2001 From: Francisco Gil Date: Tue, 9 Jul 2024 11:43:54 +0200 Subject: [PATCH 02/27] docker: add missing config entry in STM platform for docker Also some duplicated entries were removed. https://onedigi.atlassian.net/browse/DEL-9122 Signed-off-by: Francisco Gil --- meta-digi-arm/recipes-kernel/linux/linux-dey/docker_conf.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey/docker_conf.cfg b/meta-digi-arm/recipes-kernel/linux/linux-dey/docker_conf.cfg index 60ab5875a..cb07061fd 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey/docker_conf.cfg +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey/docker_conf.cfg @@ -40,8 +40,7 @@ CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_SCHED=y CONFIG_CGROUP_BPF=y CONFIG_CGROUP_NS=y -CONFIG_CGROUP_FREEZER=y -CONFIG_CGROUP_DEVICE=y +CONFIG_IP_NF_FILTER=m CONFIG_BLK_CGROUP=y CONFIG_NETFILTER=y CONFIG_BRIDGE_NETFILTER=m From 5fabf75615569d03039c23e843a1823ba4826753 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Wed, 25 Sep 2024 16:36:48 +0200 Subject: [PATCH 03/27] switch to building from maintenance branches Signed-off-by: Arturo Buzarra --- .../recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb | 2 +- .../recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb | 2 +- .../recipes-security/optee/optee-os-stm32mp_3.19.0.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb index d83049b77..b604ec605 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb @@ -12,7 +12,7 @@ TFA_URI_STASH = "${DIGI_MTK_GIT}/emp/arm-trusted-firmware.git;protocol=ssh" TFA_URI_GITHUB = "${DIGI_GITHUB_GIT}/arm-trusted-firmware.git;protocol=https" TFA_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${TFA_URI_STASH}', '${TFA_URI_GITHUB}', d)}" -SRCBRANCH = "v2.8/stm32mp/master" +SRCBRANCH = "v2.8/stm32mp/maint_ccmp2-beta" SRCREV = "${AUTOREV}" SRC_URI = " \ diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb index 27bff1dde..d6e1a3294 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb @@ -9,7 +9,7 @@ TFA_URI_STASH = "${DIGI_MTK_GIT}/emp/arm-trusted-firmware.git;protocol=ssh" TFA_URI_GITHUB = "${DIGI_GITHUB_GIT}/arm-trusted-firmware.git;protocol=https" TFA_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${TFA_URI_STASH}', '${TFA_URI_GITHUB}', d)}" -SRCBRANCH = "v2.8/stm32mp/master" +SRCBRANCH = "v2.8/stm32mp/maint_ccmp2-beta" SRCREV = "${AUTOREV}" SRC_URI = " \ diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb index 2fe62ea76..4b91f0704 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb @@ -7,7 +7,7 @@ OPTEE_URI_STASH = "${DIGI_MTK_GIT}/emp/optee_os.git;protocol=ssh" OPTEE_URI_GITHUB = "${DIGI_GITHUB_GIT}/optee_os.git;protocol=https" OPTEE_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${OPTEE_URI_STASH}', '${OPTEE_URI_GITHUB}', d)}" -SRCBRANCH = "3.19.0/stm/master" +SRCBRANCH = "3.19.0/stm/maint_ccmp2-beta" SRCREV = "${AUTOREV}" SRC_URI = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb index 11f0da850..c23632bdc 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" DEPENDS += "flex-native bison-native" DEPENDS += "python3-setuptools-native" -SRCBRANCH = "v2022.10/master" +SRCBRANCH = "v2022.10/maint_ccmp2-beta" SRCREV = "${AUTOREV}" SRC_URI += " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb index f946687ee..b81dfdda6 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" DEPENDS += "flex-native bison-native" -SRCBRANCH = "v2024.04/master" +SRCBRANCH = "v2024.04/maint" SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx91)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb index 8320996c6..bacbf6737 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb @@ -3,7 +3,7 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v6.1/nxp/dey-4.0/maint" -SRCBRANCH:stm32mp2common = "v6.1.28/stm/master" +SRCBRANCH:stm32mp2common = "v6.1/stm/dey-4.0/maint_ccmp2-beta" SRCREV = "${AUTOREV}" SRCREV:stm32mp2common = "${AUTOREV}" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb index ee482354e..241772dea 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb @@ -2,7 +2,7 @@ require recipes-kernel/linux/linux-dey.inc -SRCBRANCH = "v6.6.23/nxp/master" +SRCBRANCH = "v6.6/nxp/dey-4.0/maint" SRCREV = "${AUTOREV}" # Blacklist btnxpuart module. It will be managed by the bluetooth-init script From 570c057a591d8a51103131dfd205477ce7a43447 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 27 Sep 2024 10:00:44 +0200 Subject: [PATCH 04/27] ccimx91: disable graphical distro features The ccimx91 is a headless platform. Disabling those distro features prevents building/installing packages that are useless (e.g. gstreamer) Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/include/ccimx9.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-digi-arm/conf/machine/include/ccimx9.inc b/meta-digi-arm/conf/machine/include/ccimx9.inc index 3079142a9..c1809338e 100644 --- a/meta-digi-arm/conf/machine/include/ccimx9.inc +++ b/meta-digi-arm/conf/machine/include/ccimx9.inc @@ -67,6 +67,7 @@ BT_TTY ?= "ttyLP0" # Per-machine DISTRO_FEATURES customization MACHINE_DISTRO_FEATURES_REMOVE = "vulkan" +MACHINE_DISTRO_FEATURES_REMOVE:ccimx91 = "gstreamer opengl vulkan wayland x11" # SWUpdate sw-description configuration BOOTFS_EXT ?= ".boot.vfat" From 55f8ccadec0e759f25e22734321e3fbc882d90cd Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 27 Sep 2024 14:02:34 +0200 Subject: [PATCH 05/27] bluetooth-init: start driver load service before bluetooth daemon Revert to the previous used order for the bluetooth related services. First, load the driver and then execute the bluetooth daemon. This is needed for two reasons: * The bluetooth daemon caches the MAC address. Loading the module before ensures the daemon caches the correct MAC. * The connectcore-demo server stops working if the bluetooth interface is unavailable when the server launches. This order ensures the demo works as expected. This change also brings back the problem of the btnxpuart module unload failure on reboot/suspend. The following commit adds a workaround for the driver issue. Signed-off-by: Javier Viguera --- .../bluez/bluez5-init/ccimx9/bluetooth-init.service | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx9/bluetooth-init.service b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx9/bluetooth-init.service index cc1b54a0f..adc369562 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx9/bluetooth-init.service +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx9/bluetooth-init.service @@ -1,7 +1,8 @@ [Unit] Description=Initialization of the IW612 bluetooth chip ConditionPathIsDirectory=/proc/device-tree/bluetooth -After=systemd-udev-settle.service bluetooth.service +After=systemd-udev-settle.service +Before=bluetooth.service [Service] Type=oneshot From 7b50fb3a0619f1924a130736aa894b8462eb1187 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 27 Sep 2024 14:09:23 +0200 Subject: [PATCH 06/27] bluetooth-init: ensure the interface is up before unloading the module This is a workaround for a driver failure when unloading the module. The "btnxpuart" driver crashes with a null pointer dereference if the bluetooth interface is down when the module is unloaded. Signed-off-by: Javier Viguera --- .../bluez/bluez5-init/ccimx9/bluetooth-init | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx9/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx9/bluetooth-init index 7d4b630d9..687b8cff2 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx9/bluetooth-init +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx9/bluetooth-init @@ -66,8 +66,12 @@ bluetooth_start() { } bluetooth_stop() { - # Remove the kernel module - rmmod "${MODULE_NAME}" + # + # The btnxpuart driver hits a null pointer dereference on module + # unloading when the interface is down. So as a workaround, make + # sure the interface is UP before unloading the module. + # + hciconfig "${HCI_IFACE}" up && rmmod "${MODULE_NAME}" power 0 } From 33ca8bc9143666e6235c17912c692f6d5e9a30c4 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Fri, 27 Sep 2024 14:05:13 +0200 Subject: [PATCH 07/27] optee-os-stm32mp: reduce verbosity ST_OPTEE_DEBUG_TRACE is set to 0 if ST_DEBUG_TRACE is set to 0. However, on the optee source code, if ST_OPTEE_DEBUG_TRACE=0 the log level is automatically set to 3 (INFO) resulting in a very verbose optee log. Signed-off-by: Hector Palacios --- .../recipes-security/optee/optee-os-stm32mp_3.19.0.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb index 4b91f0704..1b94870a2 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb @@ -38,6 +38,11 @@ OPTEEOUTPUTMACHINE ?= "stm32mp1" OPTEEOUTPUTMACHINE:stm32mp1common = "stm32mp1" OPTEEOUTPUTMACHINE:stm32mp2common = "stm32mp2" +# Enable OPTEE_DEBUG_TRACE; If set to 0, LOG_LEVEL defaults to 3 on optee code +ST_OPTEE_DEBUG_TRACE = "1" +# Log level +ST_OPTEE_DEBUG_LOG_LEVEL = "0" + # The package is empty but must be generated to avoid apt-get installation issue ALLOW_EMPTY:${PN} = "1" From 1624ec2bc2bb0ca211648212a87185380a51b142 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Mon, 30 Sep 2024 10:52:14 +0200 Subject: [PATCH 08/27] optee-os-stm32: reduce verbosity of SCP firmware The SCP firmware introduces too much verbosity (with timestamp included) in the middle of the boot log between the TF-A and U-Boot. Reduce the log and remove compiler flags for errors on unused variables (banner strings). This removes the following messages from SCP firmware: [ 0.000000] SCP-firmware v2.12.0-dev [ 0.000000] [ 0.000000] [FWK] Module initialization complete! Signed-off-by: Hector Palacios Signed-off-by: Javier Viguera --- .../recipes-security/optee/optee-os-stm32mp2-common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp2-common.inc b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp2-common.inc index 2ccdcf72d..533a9ffe0 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp2-common.inc +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp2-common.inc @@ -50,7 +50,7 @@ EXTRA_OEMAKE += "LDFLAGS=" # Set external-dt support EXTRA_OEMAKE += "${@bb.utils.contains('EXTERNAL_DT_ENABLED', '1', 'CFG_EXT_DTS=${STAGING_EXTDT_DIR}/optee', '', d)}" # Set scp-firmware support -EXTRA_OEMAKE += "CFG_SCP_FIRMWARE=${STAGING_SCPFW_DIR}" +EXTRA_OEMAKE += "CFG_SCP_FIRMWARE=${STAGING_SCPFW_DIR} CFG_SCPFW_LOG_LEVEL=5 CFG_WERROR=n" # debug and trace EXTRA_OEMAKE += "${@bb.utils.contains('ST_OPTEE_DEBUG_TRACE', '1', 'CFG_TEE_CORE_LOG_LEVEL=${ST_OPTEE_DEBUG_LOG_LEVEL} CFG_TEE_CORE_DEBUG=${ST_OPTEE_CORE_DEBUG}', '', d)}" From c179cd862ce325fcf0b3aa8c3f53561ae3356f6a Mon Sep 17 00:00:00 2001 From: Francisco Gil Date: Mon, 30 Sep 2024 15:00:47 +0200 Subject: [PATCH 09/27] meta-digi: update revisions for dey-4.0-r7.1 Signed-off-by: Francisco Gil --- .../recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend | 4 ++-- .../recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb | 4 ++-- .../recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb | 4 ++-- .../recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend | 4 ++-- .../recipes-security/optee/optee-os-stm32mp_3.19.0.bb | 4 ++-- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb | 2 +- .../trustfence/nativesdk-trustfence-sign-tools_2023.04.bb | 2 +- .../trustfence/trustfence-sign-tools-native_2023.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools.inc | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb | 2 +- meta-digi-dey/recipes-digi/cccs/cccs_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 23 files changed, 35 insertions(+), 35 deletions(-) diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend index 6c9041b1d..0e8b9a463 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend @@ -8,10 +8,10 @@ TFA_URI_GITHUB = "${DIGI_GITHUB_GIT}/arm-trusted-firmware.git;protocol=https" TFA_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${TFA_URI_STASH}', '${TFA_URI_GITHUB}', d)}" SRCBRANCH = "v2.6/stm32mp/maint" -SRCREV = "${AUTOREV}" +SRCREV = "9283dc9f1985a8a697ff4c8c9dfa494e85ea950b" SRC_URI = " \ - ${TFA_GIT_URI};branch=${SRCBRANCH} \ + ${TFA_GIT_URI};nobranch=1 \ " TF_A_CONFIG[nand] = "${DEVICE_BOARD_ENABLE:NAND},STM32MP_RAW_NAND=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_NAND}' if ${TF_A_MTD_START_OFFSET_NAND} else ''} STM32MP_USB_PROGRAMMER=1" diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb index b604ec605..5d7c4618f 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb @@ -13,10 +13,10 @@ TFA_URI_GITHUB = "${DIGI_GITHUB_GIT}/arm-trusted-firmware.git;protocol=https" TFA_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${TFA_URI_STASH}', '${TFA_URI_GITHUB}', d)}" SRCBRANCH = "v2.8/stm32mp/maint_ccmp2-beta" -SRCREV = "${AUTOREV}" +SRCREV = "779078679e4714addd14e58efb2564e050a0f016" SRC_URI = " \ - ${TFA_GIT_URI};branch=${SRCBRANCH} \ + ${TFA_GIT_URI};nobranch=1 \ " TF_A_VERSION = "v2.8.12" diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb index d6e1a3294..ebe52e451 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb @@ -10,10 +10,10 @@ TFA_URI_GITHUB = "${DIGI_GITHUB_GIT}/arm-trusted-firmware.git;protocol=https" TFA_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${TFA_URI_STASH}', '${TFA_URI_GITHUB}', d)}" SRCBRANCH = "v2.8/stm32mp/maint_ccmp2-beta" -SRCREV = "${AUTOREV}" +SRCREV = "779078679e4714addd14e58efb2564e050a0f016" SRC_URI = " \ - ${TFA_GIT_URI};branch=${SRCBRANCH} \ + ${TFA_GIT_URI};nobranch=1 \ " # Configure settings diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend index 3a1aba0b5..643c2b4e8 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend @@ -8,10 +8,10 @@ OPTEE_URI_GITHUB = "${DIGI_GITHUB_GIT}/optee_os.git;protocol=https" OPTEE_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${OPTEE_URI_STASH}', '${OPTEE_URI_GITHUB}', d)}" SRCBRANCH = "3.16.0/stm/maint" -SRCREV = "${AUTOREV}" +SRCREV = "25128a1706f59e84e47212be7e878e0a3e4d6d61" SRC_URI = " \ - ${OPTEE_GIT_URI};branch=${SRCBRANCH};name=os \ + ${OPTEE_GIT_URI};nobranch=1;name=os \ file://fonts.tar.gz;subdir=git;name=fonts \ " diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb index 1b94870a2..adb07c323 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb @@ -8,10 +8,10 @@ OPTEE_URI_GITHUB = "${DIGI_GITHUB_GIT}/optee_os.git;protocol=https" OPTEE_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${OPTEE_URI_STASH}', '${OPTEE_URI_GITHUB}', d)}" SRCBRANCH = "3.19.0/stm/maint_ccmp2-beta" -SRCREV = "${AUTOREV}" +SRCREV = "be32a34d4c2b6c916a17afc956289630992c68e0" SRC_URI = " \ - ${OPTEE_GIT_URI};branch=${SRCBRANCH};name=os \ + ${OPTEE_GIT_URI};nobranch=1;name=os \ file://fonts.tar.gz;subdir=git;name=fonts \ " diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc index 83edbcf49..6b9061cb5 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc @@ -27,7 +27,7 @@ INSTALL_FW_UBOOT_SCRIPTS = " \ " SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://boot.txt \ ${INSTALL_FW_UBOOT_SCRIPTS} \ " diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index ab6c1ce34..cf8695b52 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,7 +3,7 @@ require u-boot-dey.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "1ef810133fcecacf14e09155bee10aa66fc6ade7" # Disable support to initial environment for U-Boot UBOOT_INITIAL_ENV = "" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb index e8020ae16..1ddc32b06 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2020.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "d509efc3c1d1c591f6d155171c084c84594993ad" COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8m|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb index 82c0ed42d..537524cfe 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb @@ -7,7 +7,7 @@ DEPENDS += "flex-native bison-native" DEPENDS += "python3-setuptools-native" SRCBRANCH = "v2021.10/maint" -SRCREV = "${AUTOREV}" +SRCREV = "93ad20a55d98d278ffbd3eeafcc2e30ab806f0d4" SRC_URI += " \ ${@oe.utils.conditional('TRUSTFENCE_SIGN_FIT_STM', '1', 'file://fit_signature.cfg', '', d)} \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb index c23632bdc..629cbeffb 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb @@ -7,7 +7,7 @@ DEPENDS += "flex-native bison-native" DEPENDS += "python3-setuptools-native" SRCBRANCH = "v2022.10/maint_ccmp2-beta" -SRCREV = "${AUTOREV}" +SRCREV = "e6e98d7437984824219b8515f9a5ca902d12953d" SRC_URI += " \ ${@oe.utils.conditional('TRUSTFENCE_SIGN_FIT_STM', '1', 'file://fit_signature.cfg', '', d)} \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb index e7876a683..94e4005b6 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2023.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "2fd7b4507d8a01bb2ef8a5f39ddb501c7ac2b0a4" COMPATIBLE_MACHINE = "(ccimx93)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb index b81dfdda6..37ff8b2fe 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb @@ -7,6 +7,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2024.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "14c81ab20282fb7faacf8a25205c62d49ec00677" COMPATIBLE_MACHINE = "(ccimx91)" diff --git a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb index 0ff254752..bc803afc4 100644 --- a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb +++ b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb @@ -3,4 +3,4 @@ require nativesdk-trustfence-sign-tools_git.bb SRCBRANCH = "v2023.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "2fd7b4507d8a01bb2ef8a5f39ddb501c7ac2b0a4" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb index 955934262..f1431f1e0 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb @@ -3,4 +3,4 @@ require trustfence-sign-tools-native_git.bb SRCBRANCH = "v2023.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "2fd7b4507d8a01bb2ef8a5f39ddb501c7ac2b0a4" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc index 676122560..6053bf373 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc @@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2020.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "d509efc3c1d1c591f6d155171c084c84594993ad" S = "${WORKDIR}" @@ -15,7 +15,7 @@ UBOOT_URI_GITHUB = "${DIGI_GITHUB_GIT}/u-boot.git;protocol=https" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${UBOOT_URI_STASH}', '${UBOOT_URI_GITHUB}', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-artifact-nxp.sh \ file://trustfence-sign-artifact-stm.sh \ file://trustfence-gen-pki-stm.sh \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index c4b3fcaa7..0dbb911c7 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-4.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "7ba1cdedd456928ac77c1f11e0d070abaf505e95" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}/linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};branch=${SRCBRANCH} \ + ${QCOM_GIT_URI};nobranch=1 \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index cce001bf3..9948bf0c1 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -15,7 +15,7 @@ LINUX_URI_STASH = "${DIGI_MTK_GIT}/linux/linux.git;protocol=ssh" LINUX_URI_GITHUB = "${DIGI_GITHUB_GIT}/linux.git;protocol=https" LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1', '${LINUX_URI_STASH}', '${LINUX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LINUX_GIT_URI};branch=${SRCBRANCH} \ + ${LINUX_GIT_URI};nobranch=1 \ ${@oe.utils.conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'file://docker_conf.cfg', '', d)} \ ${@oe.utils.vartrue('TRUSTFENCE_FILE_BASED_ENCRYPT', 'file://fscrypt.cfg', '', d)} \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb index a4ba1aa21..1c639e174 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb @@ -4,8 +4,8 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v5.15/nxp/dey-4.0/maint" SRCBRANCH:stm32mpcommon = "v5.15/stm/dey-4.0/maint" -SRCREV = "${AUTOREV}" -SRCREV:stm32mpcommon = "${AUTOREV}" +SRCREV = "85ab27e1eba8252b78dcf36293c20e49f1d141c6" +SRCREV:stm32mpcommon = "35bde2fa4824c3fc87971a94b188e1f063d7cdf6" STM_RT_PATCHES = " \ file://patch-5.15.119-rt65.patch \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb index bacbf6737..525b62d22 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb @@ -4,8 +4,8 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v6.1/nxp/dey-4.0/maint" SRCBRANCH:stm32mp2common = "v6.1/stm/dey-4.0/maint_ccmp2-beta" -SRCREV = "${AUTOREV}" -SRCREV:stm32mp2common = "${AUTOREV}" +SRCREV = "740c551407b63f39a6f2261407eb1b7e2eda40e2" +SRCREV:stm32mp2common = "459438b270fd3576bdf3d4841dc5316b462f9ff2" # Patch series for RT Kernel NXP_RT_PATCHES = " \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb index 241772dea..0b869db59 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb @@ -3,7 +3,7 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v6.6/nxp/dey-4.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "8c33aa89e6ede40ded265de37a9e671562e9ed63" # Blacklist btnxpuart module. It will be managed by the bluetooth-init script KERNEL_MODULE_PROBECONF += "btnxpuart" diff --git a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb index 997ea2ad2..48d67ce6d 100644 --- a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb +++ b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "libconfuse libdigiapix openssl recovery-utils swupdate zlib json-c" SRCBRANCH = "dey-4.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "a9908413e2389009a10fd4f33366d694f55a59d3" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" @@ -19,7 +19,7 @@ CCCS_DEVICE_TYPE ?= "${MACHINE}" CCCS_CONF_PATH ?= "" SRC_URI = " \ - ${CC_GIT_URI};branch=${SRCBRANCH} \ + ${CC_GIT_URI};nobranch=1 \ file://cccsd-init \ file://cccsd.service \ file://cccs-gs-demo-init \ diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index 5447ceb6a..fab2926cb 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc @@ -1,11 +1,11 @@ # Copyright (C) 2019-2022, Digi International Inc. SRCBRANCH = "dey-4.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "47e0ac1d7a091452cb831cc970fae2c1a279112a" DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}/dey/dey-examples.git;protocol=ssh" DEY_EXAMPLES_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=https" DEY_EXAMPLES_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DEY_EXAMPLES_STASH}', '${DEY_EXAMPLES_GITHUB}', d)}" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${DEY_EXAMPLES_GIT_URI};nobranch=1" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 6dbaeae9f..9f569e15f 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -7,7 +7,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d" SRCBRANCH ?= "dey-4.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "305fabdf3dbb7efd5630c40519dd18ce28ec7108" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}/dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -15,7 +15,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ + ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From d9ef21b3d0df7ff1afd6c50739c8a86604831588 Mon Sep 17 00:00:00 2001 From: Francisco Gil Date: Mon, 30 Sep 2024 15:00:48 +0200 Subject: [PATCH 10/27] meta-digi: revert revisions to AUTOREV Signed-off-by: Francisco Gil --- .../recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend | 4 ++-- .../recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb | 4 ++-- .../recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb | 4 ++-- .../recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend | 4 ++-- .../recipes-security/optee/optee-os-stm32mp_3.19.0.bb | 4 ++-- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb | 2 +- .../trustfence/nativesdk-trustfence-sign-tools_2023.04.bb | 2 +- .../trustfence/trustfence-sign-tools-native_2023.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools.inc | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb | 2 +- meta-digi-dey/recipes-digi/cccs/cccs_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 23 files changed, 35 insertions(+), 35 deletions(-) diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend index 0e8b9a463..6c9041b1d 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend @@ -8,10 +8,10 @@ TFA_URI_GITHUB = "${DIGI_GITHUB_GIT}/arm-trusted-firmware.git;protocol=https" TFA_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${TFA_URI_STASH}', '${TFA_URI_GITHUB}', d)}" SRCBRANCH = "v2.6/stm32mp/maint" -SRCREV = "9283dc9f1985a8a697ff4c8c9dfa494e85ea950b" +SRCREV = "${AUTOREV}" SRC_URI = " \ - ${TFA_GIT_URI};nobranch=1 \ + ${TFA_GIT_URI};branch=${SRCBRANCH} \ " TF_A_CONFIG[nand] = "${DEVICE_BOARD_ENABLE:NAND},STM32MP_RAW_NAND=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_NAND}' if ${TF_A_MTD_START_OFFSET_NAND} else ''} STM32MP_USB_PROGRAMMER=1" diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb index 5d7c4618f..b604ec605 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb @@ -13,10 +13,10 @@ TFA_URI_GITHUB = "${DIGI_GITHUB_GIT}/arm-trusted-firmware.git;protocol=https" TFA_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${TFA_URI_STASH}', '${TFA_URI_GITHUB}', d)}" SRCBRANCH = "v2.8/stm32mp/maint_ccmp2-beta" -SRCREV = "779078679e4714addd14e58efb2564e050a0f016" +SRCREV = "${AUTOREV}" SRC_URI = " \ - ${TFA_GIT_URI};nobranch=1 \ + ${TFA_GIT_URI};branch=${SRCBRANCH} \ " TF_A_VERSION = "v2.8.12" diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb index ebe52e451..d6e1a3294 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb @@ -10,10 +10,10 @@ TFA_URI_GITHUB = "${DIGI_GITHUB_GIT}/arm-trusted-firmware.git;protocol=https" TFA_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${TFA_URI_STASH}', '${TFA_URI_GITHUB}', d)}" SRCBRANCH = "v2.8/stm32mp/maint_ccmp2-beta" -SRCREV = "779078679e4714addd14e58efb2564e050a0f016" +SRCREV = "${AUTOREV}" SRC_URI = " \ - ${TFA_GIT_URI};nobranch=1 \ + ${TFA_GIT_URI};branch=${SRCBRANCH} \ " # Configure settings diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend index 643c2b4e8..3a1aba0b5 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend @@ -8,10 +8,10 @@ OPTEE_URI_GITHUB = "${DIGI_GITHUB_GIT}/optee_os.git;protocol=https" OPTEE_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${OPTEE_URI_STASH}', '${OPTEE_URI_GITHUB}', d)}" SRCBRANCH = "3.16.0/stm/maint" -SRCREV = "25128a1706f59e84e47212be7e878e0a3e4d6d61" +SRCREV = "${AUTOREV}" SRC_URI = " \ - ${OPTEE_GIT_URI};nobranch=1;name=os \ + ${OPTEE_GIT_URI};branch=${SRCBRANCH};name=os \ file://fonts.tar.gz;subdir=git;name=fonts \ " diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb index adb07c323..1b94870a2 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb @@ -8,10 +8,10 @@ OPTEE_URI_GITHUB = "${DIGI_GITHUB_GIT}/optee_os.git;protocol=https" OPTEE_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${OPTEE_URI_STASH}', '${OPTEE_URI_GITHUB}', d)}" SRCBRANCH = "3.19.0/stm/maint_ccmp2-beta" -SRCREV = "be32a34d4c2b6c916a17afc956289630992c68e0" +SRCREV = "${AUTOREV}" SRC_URI = " \ - ${OPTEE_GIT_URI};nobranch=1;name=os \ + ${OPTEE_GIT_URI};branch=${SRCBRANCH};name=os \ file://fonts.tar.gz;subdir=git;name=fonts \ " diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc index 6b9061cb5..83edbcf49 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc @@ -27,7 +27,7 @@ INSTALL_FW_UBOOT_SCRIPTS = " \ " SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://boot.txt \ ${INSTALL_FW_UBOOT_SCRIPTS} \ " diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index cf8695b52..ab6c1ce34 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,7 +3,7 @@ require u-boot-dey.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "1ef810133fcecacf14e09155bee10aa66fc6ade7" +SRCREV = "${AUTOREV}" # Disable support to initial environment for U-Boot UBOOT_INITIAL_ENV = "" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb index 1ddc32b06..e8020ae16 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2020.04/maint" -SRCREV = "d509efc3c1d1c591f6d155171c084c84594993ad" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8m|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb index 537524cfe..82c0ed42d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb @@ -7,7 +7,7 @@ DEPENDS += "flex-native bison-native" DEPENDS += "python3-setuptools-native" SRCBRANCH = "v2021.10/maint" -SRCREV = "93ad20a55d98d278ffbd3eeafcc2e30ab806f0d4" +SRCREV = "${AUTOREV}" SRC_URI += " \ ${@oe.utils.conditional('TRUSTFENCE_SIGN_FIT_STM', '1', 'file://fit_signature.cfg', '', d)} \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb index 629cbeffb..c23632bdc 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb @@ -7,7 +7,7 @@ DEPENDS += "flex-native bison-native" DEPENDS += "python3-setuptools-native" SRCBRANCH = "v2022.10/maint_ccmp2-beta" -SRCREV = "e6e98d7437984824219b8515f9a5ca902d12953d" +SRCREV = "${AUTOREV}" SRC_URI += " \ ${@oe.utils.conditional('TRUSTFENCE_SIGN_FIT_STM', '1', 'file://fit_signature.cfg', '', d)} \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb index 94e4005b6..e7876a683 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2023.04/maint" -SRCREV = "2fd7b4507d8a01bb2ef8a5f39ddb501c7ac2b0a4" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx93)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb index 37ff8b2fe..b81dfdda6 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb @@ -7,6 +7,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2024.04/maint" -SRCREV = "14c81ab20282fb7faacf8a25205c62d49ec00677" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx91)" diff --git a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb index bc803afc4..0ff254752 100644 --- a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb +++ b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb @@ -3,4 +3,4 @@ require nativesdk-trustfence-sign-tools_git.bb SRCBRANCH = "v2023.04/maint" -SRCREV = "2fd7b4507d8a01bb2ef8a5f39ddb501c7ac2b0a4" +SRCREV = "${AUTOREV}" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb index f1431f1e0..955934262 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb @@ -3,4 +3,4 @@ require trustfence-sign-tools-native_git.bb SRCBRANCH = "v2023.04/maint" -SRCREV = "2fd7b4507d8a01bb2ef8a5f39ddb501c7ac2b0a4" +SRCREV = "${AUTOREV}" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc index 6053bf373..676122560 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc @@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2020.04/maint" -SRCREV = "d509efc3c1d1c591f6d155171c084c84594993ad" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -15,7 +15,7 @@ UBOOT_URI_GITHUB = "${DIGI_GITHUB_GIT}/u-boot.git;protocol=https" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${UBOOT_URI_STASH}', '${UBOOT_URI_GITHUB}', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-artifact-nxp.sh \ file://trustfence-sign-artifact-stm.sh \ file://trustfence-gen-pki-stm.sh \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 0dbb911c7..c4b3fcaa7 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-4.0/maint" -SRCREV = "7ba1cdedd456928ac77c1f11e0d070abaf505e95" +SRCREV = "${AUTOREV}" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}/linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};nobranch=1 \ + ${QCOM_GIT_URI};branch=${SRCBRANCH} \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index 9948bf0c1..cce001bf3 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -15,7 +15,7 @@ LINUX_URI_STASH = "${DIGI_MTK_GIT}/linux/linux.git;protocol=ssh" LINUX_URI_GITHUB = "${DIGI_GITHUB_GIT}/linux.git;protocol=https" LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1', '${LINUX_URI_STASH}', '${LINUX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LINUX_GIT_URI};nobranch=1 \ + ${LINUX_GIT_URI};branch=${SRCBRANCH} \ ${@oe.utils.conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'file://docker_conf.cfg', '', d)} \ ${@oe.utils.vartrue('TRUSTFENCE_FILE_BASED_ENCRYPT', 'file://fscrypt.cfg', '', d)} \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb index 1c639e174..a4ba1aa21 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb @@ -4,8 +4,8 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v5.15/nxp/dey-4.0/maint" SRCBRANCH:stm32mpcommon = "v5.15/stm/dey-4.0/maint" -SRCREV = "85ab27e1eba8252b78dcf36293c20e49f1d141c6" -SRCREV:stm32mpcommon = "35bde2fa4824c3fc87971a94b188e1f063d7cdf6" +SRCREV = "${AUTOREV}" +SRCREV:stm32mpcommon = "${AUTOREV}" STM_RT_PATCHES = " \ file://patch-5.15.119-rt65.patch \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb index 525b62d22..bacbf6737 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb @@ -4,8 +4,8 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v6.1/nxp/dey-4.0/maint" SRCBRANCH:stm32mp2common = "v6.1/stm/dey-4.0/maint_ccmp2-beta" -SRCREV = "740c551407b63f39a6f2261407eb1b7e2eda40e2" -SRCREV:stm32mp2common = "459438b270fd3576bdf3d4841dc5316b462f9ff2" +SRCREV = "${AUTOREV}" +SRCREV:stm32mp2common = "${AUTOREV}" # Patch series for RT Kernel NXP_RT_PATCHES = " \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb index 0b869db59..241772dea 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb @@ -3,7 +3,7 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v6.6/nxp/dey-4.0/maint" -SRCREV = "8c33aa89e6ede40ded265de37a9e671562e9ed63" +SRCREV = "${AUTOREV}" # Blacklist btnxpuart module. It will be managed by the bluetooth-init script KERNEL_MODULE_PROBECONF += "btnxpuart" diff --git a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb index 48d67ce6d..997ea2ad2 100644 --- a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb +++ b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "libconfuse libdigiapix openssl recovery-utils swupdate zlib json-c" SRCBRANCH = "dey-4.0/maint" -SRCREV = "a9908413e2389009a10fd4f33366d694f55a59d3" +SRCREV = "${AUTOREV}" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" @@ -19,7 +19,7 @@ CCCS_DEVICE_TYPE ?= "${MACHINE}" CCCS_CONF_PATH ?= "" SRC_URI = " \ - ${CC_GIT_URI};nobranch=1 \ + ${CC_GIT_URI};branch=${SRCBRANCH} \ file://cccsd-init \ file://cccsd.service \ file://cccs-gs-demo-init \ diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index fab2926cb..5447ceb6a 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc @@ -1,11 +1,11 @@ # Copyright (C) 2019-2022, Digi International Inc. SRCBRANCH = "dey-4.0/maint" -SRCREV = "47e0ac1d7a091452cb831cc970fae2c1a279112a" +SRCREV = "${AUTOREV}" DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}/dey/dey-examples.git;protocol=ssh" DEY_EXAMPLES_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=https" DEY_EXAMPLES_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DEY_EXAMPLES_STASH}', '${DEY_EXAMPLES_GITHUB}', d)}" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};nobranch=1" +SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 9f569e15f..6dbaeae9f 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -7,7 +7,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d" SRCBRANCH ?= "dey-4.0/maint" -SRCREV = "305fabdf3dbb7efd5630c40519dd18ce28ec7108" +SRCREV = "${AUTOREV}" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}/dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -15,7 +15,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ + ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From 1de1fae447fe6ff1bb93166cf056a4101fb896d4 Mon Sep 17 00:00:00 2001 From: David Escalona Date: Tue, 1 Oct 2024 11:00:15 +0200 Subject: [PATCH 11/27] stm32mpu-ai: add external delegate library to use NPU Actually, the NPU demos were not making use of the NPU, just the CPU. To enable the NPU usage, it is required to add the external delegate library 'tflite-vx-delegate'to the system. This is done by forcing 'tensorflow-lite' to depend on it for the CCMP2 platform, which also requires 'tim-vx' library as a build dependency. Both the 'tflite-vx-delegate' and 'tim-vx' recipes have been verbatim copied from the ST Beta branch, using commit with SHA256: 68686850c75061f1c7c4e756a313a41ca810f6ae Signed-off-by: David Escalona --- .../tensorflow-lite_git.bbappend | 3 + ...-delegate-fix-to-support-tflite-2-11.patch | 111 ++++++++++++++++++ .../tflite-vx-delegate_git.bb | 71 +++++++++++ ...m-vx-tests-disable-AVG_ANDROID-tests.patch | 59 ++++++++++ .../recipes-frameworks/tim-vx/tim-vx_git.bb | 105 +++++++++++++++++ .../packagegroup-x-linux-ai.bbappend | 1 + 6 files changed, 350 insertions(+) create mode 100644 meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-frameworks/tflite-vx-delegate/tflite-vx-delegate/0001-tflite-vx-delegate-fix-to-support-tflite-2-11.patch create mode 100644 meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-frameworks/tflite-vx-delegate/tflite-vx-delegate_git.bb create mode 100644 meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-frameworks/tim-vx/tim-vx/0001-tim-vx-tests-disable-AVG_ANDROID-tests.patch create mode 100644 meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-frameworks/tim-vx/tim-vx_git.bb diff --git a/meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-frameworks/tensorflow-lite/tensorflow-lite_git.bbappend b/meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-frameworks/tensorflow-lite/tensorflow-lite_git.bbappend index 6eb361db0..35e8e1eab 100644 --- a/meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-frameworks/tensorflow-lite/tensorflow-lite_git.bbappend +++ b/meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-frameworks/tensorflow-lite/tensorflow-lite_git.bbappend @@ -45,3 +45,6 @@ do_compile() { setuptools3_do_compile } + +# Require the external NPU delegate. +RDEPENDS:${PN}:append:stm32mp25common = " tflite-vx-delegate " diff --git a/meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-frameworks/tflite-vx-delegate/tflite-vx-delegate/0001-tflite-vx-delegate-fix-to-support-tflite-2-11.patch b/meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-frameworks/tflite-vx-delegate/tflite-vx-delegate/0001-tflite-vx-delegate-fix-to-support-tflite-2-11.patch new file mode 100644 index 000000000..af997e91d --- /dev/null +++ b/meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-frameworks/tflite-vx-delegate/tflite-vx-delegate/0001-tflite-vx-delegate-fix-to-support-tflite-2-11.patch @@ -0,0 +1,111 @@ +commit 7ac938965051de91c493b75a8825b007e1f52599 +Author: Feiyue Chen +Date: Thu Jul 6 10:41:35 2023 +0000 + + Fixed bugs for kernel test building + +diff --git a/tensorflow/lite/CMakeLists.txt b/tensorflow/lite/CMakeLists.txt +index 073b29c4860..67486fa183b 100644 +--- a/tensorflow/lite/CMakeLists.txt ++++ b/tensorflow/lite/CMakeLists.txt +@@ -209,6 +209,8 @@ list(FILTER TFLITE_SRCS EXCLUDE REGEX ".*tflite_with_xnnpack\\.cc$") + # Exclude Flex related files. + list(FILTER TFLITE_SRCS EXCLUDE REGEX ".*with_selected_ops\\.cc$") + ++list(FILTER TFLITE_SRCS EXCLUDE REGEX "tensorflow_profiler_logger\\.cc$") ++ + if(_TFLITE_ENABLE_MMAP) + list(FILTER TFLITE_SRCS EXCLUDE REGEX ".*mmap_allocation_disabled\\.cc$") + else() +diff --git a/tensorflow/lite/kernels/CMakeLists.txt b/tensorflow/lite/kernels/CMakeLists.txt +index f5e22ee97da..d0da2680e7b 100644 +--- a/tensorflow/lite/kernels/CMakeLists.txt ++++ b/tensorflow/lite/kernels/CMakeLists.txt +@@ -63,16 +63,16 @@ build_flatbuffers( + set(DELEGATE_PROVIDERS_SUPP + ${TFLITE_SOURCE_DIR}/nnapi/sl/SupportLibrary.cc + ${TFLITE_SOURCE_DIR}/tools/delegates/delegate_provider.cc +- ${TFLITE_SOURCE_DIR}/tools/evaluation/utils.cc ++ # ${TFLITE_SOURCE_DIR}/tools/evaluation/utils.cc + ) + + set(DELEGATE_PROVIDERS + ${DELEGATE_PROVIDERS_SUPP} + ${TFLITE_SOURCE_DIR}/tools/delegates/default_execution_provider.cc + # List of delegates referenced as options in the tensorflow/lite/CMakeLists.txt +- ${TFLITE_SOURCE_DIR}/tools/delegates/gpu_delegate_provider.cc ++ # ${TFLITE_SOURCE_DIR}/tools/delegates/gpu_delegate_provider.cc + ${TFLITE_SOURCE_DIR}/tools/delegates/nnapi_delegate_provider.cc +- ${TFLITE_SOURCE_DIR}/tools/delegates/xnnpack_delegate_provider.cc ++ # ${TFLITE_SOURCE_DIR}/tools/delegates/xnnpack_delegate_provider.cc + ) + + if(TFLITE_ENABLE_EXTERNAL_DELEGATE) +@@ -92,9 +92,9 @@ set(TEST_FRAMEWORK_SRC + ${TFLITE_SOURCE_DIR}/tools/tool_params.cc + ${TFLITE_SOURCE_DIR}/tools/versioning/op_version.cc + ${TFLITE_SOURCE_DIR}/tools/versioning/op_signature.cc +- ${TF_SOURCE_DIR}/core/platform/default/env_time.cc +- ${TF_SOURCE_DIR}/core/platform/default/logging.cc +- ${TF_SOURCE_DIR}/core/platform/default/mutex.cc ++ ${TF_SOURCE_DIR}/tsl/platform/default/env_time.cc ++ ${TF_SOURCE_DIR}/tsl/platform/default/logging.cc ++ ${TF_SOURCE_DIR}/tsl/platform/default/mutex.cc + internal/test_util.cc + acceleration_test_util.cc + acceleration_test_util_internal.cc +@@ -154,7 +154,8 @@ macro(add_kernel_test TEST_SRC TEST_LIB) + set(DELEGATE_TEST "${TEST_NAME}_delegate") + add_test( + NAME ${DELEGATE_TEST} +- COMMAND cmake -DTEST_EXECUTABLE=$ -P run-tests.cmake ++ # COMMAND cmake -DTEST_EXECUTABLE=$ -P run-tests.cmake ++ COMMAND cmake -DTEST_EXECUTABLE=$ -P ${TFLITE_SOURCE_DIR}/tools/cmake/test_utils/run-tests.cmake + ) + set_tests_properties(${DELEGATE_TEST} PROPERTIES LABELS "delegate") + endif() +diff --git a/tensorflow/lite/kernels/test_main.cc b/tensorflow/lite/kernels/test_main.cc +index 1887533399b..6e3958b77dc 100644 +--- a/tensorflow/lite/kernels/test_main.cc ++++ b/tensorflow/lite/kernels/test_main.cc +@@ -16,7 +16,6 @@ limitations under the License. + #include + + #include +-#include "benchmark/benchmark.h" // from @com_google_benchmark + #include "tensorflow/lite/kernels/test_delegate_providers.h" + #include "tensorflow/lite/kernels/test_util.h" + #include "tensorflow/lite/testing/util.h" +@@ -51,7 +50,6 @@ int main(int argc, char** argv) { + ::tflite::LogToStderr(); + if (InitKernelTest(&argc, argv)) { + ::testing::InitGoogleTest(&argc, argv); +- benchmark::RunSpecifiedBenchmarks(); + return RUN_ALL_TESTS(); + } else { + return EXIT_FAILURE; +diff --git a/tensorflow/lite/kernels/unidirectional_sequence_lstm_test.cc b/tensorflow/lite/kernels/unidirectional_sequence_lstm_test.cc +index cf3fd3a031a..e96f4e3f357 100644 +--- a/tensorflow/lite/kernels/unidirectional_sequence_lstm_test.cc ++++ b/tensorflow/lite/kernels/unidirectional_sequence_lstm_test.cc +@@ -18,7 +18,6 @@ limitations under the License. + + #include + #include +-#include "benchmark/benchmark.h" // from @com_google_benchmark + #include "flatbuffers/flatbuffers.h" // from @flatbuffers + #include "tensorflow/lite/kernels/test_util.h" + #include "tensorflow/lite/kernels/unidirectional_sequence_lstm_test_util.h" +diff --git a/tensorflow/lite/tools/cmake/modules/flatbuffers.cmake b/tensorflow/lite/tools/cmake/modules/flatbuffers.cmake +index 54b413f69ac..d7a2f8ce0f2 100644 +--- a/tensorflow/lite/tools/cmake/modules/flatbuffers.cmake ++++ b/tensorflow/lite/tools/cmake/modules/flatbuffers.cmake +@@ -23,7 +23,7 @@ OverridableFetchContent_Declare( + flatbuffers + GIT_REPOSITORY https://github.com/google/flatbuffers + # Sync with tensorflow/third_party/flatbuffers/workspace.bzl +- GIT_TAG v2.0.6 ++ GIT_TAG v2.0.8 + GIT_SHALLOW TRUE + GIT_PROGRESS TRUE + SOURCE_DIR "${CMAKE_BINARY_DIR}/flatbuffers" diff --git a/meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-frameworks/tflite-vx-delegate/tflite-vx-delegate_git.bb b/meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-frameworks/tflite-vx-delegate/tflite-vx-delegate_git.bb new file mode 100644 index 000000000..82c8fc38e --- /dev/null +++ b/meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-frameworks/tflite-vx-delegate/tflite-vx-delegate_git.bb @@ -0,0 +1,71 @@ +# Copyright 2020-2021 STMicroelectronics +DESCRIPTION = "Verisilicon TFLite VX Delegate for STM32 Devices" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7d6260e4f3f6f85de05af9c8f87e6fb5" + +SRCBRANCH_vx = "main" +SRCREV_vx = "a975b7ed7a5797812d3c5bdb7310ee92164d0a35" + +SRCBRANCH_tf = "r2.11" +SRCREV_tf = "5d37bd0350f0144632629c1aa2ebaef6ca76300b" + +SRC_URI = "git://github.com/VeriSilicon/tflite-vx-delegate.git;branch=${SRCBRANCH_vx};name=vx;destsuffix=git_vx/;protocol=https \ + git://github.com/tensorflow/tensorflow;branch=${SRCBRANCH_tf};name=tf;destsuffix=git_tf/;protocol=https " +SRC_URI += "file://0001-tflite-vx-delegate-fix-to-support-tflite-2-11.patch;patchdir=${WORKDIR}/git_tf" + +PV = "2.11.0+git${SRCREV_vx}" +S = "${WORKDIR}/git_vx" +COMPATIBLE_MACHINE = "stm32mp25common" + +inherit cmake +DEPENDS += "tim-vx patchelf-native" + +python () { + #Get major of the PV variable + version = d.getVar('PV') + version = version.split("+") + version_base = version[0] + version = version_base.split(".") + major = version[0] + d.setVar('MAJOR', major) + d.setVar('PVB', version_base) +} + +do_configure[network] = "1" + +do_configure:prepend() { + if [ -n "${http_proxy}" ]; then + export HTTP_PROXY=${http_proxy} + export http_proxy=${http_proxy} + fi + if [ -n "${https_proxy}" ]; then + export HTTPS_PROXY=${https_proxy} + export https_proxy=${https_proxy} + fi + unset FC +} + +EXTRA_OECMAKE += " -DFETCHCONTENT_SOURCE_DIR_TENSORFLOW=${WORKDIR}/git_tf \ + -DTIM_VX_INSTALL=${STAGING_DIR_TARGET}/usr \ + -DTFLITE_ENABLE_XNNPACK=OFF \ + -DTFLITE_ENABLE_EXTERNAL_DELEGATE=ON \ + -DFETCHCONTENT_FULLY_DISCONNECTED=OFF \ +" + +do_install() { + # Install libvx_delegate.so into libdir + install -d ${D}${libdir} + install -d ${D}${includedir}/VX + install -m 0755 ${WORKDIR}/build/libvx_delegate.so ${D}${libdir}/libvx_delegate.so.${PVB} + patchelf --set-soname libvx_delegate.so ${D}${libdir}/libvx_delegate.so.${PVB} + ln -sf libvx_delegate.so.${PVB} ${D}${libdir}/libvx_delegate.so.${MAJOR} + ln -sf libvx_delegate.so.${PVB} ${D}${libdir}/libvx_delegate.so + + # Install cusom static lib + install -m 0755 libvx_custom_op.a ${D}${libdir}/libvx_custom_op.a + install -m 0644 ${S}/vsi_npu_custom_op.h ${D}${includedir}/VX/vsi_npu_custom_op.h +} + +FILES:${PN} += " ${libdir}/libvx_delegate.so.${MAJOR} \ + ${libdir}/libvx_delegate.so.${PVB} \ +" diff --git a/meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-frameworks/tim-vx/tim-vx/0001-tim-vx-tests-disable-AVG_ANDROID-tests.patch b/meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-frameworks/tim-vx/tim-vx/0001-tim-vx-tests-disable-AVG_ANDROID-tests.patch new file mode 100644 index 000000000..63c4e61d9 --- /dev/null +++ b/meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-frameworks/tim-vx/tim-vx/0001-tim-vx-tests-disable-AVG_ANDROID-tests.patch @@ -0,0 +1,59 @@ +From 23cdc22779175fea6d73848a98e85702d99051c9 Mon Sep 17 00:00:00 2001 +From: Maxence GUILHIN +Date: Mon, 4 Dec 2023 11:19:21 +0100 +Subject: [PATCH 1/1] tim-vx-tests : disable AVG_ANDROID tests which fails with + tensor HDL OFF + +Signed-off-by: Maxence GUILHIN +--- + src/tim/transform/average_pool_layout_infer_test.cc | 2 +- + src/tim/vx/ops/avg_pool_test.cc | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/tim/transform/average_pool_layout_infer_test.cc b/src/tim/transform/average_pool_layout_infer_test.cc +index 0ff8115..07048f3 100644 +--- a/src/tim/transform/average_pool_layout_infer_test.cc ++++ b/src/tim/transform/average_pool_layout_infer_test.cc +@@ -4,7 +4,7 @@ + #include "tim/transform/layout_inference.h" + + #include "gtest/gtest.h" +-TEST(AVG_ANDROID, layout_infer_) { ++TEST(AVG_ANDROID, DISABLED_layout_infer_) { + auto ctx = tim::vx::Context::Create(); + auto graph = ctx->CreateGraph(); + +diff --git a/src/tim/vx/ops/avg_pool_test.cc b/src/tim/vx/ops/avg_pool_test.cc +index 3a9aed8..3f3f17d 100644 +--- a/src/tim/vx/ops/avg_pool_test.cc ++++ b/src/tim/vx/ops/avg_pool_test.cc +@@ -463,7 +463,7 @@ TEST(AVG, shape_60_52_3_5_fp32_kernel_35_stride_5) { + ArraysMatch(golden, output,1e-4f); + } + +-TEST(AVG_ANDROID, shape_60_52_3_5_fp32_kernel_35_stride_5) { ++TEST(AVG_ANDROID, DISABLED_shape_60_52_3_5_fp32_kernel_35_stride_5) { + auto ctx = tim::vx::Context::Create(); + auto graph = ctx->CreateGraph(); + +@@ -529,7 +529,7 @@ TEST(AVG_ANDROID, shape_60_52_3_5_fp32_kernel_35_stride_5) { + ArraysMatch(golden, output, 1e-5f); + } + +-TEST(AVG_ANDROID, shape_60_52_3_5_fp32_kernel_50_stride_5) { ++TEST(AVG_ANDROID, DISABLED_shape_60_52_3_5_fp32_kernel_50_stride_5) { + auto ctx = tim::vx::Context::Create(); + auto graph = ctx->CreateGraph(); + +@@ -578,7 +578,7 @@ TEST(AVG_ANDROID, shape_60_52_3_5_fp32_kernel_50_stride_5) { + ArraysMatch(golden, output, 1e-5f); + } + +-TEST(AVG_ANDROID, shape_60_52_3_5_uint8_kernel_35_stride_5) { ++TEST(AVG_ANDROID, DISABLED_shape_60_52_3_5_uint8_kernel_35_stride_5) { + auto ctx = tim::vx::Context::Create(); + auto graph = ctx->CreateGraph(); + +-- +2.25.1 + diff --git a/meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-frameworks/tim-vx/tim-vx_git.bb b/meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-frameworks/tim-vx/tim-vx_git.bb new file mode 100644 index 000000000..ed472b1cc --- /dev/null +++ b/meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-frameworks/tim-vx/tim-vx_git.bb @@ -0,0 +1,105 @@ +DESCRIPTION = "TIM-VX is a software integration module provided by VeriSilicon to facilitate \ +deployment of Neural-Networks on OpenVX enabled ML accelerators. It serves as the backend \ +binding for runtime frameworks such as Android NN, Tensorflow-Lite, MLIR, TVM and more." +SUMMARY = "Tensor Interface Module for OpenVX" +HOMEPAGE = "https://github.com/VeriSilicon/TIM-VX" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=d72cd187d764d96d91db827cb65b48a7" + +SRCBRANCH_tim_vx = "main" +SRCREV_tim_vx = "33f3a4f176ff9c407479eaf6be78c52bb3c7a939" +SRC_URI ="git://github.com/VeriSilicon/TIM-VX.git;branch=${SRCBRANCH_tim_vx};name=tim_vx;destsuffix=tim_vx_git/;protocol=https" +SRC_URI += " file://0001-tim-vx-tests-disable-AVG_ANDROID-tests.patch" + + +SRCBRANCH_googletest = "main" +SRCREV_googletest = "eab0e7e289db13eabfc246809b0284dac02a369d" +SRC_URI +="git://github.com/google/googletest;branch=${SRCBRANCH_googletest};name=googletest;destsuffix=googletest/;protocol=https " + + +PV = "1.1.57+git${SRCREV_tim_vx}" +PV_googletest = "1.14.0" + +S = "${WORKDIR}/tim_vx_git" + +# Only compatible with stm32mp25 +COMPATIBLE_MACHINE = "stm32mp25common" + +python () { + #Get major of the PV variable + version = d.getVar('PV') + version = version.split("+") + version_base = version[0] + version = version_base.split(".") + major = version[0] + d.setVar('MAJOR', major) + d.setVar('PVB', version_base) +} + +inherit cmake +DEPENDS += " patchelf-native \ + gcnano-driver-stm32mp \ + gcnano-userland \ + gtest \ + googletest \ + " + +EXTRA_OECMAKE = " \ + -DCONFIG=YOCTO \ + -DCMAKE_SYSROOT=${RECIPE_SYSROOT} \ + -DTIM_VX_ENABLE_TEST=ON \ + -DCMAKE_SKIP_RPATH=TRUE \ + -DFETCHCONTENT_FULLY_DISCONNECTED=OFF \ + -DTIM_VX_USE_EXTERNAL_OVXLIB=ON \ + -DTIM_VX_DBG_ENABLE_TENSOR_HNDL=OFF \ + -DOVXLIB_INC=${S}/src/tim/vx/internal/include/ \ + -DOVXLIB_LIB=${STAGING_LIBDIR}/libovxlib.so \ + -DFETCHCONTENT_SOURCE_DIR_GOOGLETEST=${WORKDIR}/googletest \ +" +do_configure[network] = "1" + +do_install() { + # Install libtim-vx.so into libdir + install -d ${D}${libdir} + install -d ${D}/usr/local/bin/${PN}-${PVB} + install -d ${D}/home/weston + + install -m 0755 ${WORKDIR}/build/src/tim/libtim-vx.so ${D}${libdir}/libtim-vx.so.${PVB} + patchelf --set-soname libtim-vx.so ${D}${libdir}/libtim-vx.so.${PVB} + + ln -sf libtim-vx.so.${PVB} ${D}${libdir}/libtim-vx.so.${MAJOR} + ln -sf libtim-vx.so.${PVB} ${D}${libdir}/libtim-vx.so + + # Install other libraries for benchmark + install -m 0755 ${WORKDIR}/build/lib/libgtest_main.so ${D}${libdir}/libgtest_main.so.${PV_googletest} + install -m 0755 ${WORKDIR}/build/lib/libgtest.so ${D}${libdir}/libgtest.so.${PV_googletest} + install -m 0755 ${WORKDIR}/build/lib/libgmock_main.so ${D}${libdir}/libgmock_main.so + install -m 0755 ${WORKDIR}/build/lib/libgmock.so ${D}${libdir}/libgmock.so + install -m 0755 ${WORKDIR}/build/src/tim/unit_test ${D}/usr/local/bin/${PN}-${PVB}/TIM-VX_test + + # Include + install -d ${D}${includedir} + cp -r ${S}/include/tim ${D}${includedir} + cp -r ${STAGING_INCDIR}/CL/cl_viv_vx_ext.h ${D}/usr/local/bin/${PN}-${PVB}/cl_viv_vx_ext.h + cp -r ${STAGING_INCDIR}/CL/cl_viv_vx_ext.h ${D}/home/weston/cl_viv_vx_ext.h +} + +PACKAGES =+ "${PN}-tools" +FILES_SOLIBSDEV = "" + +FILES:${PN}-tools = " /usr/local/bin/${PN}-${PVB}/TIM-VX_test \ + /usr/local/bin/${PN}-${PVB}/cl_viv_vx_ext.h \ + /home/weston/cl_viv_vx_ext.h \ + ${libdir}/libgtest_main.so.${PV_googletest} \ + ${libdir}/libgtest.so.${PV_googletest} \ + ${libdir}/libgmock_main.so \ + ${libdir}/libgmock.so \ +" + +FILES:${PN} += " ${libdir}/libtim-vx.so.${MAJOR} \ + ${libdir}/libtim-vx.so.${PVB} \ + ${libdir}/libtim-vx.so \ +" + +INSANE_SKIP:${PN} += " dev-so " \ No newline at end of file diff --git a/meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-st/packagegroups/packagegroup-x-linux-ai.bbappend b/meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-st/packagegroups/packagegroup-x-linux-ai.bbappend index b331021b3..b63694670 100644 --- a/meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-st/packagegroups/packagegroup-x-linux-ai.bbappend +++ b/meta-digi-dey/dynamic-layers/stm32mpu-ai/recipes-st/packagegroups/packagegroup-x-linux-ai.bbappend @@ -32,4 +32,5 @@ RDEPENDS:packagegroup-x-linux-ai-tflite:append:ccmp25 = " \ tflite-object-detection-python \ tflite-pose-estimation-python \ tflite-semantic-segmentation-python \ + tim-vx \ " From 3e1f3cdf9ecbbc3b409b2440a82106d858c9b984 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 2 Oct 2024 11:17:35 +0200 Subject: [PATCH 12/27] swupdate: clean warning on firmware update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The swupdate description file allows to configure the setting of u-boot environment variables. For some platforms the "upgrade_available" variable has an empty value, and swupdate parser warns when the description asks to set a variable with an empty value.      Initialize the variable to 0, which is semantically the same for u-boot. https://onedigi.atlassian.net/browse/DEL-9279 Signed-off-by: Javier Viguera --- meta-digi-dey/recipes-digi/swu-images/swu.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-digi/swu-images/swu.inc b/meta-digi-dey/recipes-digi/swu-images/swu.inc index fd79434a4..5fea641f9 100644 --- a/meta-digi-dey/recipes-digi/swu-images/swu.inc +++ b/meta-digi-dey/recipes-digi/swu-images/swu.inc @@ -80,7 +80,7 @@ python do_swuimage:prepend() { } # Upgrade available. -UPGRADE_AVAILABLE = "" +UPGRADE_AVAILABLE = "0" UPGRADE_AVAILABLE:ccimx6 = "1" # Create and fill 'sw-description' file. From 81ab1ccfd939374208e8f3d869df7d89fc839aed Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 1 Oct 2024 22:11:02 +0200 Subject: [PATCH 13/27] ccmp25-dvk: add overlay to support Sony imx355 MIPI-CSI camera Signed-off-by: Arturo Buzarra --- meta-digi-arm/conf/machine/ccmp25-dvk.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-digi-arm/conf/machine/ccmp25-dvk.conf b/meta-digi-arm/conf/machine/ccmp25-dvk.conf index 88b604f94..6ad3d3de2 100644 --- a/meta-digi-arm/conf/machine/ccmp25-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp25-dvk.conf @@ -45,6 +45,7 @@ STM32MP_KERNEL_DEVICETREE:ccmp25-dvk += " \ ccmp25-dvk.dtb \ _ov_board_e55rb-i-mw346-c-mipi-dsi_ccmp25-dvk.dtbo \ _ov_board_g101evn010-lvds_ccmp25-dvk.dtbo \ + _ov_board_imx355-mipi-csi_ccmp25-dvk.dtbo \ _ov_board_mikroe-accel2-click_ccmp25-dvk.dtbo \ _ov_board_mikroe-gyro-click_ccmp25-dvk.dtbo \ _ov_board_mikroe-i2c-to-spi-click_ccmp25-dvk.dtbo \ From 2880f7ea0fe717ee90adf6708dd4de870e4dc95b Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Wed, 2 Oct 2024 16:56:45 +0200 Subject: [PATCH 14/27] cccs: [cosmetic] group RDEPENDS in a single line Signed-off-by: Hector Palacios --- meta-digi-dey/recipes-digi/cccs/cccs_git.bb | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb index 997ea2ad2..41f670a0f 100644 --- a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb +++ b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb @@ -152,15 +152,20 @@ CONFFILES:${PN}-daemon += "${sysconfdir}/cccs.conf" CONFFILES:${PN}-legacy += "${sysconfdir}/cc.conf" -RDEPENDS:${PN}-daemon = "${PN} ${PN}-cert" +# 'cccsd-init' script uses '/etc/init.d/functions' +RDEPENDS:${PN}-daemon = " \ + ${PN} \ + ${PN}-cert \ + initscripts-functions \ +" -RDEPENDS:${PN}-gs-demo = "${PN}-daemon" +# 'cccsd-gs-demo-init' script uses '/etc/init.d/functions' +RDEPENDS:${PN}-gs-demo = " \ + ${PN}-daemon \ + initscripts-functions \ +" RDEPENDS:${PN}-legacy = "${PN} ${PN}-cert" -# 'cccsd-init' and 'cccs-gs-demo-init' scripts use '/etc/init.d/functions' -RDEPENDS:${PN}-daemon += "initscripts-functions" -RDEPENDS:${PN}-gs-demo += "initscripts-functions" - # Disable extra compilation checks from SECURITY_CFLAGS to avoid build errors lcl_maybe_fortify:pn-cccs = "" From 52287bf6be1e524c1e5dc24ef9de0282c8164e24 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Wed, 2 Oct 2024 18:00:31 +0200 Subject: [PATCH 15/27] cccs: specify the runtime package (daemon) that requires the postinst The postinst modifies the /etc/cccs.conf config file used by the daemon. Signed-off-by: Hector Palacios --- meta-digi-dey/recipes-digi/cccs/cccs_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb index 41f670a0f..64713d67f 100644 --- a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb +++ b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb @@ -88,7 +88,7 @@ do_install:append:ccimx6ul() { fi } -pkg_postinst_ontarget:${PN}() { +pkg_postinst_ontarget:${PN}-daemon() { # If dualboot is enabled, change the CCCSD download path and set on the fly to yes on the first boot if [ "$(fw_printenv -n dualboot 2>/dev/null)" = "yes" ]; then sed -i "/firmware_download_path = \/mnt\/update/c\firmware_download_path = \/home\/root" /etc/cccs.conf From 720d627bd3a088693c35422de7ccd69572be9bdf Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Wed, 2 Oct 2024 18:02:20 +0200 Subject: [PATCH 16/27] cccs: add libubootenv as RDEPENDS of daemon Some parameters of the CCCS configuration file need to be substituted at run-time during a postinst script. Such script takes actions depending on the value of U-Boot env variables. The libubootenv recipe itself also has a postinst script that modifies the U-Boot env configuration file (on NAND-based platforms). If there are no dependencies between these two recipes, poky will decide the order in which the postinst scripts are named (and thus executed) during the first boot. By creating the rdepends to libubootenv, we guarantee that its postinst script is run before the cccs one, which depends on the environment being accessible. Signed-off-by: Hector Palacios https://onedigi.atlassian.net/browse/DEL-9282 --- meta-digi-dey/recipes-digi/cccs/cccs_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb index 64713d67f..2c639d010 100644 --- a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb +++ b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb @@ -157,6 +157,7 @@ RDEPENDS:${PN}-daemon = " \ ${PN} \ ${PN}-cert \ initscripts-functions \ + libubootenv \ " # 'cccsd-gs-demo-init' script uses '/etc/init.d/functions' From adb6a37e61ba103f25dd9803c7ae1e12527ea7c5 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Thu, 3 Oct 2024 10:04:56 +0200 Subject: [PATCH 17/27] ccmp25-dvk: fix overlay name for Sony imx335 MIPI-CSI camera Signed-off-by: Arturo Buzarra --- meta-digi-arm/conf/machine/ccmp25-dvk.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-arm/conf/machine/ccmp25-dvk.conf b/meta-digi-arm/conf/machine/ccmp25-dvk.conf index 6ad3d3de2..0044a8b9f 100644 --- a/meta-digi-arm/conf/machine/ccmp25-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp25-dvk.conf @@ -45,7 +45,7 @@ STM32MP_KERNEL_DEVICETREE:ccmp25-dvk += " \ ccmp25-dvk.dtb \ _ov_board_e55rb-i-mw346-c-mipi-dsi_ccmp25-dvk.dtbo \ _ov_board_g101evn010-lvds_ccmp25-dvk.dtbo \ - _ov_board_imx355-mipi-csi_ccmp25-dvk.dtbo \ + _ov_board_imx335-mipi-csi_ccmp25-dvk.dtbo \ _ov_board_mikroe-accel2-click_ccmp25-dvk.dtbo \ _ov_board_mikroe-gyro-click_ccmp25-dvk.dtbo \ _ov_board_mikroe-i2c-to-spi-click_ccmp25-dvk.dtbo \ From 82851b0308098a6b785fdfa8d1a84eebcd2c70d5 Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Wed, 2 Oct 2024 12:20:10 +0200 Subject: [PATCH 18/27] eiq-examples: improvements * do not run the demos in background, if not they can not be ctrl+c. * fix service dependencies: required camera and weston. * patch the examples to: ** set camera resolution to 1280x720 ** set default format to ov5640 camera (YUYV) ** detect the "x" event when the demo application is running in windowed mode (not fullscreen). Signed-off-by: Isaac Hermida --- .../eiq-examples/eiq-examples_git.bbappend | 3 +- ...ture-x-windows-and-increase-resoluti.patch | 138 ++++++++++++++++++ .../files/scripts/launch_eiq_demo.sh | 2 +- .../files/service/eiqdemo.service | 8 +- 4 files changed, 146 insertions(+), 5 deletions(-) create mode 100644 meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/files/patches/0004-improvements-capture-x-windows-and-increase-resoluti.patch diff --git a/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/eiq-examples_git.bbappend b/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/eiq-examples_git.bbappend index b9ca14bee..a1db80aeb 100644 --- a/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/eiq-examples_git.bbappend +++ b/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/eiq-examples_git.bbappend @@ -13,6 +13,7 @@ SRC_URI += " \ file://patches/0001-Customize-EiQ-demos.patch \ file://patches/0002-dms-update-the-demo-to-use-the-landmark-full-model.patch \ file://patches/0003-download_models-update-the-download-location-of-some.patch \ + file://patches/0004-improvements-capture-x-windows-and-increase-resoluti.patch \ file://scripts/launch_eiq_demo.sh \ file://service/eiqdemo.service \ " @@ -25,7 +26,7 @@ do_download_transform_models() { do_download_transform_models[network] = "1" # Add the custom task to download and transform the models. -addtask do_download_transform_models after do_patch before do_install +addtask download_transform_models after do_patch before do_install inherit systemd diff --git a/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/files/patches/0004-improvements-capture-x-windows-and-increase-resoluti.patch b/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/files/patches/0004-improvements-capture-x-windows-and-increase-resoluti.patch new file mode 100644 index 000000000..87ad567d0 --- /dev/null +++ b/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/files/patches/0004-improvements-capture-x-windows-and-increase-resoluti.patch @@ -0,0 +1,138 @@ +From: Isaac Hermida +Date: Wed, 2 Oct 2024 11:58:15 +0200 +Subject: [PATCH] improvements: capture "x" windows and increase resolution + +When running in window mode (no fullscreen), stop the application. +Increase the camera resolution to 1280x720. + +Signed-off-by: Isaac Hermida +--- + dms/main.py | 13 +++++++++---- + face_recognition/main.py | 12 ++++++++---- + gesture_detection/main.py | 13 +++++++++---- + object_detection/main.py | 13 +++++++++---- + 4 files changed, 35 insertions(+), 16 deletions(-) + +diff --git a/dms/main.py b/dms/main.py +index e74b6be1b938..99b501ca2194 100644 +--- a/dms/main.py ++++ b/dms/main.py +@@ -14,10 +14,10 @@ from eye_landmark import EyeMesher + from face_landmark import FaceMesher + from utils import * + +-WIDTH=640 +-HEIGH=480 +-FLIP=None # None, skip, 0: Flip vertically, 1: Flip horizontally (around the y-axis), -1: Flip both vertically and horizontally +-FORMAT=0 # None, skip (YUYV, default), 0 MJPG (for usb camera) ++WIDTH=1280 ++HEIGH=720 ++FLIP=None # None, skip, 0: Flip vertically, 1: Flip horizontally (around the y-axis), -1: Flip both vertically and horizontally ++FORMAT=None # None, skip (YUYV, default), 0 MJPG (for usb camera) + + # Always enforce the Ethos NPU, use the converted vela models + MODEL_PATH = pathlib.Path("../vela_models/") +@@ -197,6 +197,11 @@ while ret: + if FLIP is not None: + image = cv2.flip(image, FLIP) + if cv2.waitKey(1) & 0xFF == ord('q'): ++ # "q" key pressed ++ break ++ ++ if cv2.getWindowProperty(window_name, cv2.WND_PROP_AUTOSIZE): ++ # Window closed by click 'X' + break + except Exception as err: + # Ignore exceptions +diff --git a/face_recognition/main.py b/face_recognition/main.py +index 33ffa7161fac..40ca9f8afb91 100644 +--- a/face_recognition/main.py ++++ b/face_recognition/main.py +@@ -13,10 +13,10 @@ from face_detection import YoloFace + from face_recognition import Facenet + from face_database import FaceDatabase + +-WIDTH=640 +-HEIGH=480 +-FLIP=None # None, skip, 0: Flip vertically, 1: Flip horizontally (around the y-axis), -1: Flip both vertically and horizontally +-FORMAT=0 # None, skip (YUYV, default), 0 MJPG (for usb camera) ++WIDTH=1280 ++HEIGH=720 ++FLIP=None # None, skip, 0: Flip vertically, 1: Flip horizontally (around the y-axis), -1: Flip both vertically and horizontally ++FORMAT=None # None, skip (YUYV, default), 0 MJPG (for usb camera) + + parser = argparse.ArgumentParser() + parser.add_argument( +@@ -144,6 +144,10 @@ while True: + while cv2.waitKey(100) & 0xFF == 0xFF: + pass + ++ if cv2.getWindowProperty(window_name, cv2.WND_PROP_AUTOSIZE): ++ # Window closed by click 'X' ++ break ++ + time.sleep(2) + vid.release() + cv2.destroyAllWindows() +diff --git a/gesture_detection/main.py b/gesture_detection/main.py +index 15b85976fd72..8ad2c9bd409b 100644 +--- a/gesture_detection/main.py ++++ b/gesture_detection/main.py +@@ -63,10 +63,10 @@ if args.input.isdigit(): + else: + cap_input = args.input + +-WIDTH=640 +-HEIGH=480 +-FLIP=None # None, skip, 0: Flip vertically, 1: Flip horizontally (around the y-axis), -1: Flip both vertically and horizontally +-FORMAT=0 # None, skip (YUYV, default), 0 MJPG (for usb camera) ++WIDTH=1280 ++HEIGH=720 ++FLIP=None # None, skip, 0: Flip vertically, 1: Flip horizontally (around the y-axis), -1: Flip both vertically and horizontally ++FORMAT=None # None, skip (YUYV, default), 0 MJPG (for usb camera) + + # This pipeline for the OV5640 camera in case the other command fails + # capture = cv2.VideoCapture("v4l2src device=%s ! imxvideoconvert_pxp ! video/x-raw,format=RGB16,width=%d,height=%d " \ +@@ -100,6 +100,11 @@ while ret: + + ret, frame = capture.read() + if cv2.waitKey(1) & 0xFF == ord('q'): ++ # "q" key pressed ++ break ++ ++ if cv2.getWindowProperty(window_name, cv2.WND_PROP_AUTOSIZE): ++ # Window closed by click 'X' + break + + cv2.waitKey(2000) +diff --git a/object_detection/main.py b/object_detection/main.py +index efa614ebd44b..34ba17eddffb 100644 +--- a/object_detection/main.py ++++ b/object_detection/main.py +@@ -13,10 +13,10 @@ import argparse + + from labels import label2string + +-WIDTH=640 +-HEIGH=480 +-FLIP=None # None, skip, 0: Flip vertically, 1: Flip horizontally (around the y-axis), -1: Flip both vertically and horizontally +-FORMAT=0 # None, skip (YUYV, default), 0 MJPG (for usb camera) ++WIDTH=1280 ++HEIGH=720 ++FLIP=None # None, skip, 0: Flip vertically, 1: Flip horizontally (around the y-axis), -1: Flip both vertically and horizontally ++FORMAT=None # None, skip (YUYV, default), 0 MJPG (for usb camera) + + # Always enforce the Ethos NPU, use the converted vela models + MODEL_PATH = "../vela_models/ssd_mobilenet_v1_quant_vela.tflite" +@@ -122,6 +122,11 @@ while ret: + if FLIP is not None: + frame = cv2.flip(frame, FLIP) + if cv2.waitKey(1) & 0xFF == ord('q'): ++ # "q" key pressed ++ break ++ ++ if cv2.getWindowProperty(window_name, cv2.WND_PROP_AUTOSIZE): ++ # Window closed by click 'X' + break + + cv2.waitKey(2000) diff --git a/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/files/scripts/launch_eiq_demo.sh b/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/files/scripts/launch_eiq_demo.sh index d719c2988..374dd6d79 100644 --- a/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/files/scripts/launch_eiq_demo.sh +++ b/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/files/scripts/launch_eiq_demo.sh @@ -36,4 +36,4 @@ DEMO_DIR="/usr/bin/eiq-examples-git/${DEMO}" cd "${DEMO_DIR}" || exit # Execute the demo pre-configuring the display settings. -WAYLAND_DISPLAY=/run/wayland-0 DISPLAY=:0.0 XDG_RUNTIME_DIR=/run/user/0 python3 main.py -i /dev/video0 -f -d /usr/lib/libethosu_delegate.so & +WAYLAND_DISPLAY=/run/wayland-0 DISPLAY=:0.0 XDG_RUNTIME_DIR=/run/user/0 python3 main.py -i /dev/video0 -f -d /usr/lib/libethosu_delegate.so diff --git a/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/files/service/eiqdemo.service b/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/files/service/eiqdemo.service index 2189e5d4a..7313c5b8f 100644 --- a/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/files/service/eiqdemo.service +++ b/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/files/service/eiqdemo.service @@ -1,10 +1,12 @@ [Unit] Description=Initialization of EiQ DMS demo -After=multi-user.target +After=graphical.target +ConditionPathExists=/dev/video0 [Service] -Type=forking +Type=exec +RemainAfterExit=yes ExecStart=/etc/demos/scripts/launch_eiq_demo.sh [Install] -WantedBy=multi-user.target +WantedBy=graphical.target From 674d012e36eeb42afeb074f255d910d95b8b0259 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 3 Oct 2024 18:13:36 +0200 Subject: [PATCH 19/27] ccimx93: add support for single core 512M variants https://onedigi.atlassian.net/browse/DEL-9221 Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/ccimx93-dvk.conf | 1 + meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/boot.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/meta-digi-arm/conf/machine/ccimx93-dvk.conf b/meta-digi-arm/conf/machine/ccimx93-dvk.conf index a659defa9..7f2036031 100644 --- a/meta-digi-arm/conf/machine/ccimx93-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx93-dvk.conf @@ -31,6 +31,7 @@ KERNEL_DEVICETREE ?= " \ digi/_ov_som_bt-dtm_ccimx9.dtbo \ digi/_ov_som_emulate-ccimx91_ccimx93.dtbo \ digi/_ov_som_npu_ccimx93.dtbo \ + digi/_ov_som_single-core-512M_ccimx93.dtbo \ digi/_ov_som_wifi_ccimx9.dtbo \ ${@bb.utils.contains('DISTRO_FEATURES', 'tsn', 'digi/_ov_board_eqos-tsn_ccimx9-dvk.dtbo', '', d)} \ " diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/boot.txt index eb54b8080..6f75c7d45 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/boot.txt @@ -85,6 +85,8 @@ if test "${soc_type}" = "imx93"; then module_has_npu="0" setenv extra_bootargs ${extra_bootargs} mem=512M setenv overlays _ov_som_emulate-ccimx91_ccimx93.dtbo,${overlays} + elif test "${module_variant}" = "0x03" || test "${module_variant}" = "0x04"; then + setenv overlays _ov_som_single-core-512M_ccimx93.dtbo,${overlays} fi fi From da37858d806cf73cd09ada4f62ab834a06b19e95 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 4 Oct 2024 11:53:27 +0200 Subject: [PATCH 20/27] eiq-examples: fix dependence on vela native tool The recipe level DEPENDS on ethos-u-vela-native is insufficient to ensure the native vela tool population into the eiq-examples recipe sysroot native directory before use. The new download_transform_models task uses that tool, so add the dependence on the task to ensure it is available before use. While on it, configure the working directory of the new task using the Yocto way (using task[dirs]). Signed-off-by: Javier Viguera --- .../eiq-examples/eiq-examples_git.bbappend | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/eiq-examples_git.bbappend b/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/eiq-examples_git.bbappend index a1db80aeb..fd956fb85 100644 --- a/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/eiq-examples_git.bbappend +++ b/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/eiq-examples_git.bbappend @@ -6,9 +6,6 @@ MODELS_DIR = "models" # Directory for transformation tasks. VELA_MODELS_DIR = "vela_models" -# The Vela native tool is required to transform the models. -DEPENDS += "ethos-u-vela-native" - SRC_URI += " \ file://patches/0001-Customize-EiQ-demos.patch \ file://patches/0002-dms-update-the-demo-to-use-the-landmark-full-model.patch \ @@ -20,12 +17,11 @@ SRC_URI += " \ # Custom task to download and transform the models using Vela. do_download_transform_models() { - cd "${S}" - python3 "${S}/download_models.py" + python3 download_models.py } +do_download_transform_models[depends] = "ethos-u-vela-native:do_populate_sysroot" +do_download_transform_models[dirs] = "${S}" do_download_transform_models[network] = "1" - -# Add the custom task to download and transform the models. addtask download_transform_models after do_patch before do_install inherit systemd From 548adca09b66b0d50fad2f747fe27a416b6e2874 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 4 Oct 2024 12:34:22 +0200 Subject: [PATCH 21/27] eiq-examples: use yocto provided native python Signed-off-by: Javier Viguera --- .../eiq-examples/eiq-examples_git.bbappend | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/eiq-examples_git.bbappend b/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/eiq-examples_git.bbappend index fd956fb85..9052371f7 100644 --- a/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/eiq-examples_git.bbappend +++ b/meta-digi-dey/dynamic-layers/meta-ml/recipes-libraries/eiq-examples/eiq-examples_git.bbappend @@ -15,17 +15,20 @@ SRC_URI += " \ file://service/eiqdemo.service \ " +inherit python3native systemd + # Custom task to download and transform the models using Vela. do_download_transform_models() { - python3 download_models.py + ${PYTHON} download_models.py } -do_download_transform_models[depends] = "ethos-u-vela-native:do_populate_sysroot" +do_download_transform_models[depends] += " \ + ethos-u-vela-native:do_populate_sysroot \ + python3-requests-native:do_populate_sysroot \ +" do_download_transform_models[dirs] = "${S}" do_download_transform_models[network] = "1" addtask download_transform_models after do_patch before do_install -inherit systemd - do_install () { # Install scripts to /usr/bin. install -d "${D}${bindir}/${PN}-${PV}/" From d1105835e2fe9278b40d05bab3fe804606c2ab32 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 8 Oct 2024 11:24:56 +0200 Subject: [PATCH 22/27] dey.conf: bump DEY_BUILD version Signed-off-by: Hector Palacios https://onedigi.atlassian.net/browse/DEL-9291 --- meta-digi-dey/conf/distro/dey.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf index 5639e4b7d..d29933447 100644 --- a/meta-digi-dey/conf/distro/dey.conf +++ b/meta-digi-dey/conf/distro/dey.conf @@ -5,7 +5,7 @@ require include/time64.inc YOCTO_MAJOR = "4" YOCTO_MINOR = "0" DEY_RELEASE = "7" -DEY_BUILD = "1" +DEY_BUILD = "2" # Firmware version of the system. DEY_FIRMWARE_VERSION ?= "${YOCTO_MAJOR}.${YOCTO_MINOR}.${DEY_RELEASE}.${DEY_BUILD}" From 46f15efff2a12c6aa4caadbadc34080e2aba0a53 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Mon, 7 Oct 2024 13:03:13 +0200 Subject: [PATCH 23/27] meta-digi: update revisions for dey-4.0-r7.2 Signed-off-by: Arturo Buzarra --- .../recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend | 4 ++-- .../recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb | 4 ++-- .../recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb | 4 ++-- .../recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend | 4 ++-- .../recipes-security/optee/optee-os-stm32mp_3.19.0.bb | 4 ++-- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb | 2 +- .../trustfence/nativesdk-trustfence-sign-tools_2023.04.bb | 2 +- .../trustfence/trustfence-sign-tools-native_2023.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools.inc | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb | 2 +- meta-digi-dey/recipes-digi/cccs/cccs_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 23 files changed, 35 insertions(+), 35 deletions(-) diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend index 6c9041b1d..0e8b9a463 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend @@ -8,10 +8,10 @@ TFA_URI_GITHUB = "${DIGI_GITHUB_GIT}/arm-trusted-firmware.git;protocol=https" TFA_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${TFA_URI_STASH}', '${TFA_URI_GITHUB}', d)}" SRCBRANCH = "v2.6/stm32mp/maint" -SRCREV = "${AUTOREV}" +SRCREV = "9283dc9f1985a8a697ff4c8c9dfa494e85ea950b" SRC_URI = " \ - ${TFA_GIT_URI};branch=${SRCBRANCH} \ + ${TFA_GIT_URI};nobranch=1 \ " TF_A_CONFIG[nand] = "${DEVICE_BOARD_ENABLE:NAND},STM32MP_RAW_NAND=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_NAND}' if ${TF_A_MTD_START_OFFSET_NAND} else ''} STM32MP_USB_PROGRAMMER=1" diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb index b604ec605..5d7c4618f 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb @@ -13,10 +13,10 @@ TFA_URI_GITHUB = "${DIGI_GITHUB_GIT}/arm-trusted-firmware.git;protocol=https" TFA_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${TFA_URI_STASH}', '${TFA_URI_GITHUB}', d)}" SRCBRANCH = "v2.8/stm32mp/maint_ccmp2-beta" -SRCREV = "${AUTOREV}" +SRCREV = "779078679e4714addd14e58efb2564e050a0f016" SRC_URI = " \ - ${TFA_GIT_URI};branch=${SRCBRANCH} \ + ${TFA_GIT_URI};nobranch=1 \ " TF_A_VERSION = "v2.8.12" diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb index d6e1a3294..ebe52e451 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb @@ -10,10 +10,10 @@ TFA_URI_GITHUB = "${DIGI_GITHUB_GIT}/arm-trusted-firmware.git;protocol=https" TFA_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${TFA_URI_STASH}', '${TFA_URI_GITHUB}', d)}" SRCBRANCH = "v2.8/stm32mp/maint_ccmp2-beta" -SRCREV = "${AUTOREV}" +SRCREV = "779078679e4714addd14e58efb2564e050a0f016" SRC_URI = " \ - ${TFA_GIT_URI};branch=${SRCBRANCH} \ + ${TFA_GIT_URI};nobranch=1 \ " # Configure settings diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend index 3a1aba0b5..643c2b4e8 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend @@ -8,10 +8,10 @@ OPTEE_URI_GITHUB = "${DIGI_GITHUB_GIT}/optee_os.git;protocol=https" OPTEE_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${OPTEE_URI_STASH}', '${OPTEE_URI_GITHUB}', d)}" SRCBRANCH = "3.16.0/stm/maint" -SRCREV = "${AUTOREV}" +SRCREV = "25128a1706f59e84e47212be7e878e0a3e4d6d61" SRC_URI = " \ - ${OPTEE_GIT_URI};branch=${SRCBRANCH};name=os \ + ${OPTEE_GIT_URI};nobranch=1;name=os \ file://fonts.tar.gz;subdir=git;name=fonts \ " diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb index 1b94870a2..adb07c323 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb @@ -8,10 +8,10 @@ OPTEE_URI_GITHUB = "${DIGI_GITHUB_GIT}/optee_os.git;protocol=https" OPTEE_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${OPTEE_URI_STASH}', '${OPTEE_URI_GITHUB}', d)}" SRCBRANCH = "3.19.0/stm/maint_ccmp2-beta" -SRCREV = "${AUTOREV}" +SRCREV = "be32a34d4c2b6c916a17afc956289630992c68e0" SRC_URI = " \ - ${OPTEE_GIT_URI};branch=${SRCBRANCH};name=os \ + ${OPTEE_GIT_URI};nobranch=1;name=os \ file://fonts.tar.gz;subdir=git;name=fonts \ " diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc index 83edbcf49..6b9061cb5 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc @@ -27,7 +27,7 @@ INSTALL_FW_UBOOT_SCRIPTS = " \ " SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://boot.txt \ ${INSTALL_FW_UBOOT_SCRIPTS} \ " diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index ab6c1ce34..cf8695b52 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,7 +3,7 @@ require u-boot-dey.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "1ef810133fcecacf14e09155bee10aa66fc6ade7" # Disable support to initial environment for U-Boot UBOOT_INITIAL_ENV = "" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb index e8020ae16..1ddc32b06 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2020.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "d509efc3c1d1c591f6d155171c084c84594993ad" COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8m|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb index 82c0ed42d..3461f8e6e 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb @@ -7,7 +7,7 @@ DEPENDS += "flex-native bison-native" DEPENDS += "python3-setuptools-native" SRCBRANCH = "v2021.10/maint" -SRCREV = "${AUTOREV}" +SRCREV = "13810639f2beb489f640d7c2c5716a67efb1b522" SRC_URI += " \ ${@oe.utils.conditional('TRUSTFENCE_SIGN_FIT_STM', '1', 'file://fit_signature.cfg', '', d)} \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb index c23632bdc..2082c166f 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb @@ -7,7 +7,7 @@ DEPENDS += "flex-native bison-native" DEPENDS += "python3-setuptools-native" SRCBRANCH = "v2022.10/maint_ccmp2-beta" -SRCREV = "${AUTOREV}" +SRCREV = "020c0fc63a86b4d9dbc49ea9cf8f8895f56d5883" SRC_URI += " \ ${@oe.utils.conditional('TRUSTFENCE_SIGN_FIT_STM', '1', 'file://fit_signature.cfg', '', d)} \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb index e7876a683..cc9337e73 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2023.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "87dc53402fca01e327b49d7b13bc0feb041db418" COMPATIBLE_MACHINE = "(ccimx93)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb index b81dfdda6..bd14befcf 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb @@ -7,6 +7,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2024.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "61b5a0329c80da93fed470ee5b7ede0621f6ead3" COMPATIBLE_MACHINE = "(ccimx91)" diff --git a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb index 0ff254752..9b9694c7b 100644 --- a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb +++ b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb @@ -3,4 +3,4 @@ require nativesdk-trustfence-sign-tools_git.bb SRCBRANCH = "v2023.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "87dc53402fca01e327b49d7b13bc0feb041db418" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb index 955934262..ae702d1a5 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb @@ -3,4 +3,4 @@ require trustfence-sign-tools-native_git.bb SRCBRANCH = "v2023.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "87dc53402fca01e327b49d7b13bc0feb041db418" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc index 676122560..6053bf373 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc @@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2020.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "d509efc3c1d1c591f6d155171c084c84594993ad" S = "${WORKDIR}" @@ -15,7 +15,7 @@ UBOOT_URI_GITHUB = "${DIGI_GITHUB_GIT}/u-boot.git;protocol=https" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${UBOOT_URI_STASH}', '${UBOOT_URI_GITHUB}', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-artifact-nxp.sh \ file://trustfence-sign-artifact-stm.sh \ file://trustfence-gen-pki-stm.sh \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index c4b3fcaa7..0dbb911c7 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-4.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "7ba1cdedd456928ac77c1f11e0d070abaf505e95" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}/linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};branch=${SRCBRANCH} \ + ${QCOM_GIT_URI};nobranch=1 \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index cce001bf3..9948bf0c1 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -15,7 +15,7 @@ LINUX_URI_STASH = "${DIGI_MTK_GIT}/linux/linux.git;protocol=ssh" LINUX_URI_GITHUB = "${DIGI_GITHUB_GIT}/linux.git;protocol=https" LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1', '${LINUX_URI_STASH}', '${LINUX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LINUX_GIT_URI};branch=${SRCBRANCH} \ + ${LINUX_GIT_URI};nobranch=1 \ ${@oe.utils.conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'file://docker_conf.cfg', '', d)} \ ${@oe.utils.vartrue('TRUSTFENCE_FILE_BASED_ENCRYPT', 'file://fscrypt.cfg', '', d)} \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb index a4ba1aa21..443d07f67 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb @@ -4,8 +4,8 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v5.15/nxp/dey-4.0/maint" SRCBRANCH:stm32mpcommon = "v5.15/stm/dey-4.0/maint" -SRCREV = "${AUTOREV}" -SRCREV:stm32mpcommon = "${AUTOREV}" +SRCREV = "b11cc21dcd3ea7b1ebaf06455ced4a6e721cc421" +SRCREV:stm32mpcommon = "35bde2fa4824c3fc87971a94b188e1f063d7cdf6" STM_RT_PATCHES = " \ file://patch-5.15.119-rt65.patch \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb index bacbf6737..6ce7a3890 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb @@ -4,8 +4,8 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v6.1/nxp/dey-4.0/maint" SRCBRANCH:stm32mp2common = "v6.1/stm/dey-4.0/maint_ccmp2-beta" -SRCREV = "${AUTOREV}" -SRCREV:stm32mp2common = "${AUTOREV}" +SRCREV = "73f6fa62bf36bcf8e62f08a6933a1039e62f3684" +SRCREV:stm32mp2common = "7016256368328179364ae878e7b5e9b5de321f82" # Patch series for RT Kernel NXP_RT_PATCHES = " \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb index 241772dea..0b869db59 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb @@ -3,7 +3,7 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v6.6/nxp/dey-4.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "8c33aa89e6ede40ded265de37a9e671562e9ed63" # Blacklist btnxpuart module. It will be managed by the bluetooth-init script KERNEL_MODULE_PROBECONF += "btnxpuart" diff --git a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb index 2c639d010..82e8e5615 100644 --- a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb +++ b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "libconfuse libdigiapix openssl recovery-utils swupdate zlib json-c" SRCBRANCH = "dey-4.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "a9908413e2389009a10fd4f33366d694f55a59d3" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" @@ -19,7 +19,7 @@ CCCS_DEVICE_TYPE ?= "${MACHINE}" CCCS_CONF_PATH ?= "" SRC_URI = " \ - ${CC_GIT_URI};branch=${SRCBRANCH} \ + ${CC_GIT_URI};nobranch=1 \ file://cccsd-init \ file://cccsd.service \ file://cccs-gs-demo-init \ diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index 5447ceb6a..fab2926cb 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc @@ -1,11 +1,11 @@ # Copyright (C) 2019-2022, Digi International Inc. SRCBRANCH = "dey-4.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "47e0ac1d7a091452cb831cc970fae2c1a279112a" DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}/dey/dey-examples.git;protocol=ssh" DEY_EXAMPLES_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=https" DEY_EXAMPLES_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DEY_EXAMPLES_STASH}', '${DEY_EXAMPLES_GITHUB}', d)}" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${DEY_EXAMPLES_GIT_URI};nobranch=1" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 6dbaeae9f..9f569e15f 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -7,7 +7,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d" SRCBRANCH ?= "dey-4.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "305fabdf3dbb7efd5630c40519dd18ce28ec7108" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}/dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -15,7 +15,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ + ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From ed8113d99ba2f55b6f965b3c86ed9b1178b41140 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Mon, 7 Oct 2024 13:03:15 +0200 Subject: [PATCH 24/27] meta-digi: revert revisions to AUTOREV Signed-off-by: Arturo Buzarra --- .../recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend | 4 ++-- .../recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb | 4 ++-- .../recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb | 4 ++-- .../recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend | 4 ++-- .../recipes-security/optee/optee-os-stm32mp_3.19.0.bb | 4 ++-- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb | 2 +- .../trustfence/nativesdk-trustfence-sign-tools_2023.04.bb | 2 +- .../trustfence/trustfence-sign-tools-native_2023.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools.inc | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb | 2 +- meta-digi-dey/recipes-digi/cccs/cccs_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 23 files changed, 35 insertions(+), 35 deletions(-) diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend index 0e8b9a463..6c9041b1d 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.6.bbappend @@ -8,10 +8,10 @@ TFA_URI_GITHUB = "${DIGI_GITHUB_GIT}/arm-trusted-firmware.git;protocol=https" TFA_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${TFA_URI_STASH}', '${TFA_URI_GITHUB}', d)}" SRCBRANCH = "v2.6/stm32mp/maint" -SRCREV = "9283dc9f1985a8a697ff4c8c9dfa494e85ea950b" +SRCREV = "${AUTOREV}" SRC_URI = " \ - ${TFA_GIT_URI};nobranch=1 \ + ${TFA_GIT_URI};branch=${SRCBRANCH} \ " TF_A_CONFIG[nand] = "${DEVICE_BOARD_ENABLE:NAND},STM32MP_RAW_NAND=1 ${@'STM32MP_FORCE_MTD_START_OFFSET=${TF_A_MTD_START_OFFSET_NAND}' if ${TF_A_MTD_START_OFFSET_NAND} else ''} STM32MP_USB_PROGRAMMER=1" diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb index 5d7c4618f..b604ec605 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.8.bb @@ -13,10 +13,10 @@ TFA_URI_GITHUB = "${DIGI_GITHUB_GIT}/arm-trusted-firmware.git;protocol=https" TFA_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${TFA_URI_STASH}', '${TFA_URI_GITHUB}', d)}" SRCBRANCH = "v2.8/stm32mp/maint_ccmp2-beta" -SRCREV = "779078679e4714addd14e58efb2564e050a0f016" +SRCREV = "${AUTOREV}" SRC_URI = " \ - ${TFA_GIT_URI};nobranch=1 \ + ${TFA_GIT_URI};branch=${SRCBRANCH} \ " TF_A_VERSION = "v2.8.12" diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb index ebe52e451..d6e1a3294 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-tools_2.8.bb @@ -10,10 +10,10 @@ TFA_URI_GITHUB = "${DIGI_GITHUB_GIT}/arm-trusted-firmware.git;protocol=https" TFA_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${TFA_URI_STASH}', '${TFA_URI_GITHUB}', d)}" SRCBRANCH = "v2.8/stm32mp/maint_ccmp2-beta" -SRCREV = "779078679e4714addd14e58efb2564e050a0f016" +SRCREV = "${AUTOREV}" SRC_URI = " \ - ${TFA_GIT_URI};nobranch=1 \ + ${TFA_GIT_URI};branch=${SRCBRANCH} \ " # Configure settings diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend index 643c2b4e8..3a1aba0b5 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.16.0.bbappend @@ -8,10 +8,10 @@ OPTEE_URI_GITHUB = "${DIGI_GITHUB_GIT}/optee_os.git;protocol=https" OPTEE_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${OPTEE_URI_STASH}', '${OPTEE_URI_GITHUB}', d)}" SRCBRANCH = "3.16.0/stm/maint" -SRCREV = "25128a1706f59e84e47212be7e878e0a3e4d6d61" +SRCREV = "${AUTOREV}" SRC_URI = " \ - ${OPTEE_GIT_URI};nobranch=1;name=os \ + ${OPTEE_GIT_URI};branch=${SRCBRANCH};name=os \ file://fonts.tar.gz;subdir=git;name=fonts \ " diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb index adb07c323..1b94870a2 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_3.19.0.bb @@ -8,10 +8,10 @@ OPTEE_URI_GITHUB = "${DIGI_GITHUB_GIT}/optee_os.git;protocol=https" OPTEE_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${OPTEE_URI_STASH}', '${OPTEE_URI_GITHUB}', d)}" SRCBRANCH = "3.19.0/stm/maint_ccmp2-beta" -SRCREV = "be32a34d4c2b6c916a17afc956289630992c68e0" +SRCREV = "${AUTOREV}" SRC_URI = " \ - ${OPTEE_GIT_URI};nobranch=1;name=os \ + ${OPTEE_GIT_URI};branch=${SRCBRANCH};name=os \ file://fonts.tar.gz;subdir=git;name=fonts \ " diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc index 6b9061cb5..83edbcf49 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc @@ -27,7 +27,7 @@ INSTALL_FW_UBOOT_SCRIPTS = " \ " SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://boot.txt \ ${INSTALL_FW_UBOOT_SCRIPTS} \ " diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index cf8695b52..ab6c1ce34 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,7 +3,7 @@ require u-boot-dey.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "1ef810133fcecacf14e09155bee10aa66fc6ade7" +SRCREV = "${AUTOREV}" # Disable support to initial environment for U-Boot UBOOT_INITIAL_ENV = "" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb index 1ddc32b06..e8020ae16 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2020.04/maint" -SRCREV = "d509efc3c1d1c591f6d155171c084c84594993ad" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8m|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb index 3461f8e6e..82c0ed42d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb @@ -7,7 +7,7 @@ DEPENDS += "flex-native bison-native" DEPENDS += "python3-setuptools-native" SRCBRANCH = "v2021.10/maint" -SRCREV = "13810639f2beb489f640d7c2c5716a67efb1b522" +SRCREV = "${AUTOREV}" SRC_URI += " \ ${@oe.utils.conditional('TRUSTFENCE_SIGN_FIT_STM', '1', 'file://fit_signature.cfg', '', d)} \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb index 2082c166f..c23632bdc 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.10.bb @@ -7,7 +7,7 @@ DEPENDS += "flex-native bison-native" DEPENDS += "python3-setuptools-native" SRCBRANCH = "v2022.10/maint_ccmp2-beta" -SRCREV = "020c0fc63a86b4d9dbc49ea9cf8f8895f56d5883" +SRCREV = "${AUTOREV}" SRC_URI += " \ ${@oe.utils.conditional('TRUSTFENCE_SIGN_FIT_STM', '1', 'file://fit_signature.cfg', '', d)} \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb index cc9337e73..e7876a683 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2023.04/maint" -SRCREV = "87dc53402fca01e327b49d7b13bc0feb041db418" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx93)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb index bd14befcf..b81dfdda6 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb @@ -7,6 +7,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2024.04/maint" -SRCREV = "61b5a0329c80da93fed470ee5b7ede0621f6ead3" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx91)" diff --git a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb index 9b9694c7b..0ff254752 100644 --- a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb +++ b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb @@ -3,4 +3,4 @@ require nativesdk-trustfence-sign-tools_git.bb SRCBRANCH = "v2023.04/maint" -SRCREV = "87dc53402fca01e327b49d7b13bc0feb041db418" +SRCREV = "${AUTOREV}" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb index ae702d1a5..955934262 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb @@ -3,4 +3,4 @@ require trustfence-sign-tools-native_git.bb SRCBRANCH = "v2023.04/maint" -SRCREV = "87dc53402fca01e327b49d7b13bc0feb041db418" +SRCREV = "${AUTOREV}" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc index 6053bf373..676122560 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc @@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2020.04/maint" -SRCREV = "d509efc3c1d1c591f6d155171c084c84594993ad" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -15,7 +15,7 @@ UBOOT_URI_GITHUB = "${DIGI_GITHUB_GIT}/u-boot.git;protocol=https" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${UBOOT_URI_STASH}', '${UBOOT_URI_GITHUB}', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-artifact-nxp.sh \ file://trustfence-sign-artifact-stm.sh \ file://trustfence-gen-pki-stm.sh \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 0dbb911c7..c4b3fcaa7 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-4.0/maint" -SRCREV = "7ba1cdedd456928ac77c1f11e0d070abaf505e95" +SRCREV = "${AUTOREV}" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}/linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};nobranch=1 \ + ${QCOM_GIT_URI};branch=${SRCBRANCH} \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index 9948bf0c1..cce001bf3 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -15,7 +15,7 @@ LINUX_URI_STASH = "${DIGI_MTK_GIT}/linux/linux.git;protocol=ssh" LINUX_URI_GITHUB = "${DIGI_GITHUB_GIT}/linux.git;protocol=https" LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1', '${LINUX_URI_STASH}', '${LINUX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LINUX_GIT_URI};nobranch=1 \ + ${LINUX_GIT_URI};branch=${SRCBRANCH} \ ${@oe.utils.conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'file://docker_conf.cfg', '', d)} \ ${@oe.utils.vartrue('TRUSTFENCE_FILE_BASED_ENCRYPT', 'file://fscrypt.cfg', '', d)} \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb index 443d07f67..a4ba1aa21 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb @@ -4,8 +4,8 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v5.15/nxp/dey-4.0/maint" SRCBRANCH:stm32mpcommon = "v5.15/stm/dey-4.0/maint" -SRCREV = "b11cc21dcd3ea7b1ebaf06455ced4a6e721cc421" -SRCREV:stm32mpcommon = "35bde2fa4824c3fc87971a94b188e1f063d7cdf6" +SRCREV = "${AUTOREV}" +SRCREV:stm32mpcommon = "${AUTOREV}" STM_RT_PATCHES = " \ file://patch-5.15.119-rt65.patch \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb index 6ce7a3890..bacbf6737 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb @@ -4,8 +4,8 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v6.1/nxp/dey-4.0/maint" SRCBRANCH:stm32mp2common = "v6.1/stm/dey-4.0/maint_ccmp2-beta" -SRCREV = "73f6fa62bf36bcf8e62f08a6933a1039e62f3684" -SRCREV:stm32mp2common = "7016256368328179364ae878e7b5e9b5de321f82" +SRCREV = "${AUTOREV}" +SRCREV:stm32mp2common = "${AUTOREV}" # Patch series for RT Kernel NXP_RT_PATCHES = " \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb index 0b869db59..241772dea 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb @@ -3,7 +3,7 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v6.6/nxp/dey-4.0/maint" -SRCREV = "8c33aa89e6ede40ded265de37a9e671562e9ed63" +SRCREV = "${AUTOREV}" # Blacklist btnxpuart module. It will be managed by the bluetooth-init script KERNEL_MODULE_PROBECONF += "btnxpuart" diff --git a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb index 82e8e5615..2c639d010 100644 --- a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb +++ b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "libconfuse libdigiapix openssl recovery-utils swupdate zlib json-c" SRCBRANCH = "dey-4.0/maint" -SRCREV = "a9908413e2389009a10fd4f33366d694f55a59d3" +SRCREV = "${AUTOREV}" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" @@ -19,7 +19,7 @@ CCCS_DEVICE_TYPE ?= "${MACHINE}" CCCS_CONF_PATH ?= "" SRC_URI = " \ - ${CC_GIT_URI};nobranch=1 \ + ${CC_GIT_URI};branch=${SRCBRANCH} \ file://cccsd-init \ file://cccsd.service \ file://cccs-gs-demo-init \ diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index fab2926cb..5447ceb6a 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc @@ -1,11 +1,11 @@ # Copyright (C) 2019-2022, Digi International Inc. SRCBRANCH = "dey-4.0/maint" -SRCREV = "47e0ac1d7a091452cb831cc970fae2c1a279112a" +SRCREV = "${AUTOREV}" DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}/dey/dey-examples.git;protocol=ssh" DEY_EXAMPLES_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=https" DEY_EXAMPLES_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DEY_EXAMPLES_STASH}', '${DEY_EXAMPLES_GITHUB}', d)}" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};nobranch=1" +SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 9f569e15f..6dbaeae9f 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -7,7 +7,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d" SRCBRANCH ?= "dey-4.0/maint" -SRCREV = "305fabdf3dbb7efd5630c40519dd18ce28ec7108" +SRCREV = "${AUTOREV}" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}/dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -15,7 +15,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ + ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From 7c543bbafb575576381fe9bfef53a8bd38f77783 Mon Sep 17 00:00:00 2001 From: Francisco Gil Date: Fri, 11 Oct 2024 10:07:28 +0200 Subject: [PATCH 25/27] ccmp25: swupdate: remove unnecessary logic in the script The rdiff update is only available for dual-boot systems, and it is checked at the beginning of the process. We can remove the related logic and some variables in the script. Signed-off-by: Francisco Gil # Conflicts: # meta-digi-dey/recipes-digi/swu-images/files/update_rdiff.sh --- .../swu-images/files/update_rdiff.sh | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/meta-digi-dey/recipes-digi/swu-images/files/update_rdiff.sh b/meta-digi-dey/recipes-digi/swu-images/files/update_rdiff.sh index aca86d7f5..85ee8f265 100755 --- a/meta-digi-dey/recipes-digi/swu-images/files/update_rdiff.sh +++ b/meta-digi-dey/recipes-digi/swu-images/files/update_rdiff.sh @@ -31,9 +31,7 @@ fi # Variables. BLOCK_SIZE=4096 -ROOTFS_NAME="rootfs" ROOTFS_SOURCE_ENDPOINT="/dev/rdiff_source_rootfs" -ROOTFS_DEV_BLOCK="mmcblk0p3" ROOTFS_DEV_BLOCK_A="mmcblk0p3" ROOTFS_DEV_BLOCK_B="mmcblk0p4" @@ -141,22 +139,15 @@ get_ubi_volume() { # For this reason, hook the source update to a well known endpoint and just create the # required link from the running system once all the information is available. create_source_endpoint() { - # Initialize vars. Assume system is MMC based. - local rootfs_source_partiton="${ROOTFS_NAME}" - local rootfs_source_dev="${ROOTFS_DEV_BLOCK}" - # Remove previous link. [ -L "${ROOTFS_SOURCE_ENDPOINT}" ] && unlink "${ROOTFS_SOURCE_ENDPOINT}" - # Update variables for dualboot systems. - if is_dualboot; then - local active_part="$(get_active_system)" - rootfs_source_partiton="${rootfs_source_partiton}_${active_part}" - if [ "${active_part}" = "a" ]; then - rootfs_source_dev=${ROOTFS_DEV_BLOCK_A} - else - rootfs_source_dev=${ROOTFS_DEV_BLOCK_B} - fi + local active_part="$(get_active_system)" + rootfs_source_partiton="rootfs_${active_part}" + if [ "${active_part}" = "a" ]; then + rootfs_source_dev=${ROOTFS_DEV_BLOCK_A} + else + rootfs_source_dev=${ROOTFS_DEV_BLOCK_B} fi # Update variables for MTD systems. From 97d8740fb2f6707bd2fe85bd3b4408dfabfd5a29 Mon Sep 17 00:00:00 2001 From: Francisco Gil Date: Fri, 11 Oct 2024 10:11:00 +0200 Subject: [PATCH 26/27] ccmp25: swupdate: fix hardcoded index in fwupdate strategy https://onedigi.atlassian.net/browse/DEL-9228 Signed-off-by: Francisco Gil --- meta-digi-dey/recipes-digi/swu-images/files/update_files.sh | 4 ++-- meta-digi-dey/recipes-digi/swu-images/files/update_rdiff.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta-digi-dey/recipes-digi/swu-images/files/update_files.sh b/meta-digi-dey/recipes-digi/swu-images/files/update_files.sh index 9d28629ec..83de89ba2 100755 --- a/meta-digi-dey/recipes-digi/swu-images/files/update_files.sh +++ b/meta-digi-dey/recipes-digi/swu-images/files/update_files.sh @@ -22,9 +22,9 @@ fi # Variables. FS_TYPE="ext4" -LINUX_DEV_BLOCK="/dev/mmcblk0p1" +LINUX_DEV_BLOCK="/dev/mmcblk0p$(fdisk -l /dev/mmcblk0 | sed -ne "s,^[^0-9]*\([0-9]\+\).*\.*,\1,g;T;p")" LINUX_MOUNT_POINT="/mnt/linux" -ROOTFS_DEV_BLOCK="/dev/mmcblk0p3" +ROOTFS_DEV_BLOCK="/dev/mmcblk0p$(fdisk -l /dev/mmcblk0 | sed -ne "s,^[^0-9]*\([0-9]\+\).*\.*,\1,g;T;p")" ROOTFS_MOUNT_POINT="/system" # Determines whether the file system type is UBI or not. diff --git a/meta-digi-dey/recipes-digi/swu-images/files/update_rdiff.sh b/meta-digi-dey/recipes-digi/swu-images/files/update_rdiff.sh index 85ee8f265..c65f630c4 100755 --- a/meta-digi-dey/recipes-digi/swu-images/files/update_rdiff.sh +++ b/meta-digi-dey/recipes-digi/swu-images/files/update_rdiff.sh @@ -32,8 +32,8 @@ fi # Variables. BLOCK_SIZE=4096 ROOTFS_SOURCE_ENDPOINT="/dev/rdiff_source_rootfs" -ROOTFS_DEV_BLOCK_A="mmcblk0p3" -ROOTFS_DEV_BLOCK_B="mmcblk0p4" +ROOTFS_DEV_BLOCK_A="mmcblk0p$(fdisk -l /dev/mmcblk0 | sed -ne "s,^[^0-9]*\([0-9]\+\).*\.*,\1,g;T;p")" +ROOTFS_DEV_BLOCK_B="mmcblk0p$(fdisk -l /dev/mmcblk0 | sed -ne "s,^[^0-9]*\([0-9]\+\).*\.*,\1,g;T;p")" # Determines whether the file system type is UBIFS or not. is_ubifs() { From e586f50bd42cd2a4d17aedb96f162f9510228df3 Mon Sep 17 00:00:00 2001 From: Francisco Gil Date: Thu, 10 Oct 2024 16:42:58 +0200 Subject: [PATCH 27/27] cccs: fix name of the package to remove in read-only filesystems The package name has changed due to commit 52287bf6be1. This fix makes use of the Yocto variable `REMOVE_POSTINST_RPN`, which holds the target name for the `remove-pkg-postinst-ontarget` class. Signed-off-by: Francisco Gil --- meta-digi-dey/recipes-digi/cccs/cccs_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb index 2c639d010..95768884d 100644 --- a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb +++ b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb @@ -96,6 +96,7 @@ pkg_postinst_ontarget:${PN}-daemon() { fi } +REMOVE_POSTINST_RPN = "${PN}-daemon" inherit ${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "remove-pkg-postinst-ontarget", \ oe.utils.ifelse(d.getVar("CCCS_CONF_PATH"), "remove-pkg-postinst-ontarget", ""), d)}