diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.10.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.10.bbappend index cb1c39ec7..4be084e74 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.10.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_2.10.bbappend @@ -7,7 +7,7 @@ TFA_URI_STASH = "${DIGI_MTK_GIT}/emp/arm-trusted-firmware.git;protocol=ssh" TFA_URI_GITHUB = "${DIGI_GITHUB_GIT}/arm-trusted-firmware.git;protocol=https" TFA_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${TFA_URI_STASH}', '${TFA_URI_GITHUB}', d)}" -SRCBRANCH = "v2.10/stm32mp/master" +SRCBRANCH = "v2.10/stm32mp/maint" SRCREV = "${AUTOREV}" SRC_URI = " \ diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_4.0.0.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_4.0.0.bbappend index daa71e9d7..83a187760 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_4.0.0.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_4.0.0.bbappend @@ -1,5 +1,5 @@ # -# Copyright (C) 2022-2024, Digi International Inc. +# Copyright (C) 2022-2025, Digi International Inc. # # Select internal or Github OPTEE repo @@ -7,7 +7,7 @@ OPTEE_URI_STASH = "${DIGI_MTK_GIT}/emp/optee_os.git;protocol=ssh" OPTEE_URI_GITHUB = "${DIGI_GITHUB_GIT}/optee_os.git;protocol=https" OPTEE_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${OPTEE_URI_STASH}', '${OPTEE_URI_GITHUB}', d)}" -SRCBRANCH = "4.0.0/stm/master" +SRCBRANCH = "4.0.0/stm/maint" SRCREV = "${AUTOREV}" SRC_URI = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.10.bb index bbb5f047e..f354495ea 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.10.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.10.bb @@ -1,4 +1,4 @@ -# Copyright (C) 2024 Digi International Inc. +# Copyright (C) 2024,2025, Digi International Inc. require u-boot-dey.inc LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" DEPENDS += "flex-native bison-native" DEPENDS += "python3-setuptools-native" -SRCBRANCH = "v2023.10/master" +SRCBRANCH = "v2023.10/maint" SRCREV = "${AUTOREV}" SRC_URI += " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb index d33623c60..9b381fff8 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2024.04.bb @@ -1,4 +1,4 @@ -# Copyright (C) 2024, Digi International Inc. +# Copyright (C) 2024,2025, Digi International Inc. require u-boot-dey.inc @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" DEPENDS += "flex-native bison-native" -SRCBRANCH = "v2024.04/master" +SRCBRANCH = "v2024.04/maint" SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8x|ccimx9)" diff --git a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2024.04.bb b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2024.04.bb index 39000e5b5..92685d82f 100644 --- a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2024.04.bb +++ b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2024.04.bb @@ -1,6 +1,6 @@ -# Copyright (C) 2024, Digi International Inc. +# Copyright (C) 2024,2025, Digi International Inc. require nativesdk-trustfence-sign-tools_git.bb -SRCBRANCH = "v2024.04/master" +SRCBRANCH = "v2024.04/maint" SRCREV = "${AUTOREV}" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2024.04.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2024.04.bb index 646a7a217..8fc53a00c 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2024.04.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2024.04.bb @@ -1,6 +1,6 @@ -# Copyright (C) 2024, Digi International Inc. +# Copyright (C) 2024,2025, Digi International Inc. require trustfence-sign-tools-native_git.bb -SRCBRANCH = "v2024.04/master" +SRCBRANCH = "v2024.04/maint" SRCREV = "${AUTOREV}" 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 80225ca58..6b2061aeb 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 @@ -1,4 +1,4 @@ -# Copyright (C) 2016-2023, Digi International Inc. +# Copyright (C) 2016-2025, Digi International Inc. SUMMARY = "Qualcomm's wireless driver for qca65xx" DESCRIPTION = "qcacld-2.0 module" @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca # Reference Qualcomm tag/version PV = "v4.0.11.213X" -SRCBRANCH = "qca65X4/master" +SRCBRANCH = "qca65X4/dey-5.0/maint" 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)}" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb index 88fddfdae..84862071a 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.6.bb @@ -1,9 +1,9 @@ -# Copyright (C) 2024, Digi International Inc. +# Copyright (C) 2024,2025 Digi International Inc. require recipes-kernel/linux/linux-dey.inc -SRCBRANCH = "v6.6.52/nxp/master" -SRCBRANCH:stm32mp2common = "v6.6.48/stm/master" +SRCBRANCH = "v6.6/nxp/dey-5.0/maint" +SRCBRANCH:stm32mp2common = "v6.6/stm/dey-5.0/maint" SRCREV = "${AUTOREV}" SRCREV:stm32mp2common = "${AUTOREV}" diff --git a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb index 461eda8d7..694d2ac1c 100644 --- a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb +++ b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2024, Digi International Inc. +# Copyright (C) 2017-2025, Digi International Inc. SUMMARY = "Digi's ConnectCore Cloud services" SECTION = "libs" @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "libconfuse libdigiapix openssl recovery-utils swupdate zlib json-c" -SRCBRANCH = "master" +SRCBRANCH = "dey-5.0/maint" SRCREV = "${AUTOREV}" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" 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 19e1bdfc8..852a67bee 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,6 +1,6 @@ -# Copyright (C) 2019-2022, Digi International Inc. +# Copyright (C) 2019-2025, Digi International Inc. -SRCBRANCH = "master" +SRCBRANCH = "dey-5.0/maint" SRCREV = "${AUTOREV}" DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}/dey/dey-examples.git;protocol=ssh" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 92d03fb43..3e4f5b7a8 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2022, Digi International Inc. +# Copyright (C) 2017-2025, Digi International Inc. SUMMARY = "Digi APIX library" DESCRIPTION = "C library to access and manage your ConnectCore platform interfaces in an easy manner" @@ -6,7 +6,7 @@ SECTION = "libs" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca7947a896d" -SRCBRANCH ?= "master" +SRCBRANCH ?= "dey-5.0/maint" SRCREV = "${AUTOREV}" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}/dey/libdigiapix.git;protocol=ssh"