From 27414d34202bcc32253d7be1b64f9892c545d0b6 Mon Sep 17 00:00:00 2001
From: Francisco Gil <francisco.gilmartinez@digi.com>
Date: Fri, 10 Mar 2023 15:46:37 +0100
Subject: [PATCH 01/29] meta-digi: revert revisions to AUTOREV

Signed-off-by: Francisco Gil <francisco.gilmartinez@digi.com>
---
 .../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_2020.04.bb        | 2 +-
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb        | 2 +-
 .../recipes-digi/trustfence/trustfence-sign-tools_git.bb      | 4 ++--
 .../kernel-module-qualcomm/kernel-module-qualcomm.bb          | 4 ++--
 meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc          | 2 +-
 meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb          | 4 ++--
 .../python3-connectcore-ble/python3-connectcore-ble_git.bb    | 4 ++--
 .../recipes-digi/cloudconnector/cloudconnector_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 ++--
 13 files changed, 22 insertions(+), 22 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 3501d8633..3c96008f2 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 = "56756557afc91a8d7c382a5e2a17d3bb6ecf6b54"
+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 90b0b5902..ec8bc733a 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,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 = "61357ddb2b3d2464ec0fedaa9aa6ec038e56cc2a"
+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 386dd6275..45763922b 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://altboot.txt \
     file://boot.txt \
     ${INSTALL_FW_UBOOT_SCRIPTS} \
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 8a491c80e..d7a573416 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 = "5df0daa78474fc9f48bf1584bb18afcd8d1d1769"
+SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m|ccimx6ul)"
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 fd2504e12..a8e2c07d8 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,6 +7,6 @@ DEPENDS += "flex-native bison-native"
 DEPENDS += "python3-setuptools-native"
 
 SRCBRANCH = "v2021.10/maint"
-SRCREV = "74a98a8a66bea87aaaaa3cc744c01ab18114028c"
+SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(ccmp1)"
diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
index 9301f08b7..fdf63f5d5 100644
--- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
+++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb
@@ -8,7 +8,7 @@ DEPENDS = "trustfence-cst coreutils util-linux"
 DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}"
 
 SRCBRANCH = "v2020.04/maint"
-SRCREV = "5df0daa78474fc9f48bf1584bb18afcd8d1d1769"
+SRCREV = "${AUTOREV}"
 
 S = "${WORKDIR}"
 
@@ -18,7 +18,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.sh;name=artifact-sign-script \
     file://sign_hab;name=artifact-hab-sign \
     file://encrypt_hab;name=artifact-hab-encrypt \
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 bd55bff10..798eff21d 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 = "333e820a6ba3f13b0e4017aeda0e7ed00cea4c2f"
+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-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
index a29464636..e3e15bca2 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
@@ -7,7 +7,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"
+SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}"
 
 # A user can provide his own kernel 'defconfig' file by:
 # - setting the variable KERNEL_DEFCONFIG to a custom kernel configuration file
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 e70059e5f..a8c85a053 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
@@ -12,8 +12,8 @@ inherit ${@oe.utils.conditional('DEY_BUILD_PLATFORM', 'NXP', 'fsl-kernel-localve
 
 SRCBRANCH = "v5.15/nxp/dey-4.0/maint"
 SRCBRANCH:stm32mpcommon = "v5.15/stm/dey-4.0/maint"
-SRCREV = "f764cd6f8295f04df1252e848f14f7f6e472b333"
-SRCREV:stm32mpcommon = "fd7fb9f34b6fa340a9da97616a1f0898a839abbb"
+SRCREV = "${AUTOREV}"
+SRCREV:stm32mpcommon = "${AUTOREV}"
 
 require ${@oe.utils.conditional('DEY_BUILD_PLATFORM', 'STM', 'recipes-kernel/linux/linux-stm32mp.inc', '', d)}
 # Don't create custom folder for kernel artifacts
diff --git a/meta-digi-dey/recipes-devtools/python3-connectcore-ble/python3-connectcore-ble_git.bb b/meta-digi-dey/recipes-devtools/python3-connectcore-ble/python3-connectcore-ble_git.bb
index 6051f0a97..a89c868cf 100644
--- a/meta-digi-dey/recipes-devtools/python3-connectcore-ble/python3-connectcore-ble_git.bb
+++ b/meta-digi-dey/recipes-devtools/python3-connectcore-ble/python3-connectcore-ble_git.bb
@@ -8,14 +8,14 @@ LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad"
 
 SRCBRANCH ?= "master"
-SRCREV = "23e8bf3dc438edae117fb1d721c06ec9b626dcec"
+SRCREV = "${AUTOREV}"
 
 CONNECTCORE_BLE_URI_STASH = "${DIGI_MTK_GIT}/python/connectcore-ble-python.git;protocol=ssh"
 CONNECTCORE_BLE_URI_GITHUB = "${DIGI_GITHUB_GIT}/connectcore-ble-python.git;protocol=https"
 CONNECTCORE_BLE_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CONNECTCORE_BLE_URI_STASH}', '${CONNECTCORE_BLE_URI_GITHUB}', d)}"
 
 SRC_URI = " \
-    ${CONNECTCORE_BLE_URI};nobranch=1 \
+    ${CONNECTCORE_BLE_URI};branch=${SRCBRANCH} \
 "
 
 S = "${WORKDIR}/git"
diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
index f7dfa1a20..fc9183416 100644
--- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
+++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_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 = "3b8b9f9ff081c3d7d1d0ef334eb540ba763ed540"
+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"
@@ -16,7 +16,7 @@ CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https"
 CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}"
 
 SRC_URI = " \
-    ${CC_GIT_URI};nobranch=1 \
+    ${CC_GIT_URI};branch=${SRCBRANCH} \
     file://cloud-connector-init \
     file://cloud-connector.service \
 "
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 d8145dc7a..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 = "352fabc24d1fa2e389be57ea21f65e3b3f86121e"
+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 8d1db8c4b..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 = "5e39495219662c7bbea2e82a2ec3293a25f7b74f"
+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 7ea467dba7ba2bb6f510ca2fd7cd2f5218929853 Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Mon, 13 Mar 2023 11:43:55 +0100
Subject: [PATCH 02/29] dey-image-installer: remove path from README file for
 USB driver installation script

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 meta-digi-dey/classes/dey-image-installer.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-digi-dey/classes/dey-image-installer.bbclass b/meta-digi-dey/classes/dey-image-installer.bbclass
index 6231356ce..ac1717729 100644
--- a/meta-digi-dey/classes/dey-image-installer.bbclass
+++ b/meta-digi-dey/classes/dey-image-installer.bbclass
@@ -1,7 +1,7 @@
 #
 # Generate DEY installer ZIP package
 #
-# Copyright 2017-2022, Digi International Inc.
+# Copyright 2017-2023, Digi International Inc.
 #
 DEPENDS += "zip-native"
 
@@ -61,7 +61,7 @@ ${DISTRO_NAME} ${DISTRO_VERSION} kit installer
 ----------------------------------------
 
 _EOF_
-	md5sum ${INSTALLER_FILELIST} | sed -e "s,${DEPLOY_DIR_IMAGE}/,,g;s,${IMGDEPLOYDIR}/,,g" >> ${IMGDEPLOYDIR}/README.txt
+	md5sum ${INSTALLER_FILELIST} | sed -e "s,${DEPLOY_DIR_IMAGE}/,,g;s,${IMGDEPLOYDIR}/,,g;s,${META_DIGI_SCRIPTS}/,,g" >> ${IMGDEPLOYDIR}/README.txt
 
 	# Pack the files and remove the temporary readme file
 	zip -j ${IMGDEPLOYDIR}/${IMAGE_NAME}.installer.zip ${INSTALLER_FILELIST} ${IMGDEPLOYDIR}/README.txt

From bdece7102ba6a2183ab8155507a9abe246eef2cf Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Mon, 13 Mar 2023 16:36:06 +0100
Subject: [PATCH 03/29] systemd-conf: use custom journald conf file

The Poky layer defines a default journald conf file that allows log files on
the file system to grow to a maximum of 64 MiB. However, this size on some
platforms is impossible to address, so this commit reduces the maximum size for
runtime logs to 4 MiB.

https://onedigi.atlassian.net/browse/DEL-8419

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 meta-digi-dey/recipes-core/systemd/systemd-conf/journald.conf | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 meta-digi-dey/recipes-core/systemd/systemd-conf/journald.conf

diff --git a/meta-digi-dey/recipes-core/systemd/systemd-conf/journald.conf b/meta-digi-dey/recipes-core/systemd/systemd-conf/journald.conf
new file mode 100644
index 000000000..4860db626
--- /dev/null
+++ b/meta-digi-dey/recipes-core/systemd/systemd-conf/journald.conf
@@ -0,0 +1,3 @@
+[Journal]
+ForwardToSyslog=yes
+RuntimeMaxUse=4M

From 88251adc0debadfe648d9c1bd18d296f2a919632 Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Tue, 14 Mar 2023 09:37:00 +0100
Subject: [PATCH 04/29] dey-image-installer: remove path from binaries stored
 inside a folder in the deploy dir

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 meta-digi-dey/classes/dey-image-installer.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-digi-dey/classes/dey-image-installer.bbclass b/meta-digi-dey/classes/dey-image-installer.bbclass
index ac1717729..66243e878 100644
--- a/meta-digi-dey/classes/dey-image-installer.bbclass
+++ b/meta-digi-dey/classes/dey-image-installer.bbclass
@@ -61,7 +61,7 @@ ${DISTRO_NAME} ${DISTRO_VERSION} kit installer
 ----------------------------------------
 
 _EOF_
-	md5sum ${INSTALLER_FILELIST} | sed -e "s,${DEPLOY_DIR_IMAGE}/,,g;s,${IMGDEPLOYDIR}/,,g;s,${META_DIGI_SCRIPTS}/,,g" >> ${IMGDEPLOYDIR}/README.txt
+	md5sum ${INSTALLER_FILELIST} | sed -e "s,${DEPLOY_DIR_IMAGE}.*/,,g;s,${IMGDEPLOYDIR}/,,g;s,${META_DIGI_SCRIPTS}/,,g" >> ${IMGDEPLOYDIR}/README.txt
 
 	# Pack the files and remove the temporary readme file
 	zip -j ${IMGDEPLOYDIR}/${IMAGE_NAME}.installer.zip ${INSTALLER_FILELIST} ${IMGDEPLOYDIR}/README.txt

From b92028b407caa10caf8239d7ab3bf5f8e611f6c5 Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Fri, 17 Mar 2023 12:26:56 +0100
Subject: [PATCH 05/29] build.sh: add dey-image-qt for ccmp15-dvk

ConnectCore MP15 has support to QT applications, so add it to the daily build.

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 sdk/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/build.sh b/sdk/build.sh
index a02bdd009..49abd244c 100755
--- a/sdk/build.sh
+++ b/sdk/build.sh
@@ -184,7 +184,7 @@ done<<-_EOF_
 	ccimx6ulstarter      core-image-base
 	ccimx6ulsom          dey-image-mft-module-min
 	ccimx6ulrftest       dey-image-mft-module-rf
-	ccmp15-dvk           dey-image-webkit,dey-image-crank
+	ccmp15-dvk           dey-image-qt,dey-image-crank,dey-image-webkit
 	ccmp13-dvk           core-image-base
 	ccimx93-dvk          dey-image-qt
 _EOF_

From 6a8bf7affffc4cb38b55070f4b6aa8adfeda297a Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Wed, 15 Mar 2023 17:17:11 +0100
Subject: [PATCH 06/29] trustfence: add function to generate a PKI tree if it
 doesn't exist

The stand-alone signing script 'trustfence-sign-artifact.sh' checks
if a valid PKI tree exists (by checking the existance of four SRK
files) and if they don't, it calls trustfence-gen-pki.sh (which is
a wrapper over different generators (for HAB or AHAB) to create one.

Recipes such as 'dualboot' or 'recovery-initramfs' may need to call
openssl functions over the PKI tree. These recipes do not currently
generate the PKI tree; they expect it to be already in place.
This might not be the case if the trustfence-sign-artifact.sh script
has not been called yet.

Originally, a fake dependency on virtual/kernel recipe was made to
force it, but it doesn't quite work since the calling only happens
on deploy() while regular DEPENDS doesn't wait for this task.
If the PKI does not exist, a recipe that requires the PKI tree will
fail.

The solution is to create a function on the trustfence.bbclass that
allows any recipe to check for the existance of a PKI tree and
generate it if it doesn't exist. This is repeated inside the
trustfence-sign-artifact.sh, but it needs to be in both places
because this script must work stand-alone.

The generation of the PKI tree takes some seconds so this commit
adds a lock dir to prevent race conditions when called from
different recipes.

It also removes the fake dependency on virtual/kernel and adds a
dependency on trustfence-cst-native (which is the recipe that
provides the PKI generation tool).

Signed-off-by: Hector Palacios <hector.palacios@digi.com>

https://onedigi.atlassian.net/browse/DEL-8430
---
 .../trustfence-sign-artifact.sh               | 16 ++++++++++++--
 meta-digi-dey/classes/trustfence.bbclass      | 22 +++++++++++++++++++
 .../recovery/recovery-initramfs.bb            |  8 +++----
 .../recipes-digi/dualboot/dualboot.bb         |  9 +++-----
 4 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh
index 8c57ff03a..ba916eafa 100755
--- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh
+++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh
@@ -152,6 +152,18 @@ if [ "${CONFIG_SIGN_MODE}" = "HAB" ]; then
 	DEK_BLOB_OFFSET="0x100"
 fi
 
+# Function to generate a PKI tree (with lock dir protection)
+GENPKI_LOCK_DIR="${CONFIG_SIGN_KEYS_PATH}/.genpki.lock"
+gen_pki_tree() {
+	if mkdir -p ${GENPKI_LOCK_DIR}; then
+		trustfence-gen-pki.sh ${CONFIG_SIGN_KEYS_PATH}
+		rm -rf ${GENPKI_LOCK_DIR}
+	else
+		echo "Could not get lock to generate PKI tree"
+		exit 1
+	fi
+}
+
 # Default values
 [ -z "${CONFIG_KEY_INDEX}" ] && CONFIG_KEY_INDEX="0"
 CONFIG_KEY_INDEX_1="$((CONFIG_KEY_INDEX + 1))"
@@ -170,7 +182,7 @@ if [ "${CONFIG_SIGN_MODE}" = "HAB" ]; then
 		echo "Using existing PKI tree"
 	elif [ "${n_commas}" -eq 0 ] || [ ! -f "${CERT_CSF}" ] || [ ! -f "${CERT_IMG}" ]; then
 		# Generate PKI
-		trustfence-gen-pki.sh "${CONFIG_SIGN_KEYS_PATH}"
+		gen_pki_tree
 
 		SRK_KEYS="$(echo ${CONFIG_SIGN_KEYS_PATH}/crts/SRK*crt.pem | sed s/\ /\,/g)"
 		CERT_CSF="$(echo ${CONFIG_SIGN_KEYS_PATH}/crts/CSF${CONFIG_KEY_INDEX_1}*crt.pem)"
@@ -185,7 +197,7 @@ elif [ "${CONFIG_SIGN_MODE}" = "AHAB" ]; then
 		echo "Using existing PKI tree"
 	elif [ "${n_commas}" -eq 0 ] && [ "${CONFIG_SIGN_MODE}" = "AHAB" ]; then
 		# Generate PKI
-		trustfence-gen-pki.sh "${CONFIG_SIGN_KEYS_PATH}"
+		gen_pki_tree
 
 		SRK_KEYS="$(echo ${CONFIG_SIGN_KEYS_PATH}/crts/SRK*crt.pem | sed s/\ /\,/g)"
 	else
diff --git a/meta-digi-dey/classes/trustfence.bbclass b/meta-digi-dey/classes/trustfence.bbclass
index 663204290..0e430cf94 100644
--- a/meta-digi-dey/classes/trustfence.bbclass
+++ b/meta-digi-dey/classes/trustfence.bbclass
@@ -110,3 +110,25 @@ python () {
     else:
         d.setVar("TRUSTFENCE_INITRAMFS_IMAGE", "");
 }
+
+# Function to generate a PKI tree (with lock dir protection)
+GENPKI_LOCK_DIR = "${TRUSTFENCE_SIGN_KEYS_PATH}/.genpki.lock"
+gen_pki_tree() {
+	if mkdir -p ${GENPKI_LOCK_DIR}; then
+		trustfence-gen-pki.sh ${TRUSTFENCE_SIGN_KEYS_PATH}
+		rm -rf ${GENPKI_LOCK_DIR}
+	else
+		bbfatal "Could not get lock to generate PKI tree"
+	fi
+}
+
+# Function that generates a PKI tree if there isn't one
+check_gen_pki_tree() {
+	SRK_KEYS="$(echo ${TRUSTFENCE_SIGN_KEYS_PATH}/crts/SRK*crt.pem | sed s/\ /\,/g)"
+	n_commas="$(echo ${SRK_KEYS} | grep -o "," | wc -l)"
+	if [ "${n_commas}" -eq 0 ]; then
+		gen_pki_tree
+	elif [ "${n_commas}" -ne 3 ]; then
+		bbfatal "Inconsistent PKI tree"
+	fi
+}
diff --git a/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb b/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb
index b10bc069e..03e121515 100644
--- a/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb
+++ b/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb
@@ -4,11 +4,7 @@ SUMMARY = "Recovery initramfs files"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
-# When building a TrustFence enabled recovery initramfs, we need the TrustFence PKI tree to
-# be already generated in order to copy the public key. Forcing a dependence against
-# 'virtual/kernel' ensures that the keys are already generated as they are needed to sign the
-# kernel artifacts.
-DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'virtual/kernel openssl-native', '', d)}"
+DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'openssl-native trustfence-cst-native', '', d)}"
 
 SRC_URI = " \
     file://recovery-initramfs-init \
@@ -38,6 +34,8 @@ do_install() {
 	# If Trustfence is enabled, copy the public key that is going to be used into the
 	# initramfs '/etc/ssl/certs' folder in order to verify swupdate packages.
 	if [ "${TRUSTFENCE_SIGN}" = "1" ]; then
+		# Check and generate a PKI tree if there isn't one
+		check_gen_pki_tree
 		# Retrieve the key index to use.
 		KEY_INDEX="0"
 		if [ -n "${TRUSTFENCE_KEY_INDEX}" ]; then
diff --git a/meta-digi-dey/recipes-digi/dualboot/dualboot.bb b/meta-digi-dey/recipes-digi/dualboot/dualboot.bb
index 1876504a6..374a532c7 100644
--- a/meta-digi-dey/recipes-digi/dualboot/dualboot.bb
+++ b/meta-digi-dey/recipes-digi/dualboot/dualboot.bb
@@ -5,12 +5,7 @@ SECTION = "base"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
-
-# When building a TrustFence enabled rootfs, we need the TrustFence PKI tree to
-# be already generated in order to copy the public key. Forcing a dependency with
-# 'virtual/kernel' ensures that the keys are already generated as they are needed to sign the
-# kernel artifacts.
-DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'virtual/kernel openssl-native', '', d)}"
+DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'openssl-native trustfence-cst-native', '', d)}"
 
 SRC_URI = " \
     file://dualboot-init \
@@ -41,6 +36,8 @@ do_install() {
 	# If Trustfence is enabled, copy the public key that is going to be used into the
 	# initramfs '/etc/ssl/certs' folder in order to verify swupdate packages.
 	if [ "${TRUSTFENCE_SIGN}" = "1" ]; then
+		# Check and generate a PKI tree if there isn't one
+		check_gen_pki_tree
 		# Retrieve the key index to use.
 		KEY_INDEX="0"
 		if [ -n "${TRUSTFENCE_KEY_INDEX}" ]; then

From 1560472f6627777b8201cbdf05ed83a3adf4855f Mon Sep 17 00:00:00 2001
From: Francisco Gil <francisco.gilmartinez@digi.com>
Date: Tue, 21 Mar 2023 15:14:53 +0100
Subject: [PATCH 07/29] pulseaudio: keep the PID file in headless system

Without the PIDfile pulseaudio is not reliable.

https://onedigi.atlassian.net/browse/DEL-8429
https://onedigi.atlassian.net/browse/DEL-6795

Signed-off-by: Francisco Gil <francisco.gilmartinez@digi.com>
---
 .../recipes-multimedia/pulseaudio/pulseaudio_%.bbappend      | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
index aa748cf1a..615de1021 100644
--- a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
+++ b/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
@@ -91,11 +91,6 @@ do_install:append() {
 	install -d ${D}${systemd_unitdir}/system
 	install -m 0644 ${WORKDIR}/pulseaudio-system.service ${D}/${systemd_unitdir}/system
 
-	# Remove pid file entry for non-graphical backend
-	if [ "${IS_HEADLESS}" = "true" ]; then
-		sed -i -e "/PIDFile/d" ${D}/${systemd_unitdir}/system/pulseaudio-system.service
-	fi
-
 	# Configuration files for HDMI sound card
 	if [ "${AUDIO_HDMI}" = "yes" ]; then
 		install -d ${D}${sysconfdir}/udev/scripts

From 4f1bbf4d2d587ae68943a357620b56680438ea6d Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Wed, 22 Mar 2023 17:09:51 +0100
Subject: [PATCH 08/29] README: fix cc6ul supported platforms

- Add missing PNs and order list as per Digi website.
- Remove SBC Express, which is not available for purchase.

Reported-by: Leonid Makhnovskiy <leonid.makhnovskiy@digi.com>
Signed-off-by: Hector Palacios <hector.palacios@digi.com>
---
 README.md | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index b2f4b66f8..ae998192d 100644
--- a/README.md
+++ b/README.md
@@ -55,19 +55,18 @@ Software for the following hardware platforms is in production support:
 
 ## ConnectCore 6UL
 * ConnectCore 6UL System-on-Module (SOM)
-  * [CC-WMX-JN58-NE](https://www.digi.com/products/models/cc-wmx-jn58-ne)
-  * [CC-MX-JN58-Z1](https://www.digi.com/products/models/cc-mx-jn58-z1)
-  * CC-WMX-JN7A-NE
-  * [CC-WMX-JN7A-CBX](https://www.digi.com/products/models/cc-wmx-jn7a-cbx)
-  * [CC-WMX-JN68-NN](https://www.digi.com/products/models/cc-wmx-jn68-nn)
+  * [CC-WMX-JN7A-NE](https://www.digi.com/products/models/cc-wmx-jn7a-ne)
   * [CC-WMX-JN69-NN](https://www.digi.com/products/models/cc-wmx-jn69-nn)
-  * [CC-MX-JN69-ZN](hhtps://www.digi.com/products/models/cc-mx-jn69-zn)
-* ConnectCore 6UL SBC Express
-  * [CC-WMX6UL-START](https://www.digi.com/products/models/cc-wmx6ul-start) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/4.0/cc6ul/yocto-gs_index))
-  * [CC-SBE-WMX-JN58](https://www.digi.com/products/models/cc-sbe-wmx-jn58)
+  * [CC-WMX-JN59-NN](https://www.digi.com/products/models/cc-wmx-jn59-nn)
+  * [CC-WMX-JN58-NE](https://www.digi.com/products/models/cc-wmx-jn58-ne)
+  * [CC-MX-JN7A-Z1](https://www.digi.com/products/models/cc-mx-jn7a-z1)
+  * [CC-MX-JN69-ZN](https://www.digi.com/products/models/cc-mx-jn69-zn)
+  * [CC-MX-JN58-Z1](https://www.digi.com/products/models/cc-mx-jn58-z1)
+
 * ConnectCore 6UL SBC Pro
   * [CC-WMX6UL-KIT](https://www.digi.com/products/models/cc-wmx6ul-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/4.0/cc6ul/yocto-gs_index))
   * [CC-SBP-WMX-JN58](https://www.digi.com/products/models/cc-sbp-wmx-jn58)
+  * [CC-SBP-WMX-JN7A](https://www.digi.com/products/models/cc-sbp-wmx-jn7a)
 
 # Installation
 

From 40d5207400797ce050f7ec1918c5e73531c34200 Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Mon, 3 Apr 2023 11:53:49 +0200
Subject: [PATCH 09/29] update URL of NXP recipes from codeaurora to Github

Codeaurora was retired on April 2023.
Fix bbappends to point to their new location on Github.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
---
 .../recipes-graphics/libgpuperfcnt/gputop_6.4.3.p2.4.bb         | 2 +-
 .../freescale-layer/recipes-multimedia/nxp-afe/nxp-afe_git.bb   | 2 +-
 .../recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.18.5.imx.bb   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/gputop_6.4.3.p2.4.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/gputop_6.4.3.p2.4.bb
index 5ce64c801..88b6b1e59 100644
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/gputop_6.4.3.p2.4.bb
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/libgpuperfcnt/gputop_6.4.3.p2.4.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=bcacc6777a7173f8b95b5d1e0ac341ae"
 
 DEPENDS = "libgpuperfcnt"
 
-GPUTOP_SRC ?= "git://source.codeaurora.org/external/imx/imx-gputop.git;protocol=https"
+GPUTOP_SRC ?= "git://github.com/nxp-imx/imx-gputop.git;protocol=https"
 SRCBRANCH = "release"
 SRC_URI = "${GPUTOP_SRC};branch=${SRCBRANCH} "
 SRCREV = "ecd0b278c9ed4ab6ecde83d3c6deeae9367fa828"
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/nxp-afe/nxp-afe_git.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/nxp-afe/nxp-afe_git.bb
index bafdb7fb3..5125f8465 100644
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/nxp-afe/nxp-afe_git.bb
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/nxp-afe/nxp-afe_git.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7bdef19938f3503cfc4c586461f99012"
 PV = "1.0+git${SRCPV}" 
 
 SRCBRANCH = "MM_04.06.03_2110_L5.10.y"
-NXPAFE_SRC ?= "git://source.codeaurora.org/external/imx/nxp-afe.git;protocol=https"
+NXPAFE_SRC ?= "git://github.com/nxp-imx/nxp-afe.git;protocol=https"
 SRC_URI = " \
     ${NXPAFE_SRC};branch=${SRCBRANCH} \
 "
diff --git a/meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.18.5.imx.bb b/meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.18.5.imx.bb
index c8000d070..25995a00b 100644
--- a/meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.18.5.imx.bb
+++ b/meta-digi-dey/dynamic-layers/qt5-layer/NXP/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.18.5.imx.bb
@@ -1,6 +1,6 @@
 require recipes-multimedia/gstreamer/gstreamer1.0-plugins-common.inc
 
-GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://source.codeaurora.org/external/imx/gst-plugins-good.git;protocol=https"
+GST1.0-PLUGINS-GOOD_SRC ?= "gitsm://github.com/nxp-imx/gst-plugins-good.git;protocol=https"
 SRCBRANCH = "MM_04.06.03_2110_L5.10.y"
 
 SRC_URI = " \

From b3bd2014d4250cdfc51b8499b8bf7cf8beb6d443 Mon Sep 17 00:00:00 2001
From: Hector Bujanda <hector.bujanda@digi.com>
Date: Tue, 4 Apr 2023 23:00:28 +0200
Subject: [PATCH 10/29] =?UTF-8?q?ccx:=20fix=20some=20outdated=20files=20so?=
 =?UTF-8?q?=20implementation=20matches=20'cctags=20api=E2=80=99=20reposito?=
 =?UTF-8?q?ry?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1)
CcxTagControlData struct in CORE/HDD/inc/CcxTagDefs.h had some fields missing compared
with 'cctags api’ which was producing CCX_TAG_DRVR_RSP_ERR_CTRL_SIZE.

2)
Then CCX_TAG_DRVR_RSP_ERR_PACKET_SIZE aroused because following paddings:
	CCX_TAG_MPDU_HEADER_PAD_SIZE = 2
	CCX_TAG_CONTENT_HEADER_PAD_SIZE = 3
where producing wrong alignements and sizes between the 'cctags api’ and the driver.

With changes in this commit, master branch of ‘CCxTagTest’ repository compiled
out of source code gets on well with 'cctags api’ repository and with qca driver in
both dey-2.4 and dey4.0.
Packets in the air match 100% in content in both dey-2.4 and dey4.0.

https://onedigi.atlassian.net/browse/DEL-8446

Signed-off-by: Hector Bujanda <hector.bujanda@digi.com>
---
 ...dd-CCX-tags-support-for-kernel-v5.15.patch | 285 +++++++++++-------
 1 file changed, 183 insertions(+), 102 deletions(-)

diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/0001-add-CCX-tags-support-for-kernel-v5.15.patch b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/0001-add-CCX-tags-support-for-kernel-v5.15.patch
index 9e64e87c1..8cf44c578 100644
--- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/0001-add-CCX-tags-support-for-kernel-v5.15.patch
+++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/0001-add-CCX-tags-support-for-kernel-v5.15.patch
@@ -1,34 +1,36 @@
-From: Isaac Hermida <isaac.hermida@digi.com>
-Date: Thu, 25 Aug 2022 10:15:31 +0200
+From: Hector Bujanda <hector.bujanda@digi.com>
+Date: Tue, 11 Apr 2023 12:47:24 +0200
 Subject: [PATCH] add CCX tags support for kernel v5.15
 
 https://onedigi.atlassian.net/browse/DEL-8038
 
 Signed-off-by: Isaac Hermida <isaac.hermida@digi.com>
+Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
+Signed-off-by: Hector Bujanda <hector.bujanda@digi.com>
 ---
- CORE/HDD/inc/CcxTagDefs.h           | 396 +++++++++++++
+ CORE/HDD/inc/CcxTagDefs.h           | 424 ++++++++++++++
  CORE/HDD/inc/wlan_hdd_ccx_tag.h     |  19 +
- CORE/HDD/src/wlan_hdd_ccx_tag.c     | 833 ++++++++++++++++++++++++++++
+ CORE/HDD/src/wlan_hdd_ccx_tag.c     | 880 ++++++++++++++++++++++++++++
  CORE/HDD/src/wlan_hdd_main.c        |  20 +
  CORE/MAC/inc/aniGlobal.h            |   4 +
  CORE/MAC/inc/qwlan_version.h        |   3 +-
  CORE/MAC/src/include/sirParams.h    |   6 +
  CORE/SERVICES/COMMON/wmi_tlv_defs.h |  19 +-
  CORE/SERVICES/COMMON/wmi_unified.h  |  75 ++-
- CORE/SERVICES/WMA/wma.c             |  80 +++
+ CORE/SERVICES/WMA/wma.c             |  82 +++
  CORE/SERVICES/WMI/wmi_unified.c     |   3 +
  Kbuild                              |   2 +
- 12 files changed, 1456 insertions(+), 4 deletions(-)
+ 12 files changed, 1533 insertions(+), 4 deletions(-)
  create mode 100644 CORE/HDD/inc/CcxTagDefs.h
  create mode 100644 CORE/HDD/inc/wlan_hdd_ccx_tag.h
  create mode 100644 CORE/HDD/src/wlan_hdd_ccx_tag.c
 
 diff --git a/CORE/HDD/inc/CcxTagDefs.h b/CORE/HDD/inc/CcxTagDefs.h
 new file mode 100644
-index 000000000000..b0b337c4ec47
+index 000000000..5d70261e1
 --- /dev/null
 +++ b/CORE/HDD/inc/CcxTagDefs.h
-@@ -0,0 +1,396 @@
+@@ -0,0 +1,424 @@
 +/****************************************************************/
 +/*                                                              */
 +/* Copyright 2018 Digi International, Inc. All Rights Reserved. */
@@ -43,6 +45,11 @@ index 000000000000..b0b337c4ec47
 +/* Fixed Netlink Communication Fields */
 +#define CCX_TAG_FAMILY_NAME ("CCX_TAG")
 +
++typedef enum CcxTagVersionTag
++{
++    CCX_TAG_VERSION = 1
++}CcxTagVersion;
++
 +/* Netlink Attributes */
 +typedef enum CcxTagAttrTypeTag
 +{
@@ -270,8 +277,6 @@ index 000000000000..b0b337c4ec47
 + * Unspecified
 + *  - MPDU footer, added by firmware
 + */
-+
-+
 +typedef struct CcxTagControlDataTag
 +{
 +    /* The size of the packed control data header in the IPC message. */
@@ -290,24 +295,31 @@ index 000000000000..b0b337c4ec47
 +    /* RawByteBuffer[Offset] |= Channel                                  */
 +    uint16_t ChannelOffsetOctets;
 +
++    /* The size of the MPDU header section in the IPC message. */
++    uint16_t MpduHeaderBlockSize;
++
 +    /* The size of the packed MPDU header in the IPC message. */
 +    uint16_t MpduHeaderSize;
 +
++    /* The size of the CCX Tag content header section in the IPC message. */
++    uint16_t ContentHeaderBlockSize;
++
 +    /* The size of the packed CCX Tag content header in the IPC message. */
 +    uint16_t ContentHeaderSize;
 +
++    /* The size of the CCX Tag content payload block in the IPC message. */
++    uint16_t ContentPayloadBlockSize;
++
 +    /* The size of the packed CCX Tag content payload in the IPC message. */
 +    uint16_t ContentPayloadSize;
++
++    /* This field is unused. */
++    uint16_t Pad;
 +}CcxTagControlData;
 +
-+#define CCX_TAG_CHANNEL_OFFSET (35)
++#define CCX_TAG_CHANNEL_OFFSET (32)
 +#define CCX_TAG_FRAGMENT_OFFSET (22)
 +
-+typedef enum CcxTagVersionTag
-+{
-+    CCX_TAG_VERSION = 1
-+}CcxTagVersion;
-+
 +typedef enum CcxTagMacLengthTag
 +{
 +    CCX_TAG_MAC_LENGTH = 6
@@ -382,21 +394,39 @@ index 000000000000..b0b337c4ec47
 +{
 +    CCX_TAG_MPDU_HEADER_SIZE = 30,
 +
-+    CCX_TAG_CONTENT_MAX_SIZE = 2312,
++    CCX_TAG_MPDU_HEADER_PAD_SIZE = 2,
++
++	CCX_TAG_MPDU_HEADER_BLOCK_SIZE = (CCX_TAG_MPDU_HEADER_SIZE + CCX_TAG_MPDU_HEADER_PAD_SIZE),
++
++	// The CCX specification calls for a content section (header and payload)
++	// of up to 2312 bytes.  This is unachievable due to memory constraints
++	// in the driver at the bus/transport layer.
++    CCX_TAG_CONTENT_THEORETICAL_MAX_SIZE = 2312,
++
++	// This implementation uses a max content length of 460 bytes.
++    CCX_TAG_CONTENT_MAX_SIZE = 460,
 +
 +    CCX_TAG_CONTENT_HEADER_SIZE = 5,
 +
++    CCX_TAG_CONTENT_HEADER_PAD_SIZE = 3,
++
++	CCX_TAG_CONTENT_HEADER_BLOCK_SIZE = (CCX_TAG_CONTENT_HEADER_SIZE + CCX_TAG_CONTENT_HEADER_PAD_SIZE),
++
 +    CCX_TAG_CONTENT_PAYLOAD_MAX_SIZE = (CCX_TAG_CONTENT_MAX_SIZE - CCX_TAG_CONTENT_HEADER_SIZE),
 +
++	CCX_TAG_CONTENT_PAYLOAD_MAX_PAD_SIZE = 1,
++
++	CCX_TAG_CONTENT_PAYLOAD_MAX_BLOCK_SIZE = (CCX_TAG_CONTENT_PAYLOAD_MAX_SIZE + CCX_TAG_CONTENT_PAYLOAD_MAX_PAD_SIZE),
++
 +    CCX_TAG_PACKET_MIN_SIZE = (CCX_TAG_MPDU_HEADER_SIZE + CCX_TAG_CONTENT_HEADER_SIZE),
 +
 +    CCX_TAG_PACKET_MAX_SIZE = (CCX_TAG_MPDU_HEADER_SIZE + CCX_TAG_CONTENT_HEADER_SIZE + CCX_TAG_CONTENT_PAYLOAD_MAX_SIZE),
 +
 +    CCX_TAG_CONTROL_DATA_SIZE = sizeof(CcxTagControlData),
 +
-+    CCX_TAG_IPC_MSG_MIN_SIZE = (CCX_TAG_PACKET_MIN_SIZE + CCX_TAG_CONTROL_DATA_SIZE),
++    CCX_TAG_IPC_MSG_MIN_SIZE = (CCX_TAG_CONTROL_DATA_SIZE + CCX_TAG_MPDU_HEADER_BLOCK_SIZE + CCX_TAG_CONTENT_HEADER_BLOCK_SIZE),
 +
-+    CCX_TAG_IPC_MSG_MAX_SIZE = (CCX_TAG_PACKET_MAX_SIZE + CCX_TAG_CONTROL_DATA_SIZE)
++    CCX_TAG_IPC_MSG_MAX_SIZE = (CCX_TAG_IPC_MSG_MIN_SIZE + CCX_TAG_CONTENT_PAYLOAD_MAX_BLOCK_SIZE)
 +}CcxTagDimension;
 +
 +typedef struct CcxTagStatusDataTag
@@ -427,7 +457,7 @@ index 000000000000..b0b337c4ec47
 +#endif /* CCX_TAG_DEFS_H_ */
 diff --git a/CORE/HDD/inc/wlan_hdd_ccx_tag.h b/CORE/HDD/inc/wlan_hdd_ccx_tag.h
 new file mode 100644
-index 000000000000..edc29332a2c0
+index 000000000..edc29332a
 --- /dev/null
 +++ b/CORE/HDD/inc/wlan_hdd_ccx_tag.h
 @@ -0,0 +1,19 @@
@@ -452,10 +482,10 @@ index 000000000000..edc29332a2c0
 +
 diff --git a/CORE/HDD/src/wlan_hdd_ccx_tag.c b/CORE/HDD/src/wlan_hdd_ccx_tag.c
 new file mode 100644
-index 000000000000..03697601bcb0
+index 000000000..cbcb7294b
 --- /dev/null
 +++ b/CORE/HDD/src/wlan_hdd_ccx_tag.c
-@@ -0,0 +1,833 @@
+@@ -0,0 +1,880 @@
 +/****************************************************************/
 +/*                                                              */
 +/* Copyright 2018 Digi International, Inc. All Rights Reserved. */
@@ -481,6 +511,8 @@ index 000000000000..03697601bcb0
 +
 +#include "CcxTagDefs.h"
 +
++#define CCX_TAG_DEBUG 1
++
 +static struct hdd_context_s *pHddCtx;
 +
 +static uint32_t HDD_CCX_TAG_DRVR_VERSION = 1;
@@ -499,7 +531,7 @@ index 000000000000..03697601bcb0
 +static int ccx_tag_status_cmd_handler(struct sk_buff *skb, struct genl_info *info);
 +
 +/* attribute policy */
-+static struct nla_policy ccx_tag_genl_policy[CCX_TAG_ATTR_COUNT] =
++static struct nla_policy const ccx_tag_genl_policy[CCX_TAG_ATTR_COUNT] =
 +{
 +	/* Reserved position of 0. */
 +	[CCX_TAG_ATTR_UNUSED] = { .type = NLA_STRING },
@@ -524,29 +556,33 @@ index 000000000000..03697601bcb0
 +};
 +
 +/* operation definition */
-+static struct genl_ops ccx_tag_gnl_ops_table[CCX_TAG_CMD_COUNT] =
++static struct genl_ops const ccx_tag_gnl_ops_table[CCX_TAG_CMD_COUNT] =
 +{
 +	{
 +		.cmd = CCX_TAG_CMD_CHECK_VERSION,
 +		.flags = 0,
++		.policy = ccx_tag_genl_policy,
 +		.doit = ccx_tag_check_version_cmd_handler,
 +		.dumpit = NULL,
 +	},
 +	{
 +		.cmd = CCX_TAG_CMD_RESET,
 +		.flags = 0,
++		.policy = ccx_tag_genl_policy,
 +		.doit = ccx_tag_reset_cmd_handler,
 +		.dumpit = NULL,
 +	},
 +	{
 +		.cmd = CCX_TAG_CMD_TRANSMIT,
 +		.flags = 0,
++		.policy = ccx_tag_genl_policy,
 +		.doit = ccx_tag_transmit_cmd_handler,
 +		.dumpit = NULL,
 +	},
 +	{
 +		.cmd = CCX_TAG_CMD_STATUS,
 +		.flags = 0,
++		.policy = ccx_tag_genl_policy,
 +		.doit = ccx_tag_status_cmd_handler,
 +		.dumpit = NULL,
 +	}
@@ -564,8 +600,9 @@ index 000000000000..03697601bcb0
 +      .n_ops	= ARRAY_SIZE(ccx_tag_gnl_ops_table),
 +};
 +
++#if CCX_TAG_DEBUG
 +
-+void RawBlockDisplay(uint8_t const * data, uint16_t length)
++void static RawBlockDisplay(uint8_t const * data, uint16_t length)
 +{
 +	uint16_t byte = 0;
 +
@@ -594,6 +631,28 @@ index 000000000000..03697601bcb0
 +	}
 +}
 +
++void static TagConfigDisplay(CcxTagMpduHeader const * MpduHeaderBuffer,
++							 uint16_t MpduHeaderBufferLength,
++							 CcxTagContentHeader const * ContentHeaderBuffer,
++							 uint16_t ContentHeaderBufferLength,
++							 uint8_t const * ContentPayloadBlock,
++							 uint16_t ContentPayloadBlockLength)
++{
++	printk(KERN_DEBUG "CCX Tag Header: \n");
++	RawBlockDisplay((uint8_t const *)MpduHeaderBuffer, MpduHeaderBufferLength);
++
++	printk(KERN_DEBUG "CCX Tag Content: \n");
++	RawBlockDisplay((uint8_t const *)ContentHeaderBuffer, ContentHeaderBufferLength);
++
++	if (ContentPayloadBlockLength > 0)
++	{
++		printk(KERN_DEBUG "CCX Tag Data: \n");
++		RawBlockDisplay(ContentPayloadBlock, ContentPayloadBlockLength);
++	}
++}
++
++#endif
++
 +static void SendAttrData(uint16_t cmd_type, uint16_t seq_num,
 +						 uint16_t rsp_type, CcxTagAttrType attr_type,
 +						 uint8_t const * msg_buf, uint16_t msg_len,
@@ -601,7 +660,6 @@ index 000000000000..03697601bcb0
 +{
 +	int flags = 0;
 +	int ret = 0;
-+	int status = 0;
 +	int has_attr = 0;
 +
 +	/* Allocate a message buffer. */
@@ -627,7 +685,7 @@ index 000000000000..03697601bcb0
 +	if (!skb)
 +	{
 +		/* Error - Socket buffer allocation failed. Abandon Send. */
-+		goto nla_put_failure;
++		goto nla_send_end;
 +	}
 +
 +	/* Set up the message header first.  Use the same       */
@@ -682,8 +740,6 @@ index 000000000000..03697601bcb0
 +	/* Send the message. */
 +	ret = genlmsg_unicast(genl_info_net(info), skb, info->snd_portid);
 +
-+	status = (ret == 0);
-+
 +	goto nla_send_end;
 +
 +nla_put_failure:
@@ -692,7 +748,6 @@ index 000000000000..03697601bcb0
 +	{
 +		nlmsg_free(skb);
 +	}
-+	status = 0;
 +
 +nla_send_end:
 +
@@ -721,7 +776,7 @@ index 000000000000..03697601bcb0
 +			else
 +			{
 +				/* Unexpected callback from firmware.  Report error. */
-+				hdd_ccx_tag_drvr_op_state = CCX_TAG_DRVR_OP_IDLE;
++				hdd_ccx_tag_drvr_op_state = CCX_TAG_DRVR_OP_STATE_UNDEFINED;
 +				hdd_ccx_tag_fw_status = CCX_TAG_FW_STATUS_ERROR;
 +				hdd_ccx_tag_fw_attempts = 0;
 +				hdd_ccx_tag_fw_failures = 0;
@@ -739,8 +794,6 @@ index 000000000000..03697601bcb0
 +    CcxTagWmiHeader * pCcxTagReqHeader = NULL;
 +    tANI_U32 reqLen = 0;
 +
-+    mutex_lock(&hdd_ccx_tag_mutex);
-+
 +    if ((NULL == pHeader) || ((pHeader->ContentPayloadLength > 0) && (NULL == pData)))
 +    {
 +        status = VOS_STATUS_E_INVAL;
@@ -762,6 +815,8 @@ index 000000000000..03697601bcb0
 +        u8 * pCcxTagReqPayload = (u8 *)&pCcxTagReqHeader[1];
 +        vos_msg_t msg;
 +
++        mutex_lock(&hdd_ccx_tag_mutex);
++
 +		vos_mem_set((u8*)(pCcxTagReqHeader), reqLen, 0);
 +
 +		/* Now copy over the information to the CCX Tag REQ to WMI message. */
@@ -781,9 +836,9 @@ index 000000000000..03697601bcb0
 +		{
 +			vos_mem_free(pCcxTagReqHeader);
 +		}
-+    }
 +
-+    mutex_unlock(&hdd_ccx_tag_mutex);
++	    mutex_unlock(&hdd_ccx_tag_mutex);
++    }
 +
 +    return status;
 +}
@@ -828,9 +883,9 @@ index 000000000000..03697601bcb0
 +		if (wma_handle != NULL)
 +		{
 +			status = wmi_unified_register_event_handler(
-+			   wma_handle->wmi_handle,
-+			   WMI_STA_TAG_PKT_INJ_COMP_EVENTID,
-+			   RecvCcxTagWmaRsp);
++				wma_handle->wmi_handle,
++				WMI_STA_TAG_PKT_INJ_COMP_EVENTID,
++				RecvCcxTagWmaRsp);
 +			if (status == 0)
 +			{
 +				ResetDriver();
@@ -878,24 +933,6 @@ index 000000000000..03697601bcb0
 +	return rc;
 +}
 +
-+void TagConfigDisplay(CcxTagMpduHeader const * MpduHeaderBuffer, uint16_t MpduHeaderBufferLength,
-+					  CcxTagContentHeader const * ContentHeaderBuffer, uint16_t ContentHeaderBufferLength,
-+					  uint8_t const * ContentPayloadBlock,
-+					  uint16_t ContentPayloadBlockLength)
-+{
-+	printk(KERN_DEBUG "CCX Tag Header: \n");
-+	RawBlockDisplay((uint8_t const *)MpduHeaderBuffer, MpduHeaderBufferLength);
-+
-+	printk(KERN_DEBUG "CCX Tag Content: \n");
-+	RawBlockDisplay((uint8_t const *)ContentHeaderBuffer, ContentHeaderBufferLength);
-+
-+	if (ContentPayloadBlockLength > 0)
-+	{
-+		printk(KERN_DEBUG "CCX Tag Data: \n");
-+		RawBlockDisplay(ContentPayloadBlock, ContentPayloadBlockLength);
-+	}
-+}
-+
 +/* Parse an attribute from the command.                */
 +/* The expected length is for each attribute is known, */
 +/* so simply fail if it doesn't match the actual.      */
@@ -934,7 +971,7 @@ index 000000000000..03697601bcb0
 +								uint16_t * cont_len)
 +{
 +	int parse_status = 0;
-+	uint8_t const * payload_data = NULL;
++	uint8_t const * payload_data = NULL; /* Payload for whole IPC Message. */
 +	uint32_t payload_len = 0;
 +
 +	if (attrs && (type == CCX_TAG_ATTR_TAG_COMMAND))
@@ -954,44 +991,84 @@ index 000000000000..03697601bcb0
 +		}
 +	}
 +
-+	if ((payload_data != NULL)
-+			&& (payload_len >= (CCX_TAG_CONTROL_DATA_SIZE + CCX_TAG_PACKET_MIN_SIZE)))
++	if ((payload_data != NULL) && (ctrl_data != NULL)
++			&& (mpdu_hdr != NULL) && (cont_hdr != NULL)
++			&& (cont_data != NULL) && (cont_len != NULL))
 +	{
-+		if ((ctrl_data != NULL) && (mpdu_hdr != NULL) && (cont_hdr != NULL)
-+				&& (cont_data != NULL) && (cont_len != NULL))
++		size_t tmp_len = 0;
++
++		parse_status = 1;
++
++		/* Length is always the first byte. */
++		tmp_len = *payload_data;
++		if ((tmp_len == sizeof(*ctrl_data))
++				&& (payload_len >= sizeof(*ctrl_data)))
 +		{
-+			size_t tmp_len = sizeof(CcxTagControlData);
 +			memcpy(ctrl_data, payload_data, tmp_len);
 +			payload_data = &payload_data[tmp_len];
 +			payload_len -= tmp_len;
++		}
++		else
++		{
++			parse_status = 0;
++		}
 +
-+			tmp_len = sizeof(CcxTagMpduHeader);
-+			memcpy(mpdu_hdr, payload_data, tmp_len);
-+			payload_data = &payload_data[tmp_len];
-+			payload_len -= tmp_len;
++		if ((parse_status)
++				&& (ctrl_data->MpduHeaderSize <= ctrl_data->MpduHeaderBlockSize)
++				&& (ctrl_data->MpduHeaderSize >= sizeof(*mpdu_hdr))
++				&& (ctrl_data->MpduHeaderBlockSize <= payload_len))
++		{
 +
-+			tmp_len = sizeof(CcxTagContentHeader);
-+			memcpy(cont_hdr, payload_data, tmp_len);
-+			payload_data = &payload_data[tmp_len];
-+			payload_len -= tmp_len;
++			memcpy(mpdu_hdr, payload_data, sizeof(*mpdu_hdr));
++			payload_data = &payload_data[ctrl_data->MpduHeaderBlockSize];
++			payload_len -= ctrl_data->MpduHeaderBlockSize;
++		}
++		else
++		{
++			parse_status = 0;
++		}
 +
-+			*cont_len = payload_len;
-+			if (payload_len > 0)
++		if ((parse_status)
++				&& (ctrl_data->ContentHeaderSize <= ctrl_data->ContentHeaderBlockSize)
++				&& (ctrl_data->ContentHeaderSize >= sizeof(*cont_hdr))
++				&& (ctrl_data->ContentHeaderBlockSize <= payload_len))
++		{
++
++			memcpy(cont_hdr, payload_data, sizeof(*cont_hdr));
++			payload_data = &payload_data[ctrl_data->ContentHeaderBlockSize];
++			payload_len -= ctrl_data->ContentHeaderBlockSize;
++		}
++		else
++		{
++			parse_status = 0;
++		}
++
++		if ((parse_status)
++				&& (ctrl_data->ContentPayloadSize <= ctrl_data->ContentPayloadBlockSize)
++				&& (ctrl_data->ContentPayloadBlockSize <= payload_len))
++		{
++			*cont_len = ctrl_data->ContentPayloadSize;
++			if (ctrl_data->ContentPayloadSize > 0)
 +			{
 +				*cont_data = payload_data;
 +			}
-+
-+			if (1)
++			else
 +			{
-+				printk(KERN_DEBUG "Kernel Cfg - Frag: %u Chan: %u \n",
-+						ctrl_data->FragmentOffsetOctets, ctrl_data->ChannelOffsetOctets);
-+
-+				TagConfigDisplay(mpdu_hdr, ctrl_data->MpduHeaderSize,
-+								 cont_hdr, ctrl_data->ContentHeaderSize,
-+								 *cont_data, ctrl_data->ContentPayloadSize);
++				*cont_data = NULL;
 +			}
 +
-+			parse_status = 1;
++#if CCX_TAG_DEBUG
++			printk(KERN_DEBUG "Kernel Cfg - Frag: %u Chan: %u \n",
++			       ctrl_data->FragmentOffsetOctets, ctrl_data->ChannelOffsetOctets);
++
++			TagConfigDisplay(mpdu_hdr, ctrl_data->MpduHeaderSize,
++							 cont_hdr, ctrl_data->ContentHeaderSize,
++							 *cont_data, ctrl_data->ContentPayloadSize);
++#endif
++		}
++		else
++		{
++			parse_status = 0;
 +		}
 +	}
 +
@@ -1169,7 +1246,6 @@ index 000000000000..03697601bcb0
 +			{
 +				rsp_err = CCX_TAG_DRVR_RSP_ERR_OFFSET_OVERRUN;
 +			}
-+
 +		}
 +	}
 +
@@ -1262,12 +1338,13 @@ index 000000000000..03697601bcb0
 +	if (rsp_err == CCX_TAG_DRVR_RSP_OK)
 +	{
 +	    mutex_lock(&hdd_ccx_tag_mutex);
-+		status.DriverOpState = hdd_ccx_tag_drvr_op_state;
-+	    mutex_unlock(&hdd_ccx_tag_mutex);
 +
++	    status.DriverOpState = hdd_ccx_tag_drvr_op_state;
 +		status.FirmwareStatus = hdd_ccx_tag_fw_status;
 +		status.AttemptCount = hdd_ccx_tag_fw_attempts;
 +		status.FailureCount = hdd_ccx_tag_fw_failures;
++
++	    mutex_unlock(&hdd_ccx_tag_mutex);
 +	}
 +	else
 +	{
@@ -1290,7 +1367,7 @@ index 000000000000..03697601bcb0
 +
 +#endif
 diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
-index 05600538cda5..4d21d850a22e 100644
+index 05600538c..4d21d850a 100644
 --- a/CORE/HDD/src/wlan_hdd_main.c
 +++ b/CORE/HDD/src/wlan_hdd_main.c
 @@ -71,6 +71,9 @@
@@ -1335,7 +1412,7 @@ index 05600538cda5..4d21d850a22e 100644
     if (cnss_diag_activate_service() < 0)
     {
 diff --git a/CORE/MAC/inc/aniGlobal.h b/CORE/MAC/inc/aniGlobal.h
-index cf78093490f5..2f1677fa5168 100644
+index cf7809349..2f1677fa5 100644
 --- a/CORE/MAC/inc/aniGlobal.h
 +++ b/CORE/MAC/inc/aniGlobal.h
 @@ -74,6 +74,10 @@
@@ -1350,7 +1427,7 @@ index cf78093490f5..2f1677fa5168 100644
  #include "smeRrmInternal.h"
  #include "rrmGlobal.h"
 diff --git a/CORE/MAC/inc/qwlan_version.h b/CORE/MAC/inc/qwlan_version.h
-index 5d5ee0c2124f..ec245797b79b 100644
+index 5d5ee0c21..ec245797b 100644
 --- a/CORE/MAC/inc/qwlan_version.h
 +++ b/CORE/MAC/inc/qwlan_version.h
 @@ -44,8 +44,7 @@ BRIEF DESCRIPTION:
@@ -1364,7 +1441,7 @@ index 5d5ee0c2124f..ec245797b79b 100644
  #define AR6320_REV1_VERSION             0x5000000
  #define AR6320_REV1_1_VERSION           0x5000001
 diff --git a/CORE/MAC/src/include/sirParams.h b/CORE/MAC/src/include/sirParams.h
-index 67eb0eab64c4..97d2194d31c4 100644
+index 67eb0eab6..97d2194d3 100644
 --- a/CORE/MAC/src/include/sirParams.h
 +++ b/CORE/MAC/src/include/sirParams.h
 @@ -823,6 +823,12 @@ struct sir_mgmt_msg {
@@ -1381,7 +1458,7 @@ index 67eb0eab64c4..97d2194d31c4 100644
  
  // CFG message types
 diff --git a/CORE/SERVICES/COMMON/wmi_tlv_defs.h b/CORE/SERVICES/COMMON/wmi_tlv_defs.h
-index 3215790ac023..fb4ee7298086 100644
+index 3215790ac..fb4ee7298 100644
 --- a/CORE/SERVICES/COMMON/wmi_tlv_defs.h
 +++ b/CORE/SERVICES/COMMON/wmi_tlv_defs.h
 @@ -958,6 +958,11 @@ typedef enum {
@@ -1435,7 +1512,7 @@ index 3215790ac023..fb4ee7298086 100644
  }
  #endif
 diff --git a/CORE/SERVICES/COMMON/wmi_unified.h b/CORE/SERVICES/COMMON/wmi_unified.h
-index 2332e8711a9d..a8070b2d7cc9 100644
+index 2332e8711..a8070b2d7 100644
 --- a/CORE/SERVICES/COMMON/wmi_unified.h
 +++ b/CORE/SERVICES/COMMON/wmi_unified.h
 @@ -250,13 +250,14 @@ typedef enum {
@@ -1548,10 +1625,10 @@ index 2332e8711a9d..a8070b2d7cc9 100644
      A_UINT32 tlv_header;  /* TLV tag and len; tag equals WMITLV_TAG_STRUC_wmi_vdev_get_mws_coex_tdm_state_fixed_param */
      A_UINT32 vdev_id;
 diff --git a/CORE/SERVICES/WMA/wma.c b/CORE/SERVICES/WMA/wma.c
-index be13660667c7..337ae97be0a1 100644
+index be1366066..052673f63 100644
 --- a/CORE/SERVICES/WMA/wma.c
 +++ b/CORE/SERVICES/WMA/wma.c
-@@ -30227,6 +30227,77 @@ VOS_STATUS wma_ProcessAddPeriodicTxPtrnInd(WMA_HANDLE handle,
+@@ -30227,6 +30227,79 @@ VOS_STATUS wma_ProcessAddPeriodicTxPtrnInd(WMA_HANDLE handle,
  	return VOS_STATUS_SUCCESS;
  }
  
@@ -1565,14 +1642,16 @@ index be13660667c7..337ae97be0a1 100644
 +	{
 +
 +		uint8_t * ccxTagReqPayload = (uint8_t *)&ccxTagReqHeader[1];
-+		uint32_t packet_size = sizeof(ccxTagReqHeader->MpduHeader)
-+									+ sizeof(ccxTagReqHeader->ContentHeader)
++		uint32_t packet_size = CCX_TAG_MPDU_HEADER_SIZE
++									+ CCX_TAG_CONTENT_HEADER_SIZE
 +									+ ccxTagReqHeader->ContentPayloadLength;
 +		uint32_t packet_size_aligned = roundup(packet_size, sizeof(A_UINT32));
 +		uint32_t len = sizeof(wmi_sta_tag_pkt_injection_cmd_fixed_param) +
 +								WMI_TLV_HDR_SIZE + packet_size_aligned;
++		wmi_buf_t wmi_buf = NULL;
++
++		wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, len);
 +
-+		wmi_buf_t wmi_buf = wmi_buf_alloc(wma_handle->wmi_handle, len);
 +		if (wmi_buf != NULL)
 +		{
 +			int ret = 0;
@@ -1602,12 +1681,12 @@ index be13660667c7..337ae97be0a1 100644
 +
 +			/*Copy the data packet segments after TLV Header*/
 +			vos_mem_copy(buf_ptr, &ccxTagReqHeader->MpduHeader,
-+						 sizeof(ccxTagReqHeader->MpduHeader));
-+			buf_ptr +=  sizeof(ccxTagReqHeader->MpduHeader);
++						 CCX_TAG_MPDU_HEADER_SIZE);
++			buf_ptr += CCX_TAG_MPDU_HEADER_SIZE;
 +
 +			vos_mem_copy(buf_ptr, &ccxTagReqHeader->ContentHeader,
-+						 sizeof(ccxTagReqHeader->ContentHeader));
-+			buf_ptr +=  sizeof(ccxTagReqHeader->ContentHeader);
++						 CCX_TAG_CONTENT_HEADER_SIZE);
++			buf_ptr += CCX_TAG_CONTENT_HEADER_SIZE;
 +
 +			vos_mem_copy(buf_ptr, ccxTagReqPayload, ccxTagReqHeader->ContentPayloadLength);
 +			buf_ptr +=  ccxTagReqHeader->ContentPayloadLength;
@@ -1629,7 +1708,7 @@ index be13660667c7..337ae97be0a1 100644
  /*
   * FUNCTION: wma_ProcessDelPeriodicTxPtrnInd
   * WMI command sent to firmware to del patterns
-@@ -35469,6 +35540,15 @@ VOS_STATUS wma_mc_process_msg(v_VOID_t *vos_context, vos_msg_t *msg)
+@@ -35469,6 +35542,15 @@ VOS_STATUS wma_mc_process_msg(v_VOID_t *vos_context, vos_msg_t *msg)
  					(u_int32_t *)msg->bodyptr);
  			vos_mem_free(msg->bodyptr);
  			break;
@@ -1646,7 +1725,7 @@ index be13660667c7..337ae97be0a1 100644
  			wma_send_echo_request(wma_handle);
  			break;
 diff --git a/CORE/SERVICES/WMI/wmi_unified.c b/CORE/SERVICES/WMI/wmi_unified.c
-index f25b7966e22e..40c2ceb4234b 100644
+index f25b7966e..40c2ceb42 100644
 --- a/CORE/SERVICES/WMI/wmi_unified.c
 +++ b/CORE/SERVICES/WMI/wmi_unified.c
 @@ -811,6 +811,9 @@ static u_int8_t* get_wmi_cmd_string(WMI_CMD_ID wmi_command)
@@ -1660,7 +1739,7 @@ index f25b7966e22e..40c2ceb4234b 100644
  	return "Invalid WMI cmd";
  }
 diff --git a/Kbuild b/Kbuild
-index fdad10c753a3..1ff42e6dedd4 100644
+index fdad10c75..1ff42e6de 100644
 --- a/Kbuild
 +++ b/Kbuild
 @@ -447,6 +447,7 @@ HDD_INC := 	-I$(WLAN_ROOT)/$(HDD_INC_DIR) \
@@ -1679,3 +1758,5 @@ index fdad10c753a3..1ff42e6dedd4 100644
  		-DSOFTAP_CHANNEL_RANGE \
  		-DWLAN_AP_STA_CONCURRENCY \
  		-DFEATURE_WLAN_SCAN_PNO \
+
+

From 222a91f213e7d7e201f389fe3773f5f3f3a10c0a Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Thu, 23 Mar 2023 14:12:34 +0100
Subject: [PATCH 11/29] libubootenv: add fall-back function to read HWID from
 nvmem

The HWID is populated on the device tree by the boot loader.
This can be used as a key modifier when encrypting the U-Boot
environment. Some old U-Boot versions however, did not populate
the HWID on the device tree. When updating firmware from an
old version to a new one, the library may not be able to read
the HWID from the DT and then be unable to unencrypt the
environment.

This patch implements a fall-back function to read the HWID
directly from the nvmem node (sysfs). Implementation has been
done for ccimx6 family only, where this case of old U-Boot
can happen.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>

https://onedigi.atlassian.net/browse/DEL-8444
---
 ...d-HWID-from-nvmem-device-if-not-avai.patch | 105 ++++++++++++++++++
 .../libubootenv/libubootenv_%.bbappend        |   3 +-
 2 files changed, 107 insertions(+), 1 deletion(-)
 create mode 100644 meta-digi-arm/recipes-bsp/libubootenv/libubootenv/0004-fall-back-to-read-HWID-from-nvmem-device-if-not-avai.patch

diff --git a/meta-digi-arm/recipes-bsp/libubootenv/libubootenv/0004-fall-back-to-read-HWID-from-nvmem-device-if-not-avai.patch b/meta-digi-arm/recipes-bsp/libubootenv/libubootenv/0004-fall-back-to-read-HWID-from-nvmem-device-if-not-avai.patch
new file mode 100644
index 000000000..08cb1ab43
--- /dev/null
+++ b/meta-digi-arm/recipes-bsp/libubootenv/libubootenv/0004-fall-back-to-read-HWID-from-nvmem-device-if-not-avai.patch
@@ -0,0 +1,105 @@
+From: Hector Palacios <hector.palacios@digi.com>
+Date: Mon, 3 Apr 2023 18:21:07 +0200
+Subject: [PATCH] fall back to read HWID from nvmem device if not available on
+ DT
+
+Old U-Boot versions don't populate the HWID on the device tree. This may
+be used as a key modifier for TrustFence encryption and, if not available
+on the DT, newer firmware may be unable to unencrypt the U-Boot
+environment.
+
+This patch implements a fall-back function to query the HWID directly from
+the nvmem device node if it cannot locate it at the DT.
+This is only implemented for ccimx6 family, which may be in the case of
+having an old U-Boot.
+
+Signed-off-by: Hector Palacios <hector.palacios@digi.com>
+
+https://onedigi.atlassian.net/browse/DEL-8444
+---
+ src/uboot_env.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 52 insertions(+), 2 deletions(-)
+
+diff --git a/src/uboot_env.c b/src/uboot_env.c
+index 539e22f9a8ac..86f9b9ebfec2 100644
+--- a/src/uboot_env.c
++++ b/src/uboot_env.c
+@@ -945,6 +945,32 @@ static int is_env_encrypted(void)
+ 	return access(dt_prop, F_OK) != -1;
+ }
+
++/* Function that checks if machine is compatible (on the DT) */
++static bool machine_is_compatible(char *machine)
++{
++	int fd, nchars, len = 0;
++	int ret = false;
++	char str[256];
++	char *p = str;
++
++	fd = open("/proc/device-tree/compatible", O_RDONLY);
++	if (fd < 0)
++		return false;
++
++	nchars = read(fd, str, 255);
++	while (len < nchars) {
++		if (!strcmp(p, machine)) {
++			ret = true;
++			break;
++		}
++		len += strlen(p) + 1;
++		p += strlen(p) + 1;
++	}
++
++	close(fd);
++	return ret;
++}
++
+ #define MAX_HWID_WORDS		4
+ static int env_caam_get_keymod(unsigned char output[16])
+ {
+@@ -953,12 +979,11 @@ static int env_caam_get_keymod(unsigned char output[16])
+ 	int fd;
+ 	uint32_t ocotp_hwid[MAX_HWID_WORDS];
+ 	char dt_prop[32];
++	char buf[sizeof(uint32_t)];
+
+ 	for (i = 0; i < MAX_HWID_WORDS; i++) {
+ 		sprintf(dt_prop, "/proc/device-tree/digi,hwid_%d", i);
+ 		if (access(dt_prop, F_OK) != -1) {
+-			char buf[sizeof(uint32_t)];
+-
+ 			fd = open(dt_prop, O_RDONLY);
+ 			if (fd < 0)
+ 				return fd;
+@@ -969,6 +994,31 @@ static int env_caam_get_keymod(unsigned char output[16])
+ 			}
+ 			ocotp_hwid[i] = ntohl(*(uint32_t *)buf);
+ 			close(fd);
++		} else if (machine_is_compatible("digi,ccimx6ul") ||
++			   machine_is_compatible("digi,ccimx6")) {
++			/*
++			 * If HWID not available on the DT (old U-Boot version),
++			 * fall back to read it directly from the nvmem device.
++			 */
++			int hwid_offset = 136;	/* (Bank * 8 + Word) * 4 */
++
++			/* HWID for CC6 family only has two words */
++			if (i == 2)
++				break;
++
++			fd = open("/sys/bus/nvmem/devices/imx-ocotp0/nvmem",
++				  O_RDONLY);
++			if (fd < 0)
++				return fd;
++			len = lseek(fd, hwid_offset + i * 4, SEEK_SET);
++
++			len = read(fd, buf, sizeof(unsigned int));
++			if (len < 0) {
++				close(fd);
++				return -1;
++			}
++			ocotp_hwid[i] = *(unsigned int *)buf;
++			close(fd);
+ 		} else {
+ 			break;
+ 		}
diff --git a/meta-digi-arm/recipes-bsp/libubootenv/libubootenv_%.bbappend b/meta-digi-arm/recipes-bsp/libubootenv/libubootenv_%.bbappend
index 8076b29bd..5ee54cb84 100644
--- a/meta-digi-arm/recipes-bsp/libubootenv/libubootenv_%.bbappend
+++ b/meta-digi-arm/recipes-bsp/libubootenv/libubootenv_%.bbappend
@@ -1,4 +1,4 @@
-# Copyright (C) 2021, Digi International Inc.
+# Copyright (C) 2021-2023 Digi International Inc.
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
@@ -18,6 +18,7 @@ SRC_URI += " \
     file://0001-Implement-support-for-environment-encryption-by-CAAM.patch \
     file://0002-Implement-U-Boot-environment-access-functions.patch \
     file://0003-tools-env-add-support-to-set-dynamic-location-of-env.patch \
+    file://0004-fall-back-to-read-HWID-from-nvmem-device-if-not-avai.patch \
 "
 
 do_install:append() {

From 44ad42551abeed7e108ec3d41f8f6fd1341a4a52 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Mon, 17 Apr 2023 13:05:37 +0200
Subject: [PATCH 12/29] cryptoauthlib: use digi-embedded github mirror

The commit we use to build the cryotpauthlib package is currently not part of
any branches or tags in the original MicrochipTech repo. To make sure the
package can always be built, use our mirror of the repo, which includes an
additional branch for the specific commit.

While at it, move the "nobranch=1" parameter to the GIT_URI variable, since
we're putting all other git parameters there, anyway. Also, remove the "branch"
parameter because it isn't needed in this case.

https://onedigi.atlassian.net/browse/DEL-8015

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 meta-digi-arm/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-digi-arm/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb b/meta-digi-arm/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb
index 0567b41f6..ba76662dd 100644
--- a/meta-digi-arm/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb
+++ b/meta-digi-arm/recipes-digi/cryptoauthlib/cryptoauthlib_git.bb
@@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://license.txt;md5=84f2905dc39d2f8cdffb00af6f9e6d4e"
 
 SRCREV = "a0007d2f6c42fddab5dca1575e0f404788829ddc"
 
-GIT_URI ?= "git://github.com/MicrochipTech/cryptoauthlib.git;protocol=https;branch=master"
+GIT_URI ?= "git://github.com/digi-embedded/cryptoauthlib.git;protocol=https;nobranch=1"
 
 SRC_URI = " \
-    ${GIT_URI};nobranch=1 \
+    ${GIT_URI} \
     file://0001-lib-add-parameters-to-be-able-to-modify-default-I2C-.patch \
     file://0002-lib-apply-library-version-number-to-CMake-VERSION-pr.patch \
     file://0003-pkcs11-rename-template-configuration-file-to-its-int.patch \

From 37b8f89913524a427331b55329d6d1f5180446b3 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Tue, 9 May 2023 15:44:37 +0200
Subject: [PATCH 13/29] packagegroup-qt6-dey: remove qtquick3d-dev

This package was inadvertantly pulling in a lot of dependencies into our
images that make use of Qt6. Most of these packages consisted of *-dev
packages, which are only useful for development with the SDK.

Remove this package along with its dependencies to significantly reduce the
dey-image-qt rootfs image size.

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 .../NXP/recipes-fsl/packagegroup/packagegroup-qt6-dey.bb        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-fsl/packagegroup/packagegroup-qt6-dey.bb b/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-fsl/packagegroup/packagegroup-qt6-dey.bb
index 9f98544a4..d839fab74 100644
--- a/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-fsl/packagegroup/packagegroup-qt6-dey.bb
+++ b/meta-digi-dey/dynamic-layers/qt6-layer/NXP/recipes-fsl/packagegroup/packagegroup-qt6-dey.bb
@@ -16,7 +16,7 @@ QT6_IMAGE_INSTALL_APPS = ""
 QT6_FONTS = "ttf-dejavu-common ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-serif "
 
 # Install qtquick3d
-QT6_QTQUICK3D = "qtquick3d qtquick3d-dev qtquick3d-examples"
+QT6_QTQUICK3D = "qtquick3d qtquick3d-examples"
 
 QT6_IMAGE_INSTALL = ""
 QT6_IMAGE_INSTALL_common = " \

From 78eef642a055de8f714c81a437f3d4adc260c0c0 Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Thu, 11 May 2023 14:08:10 +0200
Subject: [PATCH 14/29] README: dey-4.0-r3 release notes

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
---
 README.md | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index dda0ee0c6..de10c05e0 100644
--- a/README.md
+++ b/README.md
@@ -21,18 +21,24 @@ OS versions:
 
 Software for the following hardware platforms is in production support:
 
+## ConnectCore 93
+* ConnectCore 93 System-on-Module (SOM)
+  * [CC-WMX-YC7D-KN](https://www.digi.com/products/models/cc-wmx-yc7d-kn)
+* ConnectCore 93 Development Kit (DVK)
+  * [CC-WMX93-KIT](https://www.digi.com/products/models/cc-wmx93-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/4.0/cc93/yocto-gs_index))
+
 ## ConnectCore MP13
 * ConnectCore MP13 System-on-Module (SOM)
   * [CC-WST-DX58-NK](https://www.digi.com/products/models/cc-wst-dx58-nk)
   * [CC-ST-DX58-ZK](https://www.digi.com/products/models/cc-st-dx58-zk)
-* ConnectCore MP13 DVK
+* ConnectCore MP13 Development Kit (DVK)
   * [CC-WMP133-KIT](https://www.digi.com/products/models/cc-wmp133-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/4.0/ccmp13/yocto-gs_index))
 
 ## ConnectCore MP15
 * ConnectCore MP15 System-on-Module (SOM)
   * [CC-WST-DW69-NM](https://www.digi.com/products/models/cc-wst-dw69-nm)
   * [CC-ST-DW69-ZM](https://www.digi.com/products/models/cc-st-dw69-zm)
-* ConnectCore MP15 DVK
+* ConnectCore MP15 Development Kit (DVK)
   * [CC-WMP157-KIT](https://www.digi.com/products/models/cc-wmp157-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/4.0/ccmp15/yocto-gs_index))
 
 ## ConnectCore 8M Mini
@@ -41,7 +47,7 @@ Software for the following hardware platforms is in production support:
   * [CC-WMX-ET7D-NN](https://www.digi.com/products/models/cc-wmx-et7d-nn)
   * [CC-MX-ET8D-ZN](https://www.digi.com/products/models/cc-mx-et8d-zn)
   * [CC-MX-ET7D-ZN](https://www.digi.com/products/models/cc-mx-et7d-zn)
-* ConnectCore 8M Mini Development Kit
+* ConnectCore 8M Mini Development Kit (DVK)
   * [CC-WMX8MM-KIT](https://www.digi.com/products/models/cc-wmx8mm-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/4.0/cc8mmini/yocto-gs_index))
 
 ## ConnectCore 8M Nano
@@ -50,7 +56,7 @@ Software for the following hardware platforms is in production support:
   * [CC-WMX-FR6D-NN](https://www.digi.com/products/models/cc-wmx-fr6d-nn)
   * [CC-MX-FS7D-ZN](https://www.digi.com/products/models/cc-mx-fs7d-zn)
   * [CC-MX-FR6D-ZN](https://www.digi.com/products/models/cc-mx-fr6d-zn)
-* ConnectCore 8M Nano Development Kit
+* ConnectCore 8M Nano Development Kit (DVK)
   * [CC-WMX8MN-KIT](https://www.digi.com/products/models/cc-wmx8mn-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/4.0/cc8mnano/yocto-gs_index))
 
 ## ConnectCore 6UL
@@ -86,6 +92,26 @@ Documentation is available online at https://www.digi.com/resources/documentatio
 
 # Release Changelog
 
+## 4.0-r3
+
+* ST-based platforms
+  * Added initial TrustFence support
+  * Fixed Ethernet PHY pinctrl resuming from deep sleep
+  * Adjust CAN bus parent clock to achieve more accurate baudrates
+  * Add DT overlay for Bluetooth raw test mode
+  * Adjust NAND lines speed settings
+  * Add specific kernel driver for Marvell Ethernet PHY on DVK
+  * Fix race condition on bringup of LAN87xx Ethernet PHY
+  * Disable auto-mount of microSD card to avoid race condition on kernel boot
+* NXP-based platforms
+  * Added support to ConnectCore 93
+    * U-Boot v2022.04 (based on tag 'lf-5.15.71-2.2.0' by NXP)
+    * Linux kernel v5.15.71 (based on tag 'lf-5.15.71-2.2.0' by NXP)
+    * QT6 6.3.2
+  * Fix PMIC regulators suspend state on ConnectCore 8M Nano
+  * Fix clock initialization issue on LAN8710/20 PHY on ConnectCore 6UL
+* General bug fixing and improvements
+
 ## 4.0-r2
 
 * Added webkit support

From dc2298625d70b945669891e7018df5edcf5feaeb Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Thu, 11 May 2023 22:57:54 +0200
Subject: [PATCH 15/29] switch to building from maintenance branches for
 dey-4.0-r3

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.04.bb          | 2 +-
 meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.04.bb
index 4b2e21d26..2ac814261 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.04.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
 
 DEPENDS += "flex-native bison-native"
 
-SRCBRANCH = "v2022.04/master"
+SRCBRANCH = "v2022.04/maint"
 SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(ccimx93)"
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 de09db48a..0f2a30aaf 100644
--- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc
+++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc
@@ -4,7 +4,7 @@ SUMMARY = "TrustFence signing and encryption scripts"
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
 
-SRCBRANCH = "v2020.04/master"
+SRCBRANCH = "v2020.04/maint"
 SRCREV = "${AUTOREV}"
 
 S = "${WORKDIR}"

From d780711b17200d684315096ec16cf50ba95f8350 Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Thu, 11 May 2023 22:58:31 +0200
Subject: [PATCH 16/29] meta-digi: update revisions for dey-4.0-r3.1

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 .../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_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.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-src.inc          | 2 +-
 meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb          | 4 ++--
 .../python3-connectcore-ble/python3-connectcore-ble_git.bb    | 4 ++--
 .../recipes-digi/cloudconnector/cloudconnector_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 ++--
 14 files changed, 23 insertions(+), 23 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 a61ec3710..35b476083 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 = "${AUTOREV}"
+SRCREV = "4acf648b812ab2522cf45c5819bff6a250539b10"
 
 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-security/optee/optee-os-stm32mp_%.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend
index ec8bc733a..dc3342560 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,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 = "fcaacab87652f68dad6e007ed9b18fd113bfcac1"
 
 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 6970a6a3a..bbe400654 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://altboot.txt \
     file://boot.txt \
     ${INSTALL_FW_UBOOT_SCRIPTS} \
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 d7a573416..8a491c80e 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 = "5df0daa78474fc9f48bf1584bb18afcd8d1d1769"
 
 COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m|ccimx6ul)"
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 a8e2c07d8..6373640ad 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,6 +7,6 @@ DEPENDS += "flex-native bison-native"
 DEPENDS += "python3-setuptools-native"
 
 SRCBRANCH = "v2021.10/maint"
-SRCREV = "${AUTOREV}"
+SRCREV = "635c699c07727660420accc28e71884ca55a25de"
 
 COMPATIBLE_MACHINE = "(ccmp1)"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.04.bb
index 2ac814261..4e038df0a 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.04.bb
@@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
 DEPENDS += "flex-native bison-native"
 
 SRCBRANCH = "v2022.04/maint"
-SRCREV = "${AUTOREV}"
+SRCREV = "c331c686b80702ed0e0d6ab5daf6cd3e741d5daa"
 
 COMPATIBLE_MACHINE = "(ccimx93)"
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 0f2a30aaf..46fbbc6f2 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 = "5df0daa78474fc9f48bf1584bb18afcd8d1d1769"
 
 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://sign_hab;name=artifact-hab-sign \
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 cdb0f3575..366ac4692 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 = "333e820a6ba3f13b0e4017aeda0e7ed00cea4c2f"
 
 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-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
index e3e15bca2..a29464636 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
@@ -7,7 +7,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}"
+SRC_URI = "${LINUX_GIT_URI};nobranch=1"
 
 # A user can provide his own kernel 'defconfig' file by:
 # - setting the variable KERNEL_DEFCONFIG to a custom kernel configuration file
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 d6a71f85e..7982a0d91 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
@@ -12,8 +12,8 @@ inherit ${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', 'fsl-kernel-localversio
 
 SRCBRANCH = "v5.15/nxp/dey-4.0/maint"
 SRCBRANCH:stm32mpcommon = "v5.15/stm/dey-4.0/maint"
-SRCREV = "${AUTOREV}"
-SRCREV:stm32mpcommon = "${AUTOREV}"
+SRCREV = "0bc92de5498aa28a94de32259b6e0bffab9a2d68"
+SRCREV:stm32mpcommon = "fba503649040ab79bcd113dc27a4e7e726ffed7c"
 
 require ${@oe.utils.conditional('DEY_SOC_VENDOR', 'STM', 'recipes-kernel/linux/linux-stm32mp.inc', '', d)}
 # Don't create custom folder for kernel artifacts
diff --git a/meta-digi-dey/recipes-devtools/python3-connectcore-ble/python3-connectcore-ble_git.bb b/meta-digi-dey/recipes-devtools/python3-connectcore-ble/python3-connectcore-ble_git.bb
index a89c868cf..6051f0a97 100644
--- a/meta-digi-dey/recipes-devtools/python3-connectcore-ble/python3-connectcore-ble_git.bb
+++ b/meta-digi-dey/recipes-devtools/python3-connectcore-ble/python3-connectcore-ble_git.bb
@@ -8,14 +8,14 @@ LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad"
 
 SRCBRANCH ?= "master"
-SRCREV = "${AUTOREV}"
+SRCREV = "23e8bf3dc438edae117fb1d721c06ec9b626dcec"
 
 CONNECTCORE_BLE_URI_STASH = "${DIGI_MTK_GIT}/python/connectcore-ble-python.git;protocol=ssh"
 CONNECTCORE_BLE_URI_GITHUB = "${DIGI_GITHUB_GIT}/connectcore-ble-python.git;protocol=https"
 CONNECTCORE_BLE_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CONNECTCORE_BLE_URI_STASH}', '${CONNECTCORE_BLE_URI_GITHUB}', d)}"
 
 SRC_URI = " \
-    ${CONNECTCORE_BLE_URI};branch=${SRCBRANCH} \
+    ${CONNECTCORE_BLE_URI};nobranch=1 \
 "
 
 S = "${WORKDIR}/git"
diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
index 2ddc74bb4..a298981e7 100644
--- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
+++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_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 = "092adcb63c0ecbf25f83f572c2081953ccefe778"
 
 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"
@@ -16,7 +16,7 @@ CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https"
 CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}"
 
 SRC_URI = " \
-    ${CC_GIT_URI};branch=${SRCBRANCH} \
+    ${CC_GIT_URI};nobranch=1 \
     file://cloud-connector-init \
     file://cloud-connector.service \
 "
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 97a2d77b4..03333e945 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 = "20ddfddc69d3a70a26beda937c89009878027b5b"
 
 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 f0f12c259..0c11649ea 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 = "6091d98850b35f591417bc28fe31af1c385179c6"
 
 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 e45edb7f56426b2a66d12194c46e57f6daa1811c Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Thu, 11 May 2023 23:10:41 +0200
Subject: [PATCH 17/29] meta-digi: revert revisions to AUTOREV

---
 .../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_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.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-src.inc          | 2 +-
 meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb          | 4 ++--
 .../python3-connectcore-ble/python3-connectcore-ble_git.bb    | 4 ++--
 .../recipes-digi/cloudconnector/cloudconnector_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 ++--
 14 files changed, 23 insertions(+), 23 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 35b476083..a61ec3710 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 = "4acf648b812ab2522cf45c5819bff6a250539b10"
+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 dc3342560..ec8bc733a 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,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 = "fcaacab87652f68dad6e007ed9b18fd113bfcac1"
+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 bbe400654..6970a6a3a 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://altboot.txt \
     file://boot.txt \
     ${INSTALL_FW_UBOOT_SCRIPTS} \
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 8a491c80e..d7a573416 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 = "5df0daa78474fc9f48bf1584bb18afcd8d1d1769"
+SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m|ccimx6ul)"
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 6373640ad..a8e2c07d8 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,6 +7,6 @@ DEPENDS += "flex-native bison-native"
 DEPENDS += "python3-setuptools-native"
 
 SRCBRANCH = "v2021.10/maint"
-SRCREV = "635c699c07727660420accc28e71884ca55a25de"
+SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(ccmp1)"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.04.bb
index 4e038df0a..2ac814261 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.04.bb
@@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
 DEPENDS += "flex-native bison-native"
 
 SRCBRANCH = "v2022.04/maint"
-SRCREV = "c331c686b80702ed0e0d6ab5daf6cd3e741d5daa"
+SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(ccimx93)"
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 46fbbc6f2..0f2a30aaf 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 = "5df0daa78474fc9f48bf1584bb18afcd8d1d1769"
+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://sign_hab;name=artifact-hab-sign \
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 366ac4692..cdb0f3575 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 = "333e820a6ba3f13b0e4017aeda0e7ed00cea4c2f"
+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-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
index a29464636..e3e15bca2 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
@@ -7,7 +7,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"
+SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}"
 
 # A user can provide his own kernel 'defconfig' file by:
 # - setting the variable KERNEL_DEFCONFIG to a custom kernel configuration file
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 7982a0d91..d6a71f85e 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
@@ -12,8 +12,8 @@ inherit ${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', 'fsl-kernel-localversio
 
 SRCBRANCH = "v5.15/nxp/dey-4.0/maint"
 SRCBRANCH:stm32mpcommon = "v5.15/stm/dey-4.0/maint"
-SRCREV = "0bc92de5498aa28a94de32259b6e0bffab9a2d68"
-SRCREV:stm32mpcommon = "fba503649040ab79bcd113dc27a4e7e726ffed7c"
+SRCREV = "${AUTOREV}"
+SRCREV:stm32mpcommon = "${AUTOREV}"
 
 require ${@oe.utils.conditional('DEY_SOC_VENDOR', 'STM', 'recipes-kernel/linux/linux-stm32mp.inc', '', d)}
 # Don't create custom folder for kernel artifacts
diff --git a/meta-digi-dey/recipes-devtools/python3-connectcore-ble/python3-connectcore-ble_git.bb b/meta-digi-dey/recipes-devtools/python3-connectcore-ble/python3-connectcore-ble_git.bb
index 6051f0a97..a89c868cf 100644
--- a/meta-digi-dey/recipes-devtools/python3-connectcore-ble/python3-connectcore-ble_git.bb
+++ b/meta-digi-dey/recipes-devtools/python3-connectcore-ble/python3-connectcore-ble_git.bb
@@ -8,14 +8,14 @@ LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad"
 
 SRCBRANCH ?= "master"
-SRCREV = "23e8bf3dc438edae117fb1d721c06ec9b626dcec"
+SRCREV = "${AUTOREV}"
 
 CONNECTCORE_BLE_URI_STASH = "${DIGI_MTK_GIT}/python/connectcore-ble-python.git;protocol=ssh"
 CONNECTCORE_BLE_URI_GITHUB = "${DIGI_GITHUB_GIT}/connectcore-ble-python.git;protocol=https"
 CONNECTCORE_BLE_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CONNECTCORE_BLE_URI_STASH}', '${CONNECTCORE_BLE_URI_GITHUB}', d)}"
 
 SRC_URI = " \
-    ${CONNECTCORE_BLE_URI};nobranch=1 \
+    ${CONNECTCORE_BLE_URI};branch=${SRCBRANCH} \
 "
 
 S = "${WORKDIR}/git"
diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
index a298981e7..2ddc74bb4 100644
--- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
+++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_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 = "092adcb63c0ecbf25f83f572c2081953ccefe778"
+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"
@@ -16,7 +16,7 @@ CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https"
 CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}"
 
 SRC_URI = " \
-    ${CC_GIT_URI};nobranch=1 \
+    ${CC_GIT_URI};branch=${SRCBRANCH} \
     file://cloud-connector-init \
     file://cloud-connector.service \
 "
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 03333e945..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 = "20ddfddc69d3a70a26beda937c89009878027b5b"
+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 0c11649ea..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 = "6091d98850b35f591417bc28fe31af1c385179c6"
+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 ca242ba0be5091ef1f57e96c275ce56268274176 Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Fri, 12 May 2023 13:24:37 +0200
Subject: [PATCH 18/29] u-boot-dey: remove extra brackets on shell condition

Signed-off-by: Hector Palacios <hector.palacios@digi.com>

https://onedigi.atlassian.net/browse/DEL-8510
---
 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 6970a6a3a..893d655b4 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
@@ -100,7 +100,7 @@ build_uboot_scripts() {
 	mkimage -T script -n "Alternate bootscript" -C none -d ${WORKDIR}/altboot.txt ${DEPLOYDIR}/altboot.scr
 
 	# Sign the scripts (TODO signing of artifacts for STM-based platforms)
-	if [ [ "${TRUSTFENCE_SIGN}" = "1" ] && [ "${DEY_SOC_VENDOR}" != "STM" ] ]; then
+	if [ "${TRUSTFENCE_SIGN}" = "1" ] && [ "${DEY_SOC_VENDOR}" != "STM" ]; then
 		export CONFIG_SIGN_KEYS_PATH="${TRUSTFENCE_SIGN_KEYS_PATH}"
 		[ -n "${TRUSTFENCE_KEY_INDEX}" ] && export CONFIG_KEY_INDEX="${TRUSTFENCE_KEY_INDEX}"
 		[ -n "${TRUSTFENCE_DEK_PATH}" ] && [ "${TRUSTFENCE_DEK_PATH}" != "0" ] && export CONFIG_DEK_PATH="${TRUSTFENCE_DEK_PATH}"

From 1ae6614dfd94de429279150b667e5316f67e700f Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Fri, 12 May 2023 09:29:11 +0200
Subject: [PATCH 19/29] README: fix release candidate version and know issues
 for dey-4.0-r3

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 README.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index de10c05e0..3fc61d3a9 100644
--- a/README.md
+++ b/README.md
@@ -87,8 +87,8 @@ Documentation is available online at https://www.digi.com/resources/documentatio
 
 # Downloads
 
-* Demo images: https://ftp1.digi.com/support/digiembeddedyocto/4.0/r2/images/
-* Software Development Kit (SDK): https://ftp1.digi.com/support/digiembeddedyocto/4.0/r2/sdk/
+* Demo images: https://ftp1.digi.com/support/digiembeddedyocto/4.0/r3/images/
+* Software Development Kit (SDK): https://ftp1.digi.com/support/digiembeddedyocto/4.0/r3/sdk/
 
 # Release Changelog
 
@@ -179,9 +179,8 @@ updated list can be found on the online documentation.
   * Wireless
     * P2P on the ConnectCore MP1 doesn't currently work in concurrency with
       other modes (station or SoftAP).
-
-  * The following features are not yet supported:
-    * TrustFence
+    * Connecting to a 802.11r network throws an unexpected error with the latest
+      CYW4373E wireless firmware.
 
 ## ConnectCore 6UL
 

From 06e472abe94807fcc0f8f4207474388a57c74022 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Mon, 15 May 2023 11:34:34 +0200
Subject: [PATCH 20/29] ccimx8mn-dvk: fix MACHINEOVERRIDES value

We accidentally used "mx8mm" instead of "mx8mn" in commit
9b165196bb21644e5c053fbc3c20cc13f3b171cf, which caused several elements to stop
working on the target (including the optee-os).

https://onedigi.atlassian.net/browse/DEL-8512

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 meta-digi-arm/conf/machine/ccimx8mn-dvk.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
index dc3a97a43..c3c620819 100644
--- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for Digi's ConnectCore 8M Nano DVK.
 
 DIGI_SOM = "ccimx8mn"
-MACHINEOVERRIDES =. "mx8:mx8m:mx8mm:${DIGI_FAMILY}:${DIGI_SOM}:"
+MACHINEOVERRIDES =. "mx8:mx8m:mx8mn:${DIGI_FAMILY}:${DIGI_SOM}:"
 
 # Include the machine configuration for Digi's ConnectCore 8M module.
 include conf/machine/include/ccimx8m.inc

From 90c864b4e3567b5534bd9a13f559598a982c4312 Mon Sep 17 00:00:00 2001
From: Gabriel Valcazar <gabriel.valcazar@digi.com>
Date: Mon, 15 May 2023 14:28:32 +0200
Subject: [PATCH 21/29] ccimx93: add BOOT_DEV_NAME and ROOTFS_DEV_NAME default
 values

Otherwise, the sw-description used for non-dualboot systems will be missing
these values and the software update process will fail.

https://onedigi.atlassian.net/browse/DEL-8513

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
 meta-digi-arm/conf/machine/include/ccimx93.inc | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta-digi-arm/conf/machine/include/ccimx93.inc b/meta-digi-arm/conf/machine/include/ccimx93.inc
index 25e8a2568..4fdc97e6f 100644
--- a/meta-digi-arm/conf/machine/include/ccimx93.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx93.inc
@@ -67,3 +67,8 @@ MACHINE_DISTRO_FEATURES_REMOVE = "vulkan"
 # SWUpdate sw-description configuration
 BOOTFS_EXT ?= ".boot.vfat"
 ROOTFS_EXT ?= ".ext4.gz"
+
+BOOT_DEV_NAME ?= "/dev/mmcblk0p1"
+ROOTFS_DEV_NAME ?= "/dev/mmcblk0p3"
+ROOTFS_ENC_DEV = "/dev/mapper/cryptrootfs"
+ROOTFS_DEV_NAME_FINAL = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT_ROOTFS') == '1', '${ROOTFS_ENC_DEV}', '${ROOTFS_DEV_NAME}')}"

From 437dd8a331630bdc02a840592109800c41e8bf04 Mon Sep 17 00:00:00 2001
From: Hector Palacios <hector.palacios@digi.com>
Date: Mon, 15 May 2023 13:04:48 +0200
Subject: [PATCH 22/29] tf-a-stm32mp: add 'w' permission to signed TF-A

By default, the signing script generates a file without 'w'
permission so DEY cannot remove it from the deploy dir on
a clean operation.
Add the 'w' permission so that DEY can remove it on clean
operations and generate a new signed file when required.

Signed-off-by: Hector Palacios <hector.palacios@digi.com>
---
 .../recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend      | 2 ++
 1 file changed, 2 insertions(+)

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 a61ec3710..fab4ddbb6 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
@@ -63,6 +63,8 @@ tfa_sign() {
 					TF_A_FILENAME="${tfa_basename}-${dt}-${config}.${TF_A_SUFFIX}"
 					if [ -f "${DEPLOYDIR}/arm-trusted-firmware/${TF_A_FILENAME}" ]; then
 						trustfence-sign-artifact.sh -p "${DIGI_SOM}" -t "${DEPLOYDIR}/arm-trusted-firmware/${TF_A_FILENAME}" "${DEPLOYDIR}/arm-trusted-firmware/${TF_A_FILENAME}_signed"
+						# the generated artifact lacks 'w' permission which prevents deletion by the build system
+						chmod u+w "${DEPLOYDIR}/arm-trusted-firmware/${TF_A_FILENAME}_signed"
 					fi
 				esac
 			done # for file_type in ${tfa_file_type}

From 999f4c87b59b51e7b930b1d56da5dcdccb7d6c1f Mon Sep 17 00:00:00 2001
From: Mike Engel <Mike.Engel@digi.com>
Date: Tue, 16 May 2023 17:42:16 +0200
Subject: [PATCH 23/29] trustfence: change CONFIG_CONSOLE_ENABLE_GPIO_NAME
 variable to be a string

This commits changes the CONFIG_CONSOLE_ENABLE_GPIO_NAME to be a string
and not an integer.

https://onedigi.atlassian.net/browse/DEL-8520

Signed-off-by: Mike Engel <Mike.Engel@digi.com>
---
 meta-digi-dey/classes/trustfence.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-digi-dey/classes/trustfence.bbclass b/meta-digi-dey/classes/trustfence.bbclass
index 8de026543..6dabb0174 100644
--- a/meta-digi-dey/classes/trustfence.bbclass
+++ b/meta-digi-dey/classes/trustfence.bbclass
@@ -55,7 +55,7 @@ python () {
             if (d.getVar("DEY_SOC_VENDOR") == "NXP"):
                 d.appendVar("UBOOT_TF_CONF", "CONFIG_CONSOLE_ENABLE_GPIO=y CONFIG_CONSOLE_ENABLE_GPIO_NR=%s " % d.getVar("TRUSTFENCE_CONSOLE_GPIO_ENABLE"))
             elif (d.getVar("DEY_SOC_VENDOR") == "STM"):
-                d.appendVar("UBOOT_TF_CONF", "CONFIG_CONSOLE_ENABLE_GPIO=y CONFIG_CONSOLE_ENABLE_GPIO_NAME=%s " % d.getVar("TRUSTFENCE_CONSOLE_GPIO_ENABLE_NAME"))
+                d.appendVar("UBOOT_TF_CONF", 'CONFIG_CONSOLE_ENABLE_GPIO=y CONFIG_CONSOLE_ENABLE_GPIO_NAME="%s" ' % d.getVar("TRUSTFENCE_CONSOLE_GPIO_ENABLE_NAME"))
 
     # Secure boot configuration
     if (d.getVar("TRUSTFENCE_SIGN_KEYS_PATH") == "default"):

From 04f8e544001360a527f414ff5885f3cd19ae92b7 Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Wed, 17 May 2023 15:30:24 +0200
Subject: [PATCH 24/29] meta-digi: update revisions for dey-4.0-r3.2

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 .../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_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.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-src.inc          | 2 +-
 meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb          | 4 ++--
 .../python3-connectcore-ble/python3-connectcore-ble_git.bb    | 4 ++--
 .../recipes-digi/cloudconnector/cloudconnector_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 ++--
 14 files changed, 23 insertions(+), 23 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 fab4ddbb6..e9a0ae2d6 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 = "${AUTOREV}"
+SRCREV = "4acf648b812ab2522cf45c5819bff6a250539b10"
 
 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-security/optee/optee-os-stm32mp_%.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend
index ec8bc733a..dc3342560 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,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 = "fcaacab87652f68dad6e007ed9b18fd113bfcac1"
 
 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 893d655b4..ad31d2b0c 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://altboot.txt \
     file://boot.txt \
     ${INSTALL_FW_UBOOT_SCRIPTS} \
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 d7a573416..8a491c80e 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 = "5df0daa78474fc9f48bf1584bb18afcd8d1d1769"
 
 COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m|ccimx6ul)"
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 a8e2c07d8..5b2155b6d 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,6 +7,6 @@ DEPENDS += "flex-native bison-native"
 DEPENDS += "python3-setuptools-native"
 
 SRCBRANCH = "v2021.10/maint"
-SRCREV = "${AUTOREV}"
+SRCREV = "a2db0f0dada1cbb9769620fc8d1d2102fd81b319"
 
 COMPATIBLE_MACHINE = "(ccmp1)"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.04.bb
index 2ac814261..4e038df0a 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.04.bb
@@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
 DEPENDS += "flex-native bison-native"
 
 SRCBRANCH = "v2022.04/maint"
-SRCREV = "${AUTOREV}"
+SRCREV = "c331c686b80702ed0e0d6ab5daf6cd3e741d5daa"
 
 COMPATIBLE_MACHINE = "(ccimx93)"
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 0f2a30aaf..46fbbc6f2 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 = "5df0daa78474fc9f48bf1584bb18afcd8d1d1769"
 
 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://sign_hab;name=artifact-hab-sign \
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 cdb0f3575..366ac4692 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 = "333e820a6ba3f13b0e4017aeda0e7ed00cea4c2f"
 
 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-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
index e3e15bca2..a29464636 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
@@ -7,7 +7,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}"
+SRC_URI = "${LINUX_GIT_URI};nobranch=1"
 
 # A user can provide his own kernel 'defconfig' file by:
 # - setting the variable KERNEL_DEFCONFIG to a custom kernel configuration file
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 d6a71f85e..baed2963e 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
@@ -12,8 +12,8 @@ inherit ${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', 'fsl-kernel-localversio
 
 SRCBRANCH = "v5.15/nxp/dey-4.0/maint"
 SRCBRANCH:stm32mpcommon = "v5.15/stm/dey-4.0/maint"
-SRCREV = "${AUTOREV}"
-SRCREV:stm32mpcommon = "${AUTOREV}"
+SRCREV = "ff02a3f47325b133c4baf4b999d2725b136cd07c"
+SRCREV:stm32mpcommon = "fba503649040ab79bcd113dc27a4e7e726ffed7c"
 
 require ${@oe.utils.conditional('DEY_SOC_VENDOR', 'STM', 'recipes-kernel/linux/linux-stm32mp.inc', '', d)}
 # Don't create custom folder for kernel artifacts
diff --git a/meta-digi-dey/recipes-devtools/python3-connectcore-ble/python3-connectcore-ble_git.bb b/meta-digi-dey/recipes-devtools/python3-connectcore-ble/python3-connectcore-ble_git.bb
index a89c868cf..6051f0a97 100644
--- a/meta-digi-dey/recipes-devtools/python3-connectcore-ble/python3-connectcore-ble_git.bb
+++ b/meta-digi-dey/recipes-devtools/python3-connectcore-ble/python3-connectcore-ble_git.bb
@@ -8,14 +8,14 @@ LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad"
 
 SRCBRANCH ?= "master"
-SRCREV = "${AUTOREV}"
+SRCREV = "23e8bf3dc438edae117fb1d721c06ec9b626dcec"
 
 CONNECTCORE_BLE_URI_STASH = "${DIGI_MTK_GIT}/python/connectcore-ble-python.git;protocol=ssh"
 CONNECTCORE_BLE_URI_GITHUB = "${DIGI_GITHUB_GIT}/connectcore-ble-python.git;protocol=https"
 CONNECTCORE_BLE_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CONNECTCORE_BLE_URI_STASH}', '${CONNECTCORE_BLE_URI_GITHUB}', d)}"
 
 SRC_URI = " \
-    ${CONNECTCORE_BLE_URI};branch=${SRCBRANCH} \
+    ${CONNECTCORE_BLE_URI};nobranch=1 \
 "
 
 S = "${WORKDIR}/git"
diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
index 2ddc74bb4..f4ead25aa 100644
--- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
+++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_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 = "8d694be2cdb6faa9038897e2202435535459a81c"
 
 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"
@@ -16,7 +16,7 @@ CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https"
 CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}"
 
 SRC_URI = " \
-    ${CC_GIT_URI};branch=${SRCBRANCH} \
+    ${CC_GIT_URI};nobranch=1 \
     file://cloud-connector-init \
     file://cloud-connector.service \
 "
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 97a2d77b4..666412b67 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 = "26f613f2e432a988f4b5c96c8de43652d7ad2d5d"
 
 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 f0f12c259..0c11649ea 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 = "6091d98850b35f591417bc28fe31af1c385179c6"
 
 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 e679d3821dbb5e3c2d1118b3578db02f30133c49 Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Wed, 17 May 2023 15:34:53 +0200
Subject: [PATCH 25/29] meta-digi: revert revisions to AUTOREV

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 .../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_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.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-src.inc          | 2 +-
 meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb          | 4 ++--
 .../python3-connectcore-ble/python3-connectcore-ble_git.bb    | 4 ++--
 .../recipes-digi/cloudconnector/cloudconnector_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 ++--
 14 files changed, 23 insertions(+), 23 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 e9a0ae2d6..fab4ddbb6 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 = "4acf648b812ab2522cf45c5819bff6a250539b10"
+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 dc3342560..ec8bc733a 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,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 = "fcaacab87652f68dad6e007ed9b18fd113bfcac1"
+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 ad31d2b0c..893d655b4 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://altboot.txt \
     file://boot.txt \
     ${INSTALL_FW_UBOOT_SCRIPTS} \
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 8a491c80e..d7a573416 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 = "5df0daa78474fc9f48bf1584bb18afcd8d1d1769"
+SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m|ccimx6ul)"
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 5b2155b6d..a8e2c07d8 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,6 +7,6 @@ DEPENDS += "flex-native bison-native"
 DEPENDS += "python3-setuptools-native"
 
 SRCBRANCH = "v2021.10/maint"
-SRCREV = "a2db0f0dada1cbb9769620fc8d1d2102fd81b319"
+SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(ccmp1)"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.04.bb
index 4e038df0a..2ac814261 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2022.04.bb
@@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025"
 DEPENDS += "flex-native bison-native"
 
 SRCBRANCH = "v2022.04/maint"
-SRCREV = "c331c686b80702ed0e0d6ab5daf6cd3e741d5daa"
+SRCREV = "${AUTOREV}"
 
 COMPATIBLE_MACHINE = "(ccimx93)"
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 46fbbc6f2..0f2a30aaf 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 = "5df0daa78474fc9f48bf1584bb18afcd8d1d1769"
+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://sign_hab;name=artifact-hab-sign \
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 366ac4692..cdb0f3575 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 = "333e820a6ba3f13b0e4017aeda0e7ed00cea4c2f"
+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-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
index a29464636..e3e15bca2 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc
@@ -7,7 +7,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"
+SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}"
 
 # A user can provide his own kernel 'defconfig' file by:
 # - setting the variable KERNEL_DEFCONFIG to a custom kernel configuration file
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 baed2963e..d6a71f85e 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
@@ -12,8 +12,8 @@ inherit ${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', 'fsl-kernel-localversio
 
 SRCBRANCH = "v5.15/nxp/dey-4.0/maint"
 SRCBRANCH:stm32mpcommon = "v5.15/stm/dey-4.0/maint"
-SRCREV = "ff02a3f47325b133c4baf4b999d2725b136cd07c"
-SRCREV:stm32mpcommon = "fba503649040ab79bcd113dc27a4e7e726ffed7c"
+SRCREV = "${AUTOREV}"
+SRCREV:stm32mpcommon = "${AUTOREV}"
 
 require ${@oe.utils.conditional('DEY_SOC_VENDOR', 'STM', 'recipes-kernel/linux/linux-stm32mp.inc', '', d)}
 # Don't create custom folder for kernel artifacts
diff --git a/meta-digi-dey/recipes-devtools/python3-connectcore-ble/python3-connectcore-ble_git.bb b/meta-digi-dey/recipes-devtools/python3-connectcore-ble/python3-connectcore-ble_git.bb
index 6051f0a97..a89c868cf 100644
--- a/meta-digi-dey/recipes-devtools/python3-connectcore-ble/python3-connectcore-ble_git.bb
+++ b/meta-digi-dey/recipes-devtools/python3-connectcore-ble/python3-connectcore-ble_git.bb
@@ -8,14 +8,14 @@ LICENSE = "MPL-2.0"
 LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad"
 
 SRCBRANCH ?= "master"
-SRCREV = "23e8bf3dc438edae117fb1d721c06ec9b626dcec"
+SRCREV = "${AUTOREV}"
 
 CONNECTCORE_BLE_URI_STASH = "${DIGI_MTK_GIT}/python/connectcore-ble-python.git;protocol=ssh"
 CONNECTCORE_BLE_URI_GITHUB = "${DIGI_GITHUB_GIT}/connectcore-ble-python.git;protocol=https"
 CONNECTCORE_BLE_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CONNECTCORE_BLE_URI_STASH}', '${CONNECTCORE_BLE_URI_GITHUB}', d)}"
 
 SRC_URI = " \
-    ${CONNECTCORE_BLE_URI};nobranch=1 \
+    ${CONNECTCORE_BLE_URI};branch=${SRCBRANCH} \
 "
 
 S = "${WORKDIR}/git"
diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
index f4ead25aa..2ddc74bb4 100644
--- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb
+++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_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 = "8d694be2cdb6faa9038897e2202435535459a81c"
+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"
@@ -16,7 +16,7 @@ CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https"
 CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}"
 
 SRC_URI = " \
-    ${CC_GIT_URI};nobranch=1 \
+    ${CC_GIT_URI};branch=${SRCBRANCH} \
     file://cloud-connector-init \
     file://cloud-connector.service \
 "
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 666412b67..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 = "26f613f2e432a988f4b5c96c8de43652d7ad2d5d"
+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 0c11649ea..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 = "6091d98850b35f591417bc28fe31af1c385179c6"
+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 5d263c77ecf62a16035b518883b3e895cb937b03 Mon Sep 17 00:00:00 2001
From: Mike Engel <Mike.Engel@digi.com>
Date: Fri, 19 May 2023 09:58:14 +0200
Subject: [PATCH 26/29] machine: swap ccmp15/13 console GPIO enable pins

This commit swaps the GPIO pin used to enable
serial console when secure console is activated.

Signed-off-by: Mike Engel <Mike.Engel@digi.com>
---
 meta-digi-arm/conf/machine/ccmp13-dvk.conf | 2 +-
 meta-digi-arm/conf/machine/ccmp15-dvk.conf | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta-digi-arm/conf/machine/ccmp13-dvk.conf b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
index a968f92dc..57d726549 100644
--- a/meta-digi-arm/conf/machine/ccmp13-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp13-dvk.conf
@@ -162,4 +162,4 @@ BOOTABLE_ARTIFACTS = " \
 
 # TRUSTFENCE basic support
 # Alternatively, uncommment to enable the console with the specified GPIO
-# TRUSTFENCE_CONSOLE_GPIO_ENABLE_NAME ?= "GPIOB6"
+# TRUSTFENCE_CONSOLE_GPIO_ENABLE_NAME ?= "GPIOA5"
diff --git a/meta-digi-arm/conf/machine/ccmp15-dvk.conf b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
index 145c857a3..1adbffbcb 100644
--- a/meta-digi-arm/conf/machine/ccmp15-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccmp15-dvk.conf
@@ -166,4 +166,4 @@ BOOTABLE_ARTIFACTS = " \
 
 # TRUSTFENCE basic support
 # Alternatively, uncommment to enable the console with the specified GPIO
-# TRUSTFENCE_CONSOLE_GPIO_ENABLE_NAME ?= "GPIOA5"
+# TRUSTFENCE_CONSOLE_GPIO_ENABLE_NAME ?= "GPIOB6"

From cecf6940735d8b665cac4b32b37a1bf5138765a3 Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Thu, 25 May 2023 13:41:00 +0200
Subject: [PATCH 27/29] swupdate: refresh Digi custom patch to support swupdate
 v2023.05

https://onedigi.atlassian.net/browse/DEL-8554

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 ...ange-Makefile-to-build-swupdate-library-s.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/meta-digi-dey/recipes-support/swupdate/swupdate/0001-Makefile-change-Makefile-to-build-swupdate-library-s.patch b/meta-digi-dey/recipes-support/swupdate/swupdate/0001-Makefile-change-Makefile-to-build-swupdate-library-s.patch
index ec8caeebc..4ab476c52 100644
--- a/meta-digi-dey/recipes-support/swupdate/swupdate/0001-Makefile-change-Makefile-to-build-swupdate-library-s.patch
+++ b/meta-digi-dey/recipes-support/swupdate/swupdate/0001-Makefile-change-Makefile-to-build-swupdate-library-s.patch
@@ -17,13 +17,13 @@ Signed-off-by: Mike Engel <Mike.Engel@digi.com>
  create mode 120000 ipc-static/progress_ipc.c
 
 diff --git a/Makefile b/Makefile
-index bf534e110ac3..8b704798501f 100644
+index 09d03a3..080b834 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -364,6 +364,7 @@ include $(srctree)/Makefile.flags
  
- objs-y		:= core handlers bootloader
- libs-y		:= corelib mongoose parser suricatta fs
+ objs-y		:= core handlers bootloader suricatta
+ libs-y		:= corelib mongoose parser fs
 +libs-y		+= ipc-static
  bindings-y	:= bindings
  tools-y		:= tools
@@ -47,7 +47,7 @@ index bf534e110ac3..8b704798501f 100644
  		install -m 0755 ${lua_swupdate} $(DESTDIR)/${LIBDIR}/lua/$(LUAVER); \
 diff --git a/ipc-static/Makefile b/ipc-static/Makefile
 new file mode 100644
-index 000000000000..99cce6cc75da
+index 0000000..99cce6c
 --- /dev/null
 +++ b/ipc-static/Makefile
 @@ -0,0 +1,6 @@
@@ -59,7 +59,7 @@ index 000000000000..99cce6cc75da
 +EXTRA_CFLAGS += -fPIC
 diff --git a/ipc-static/network_ipc-if.c b/ipc-static/network_ipc-if.c
 new file mode 120000
-index 000000000000..37894e2f8207
+index 0000000..37894e2
 --- /dev/null
 +++ b/ipc-static/network_ipc-if.c
 @@ -0,0 +1 @@
@@ -67,7 +67,7 @@ index 000000000000..37894e2f8207
 \ No newline at end of file
 diff --git a/ipc-static/network_ipc.c b/ipc-static/network_ipc.c
 new file mode 120000
-index 000000000000..0640077ec0fc
+index 0000000..0640077
 --- /dev/null
 +++ b/ipc-static/network_ipc.c
 @@ -0,0 +1 @@
@@ -75,7 +75,7 @@ index 000000000000..0640077ec0fc
 \ No newline at end of file
 diff --git a/ipc-static/progress_ipc.c b/ipc-static/progress_ipc.c
 new file mode 120000
-index 000000000000..7c6622ce0a30
+index 0000000..7c6622c
 --- /dev/null
 +++ b/ipc-static/progress_ipc.c
 @@ -0,0 +1 @@

From bc3636fd880f06442cf863c422934eeddbde460e Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Tue, 23 May 2023 11:06:17 +0200
Subject: [PATCH 28/29] build-github.sh: code review, no functional change

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 sdk/build-github.sh | 102 ++++++++++++++++++++------------------------
 1 file changed, 46 insertions(+), 56 deletions(-)

diff --git a/sdk/build-github.sh b/sdk/build-github.sh
index 357f50159..471d75293 100755
--- a/sdk/build-github.sh
+++ b/sdk/build-github.sh
@@ -22,19 +22,6 @@
 
 set -e
 
-AVAILABLE_PLATFORMS=" \
-		     ccimx8mm-dvk \
-		     ccimx8mn-dvk \
-		     ccimx8x-sbc-pro \
-		     ccimx8x-sbc-express \
-		     ccimx6qpsbc \
-		     ccimx6sbc \
-		     ccimx6ulsbc \
-		     ccimx6ulstarter \
-		     ccmp15-dvk \
-		     ccmp13-dvk \
-"
-
 MANIFEST_URL="https://github.com/digi-embedded/dey-manifest.git"
 
 RM_WORK_CFG="
@@ -53,14 +40,10 @@ SOURCE_DATE_EPOCH = \"${SOURCE_DATE_EPOCH}\"
 REPRODUCIBLE_TIMESTAMP_ROOTFS = \"${SOURCE_DATE_EPOCH}\"
 "
 
-BACKEND_REMOVAL_CFG="
-DISTRO_FEATURES_remove = \"x11 wayland vulkan\"
-"
-
 REPO="$(which repo)"
 
 error() {
-	printf "${1}"
+	printf "%s" "${1}"
 	exit 1
 }
 
@@ -73,10 +56,10 @@ copy_images() {
 	# Copy individual packages only for 'release' builds, not for 'daily'.
 	# For 'daily' builds just copy the firmware images (the buildserver
 	# cannot afford such amount of disk space)
-	if echo ${JOB_NAME} | grep -qs 'dey.*release'; then
-		cp -r tmp/deploy/* ${1}/
+	if echo "${JOB_NAME}" | grep -qs 'dey.*release'; then
+		cp -r tmp/deploy/* "${1}"/
 	else
-		cp -r tmp/deploy/images ${1}/
+		cp -r tmp/deploy/images "${1}"/
 	fi
 
 	# Images directory post-processing
@@ -85,9 +68,9 @@ copy_images() {
 	#    files.
 	#  - Remove 'README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt' files
 	#  - Create MD5SUMS file
-	find ${1} -type l -delete
-	find ${1} -type f -name 'README_-_DO_NOT_DELETE*' -delete
-	find ${1} -type f -not -name MD5SUMS -print0 | xargs -r -0 md5sum | sed -e "s,${1}/,,g" | sort -k2,2 > ${1}/MD5SUMS
+	find "${1}" -type l -delete
+	find "${1}" -type f -name 'README_-_DO_NOT_DELETE*' -delete
+	find "${1}" -type f -not -name MD5SUMS -print0 | xargs -r -0 md5sum | sed -e "s,${1}/,,g" | sort -k2,2 > "${1}"/MD5SUMS
 }
 
 #
@@ -112,7 +95,7 @@ purge_sstate() {
 		packagegroup-dey-webkit \
 		packagegroup-dey-wireless \
 	"
-	bitbake -k -c cleansstate ${PURGE_PKGS} >/dev/null 2>&1 || true
+	bitbake -k -c cleansstate "${PURGE_PKGS}" >/dev/null 2>&1 || true
 }
 
 #
@@ -121,8 +104,8 @@ purge_sstate() {
 #  $1: image recipe
 #
 swu_recipe_name() {
-	if [ -n "$(find ${YOCTO_INST_DIR}/sources/meta-digi -type f -name "${1}-swu.bb")" ]; then
-		printf "${1}-swu"
+	if [ -n "$(find "${YOCTO_INST_DIR}"/sources/meta-digi -type f -name "${1}-swu.bb")" ]; then
+		printf "%s-swu" "${1}"
 	fi
 }
 
@@ -130,11 +113,10 @@ swu_recipe_name() {
 [ -z "${DY_REVISION}" ] && error "DY_REVISION not specified"
 [ -z "${WORKSPACE}" ] && error "WORKSPACE not specified"
 
-# Set default values if not provided by Jenkins
-[ -z "${DY_PLATFORMS}" ] && DY_PLATFORMS="$(echo ${AVAILABLE_PLATFORMS})"
-
 # Per-platform data
-while read _pl _tgt; do
+while read -r _pl _tgt; do
+	AVAILABLE_PLATFORMS="${AVAILABLE_PLATFORMS:+${AVAILABLE_PLATFORMS} }${_pl}"
+	# shellcheck disable=SC2015
 	[ -n "${DY_TARGET}" ] && _tgt="${DY_TARGET}" || true
 	# Dashes are not allowed in variables so let's substitute them on
 	# the fly with underscores.
@@ -152,72 +134,80 @@ done<<-_EOF_
 	ccmp13-dvk           core-image-base
 _EOF_
 
+# Set default values if not provided by Jenkins
+DY_PLATFORMS="${DY_PLATFORMS:-${AVAILABLE_PLATFORMS}}"
+
 YOCTO_IMGS_DIR="${WORKSPACE}/images"
-YOCTO_INST_DIR="${WORKSPACE}/dey.$(echo ${DY_REVISION} | tr '/' '_')"
+YOCTO_INST_DIR="${WORKSPACE}/dey.$(echo "${DY_REVISION}" | tr '/' '_')"
 YOCTO_PROJ_DIR="${WORKSPACE}/projects"
 
 # If CPUS is unset, set it with the machine cpus
 if [ -z "${CPUS}" ]; then
 	CPUS="$(grep -c processor /proc/cpuinfo)"
 fi
-[ ${CPUS} -gt 1 ] && MAKE_JOBS="-j${CPUS}"
+[ "${CPUS}" -gt 1 ] && MAKE_JOBS="-j${CPUS}"
 
-printf "\n[INFO] Build Yocto \"${DY_REVISION}\" for \"${DY_PLATFORMS}\" (cpus=${CPUS})\n\n"
+printf "\n[INFO] Build Yocto \"%s\" for \"%s\" (cpus=%s)\n\n" "${DY_REVISION}" "${DY_PLATFORMS}" "${CPUS}"
 
 # Install DEY
-rm -rf ${YOCTO_INST_DIR} && mkdir -p ${YOCTO_INST_DIR}
-if pushd ${YOCTO_INST_DIR}; then
+rm -rf "${YOCTO_INST_DIR}" && mkdir -p "${YOCTO_INST_DIR}"
+if pushd "${YOCTO_INST_DIR}"; then
 	# Use git ls-remote to check the revision type
 	if [ "${DY_REVISION}" != "master" ]; then
 		if git ls-remote --tags --exit-code "${MANIFEST_URL}" "${DY_REVISION}"; then
-			printf "[INFO] Using tag \"${DY_REVISION}\"\n"
+			printf "[INFO] Using tag \"%s\"\n" "${DY_REVISION}"
 			repo_revision="-b refs/tags/${DY_REVISION}"
 		elif git ls-remote --heads --exit-code "${MANIFEST_URL}" "${DY_REVISION}"; then
-			printf "[INFO] Using branch \"${DY_REVISION}\"\n"
+			printf "[INFO] Using branch \"%s\"\n" "${DY_REVISION}"
 			repo_revision="-b ${DY_REVISION}"
 		else
 			error "Revision \"${DY_REVISION}\" not found"
 		fi
 	fi
+	# shellcheck disable=SC2086
 	yes "" 2>/dev/null | ${REPO} init --no-repo-verify -u ${MANIFEST_URL} ${repo_revision}
-	${REPO} forall -p -c 'git remote prune $(git remote)'
+	${REPO} --no-pager forall -j4 -p -c 'git clean -fdx'
+	# shellcheck disable=SC2016
+	${REPO} --no-pager forall -j4 -p -c 'git remote prune $(git remote)' || true
+	# shellcheck disable=SC2086
 	time ${REPO} sync -d ${MAKE_JOBS}
 	popd
 fi
 
 # Create projects and build
-rm -rf ${YOCTO_IMGS_DIR} ${YOCTO_PROJ_DIR}
+rm -rf "${YOCTO_IMGS_DIR}" "${YOCTO_PROJ_DIR}"
 for platform in ${DY_PLATFORMS}; do
-	# The variables <platform>_var|tgt got their dashes converted to
+	# The variable <platform>_tgt got its dashes converted to
 	# underscores, so we must convert also the ones in ${platform}.
-	eval platform_targets=\"\${${platform//-/_}_tgt}\"
+	eval "platform_targets=\"\${${platform//-/_}_tgt}\""
+
 	_this_prj_dir="${YOCTO_PROJ_DIR}/${platform}"
 	_this_img_dir="${YOCTO_IMGS_DIR}/${platform}"
-	mkdir -p ${_this_img_dir} ${_this_prj_dir}
-	if pushd ${_this_prj_dir}; then
+	mkdir -p "${_this_img_dir}" "${_this_prj_dir}"
+	if pushd "${_this_prj_dir}"; then
 		# Configure and build the project in a sub-shell to avoid
 		# mixing environments between different platform's projects
 		(
 			export TEMPLATECONF="${TEMPLATECONF:+${TEMPLATECONF}/${platform}}"
-			MKP_PAGER="" . ${YOCTO_INST_DIR}/mkproject.sh -p ${platform} <<< "y"
+			# shellcheck disable=SC1091,SC2086
+			MKP_PAGER="" . ${YOCTO_INST_DIR}/mkproject.sh -p "${platform}" <<< "y"
 			# Set a common DL_DIR and SSTATE_DIR for all platforms
 			sed -i  -e "/^#DL_DIR ?=/cDL_DIR ?= \"${YOCTO_PROJ_DIR}/downloads\"" \
 				-e "/^#SSTATE_DIR ?=/cSSTATE_DIR ?= \"${YOCTO_PROJ_DIR}/sstate-cache\"" \
 				conf/local.conf
-			printf "${RM_WORK_CFG}" >> conf/local.conf
-			printf "${ZIP_INSTALLER_CFG}" >> conf/local.conf
-			printf "${BUILD_TIMESTAMP}" >> conf/local.conf
-			# Remove all desktop backend distro features if building framebuffer images
-			if [ "${DY_FB_IMAGE}" = "true" ]; then
-				printf "${BACKEND_REMOVAL_CFG}" >> conf/local.conf
-			fi
-			for target in ${platform_targets}; do
-				printf "\n[INFO] Building the ${target} target.\n"
-				time bitbake ${target} $(swu_recipe_name ${target})
+			{
+				printf "%s" "${RM_WORK_CFG}"
+				printf "%s" "${ZIP_INSTALLER_CFG}"
+				printf "%s" "${BUILD_TIMESTAMP}"
+			} >> conf/local.conf
+			for target in ${platform_targets:?}; do
+				printf "\n[INFO] Building the %s target.\n" "${target}"
+				# shellcheck disable=SC2046
+				time bitbake "${target}" $(swu_recipe_name "${target}")
 			done
 			purge_sstate
 		)
-		copy_images ${_this_img_dir}
+		copy_images "${_this_img_dir}"
 		popd
 	fi
 done

From 7374cd068590b489bf8335cbb5f77a9f15ae82f2 Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Tue, 23 May 2023 11:07:55 +0200
Subject: [PATCH 29/29] build.sh: add ccimx93-dvk new platform

This allows building the new platform from GitHub.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 sdk/build-github.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdk/build-github.sh b/sdk/build-github.sh
index 471d75293..c505a6166 100755
--- a/sdk/build-github.sh
+++ b/sdk/build-github.sh
@@ -132,6 +132,7 @@ done<<-_EOF_
 	ccimx6ulstarter      core-image-base
 	ccmp15-dvk           dey-image-webkit
 	ccmp13-dvk           core-image-base
+	ccimx93-dvk          dey-image-qt
 _EOF_
 
 # Set default values if not provided by Jenkins