From ff071a17be870d03ab9238c63d5d222496d5cfa0 Mon Sep 17 00:00:00 2001 From: Francisco Gil Date: Fri, 15 Sep 2023 16:06:39 +0200 Subject: [PATCH 01/48] meta-digi: revert revisions to AUTOREV Signed-off-by: Francisco Gil --- .../recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend | 4 ++-- .../recipes-security/optee/optee-os-stm32mp_%.bbappend | 4 ++-- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools.inc | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb | 2 +- meta-digi-dey/recipes-digi/cccs/cccs_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 15 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 51fb9b8bb..459ffc4e4 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 = "8fdd443544f980b720586b77852307a8b8f48caf" +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 ee99198db..d3367b5ec 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend @@ -8,9 +8,9 @@ OPTEE_URI_GITHUB = "${DIGI_GITHUB_GIT}/optee_os.git;protocol=https" OPTEE_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${OPTEE_URI_STASH}', '${OPTEE_URI_GITHUB}', d)}" SRCBRANCH = "3.16.0/stm/maint" -SRCREV = "43350dda7553c136e0d6422d0404b577ac675c51" +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 8ca654af1..894da6074 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc @@ -27,7 +27,7 @@ INSTALL_FW_UBOOT_SCRIPTS = " \ " SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://boot.txt \ ${INSTALL_FW_UBOOT_SCRIPTS} \ " diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index c21f7b9ca..1a3fa59a3 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,7 +3,7 @@ require u-boot-dey.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "de9a9d0744ca8d88c1e1bcfa5fa3c43375d4e9da" +SRCREV = "${AUTOREV}" # Disable support to initial environment for U-Boot UBOOT_INITIAL_ENV = "" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb index 6e170226c..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 = "6e10827c66bdca9b3b7f55382534d157eebd28fb" +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 5e4c3a905..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 = "3d06f32fbc20428382c4d4db7cba87e93897bb16" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccmp1)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb index 11b8ef0fb..ca022b584 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2023.04/maint" -SRCREV = "fff1580d12ff182b91e89006b3e6aad83047ac5f" +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 52ce8412b..676122560 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc @@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2020.04/maint" -SRCREV = "6e10827c66bdca9b3b7f55382534d157eebd28fb" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -15,7 +15,7 @@ UBOOT_URI_GITHUB = "${DIGI_GITHUB_GIT}/u-boot.git;protocol=https" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${UBOOT_URI_STASH}', '${UBOOT_URI_GITHUB}', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-artifact-nxp.sh \ file://trustfence-sign-artifact-stm.sh \ file://trustfence-gen-pki-stm.sh \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 10ba01eb8..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 = "7ba1cdedd456928ac77c1f11e0d070abaf505e95" +SRCREV = "${AUTOREV}" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}/linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};nobranch=1 \ + ${QCOM_GIT_URI};branch=${SRCBRANCH} \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index 0e58639e6..de58e8115 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -17,7 +17,7 @@ LINUX_URI_STASH = "${DIGI_MTK_GIT}/linux/linux.git;protocol=ssh" LINUX_URI_GITHUB = "${DIGI_GITHUB_GIT}/linux.git;protocol=https" LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1', '${LINUX_URI_STASH}', '${LINUX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LINUX_GIT_URI};nobranch=1 \ + ${LINUX_GIT_URI};branch=${SRCBRANCH} \ ${@oe.utils.conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)} \ " S = "${WORKDIR}/git" 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 e43c42267..1a908da36 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb @@ -4,7 +4,7 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v5.15/nxp/dey-4.0/maint" SRCBRANCH:stm32mpcommon = "v5.15/stm/dey-4.0/maint" -SRCREV = "93a4ac0217558b2c56839472f853f6c25dccdff1" -SRCREV:stm32mpcommon = "8487a33b67f387a30382f58b846651eb9035ce50" +SRCREV = "${AUTOREV}" +SRCREV:stm32mpcommon = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8m|ccimx6|ccmp1|ccimx8x)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb index 4f56d3a8b..1954b8b64 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb @@ -3,7 +3,7 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v6.1/nxp/dey-4.0/maint" -SRCREV = "f6f5d5036faf7dd400415f93b27dae9fa6f47b67" +SRCREV = "${AUTOREV}" # Blacklist btnxpuart module. It will be managed by the bluetooth-init script KERNEL_MODULE_PROBECONF += "btnxpuart" diff --git a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb index 73fd5b79a..17bbbefd6 100644 --- a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb +++ b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "libconfuse libdigiapix openssl recovery-utils swupdate zlib json-c" SRCBRANCH = "dey-4.0/maint" -SRCREV = "fc6c382d4ced93be23ae1fd48651f01c81daa195" +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" @@ -18,7 +18,7 @@ CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', CCCS_DEVICE_TYPE ?= "${MACHINE}" SRC_URI = " \ - ${CC_GIT_URI};nobranch=1 \ + ${CC_GIT_URI};branch=${SRCBRANCH} \ file://cccsd-init \ file://cccsd.service \ file://cccs-gs-demo-init \ diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index 8a493fe73..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 = "6d5d1e8837fc2fe0e9f595c448cefe7e6bafeb80" +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 0ab1f16a2..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 = "fed0071f5d6c4f44a6189c6c4fa5bdeda5a684c3" +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 0d9b393afc55ad02649295671983d01040e37990 Mon Sep 17 00:00:00 2001 From: Tatiana Leon Date: Fri, 29 Sep 2023 10:25:55 +0200 Subject: [PATCH 02/48] connectcore-demo: fix systemd service dependency on connectcore-demo-server.service This fix systemd error on boot: [ 6.974370] systemd[1]: /lib/systemd/system/connectcore-demo-example.service:3: Failed to add dependency on connectcore-demo-server, ignoring: Invalid argument Signed-off-by: Tatiana Leon --- .../connectcore-demo-example.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-digi/connectcore-demo-example-webkit/connectcore-demo-example-webkit/connectcore-demo-example.service b/meta-digi-dey/dynamic-layers/webkit/recipes-digi/connectcore-demo-example-webkit/connectcore-demo-example-webkit/connectcore-demo-example.service index 091d1fb90..bbe9fe677 100644 --- a/meta-digi-dey/dynamic-layers/webkit/recipes-digi/connectcore-demo-example-webkit/connectcore-demo-example-webkit/connectcore-demo-example.service +++ b/meta-digi-dey/dynamic-layers/webkit/recipes-digi/connectcore-demo-example-webkit/connectcore-demo-example-webkit/connectcore-demo-example.service @@ -1,6 +1,6 @@ [Unit] Description=Initialization of the ConnectCore demo example -After=connectcore-demo-server +After=connectcore-demo-server.service # Make sure we are started after graphic service is available After=##WESTON_SERVICE## From 6b557694479815810c03acfef1d6fde1e0289476 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Mon, 2 Oct 2023 09:26:10 +0200 Subject: [PATCH 03/48] nativesdk: add STM signtools to SDK The appropriate way to add STM signtools to the SDK is via RDEPENDS on nativesdk-packagegroup-sdk-host, not through the parent recipe of STM signtools recipe itself. Signed-off-by: Hector Palacios https://onedigi.atlassian.net/browse/DEL-8720 --- .../packagegroup/nativesdk-packagegroup-sdk-host.bbappend | 5 +++++ .../trustfence/nativesdk-trustfence-sign-tools_git.bb | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend b/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend index 94b076552..bd339562f 100644 --- a/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend +++ b/meta-digi-arm/recipes-core/packagegroup/nativesdk-packagegroup-sdk-host.bbappend @@ -10,7 +10,12 @@ IMX_TRUSTFENCE_SDK_TOOLS ?= " \ ${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'nativesdk-imx-mkimage', '', d)} \ " +STM_TRUSTFENCE_SDK_TOOLS ?= " \ + nativesdk-trustfence-stm-signtools \ +" + RDEPENDS:${PN} += " \ nativesdk-trustfence-sign-tools \ ${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', '${IMX_OPTEE_SDK_RDEPENDS} ${IMX_TRUSTFENCE_SDK_TOOLS}', '', d)} \ + ${@oe.utils.conditional('DEY_SOC_VENDOR', 'STM', '${STM_TRUSTFENCE_SDK_TOOLS}', '', d)} \ " diff --git a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_git.bb index e1f5f9ade..3d55e7a65 100644 --- a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_git.bb @@ -2,8 +2,3 @@ require trustfence-sign-tools.inc inherit nativesdk - -RDEPENDS:${PN} = " \ - ${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', 'nativesdk-trustfence-cst', '', d)} \ - ${@oe.utils.conditional('DEY_SOC_VENDOR', 'STM', 'nativesdk-trustfence-stm-signtools', '', d)} \ -" From d3a7fef25731bce3df4fd083baa6249ea3f1c3f3 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Mon, 2 Oct 2023 09:35:29 +0200 Subject: [PATCH 04/48] trustfence-stm-signtools: rework package so that the tools are accessible The STM signtools are precompiled binaries with a fixed RPATH to look for dynamic libraries. When the binaries are installed to the regular ${bindir} (either native or nativesdk), additional toolchain libraries in the regular ${libdir} folder confuse the binaries, resulting in segmentation faults when running them or missing symbols. The package has been reworked to place the directory structure expected by the binaries, in a subfolder "stm" within the ${bindir}. Two wrapper scripts with the names of the binaries (STM32MP_KeyGen_CLI and STM32MP_SigningTool_CLI) have been created to run the binaries in the new subfolder. Package version has been bumped to 1.1. While on it, remove the 'do_install' from trustfence-stm-signtools.inc which is not needed because the 'bin_package' class already provides the same functionality. Signed-off-by: Hector Palacios https://onedigi.atlassian.net/browse/DEL-8720 --- ...bb => nativesdk-trustfence-stm-signtools_1.1.bb} | 0 ....0.bb => trustfence-stm-signtools-native_1.1.bb} | 0 .../trustfence-stm-signtools.inc | 13 ++----------- 3 files changed, 2 insertions(+), 11 deletions(-) rename meta-digi-arm/recipes-bsp/trustfence-stm-signtools/{nativesdk-trustfence-stm-signtools_1.0.bb => nativesdk-trustfence-stm-signtools_1.1.bb} (100%) rename meta-digi-arm/recipes-bsp/trustfence-stm-signtools/{trustfence-stm-signtools-native_1.0.bb => trustfence-stm-signtools-native_1.1.bb} (100%) diff --git a/meta-digi-arm/recipes-bsp/trustfence-stm-signtools/nativesdk-trustfence-stm-signtools_1.0.bb b/meta-digi-arm/recipes-bsp/trustfence-stm-signtools/nativesdk-trustfence-stm-signtools_1.1.bb similarity index 100% rename from meta-digi-arm/recipes-bsp/trustfence-stm-signtools/nativesdk-trustfence-stm-signtools_1.0.bb rename to meta-digi-arm/recipes-bsp/trustfence-stm-signtools/nativesdk-trustfence-stm-signtools_1.1.bb diff --git a/meta-digi-arm/recipes-bsp/trustfence-stm-signtools/trustfence-stm-signtools-native_1.0.bb b/meta-digi-arm/recipes-bsp/trustfence-stm-signtools/trustfence-stm-signtools-native_1.1.bb similarity index 100% rename from meta-digi-arm/recipes-bsp/trustfence-stm-signtools/trustfence-stm-signtools-native_1.0.bb rename to meta-digi-arm/recipes-bsp/trustfence-stm-signtools/trustfence-stm-signtools-native_1.1.bb diff --git a/meta-digi-arm/recipes-bsp/trustfence-stm-signtools/trustfence-stm-signtools.inc b/meta-digi-arm/recipes-bsp/trustfence-stm-signtools/trustfence-stm-signtools.inc index 2c8e9d882..54540ab00 100644 --- a/meta-digi-arm/recipes-bsp/trustfence-stm-signtools/trustfence-stm-signtools.inc +++ b/meta-digi-arm/recipes-bsp/trustfence-stm-signtools/trustfence-stm-signtools.inc @@ -10,18 +10,9 @@ PKGNAME = "trustfence-stm-signtools" # tarball SRC_URI = "${DIGI_PKG_SRC}/${PKGNAME}-${PV}.tar.gz" -SRC_URI[md5sum] = "5621d99156b75e69eecbae721475463b" -SRC_URI[sha256sum] = "5c04b16934aa316d2586980f93680e90af1968bcb9b76c18b9cecddbcf5d6a1b" - -S = "${WORKDIR}/${PKGNAME}-${PV}" +SRC_URI[md5sum] = "38ce0cd682350b15e773e725ee842da4" +SRC_URI[sha256sum] = "cc349bdcaa764d5af25b12ee9e0c143f93dc80d531f42f8a57a735e170cd378b" inherit bin_package INSANE_SKIP:${PN} = "already-stripped" - -do_install() { - install -d ${D}${bindir} - install -m 0755 bin/* ${D}${bindir} - install -d ${D}${base_libdir} - install -m 0644 lib/* ${D}${base_libdir} -} From dde01fe03cbc212c4a6fce81e073169836b6cb4c Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 3 Oct 2023 08:43:29 +0200 Subject: [PATCH 05/48] ccmp1: don't build additional UBI/UBIFS images via meta-st-stm32mp layer Through the inclusion of 'nand-4-256' in BOOTDEVICE_LABELS, the include file 'st-machine-common-stm32mp.inc' adds strings to MULTIUBI_BUILD and IMAGE_FSTYPES that result in building ubi and ubifs images. These are redundant and not needed since meta-digi's 'image_types_digi.bbclass' already generates the needed ubifs images. Signed-off-by: Hector Palacios https://onedigi.atlassian.net/browse/DEL-8714 --- meta-digi-arm/conf/machine/include/ccmp1.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-digi-arm/conf/machine/include/ccmp1.inc b/meta-digi-arm/conf/machine/include/ccmp1.inc index 15ff18221..fd74a2ad8 100644 --- a/meta-digi-arm/conf/machine/include/ccmp1.inc +++ b/meta-digi-arm/conf/machine/include/ccmp1.inc @@ -51,6 +51,11 @@ BOOTDEVICE_LABELS ?= "nand-4-256" # Supported boot schemes BOOTSCHEME_LABELS ?= "optee" +# Remove NAND-based ubi/ubifs images added by st-machine-common-stm32mp.inc +# because image_types_digi.bbclass already builds their own. +MULTIUBI_BUILD:remove = "nand_4_256" +IMAGE_FSTYPES:remove = "stmultiubi" + # Wic files WKS_FILE += "ccmp1.wks.in" WKS_FILE_DEPENDS ?= " \ From 2fd1dbfed7cc09e35a989975ce64042c9c310d16 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Mon, 9 Oct 2023 15:52:21 +0200 Subject: [PATCH 06/48] imx-boot: fix build of imx-boot artifacts Recently, meta-freescale backported the support to build multiple boot artifacts. This clashes with the changes in our imx-boot bbappend, so update the bbappend to make it compatible with the latest changes in meta-freescale. Signed-off-by: Javier Viguera --- .../imx-mkimage/imx-boot_1.0.bbappend | 34 ++++++++----------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend index 918a7310c..778389424 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend @@ -1,4 +1,4 @@ -# Copyright (C) 2022 Digi International +# Copyright (C) 2022-2023 Digi International Inc. FILESEXTRAPATHS:prepend := "${THISDIR}/files:" @@ -30,30 +30,25 @@ do_compile:append:ccimx8m() { make SOC=${IMX_BOOT_SOC_TARGET} dtbs=${UBOOT_DTB_NAME} print_fit_hab } -do_compile:ccimx8x () { - compile_${SOC_FAMILY} +do_compile:ccimx8x() { + # Copy TEE binary to SoC target folder to mkimage if ${DEPLOY_OPTEE}; then - cp ${DEPLOY_DIR_IMAGE}/tee.bin {BOOT_STAGING} + cp ${DEPLOY_DIR_IMAGE}/tee.bin ${BOOT_STAGING} fi - # mkimage for i.MX8 - + UBOOT_CONFIG_EXTRA="${UBOOT_CONFIG}" + UBOOT_NAME_EXTRA="u-boot-${MACHINE}.bin-${UBOOT_CONFIG_EXTRA}" for target in ${IMXBOOT_TARGETS}; do + compile_${SOC_FAMILY} for rev in ${SOC_REVISIONS}; do bbnote "building ${IMX_BOOT_SOC_TARGET} - REV=${rev} ${target}" - make SOC=${IMX_BOOT_SOC_TARGET} dtbs=${UBOOT_DTB_NAME} REV=${rev} ${target} > ${S}/mkimage-${rev}-${target}.log 2>&1 + make SOC=${IMX_BOOT_SOC_TARGET} REV=${rev} ${target} > ${S}/mkimage-${rev}-${target}.log 2>&1 if [ -e "${BOOT_STAGING}/flash.bin" ]; then - cp ${BOOT_STAGING}/flash.bin ${S}/${UBOOT_PREFIX}-${MACHINE}-${rev}.bin-${target} + cp ${BOOT_STAGING}/flash.bin ${S}/${BOOT_NAME}-${MACHINE}-${rev}.bin-${target} fi - SCFWBUILT="yes" - # Remove u-boot-atf-container.img so it gets generated in the next iteration - rm ${BOOT_STAGING}/u-boot-atf-container.img done done - - # Check that SCFW was built at least once - if [ "${IMX_BOOT_SOC_TARGET}" = "iMX8QX" and "${SCFWBUILT}" != "yes" ]; then - bbfatal "SCFW was not built!" - fi + unset UBOOT_CONFIG_EXTRA + unset UBOOT_NAME_EXTRA } do_install:ccimx8x () { @@ -66,10 +61,11 @@ do_install:ccimx8x () { } generate_symlinks() { - # imx-boot recipe in meta-freescale assumes only *one* build configuration - # (otherwise variable BOOT_CONFIG_MACHINE would expand to something incorrect) + # imx-boot recipe in meta-freescale supports *multiple* build configurations. + # We assume here only ONE build configuration for our platforms (otherwise + # UBOOT_CONFIG would be incorrectly expanded) for target in ${IMXBOOT_TARGETS}; do - mv ${DEPLOYDIR}/${BOOT_CONFIG_MACHINE}-${target} ${DEPLOYDIR}/${BOOT_NAME}-${MACHINE}.bin-${target} + mv ${DEPLOYDIR}/${BOOT_NAME}-${MACHINE}-${UBOOT_CONFIG}.bin-${target} ${DEPLOYDIR}/${BOOT_NAME}-${MACHINE}.bin-${target} done ln -sf ${BOOT_NAME}-${MACHINE}.bin-${IMAGE_IMXBOOT_TARGET} ${DEPLOYDIR}/${BOOT_NAME}-${MACHINE}.bin ln -sf ${BOOT_NAME}-${MACHINE}.bin-${IMAGE_IMXBOOT_TARGET} ${DEPLOYDIR}/${BOOT_NAME} From 0d6d6d219f4ecdd10b46ef8549f0645bd3f89124 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Tue, 10 Oct 2023 12:23:34 +0200 Subject: [PATCH 07/48] 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. Note that this change was already done in commit 8979331ef8a2a47e2368d33ae58c36f73f937d33, but it was accidentally reverted when upgrading to Qt 6.5 in commit a5c6f2b795467b2cb3d21e73c911638d227e3a3e. Signed-off-by: Gabriel Valcazar --- .../qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-dey.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-dey.bb b/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-dey.bb index a51cd5eb8..54fe9ea18 100644 --- a/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-dey.bb +++ b/meta-digi-dey/dynamic-layers/qt6-layer/recipes-qt/packagegroups/packagegroup-qt6-dey.bb @@ -29,6 +29,6 @@ QT6_IMAGE_INSTALL_EXAMPLES = "qtbase-examples qtdeclarative-examples" QT6_IMAGE_INSTALL_FONTS = "ttf-dejavu-common ttf-dejavu-sans ttf-dejavu-sans-mono ttf-dejavu-serif " -QT6_IMAGE_INSTALL_QUICK3D = "qtquick3d qtquick3d-dev qtquick3d-examples" +QT6_IMAGE_INSTALL_QUICK3D = "qtquick3d qtquick3d-examples" # Quick3d does not work on systems without a proper GPU QT6_IMAGE_INSTALL_QUICK3D:ccimx93 = "" From cb6b4fe67a3c80dcec192ef272a80bf4f233db48 Mon Sep 17 00:00:00 2001 From: Tatiana Leon Date: Mon, 16 Oct 2023 10:40:33 +0200 Subject: [PATCH 08/48] cccs: increment the wait time to restart cccs services when they fail to start This commits sets 30s between restart attempt after a failure. Signed-off-by: Tatiana Leon --- meta-digi-dey/recipes-digi/cccs/files/cccs-gs-demo.service | 4 ++++ meta-digi-dey/recipes-digi/cccs/files/cccsd.service | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/meta-digi-dey/recipes-digi/cccs/files/cccs-gs-demo.service b/meta-digi-dey/recipes-digi/cccs/files/cccs-gs-demo.service index 02e94f52d..fbab6a8b1 100644 --- a/meta-digi-dey/recipes-digi/cccs/files/cccs-gs-demo.service +++ b/meta-digi-dey/recipes-digi/cccs/files/cccs-gs-demo.service @@ -3,6 +3,8 @@ Description=CCCS get start demo After=cccsd.service BindsTo=cccsd.service Upholds=cccsd.service +# Do not limit the number of restarting times +StartLimitIntervalSec=0 [Service] Type=forking @@ -10,7 +12,9 @@ ExecStart=/etc/cccs-gs-demo start ExecStop=/etc/cccs-gs-demo stop # SIGTERM signal is a valid status value SuccessExitStatus=143 +# Restart the service every 30 seconds if it fails Restart=on-failure +RestartSec=30s [Install] WantedBy=multi-user.target diff --git a/meta-digi-dey/recipes-digi/cccs/files/cccsd.service b/meta-digi-dey/recipes-digi/cccs/files/cccsd.service index f63515d85..b6fe11cf1 100644 --- a/meta-digi-dey/recipes-digi/cccs/files/cccsd.service +++ b/meta-digi-dey/recipes-digi/cccs/files/cccsd.service @@ -1,13 +1,17 @@ [Unit] Description=CCCS daemon After=network.target +# Do not limit the number of restarting times +StartLimitIntervalSec=0 [Service] Type=forking ExecStart=/etc/cccsd start ExecStop=/etc/cccsd stop PIDFile=/run/cccsd.pid +# Restart the service every 30 seconds if it fails Restart=on-failure +RestartSec=30s [Install] WantedBy=multi-user.target From 7bf452e85a8533117d10f8dfdeced3efffea6cbb Mon Sep 17 00:00:00 2001 From: David Escalona Date: Fri, 20 Oct 2023 11:47:54 +0200 Subject: [PATCH 09/48] swu: enable 'upgrade-available' flag on single systems and file updates ConnectCore 6 based products require the use of the 'upgrade_available' environment flag to save the bootcount value between resets. Extend the use of this U-Boot variable for single system updates and updates based on files. Signed-off-by: David Escalona --- .../swu-images/files/sw-description-files_template | 10 ++++++++++ .../swu-images/files/sw-description-images_template | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/meta-digi-dey/recipes-digi/swu-images/files/sw-description-files_template b/meta-digi-dey/recipes-digi/swu-images/files/sw-description-files_template index d03492e00..6a8173355 100644 --- a/meta-digi-dey/recipes-digi/swu-images/files/sw-description-files_template +++ b/meta-digi-dey/recipes-digi/swu-images/files/sw-description-files_template @@ -22,6 +22,10 @@ software = } ); uboot: ( + { + name = "upgrade_available"; + value = "@@UPGRADE_AVAILABLE@@"; + }, { name = "swap_bank"; value = "false"; @@ -48,6 +52,12 @@ software = type = "shellscript"; } ); + uboot: ( + { + name = "upgrade_available"; + value = "@@UPGRADE_AVAILABLE@@"; + } + ); } platform = { ref = "#./single"; diff --git a/meta-digi-dey/recipes-digi/swu-images/files/sw-description-images_template b/meta-digi-dey/recipes-digi/swu-images/files/sw-description-images_template index dd0559912..4f182e352 100644 --- a/meta-digi-dey/recipes-digi/swu-images/files/sw-description-images_template +++ b/meta-digi-dey/recipes-digi/swu-images/files/sw-description-images_template @@ -51,6 +51,12 @@ software = type = "shellscript"; } ); + uboot: ( + { + name = "upgrade_available"; + value = "@@UPGRADE_AVAILABLE@@"; + } + ); } platform = { ref = "#./single"; From b75e88bbe048d9454b53fd944ba7dbe240026cbc Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 10 Oct 2023 09:43:04 +0200 Subject: [PATCH 10/48] boot scripts: print boot attempts only when bootcount mechanism active Improve boot attempts message showing not only the current boot attempt but also the limit: (boot attempt 1/3) Print the message only when the bootcount mechanism is active, i.e. when the bootlimit is defined (not zero), and when bootcount is > 0. Signed-off-by: Hector Palacios https://onedigi.atlassian.net/browse/DUB-1056 (cherry picked from commit 918a9caf1d2534aba1763a3f6b539c962591483a) --- .../u-boot/u-boot-dey/ccimx6qpsbc/boot.txt | 14 +++++++++++--- .../u-boot/u-boot-dey/ccimx6sbc/boot.txt | 14 +++++++++++--- .../u-boot/u-boot-dey/ccimx6ulsbc/boot.txt | 11 ++++++++--- .../u-boot/u-boot-dey/ccimx6ulstarter/boot.txt | 11 ++++++++--- .../u-boot/u-boot-dey/ccimx8mm-dvk/boot.txt | 11 ++++++++--- .../u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt | 11 ++++++++--- .../u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt | 11 ++++++++--- .../u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt | 11 ++++++++--- .../u-boot/u-boot-dey/ccimx93-dvk/boot.txt | 11 ++++++++--- .../u-boot/u-boot-dey/ccmp13-dvk/boot.txt | 11 ++++++++--- .../u-boot/u-boot-dey/ccmp15-dvk/boot.txt | 11 ++++++++--- 11 files changed, 94 insertions(+), 33 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt index 660614a7e..cef688b71 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt @@ -7,17 +7,22 @@ # and save them, while the rest of the script changes variables only temporarily # without saving them. +# Build boot attempt message string +if test "${bootlimit}" -gt 0 && test "${bootcount}" -gt 0; then + bootattempt="(boot attempt ${bootcount}/${bootlimit})" +fi + # Dual boot update verification if test "${dualboot}" = "yes"; then if test "${upgrade_available}" = "1"; then - echo "Update detected; Booting new system in ${active_system} (try ${bootcount})" + echo "Update detected; Booting new system in ${active_system} ${bootattempt}" else if test "${active_system}" = "linux_a"; then - echo "Booting from system A (try ${bootcount})" + echo "Booting from system A" part number mmc ${mmcbootdev} linux_a tmp_mmcpart part number mmc ${mmcbootdev} rootfs_a tmp_rootfs_index else - echo "Booting from system B (try ${bootcount})" + echo "Booting from system B" part number mmc ${mmcbootdev} linux_b tmp_mmcpart part number mmc ${mmcbootdev} rootfs_b tmp_rootfs_index fi @@ -50,6 +55,9 @@ else # We are booting from the SD card. setenv mmcroot /dev/mmcblk${mmcbootdev}p2 fi + if test "${upgrade_available}" = "1"; then + echo "Update detected; Booting new system ${bootattempt}" + fi fi diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt index 46cff15a2..4248d9327 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt @@ -7,17 +7,22 @@ # and save them, while the rest of the script changes variables only temporarily # without saving them. +# Build boot attempt message string +if test "${bootlimit}" -gt 0 && test "${bootcount}" -gt 0; then + bootattempt="(boot attempt ${bootcount}/${bootlimit})" +fi + # Dual boot update verification if test "${dualboot}" = "yes"; then if test "${upgrade_available}" = "1"; then - echo "Update detected; Booting new system in ${active_system} (try ${bootcount})" + echo "Update detected; Booting new system in ${active_system} ${bootattempt}" else if test "${active_system}" = "linux_a"; then - echo "Booting from system A (try ${bootcount})" + echo "Booting from system A" part number mmc ${mmcbootdev} linux_a tmp_mmcpart part number mmc ${mmcbootdev} rootfs_a tmp_rootfs_index else - echo "Booting from system B (try ${bootcount})" + echo "Booting from system B" part number mmc ${mmcbootdev} linux_b tmp_mmcpart part number mmc ${mmcbootdev} rootfs_b tmp_rootfs_index fi @@ -50,6 +55,9 @@ else # We are booting from the SD card. setenv mmcroot /dev/mmcblk${mmcbootdev}p2 fi + if test "${upgrade_available}" = "1"; then + echo "Update detected; Booting new system ${bootattempt}" + fi fi diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt index 65be2bf99..3947f0276 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt @@ -6,14 +6,19 @@ # requires the script to change some variables and save them, while the rest # of the script changes variables only temporarily without saving them. +# Build boot attempt message string +if test "${bootlimit}" -gt 0 && test "${bootcount}" -gt 0; then + bootattempt="(boot attempt ${bootcount}/${bootlimit})" +fi + # Dual boot verification if test "${dualboot}" = "yes"; then if test "${active_system}" = "linux_a"; then - echo "Booting from system A (try ${bootcount})" + echo "Booting from system A ${bootattempt}" setenv tmp_mtdrootfspart ${rootfsvol_a} setenv tmp_rootfsvol ${rootfsvol_a} else - echo "Booting from system B (try ${bootcount})" + echo "Booting from system B ${bootattempt}" setenv tmp_mtdrootfspart ${rootfsvol_b} setenv tmp_rootfsvol ${rootfsvol_b} fi @@ -34,7 +39,7 @@ if test "${dualboot}" = "yes"; then env save fi else - echo "Booting system (try ${bootcount})" + echo "Booting system ${bootattempt}" if test "${mtdbootpart}" = "recovery"; then setenv boot_initrd true setenv initrd_file uramdisk-recovery.img diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt index 6a9926838..ab78eba4c 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt @@ -6,14 +6,19 @@ # requires the script to change some variables and save them, while the rest # of the script changes variables only temporarily without saving them. +# Build boot attempt message string +if test "${bootlimit}" -gt 0 && test "${bootcount}" -gt 0; then + bootattempt="(boot attempt ${bootcount}/${bootlimit})" +fi + # Dual boot verification if test "${dualboot}" = "yes"; then if test "${active_system}" = "linux_a"; then - echo "Booting from system A (try ${bootcount})" + echo "Booting from system A ${bootattempt}" setenv tmp_mtdrootfspart ${rootfsvol_a} setenv tmp_rootfsvol ${rootfsvol_a} else - echo "Booting from system B (try ${bootcount})" + echo "Booting from system B ${bootattempt}" setenv tmp_mtdrootfspart ${rootfsvol_b} setenv tmp_rootfsvol ${rootfsvol_b} fi @@ -34,7 +39,7 @@ if test "${dualboot}" = "yes"; then env save fi else - echo "Booting system (try ${bootcount})" + echo "Booting system ${bootattempt}" if test "${mtdbootpart}" = "recovery"; then setenv boot_initrd true setenv initrd_file uramdisk-recovery.img diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/boot.txt index c42e51422..da6947ac1 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mm-dvk/boot.txt @@ -6,14 +6,19 @@ # requires the script to change some variables and save them, while the rest # of the script changes variables only temporarily without saving them. +# Build boot attempt message string +if test "${bootlimit}" -gt 0 && test "${bootcount}" -gt 0; then + bootattempt="(boot attempt ${bootcount}/${bootlimit})" +fi + # Dual boot verification if test "${dualboot}" = "yes"; then if test "${active_system}" = "linux_a"; then - echo "Booting from system A (try ${bootcount})" + echo "Booting from system A ${bootattempt}" part number mmc ${mmcbootdev} linux_a tmp_mmcpart part number mmc ${mmcbootdev} rootfs_a tmp_rootfs_index else - echo "Booting from system B (try ${bootcount})" + echo "Booting from system B ${bootattempt}" part number mmc ${mmcbootdev} linux_b tmp_mmcpart part number mmc ${mmcbootdev} rootfs_b tmp_rootfs_index fi @@ -31,7 +36,7 @@ if test "${dualboot}" = "yes"; then env save fi else - echo "Booting system (try ${bootcount})" + echo "Booting system ${bootattempt}" # Get the UUID of the configured boot partition. part uuid mmc ${mmcbootdev}:${mmcpart} bootpart # Check the boot source. diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt index 62fbaf495..6d155ca7f 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt @@ -6,14 +6,19 @@ # requires the script to change some variables and save them, while the rest # of the script changes variables only temporarily without saving them. +# Build boot attempt message string +if test "${bootlimit}" -gt 0 && test "${bootcount}" -gt 0; then + bootattempt="(boot attempt ${bootcount}/${bootlimit})" +fi + # Dual boot verification if test "${dualboot}" = "yes"; then if test "${active_system}" = "linux_a"; then - echo "Booting from system A (try ${bootcount})" + echo "Booting from system A ${bootattempt}" part number mmc ${mmcbootdev} linux_a tmp_mmcpart part number mmc ${mmcbootdev} rootfs_a tmp_rootfs_index else - echo "Booting from system B (try ${bootcount})" + echo "Booting from system B ${bootattempt}" part number mmc ${mmcbootdev} linux_b tmp_mmcpart part number mmc ${mmcbootdev} rootfs_b tmp_rootfs_index fi @@ -31,7 +36,7 @@ if test "${dualboot}" = "yes"; then env save fi else - echo "Booting system (try ${bootcount})" + echo "Booting system ${bootattempt}" # Get the UUID of the configured boot partition. part uuid mmc ${mmcbootdev}:${mmcpart} bootpart # Check the boot source. diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt index ba60afc40..f2fa935f9 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt @@ -6,14 +6,19 @@ # requires the script to change some variables and save them, while the rest # of the script changes variables only temporarily without saving them. +# Build boot attempt message string +if test "${bootlimit}" -gt 0 && test "${bootcount}" -gt 0; then + bootattempt="(boot attempt ${bootcount}/${bootlimit})" +fi + # Dual boot verification if test "${dualboot}" = "yes"; then if test "${active_system}" = "linux_a"; then - echo "Booting from system A (try ${bootcount})" + echo "Booting from system A ${bootattempt}" part number mmc ${mmcbootdev} linux_a tmp_mmcpart part number mmc ${mmcbootdev} rootfs_a tmp_rootfs_index else - echo "Booting from system B (try ${bootcount})" + echo "Booting from system B ${bootattempt}" part number mmc ${mmcbootdev} linux_b tmp_mmcpart part number mmc ${mmcbootdev} rootfs_b tmp_rootfs_index fi @@ -31,7 +36,7 @@ if test "${dualboot}" = "yes"; then env save fi else - echo "Booting system (try ${bootcount})" + echo "Booting system ${bootattempt}" # Get the UUID of the configured boot partition. part uuid mmc ${mmcbootdev}:${mmcpart} bootpart # Check the boot source. diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt index 4ee3d440f..c39102e2b 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt @@ -6,14 +6,19 @@ # requires the script to change some variables and save them, while the rest # of the script changes variables only temporarily without saving them. +# Build boot attempt message string +if test "${bootlimit}" -gt 0 && test "${bootcount}" -gt 0; then + bootattempt="(boot attempt ${bootcount}/${bootlimit})" +fi + # Dual boot verification if test "${dualboot}" = "yes"; then if test "${active_system}" = "linux_a"; then - echo "Booting from system A (try ${bootcount})" + echo "Booting from system A ${bootattempt}" part number mmc ${mmcbootdev} linux_a tmp_mmcpart part number mmc ${mmcbootdev} rootfs_a tmp_rootfs_index else - echo "Booting from system B (try ${bootcount})" + echo "Booting from system B ${bootattempt}" part number mmc ${mmcbootdev} linux_b tmp_mmcpart part number mmc ${mmcbootdev} rootfs_b tmp_rootfs_index fi @@ -31,7 +36,7 @@ if test "${dualboot}" = "yes"; then env save fi else - echo "Booting system (try ${bootcount})" + echo "Booting system ${bootattempt}" # Get the UUID of the configured boot partition. part uuid mmc ${mmcbootdev}:${mmcpart} bootpart # Check the boot source. diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93-dvk/boot.txt index 9b169085c..4fd2fae26 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93-dvk/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93-dvk/boot.txt @@ -6,17 +6,22 @@ # requires the script to change some variables and save them, while the rest # of the script changes variables only temporarily without saving them. +# Build boot attempt message string +if test "${bootlimit}" -gt 0 && test "${bootcount}" -gt 0; then + bootattempt="(boot attempt ${bootcount}/${bootlimit})" +fi + # Pre step: check if we boot from uSD. if test "${mmcbootdev}" = "1"; then # We are booting from the SD card. setenv mmcroot /dev/mmcblk${mmcbootdev}p2 elif test "${dualboot}" = "yes"; then if test "${active_system}" = "linux_a"; then - echo "Booting from system A (try ${bootcount})" + echo "Booting from system A ${bootattempt}" part number mmc ${mmcbootdev} linux_a tmp_mmcpart part number mmc ${mmcbootdev} rootfs_a tmp_rootfs_index else - echo "Booting from system B (try ${bootcount})" + echo "Booting from system B ${bootattempt}" part number mmc ${mmcbootdev} linux_b tmp_mmcpart part number mmc ${mmcbootdev} rootfs_b tmp_rootfs_index fi @@ -34,7 +39,7 @@ elif test "${dualboot}" = "yes"; then env save fi else - echo "Booting system (try ${bootcount})" + echo "Booting system ${bootattempt}" # Get the UUID of the configured boot partition. part uuid mmc ${mmcbootdev}:${mmcpart} bootpart # Check the boot source. diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp13-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp13-dvk/boot.txt index f960f2118..f73432685 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp13-dvk/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp13-dvk/boot.txt @@ -6,13 +6,18 @@ # requires the script to change some variables and save them, while the rest # of the script changes variables only temporarily without saving them. +# Build boot attempt message string +if test "${bootlimit}" -gt 0 && test "${bootcount}" -gt 0; then + bootattempt="(boot attempt ${bootcount}/${bootlimit})" +fi + # Dual boot verification if test "${dualboot}" = "yes"; then if test "${active_system}" = "linux_a"; then - echo "Booting from system A (try ${bootcount})" + echo "Booting from system A ${bootattempt}" setenv tmp_rootfsvol ${rootfsvol_a} else - echo "Booting from system B (try ${bootcount})" + echo "Booting from system B ${bootattempt}" setenv tmp_rootfsvol ${rootfsvol_b} fi if test "${mtdbootpart}" != "${active_system}"; then @@ -28,7 +33,7 @@ if test "${dualboot}" = "yes"; then env save fi else - echo "Booting system (try ${bootcount})" + echo "Booting system ${bootattempt}" # Check the boot source. if test "${mtdbootpart}" = "linux"; then # We are booting from the NAND using 'linux'. diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp15-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp15-dvk/boot.txt index 05216ff2d..f881120c3 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp15-dvk/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp15-dvk/boot.txt @@ -6,13 +6,18 @@ # requires the script to change some variables and save them, while the rest # of the script changes variables only temporarily without saving them. +# Build boot attempt message string +if test "${bootlimit}" -gt 0 && test "${bootcount}" -gt 0; then + bootattempt="(boot attempt ${bootcount}/${bootlimit})" +fi + # Dual boot verification if test "${dualboot}" = "yes"; then if test "${active_system}" = "linux_a"; then - echo "Booting from system A (try ${bootcount})" + echo "Booting from system A ${bootattempt}" setenv tmp_rootfsvol ${rootfsvol_a} else - echo "Booting from system B (try ${bootcount})" + echo "Booting from system B ${bootattempt}" setenv tmp_rootfsvol ${rootfsvol_b} fi if test "${mtdbootpart}" != "${active_system}"; then @@ -28,7 +33,7 @@ if test "${dualboot}" = "yes"; then env save fi else - echo "Booting system (try ${bootcount})" + echo "Booting system ${bootattempt}" # Check the boot source. if test "${mtdbootpart}" = "linux"; then # We are booting from the NAND using 'linux'. From 648b555dbdfd979767825884e01a73e7886e8bfc Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Wed, 11 Oct 2023 12:41:20 +0200 Subject: [PATCH 11/48] tf-a-stm32mp: create symlinks on deploydir to TF-A and FIP binaries These binaries are installed in subdirectories by default. The uuu installer expects to find all binaries on the same folder where the script is. By creating symlinks, the uuu installer can find all the binaries it needs directly on the deploy folder. NOTE: variables in 'for' clauses are intentionally without quotes to skip whitespaces in them. Signed-off-by: Hector Palacios (cherry picked from commit 019deb63139d079b35fd3769d5061c6089461294) --- .../tf-a-stm32mp_%.bbappend | 33 +++++++++++++++++++ 1 file changed, 33 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 459ffc4e4..93cd9f05f 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 @@ -52,6 +52,39 @@ python set_fip_sign_key() { d.setVar('FIP_SIGN_KEY_PASS', p[i]) } +do_deploy:append() { + unset i + for config in ${TF_A_CONFIG}; do + i=$(expr $i + 1) + # Initialize devicetree list and tf-a basename + dt_config=$(echo ${TF_A_DEVICETREE} | cut -d',' -f${i}) + tfa_basename=$(echo ${TF_A_BINARIES} | cut -d',' -f${i}) + for dt in ${dt_config}; do + TF_A_FILENAME="${tfa_basename}-${dt}-${config}.${TF_A_SUFFIX}" + if [ -f "${DEPLOYDIR}/arm-trusted-firmware/${TF_A_FILENAME}" ]; then + cd "${DEPLOYDIR}" + # symlink TF-A + ln -s "arm-trusted-firmware/${TF_A_FILENAME}" "${DEPLOYDIR}/" + fi + done + done + + unset i + for config in ${FIP_CONFIG}; do + i="$(expr ${i} + 1)" + dt_config="$(echo ${FIP_DEVICETREE} | cut -d',' -f${i})" + for dt in ${dt_config}; do + FIP_FILENAME="${FIP_BASENAME}-${dt}-${config}.${FIP_SUFFIX}" + echo "${FIP_FILENAME}" + if [ -f "${DEPLOYDIR}/fip/${FIP_FILENAME}" ]; then + cd "${DEPLOYDIR}" + # symlink FIP + ln -s "fip/${FIP_FILENAME}" "${DEPLOYDIR}/" + fi + done + done +} + # Sign TF-A image do_deploy[postfuncs] += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'tfa_sign', '', d)}" tfa_sign() { From 70476bb4558edca1162e9730642f3dbd524338e4 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 10 Oct 2023 09:45:21 +0200 Subject: [PATCH 12/48] install_fw: [cosmetic] alphabetize script options Signed-off-by: Hector Palacios (cherry picked from commit fb349b10f7356831f73fd77d2ec2523c53a1bddd) --- .../u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh | 2 +- .../u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh | 2 +- .../u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh | 2 +- .../u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh | 2 +- .../u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh | 2 +- .../u-boot/u-boot-dey/ccimx93/install_linux_fw_uuu.sh | 2 +- .../recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh index aa53810e1..67116969b 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh @@ -32,6 +32,7 @@ show_usage() echo "Usage: $0 [options]" echo "" echo " Options:" + echo " -d Install firmware on dualboot partitions (system A and system B)." echo " -h Show this help." echo " -i Image name that prefixes the image filenames, such as 'dey-image-qt', " echo " 'dey-image-webkit', 'core-image-base'..." @@ -39,7 +40,6 @@ show_usage() echo " -n No wait. Skips 10 seconds delay to stop script." echo " -u U-Boot filename." echo " Auto-determined by variant if not provided." - echo " -d Install firmware on dualboot partitions (system A and system B)." exit 2 } diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh index f5d66d49b..d215a6b5f 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh @@ -32,6 +32,7 @@ show_usage() echo "Usage: $0 [options]" echo "" echo " Options:" + echo " -d Install firmware on dualboot partitions (system A and system B)." echo " -h Show this help." echo " -i Image name that prefixes the image filenames, such as 'dey-image-qt', " echo " 'dey-image-webkit', 'core-image-base'..." @@ -39,7 +40,6 @@ show_usage() echo " -n No wait. Skips 10 seconds delay to stop script." echo " -u U-Boot filename." echo " Auto-determined by variant if not provided." - echo " -d Install firmware on dualboot partitions (system A and system B)." exit 2 } diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh index 4eeac769d..af1d48880 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh @@ -32,6 +32,7 @@ show_usage() echo "Usage: $0 [options]" echo "" echo " Options:" + echo " -d Install firmware on dualboot partitions (system A and system B)." echo " -h Show this help." echo " -i Image name that prefixes the image filenames, such as 'dey-image-qt', " echo " 'dey-image-webkit', 'core-image-base'..." @@ -39,7 +40,6 @@ show_usage() echo " -n No wait. Skips 10 seconds delay to stop script." echo " -u U-Boot filename." echo " Auto-determined by variant if not provided." - echo " -d Install firmware on dualboot partitions (system A and system B)." exit 2 } diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh index e548c0c21..760268ff6 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh @@ -32,6 +32,7 @@ show_usage() echo "Usage: $0 [options]" echo "" echo " Options:" + echo " -d Install firmware on dualboot partitions (system A and system B)." echo " -h Show this help." echo " -i Image name that prefixes the image filenames, such as 'dey-image-qt', " echo " 'dey-image-webkit', 'core-image-base'..." @@ -39,7 +40,6 @@ show_usage() echo " -n No wait. Skips 10 seconds delay to stop script." echo " -u U-Boot filename." echo " Auto-determined by variant if not provided." - echo " -d Install firmware on dualboot partitions (system A and system B)." exit 2 } diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh index e6ded19d5..a5147e364 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh @@ -32,6 +32,7 @@ show_usage() echo "Usage: $0 [options]" echo "" echo " Options:" + echo " -d Install firmware on dualboot partitions (system A and system B)." echo " -h Show this help." echo " -i Image name that prefixes the image filenames, such as 'dey-image-qt', " echo " 'dey-image-webkit', 'core-image-base'..." @@ -39,7 +40,6 @@ show_usage() echo " -n No wait. Skips 10 seconds delay to stop script." echo " -u U-Boot filename." echo " Auto-determined by variant if not provided." - echo " -d Install firmware on dualboot partitions (system A and system B)." exit 2 } diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_uuu.sh index e548c0c21..760268ff6 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_uuu.sh @@ -32,6 +32,7 @@ show_usage() echo "Usage: $0 [options]" echo "" echo " Options:" + echo " -d Install firmware on dualboot partitions (system A and system B)." echo " -h Show this help." echo " -i Image name that prefixes the image filenames, such as 'dey-image-qt', " echo " 'dey-image-webkit', 'core-image-base'..." @@ -39,7 +40,6 @@ show_usage() echo " -n No wait. Skips 10 seconds delay to stop script." echo " -u U-Boot filename." echo " Auto-determined by variant if not provided." - echo " -d Install firmware on dualboot partitions (system A and system B)." exit 2 } diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh index 43922c07d..1b140d621 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh @@ -40,6 +40,7 @@ show_usage() echo " Options:" echo " -a Arm-trusted-firmware filename." echo " Auto-determined by variant if not provided." + echo " -d Install firmware on dualboot partitions (system A and system B)." echo " -f FIP filename." echo " Auto-determined by variant if not provided." echo " -h Show this help." @@ -47,7 +48,6 @@ show_usage() echo " 'dey-image-webkit', 'core-image-base'..." echo " Defaults to '##DEFAULT_IMAGE_NAME##' if not provided." echo " -n No wait. Skips 10 seconds delay to stop script." - echo " -d Install firmware on dualboot partitions (system A and system B)." exit 2 } From 5a8d1fddaedcf1c961a718b74f820ffdfa828ccc Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Wed, 11 Oct 2023 17:56:35 +0200 Subject: [PATCH 13/48] install_linux_fw: reset bootcount before resetting target During firmware install, the target may be reset several times. We don't want the bootcount to count these as boot attempts. This was done in a791bb446396ef3c4868a1cf01b30a6c2bd2bc40 for the ccmp1 but not for the rest of platforms. Signed-off-by: Hector Palacios (cherry picked from commit 961acf48dee99b9d5e70689301f977939f4c7d79) --- .../u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt | 2 ++ .../u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt | 2 ++ .../u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh | 4 ++++ .../u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt | 2 ++ .../u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt | 2 ++ .../u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh | 4 ++++ .../u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt | 2 ++ .../u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt | 2 ++ .../u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh | 4 ++++ .../u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt | 2 ++ .../u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt | 2 ++ .../u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh | 4 ++++ .../u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt | 2 ++ .../u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt | 2 ++ .../u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh | 4 ++++ .../u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt | 2 ++ .../u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt | 2 ++ .../u-boot/u-boot-dey/ccimx93/install_linux_fw_uuu.sh | 4 ++++ .../u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh | 3 ++- 19 files changed, 50 insertions(+), 1 deletion(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt index 13e499f6a..aaefeff57 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt @@ -260,6 +260,7 @@ setenv bootcmd " setenv boot_recovery yes; setenv recovery_command wipe_update; fi; + setenv bootcount 0; saveenv; echo \"\"; echo \"\"; @@ -273,5 +274,6 @@ setenv bootcmd " reset; " +setenv bootcount 0 saveenv reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt index 1cf816465..b752e0aac 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt @@ -263,6 +263,7 @@ setenv bootcmd " setenv boot_recovery yes; setenv recovery_command wipe_update; fi; + setenv bootcount 0; saveenv; echo \"\"; echo \"\"; @@ -276,5 +277,6 @@ setenv bootcmd " reset; " +setenv bootcount 0 saveenv reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh index 67116969b..5cf3788bb 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh @@ -240,6 +240,7 @@ uuu fb: ucmd mmc partconf 0 1 1 1 # Set 'bootcmd' for the second part of the script that will # - Reset environment to defaults +# - Reset the bootcount # - Save the environment # - Partition the eMMC user data area for Linux # - Update the 'linux' partition @@ -248,6 +249,7 @@ uuu fb: ucmd mmc partconf 0 1 1 1 uuu fb: ucmd setenv bootcmd " env default -a; setenv dualboot \${dualboot}; + setenv bootcount 0 saveenv; echo \"\"; echo \"\"; @@ -315,6 +317,8 @@ if [ "${DUALBOOT}" != true ]; then uuu fb: ucmd setenv boot_recovery yes uuu fb: ucmd setenv recovery_command wipe_update fi +# Reset the bootcount +uuu fb: ucmd setenv bootcount 0 uuu fb: ucmd saveenv # Reset the target diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt index a7d67813b..b4c819221 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt @@ -271,6 +271,7 @@ setenv bootcmd " setenv boot_recovery yes; setenv recovery_command wipe_update; fi; + setenv bootcount 0; saveenv; echo \"\"; echo \"\"; @@ -284,5 +285,6 @@ setenv bootcmd " reset; " +setenv bootcount 0 saveenv reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt index 3e93d5fb5..689669278 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt @@ -274,6 +274,7 @@ setenv bootcmd " setenv boot_recovery yes; setenv recovery_command wipe_update; fi; + setenv bootcount 0; saveenv; echo \"\"; echo \"\"; @@ -287,5 +288,6 @@ setenv bootcmd " reset; " +setenv bootcount 0 saveenv reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh index d215a6b5f..655604812 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh @@ -258,6 +258,7 @@ uuu fb: ucmd mmc partconf 0 1 1 1 # Set 'bootcmd' for the second part of the script that will # - Reset environment to defaults +# - Reset the bootcount # - Save the environment # - Partition the eMMC user data area for Linux # - Update the 'linux' partition @@ -266,6 +267,7 @@ uuu fb: ucmd mmc partconf 0 1 1 1 uuu fb: ucmd setenv bootcmd " env default -a; setenv dualboot \${dualboot}; + setenv bootcount 0 saveenv; echo \"\"; echo \"\"; @@ -333,6 +335,8 @@ if [ "${DUALBOOT}" != true ]; then uuu fb: ucmd setenv boot_recovery yes uuu fb: ucmd setenv recovery_command wipe_update fi +# Reset the bootcount +uuu fb: ucmd setenv bootcount 0 uuu fb: ucmd saveenv # Reset the target diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt index acc2e5fd4..35bceb6df 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt @@ -276,8 +276,10 @@ setenv bootcmd " echo \"\"; echo \"\"; sleep 1; + bootcount reset; reset; " +bootcount reset saveenv reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt index bdad2f6da..36fdd73b4 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt @@ -279,8 +279,10 @@ setenv bootcmd " echo \"\"; echo \"\"; sleep 1; + bootcount reset; reset; " +bootcount reset saveenv reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh index af1d48880..6ae7ed748 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh @@ -249,6 +249,7 @@ part_update "uboot" "${INSTALL_UBOOT_FILENAME}" 5000 # Set 'bootcmd' for the second part of the script that will # - Reset environment to defaults +# - Reset the bootcount # - Save the environment # - Update the 'linux' partition # - Update the 'recovery' partition @@ -257,6 +258,7 @@ part_update "uboot" "${INSTALL_UBOOT_FILENAME}" 5000 uuu fb: ucmd setenv bootcmd " env default -a; setenv dualboot \${dualboot}; + bootcount reset; setenv singlemtdsys \${singlemtdsys}; saveenv; echo \"\"; @@ -324,6 +326,8 @@ fi uuu fb: ucmd saveenv +# Reset the bootcount +uuu fb: ucmd bootcount reset # Reset the target uuu fb: acmd reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt index d4824c6ee..418d833c2 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt @@ -248,8 +248,10 @@ setenv bootcmd " echo \"\"; echo \"\"; sleep 1; + bootcount reset; reset; " +bootcount reset saveenv reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt index 896eaf1e6..c870409fa 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt @@ -249,8 +249,10 @@ setenv bootcmd " echo \"\"; echo \"\"; sleep 1; + bootcount reset; reset; " +bootcount reset saveenv reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh index 760268ff6..a20af2bf3 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh @@ -209,6 +209,7 @@ uuu fb: ucmd mmc partconf 0 1 1 1 # Set 'bootcmd' for the second part of the script that will # - Reset environment to defaults +# - Reset the bootcount # - Save the environment # - Partition the eMMC user data area for Linux # - Update the 'linux' partition @@ -217,6 +218,7 @@ uuu fb: ucmd mmc partconf 0 1 1 1 uuu fb: ucmd setenv bootcmd " env default -a; setenv dualboot \${dualboot}; + bootcount reset; saveenv; echo \"\"; echo \"\"; @@ -286,6 +288,8 @@ if [ "${DUALBOOT}" != true ]; then fi uuu fb: ucmd saveenv +# Reset the bootcount +uuu fb: ucmd bootcount reset # Reset the target uuu fb: acmd reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt index 8322ffa99..9c75c13cf 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt @@ -260,8 +260,10 @@ setenv bootcmd " echo \"\"; echo \"\"; sleep 1; + bootcount reset; reset; " +bootcount reset saveenv reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt index 46dfbe340..f8b12076a 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt @@ -263,8 +263,10 @@ setenv bootcmd " echo \"\"; echo \"\"; sleep 1; + bootcount reset; reset; " +bootcount reset saveenv reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh index a5147e364..6d7ad5a4d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh @@ -213,6 +213,7 @@ uuu fb: ucmd mmc partconf 0 1 1 1 # Set 'bootcmd' for the second part of the script that will # - Reset environment to defaults +# - Reset the bootcount # - Save the environment # - Partition the eMMC user data area for Linux # - Update the 'linux' partition @@ -221,6 +222,7 @@ uuu fb: ucmd mmc partconf 0 1 1 1 uuu fb: ucmd setenv bootcmd " env default -a; setenv dualboot \${dualboot}; + bootcount reset; saveenv; echo \"\"; echo \"\"; @@ -290,6 +292,8 @@ if [ "${DUALBOOT}" != true ]; then fi uuu fb: ucmd saveenv +# Reset the bootcount +uuu fb: ucmd bootcount reset # Reset the target uuu fb: acmd reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt index a5c969145..f43d6a2e5 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt @@ -246,8 +246,10 @@ setenv bootcmd " echo \"\"; echo \"\"; sleep 1; + bootcount reset; reset; " +bootcount reset saveenv reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt index 90e7e1f3d..256accf40 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt @@ -247,8 +247,10 @@ setenv bootcmd " echo \"\"; echo \"\"; sleep 1; + bootcount reset; reset; " +bootcount reset saveenv reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_uuu.sh index 760268ff6..a20af2bf3 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_uuu.sh @@ -209,6 +209,7 @@ uuu fb: ucmd mmc partconf 0 1 1 1 # Set 'bootcmd' for the second part of the script that will # - Reset environment to defaults +# - Reset the bootcount # - Save the environment # - Partition the eMMC user data area for Linux # - Update the 'linux' partition @@ -217,6 +218,7 @@ uuu fb: ucmd mmc partconf 0 1 1 1 uuu fb: ucmd setenv bootcmd " env default -a; setenv dualboot \${dualboot}; + bootcount reset; saveenv; echo \"\"; echo \"\"; @@ -286,6 +288,8 @@ if [ "${DUALBOOT}" != true ]; then fi uuu fb: ucmd saveenv +# Reset the bootcount +uuu fb: ucmd bootcount reset # Reset the target uuu fb: acmd reset diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh index 1b140d621..2538fe4c8 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_uuu.sh @@ -297,8 +297,9 @@ if [ "${SQUASHFS}" = true ]; then uuu fb: ucmd saveenv fi -# Reset the target +# Reset the bootcount uuu fb: ucmd bootcount reset +# Reset the target uuu fb: acmd reset echo "\033[32m" From ba1cb7514d3e7711b5f3f1d7aa70f7b164b4323a Mon Sep 17 00:00:00 2001 From: Francisco Gil Date: Mon, 20 Nov 2023 13:15:48 +0100 Subject: [PATCH 14/48] trustfence: fix building issue with trustfence enabled in cc8x In commit 2fd1dbfed7c, we accidentally removed some changes needed to build imx-boot with Trustfence enabled, which were added in commit 1ce17da8646. This partially reverts commit 2fd1dbfed7c Signed-off-by: Francisco Gil --- .../recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend index 778389424..f01c68bcb 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend @@ -45,6 +45,8 @@ do_compile:ccimx8x() { if [ -e "${BOOT_STAGING}/flash.bin" ]; then cp ${BOOT_STAGING}/flash.bin ${S}/${BOOT_NAME}-${MACHINE}-${rev}.bin-${target} fi + # Remove u-boot-atf-container.img so it gets generated in the next iteration + rm ${BOOT_STAGING}/u-boot-atf-container.img done done unset UBOOT_CONFIG_EXTRA From 6a7fc990b049e8779c20131493726038119f769d Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Mon, 20 Nov 2023 17:13:03 +0100 Subject: [PATCH 15/48] build-github.sh: remove not supported platform ccimx8x_sbc_express Signed-off-by: Javier Viguera --- sdk/build-github.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/build-github.sh b/sdk/build-github.sh index c505a6166..36ad9a8f4 100755 --- a/sdk/build-github.sh +++ b/sdk/build-github.sh @@ -125,7 +125,6 @@ done<<-_EOF_ ccimx8mm-dvk dey-image-qt ccimx8mn-dvk dey-image-qt ccimx8x-sbc-pro dey-image-qt - ccimx8x-sbc-express dey-image-qt ccimx6qpsbc dey-image-qt ccimx6sbc dey-image-qt ccimx6ulsbc dey-image-qt From 54c9de6a74ed73b259b20d080c091fcc2ebd2295 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Wed, 22 Nov 2023 14:36:11 +0100 Subject: [PATCH 16/48] qt5: set default QT_QPA_PLATFORM values for mp1 platforms Otherwise, launching a Qt5 app will result in errors and the QPA platform will need to be set manually to get it to work. Signed-off-by: Gabriel Valcazar --- .../qt5-layer/STM/recipes-qt/qt5/qtbase/qt5.sh | 7 +++++++ .../qt5-layer/STM/recipes-qt/qt5/qtbase_git.bbappend | 9 +++++++++ 2 files changed, 16 insertions(+) create mode 100644 meta-digi-dey/dynamic-layers/qt5-layer/STM/recipes-qt/qt5/qtbase/qt5.sh diff --git a/meta-digi-dey/dynamic-layers/qt5-layer/STM/recipes-qt/qt5/qtbase/qt5.sh b/meta-digi-dey/dynamic-layers/qt5-layer/STM/recipes-qt/qt5/qtbase/qt5.sh new file mode 100644 index 000000000..4052b0a13 --- /dev/null +++ b/meta-digi-dey/dynamic-layers/qt5-layer/STM/recipes-qt/qt5/qtbase/qt5.sh @@ -0,0 +1,7 @@ +#!/bin/sh +export QT_QPA_PLATFORM="wayland" + +[ -f "/etc/profile.d/weston_profile.sh" ] && return + +# Use EGLFS platform plugin for images without Wayland +export QT_QPA_PLATFORM="eglfs" QT_QPA_EGLFS_INTEGRATION="eglfs_viv" diff --git a/meta-digi-dey/dynamic-layers/qt5-layer/STM/recipes-qt/qt5/qtbase_git.bbappend b/meta-digi-dey/dynamic-layers/qt5-layer/STM/recipes-qt/qt5/qtbase_git.bbappend index 24a1f2d40..1744da523 100644 --- a/meta-digi-dey/dynamic-layers/qt5-layer/STM/recipes-qt/qt5/qtbase_git.bbappend +++ b/meta-digi-dey/dynamic-layers/qt5-layer/STM/recipes-qt/qt5/qtbase_git.bbappend @@ -4,3 +4,12 @@ PACKAGECONFIG_GL = " ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', PACKAGECONFIG:append = " eglfs examples accessibility " QT_CONFIG_FLAGS += " -no-sse2 -no-opengles3" +SRC_URI:append = " \ + file://qt5.sh \ +" +do_install:append () { + install -d ${D}${sysconfdir}/profile.d/ + install -m 0755 ${WORKDIR}/qt5.sh ${D}${sysconfdir}/profile.d/qt5.sh +} + +FILES:${PN} += "${sysconfdir}/profile.d/qt5.sh" From 09c46458948927e61aef27f87bbbb780c1f56db7 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Tue, 28 Nov 2023 12:27:49 +0100 Subject: [PATCH 17/48] mp1: cmsis-svd: switch from master branch to main branch Otherwise, bitbake's git client won't be able to fetch the sources if there are no mirrors available. Signed-off-by: Gabriel Valcazar --- .../recipes-devtools/cmsis-svd/cmsis-svd_git.bbappend | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 meta-digi-dey/dynamic-layers/stm-st-stm32mp/recipes-devtools/cmsis-svd/cmsis-svd_git.bbappend diff --git a/meta-digi-dey/dynamic-layers/stm-st-stm32mp/recipes-devtools/cmsis-svd/cmsis-svd_git.bbappend b/meta-digi-dey/dynamic-layers/stm-st-stm32mp/recipes-devtools/cmsis-svd/cmsis-svd_git.bbappend new file mode 100644 index 000000000..c8888b330 --- /dev/null +++ b/meta-digi-dey/dynamic-layers/stm-st-stm32mp/recipes-devtools/cmsis-svd/cmsis-svd_git.bbappend @@ -0,0 +1,4 @@ +# "master" branch was renamed to "main", which causes do_fetch() to fail. +# Reflect this in SRC_URI. +SRC_URI:remove = "git://github.com/posborne/cmsis-svd.git;protocol=https;branch=master" +SRC_URI:append = " git://github.com/posborne/cmsis-svd.git;protocol=https;branch=main" From 31e68ff34aad1e66f9e80e244840017164c95d84 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Fri, 15 Dec 2023 12:14:27 +0100 Subject: [PATCH 18/48] Revert "mp1: cmsis-svd: switch from master branch to main branch" Fixed via commit 311a492c21f0f3643f4b764f8b743c4c6908d31b in meta-st-stm32mp This reverts commit 09c46458948927e61aef27f87bbbb780c1f56db7. Signed-off-by: Gabriel Valcazar --- .../recipes-devtools/cmsis-svd/cmsis-svd_git.bbappend | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 meta-digi-dey/dynamic-layers/stm-st-stm32mp/recipes-devtools/cmsis-svd/cmsis-svd_git.bbappend diff --git a/meta-digi-dey/dynamic-layers/stm-st-stm32mp/recipes-devtools/cmsis-svd/cmsis-svd_git.bbappend b/meta-digi-dey/dynamic-layers/stm-st-stm32mp/recipes-devtools/cmsis-svd/cmsis-svd_git.bbappend deleted file mode 100644 index c8888b330..000000000 --- a/meta-digi-dey/dynamic-layers/stm-st-stm32mp/recipes-devtools/cmsis-svd/cmsis-svd_git.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -# "master" branch was renamed to "main", which causes do_fetch() to fail. -# Reflect this in SRC_URI. -SRC_URI:remove = "git://github.com/posborne/cmsis-svd.git;protocol=https;branch=master" -SRC_URI:append = " git://github.com/posborne/cmsis-svd.git;protocol=https;branch=main" From 64684311798fc72530db824dd3e90a129846e67f Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Wed, 20 Dec 2023 13:44:08 +0100 Subject: [PATCH 19/48] recovery-initramfs: fix multi-MTD detection when formatting NAND partitions Commit 7e81e706a19a9f7e222bbde2431f22275c83476c modified the logic used to determine if a NAND is using multi-MTD or single-MTD, but single quotes were used in the grep pattern, which prevents the variable inside from expanding. This makes the script always enter the single-MTD code path, even in multi-MTD systems, which breaks partition formatting in these cases. Replace the single quotes with double quotes so the variable can expand and the condition can be properly checked. https://onedigi.atlassian.net/browse/DEL-8773 Signed-off-by: Gabriel Valcazar --- .../recovery/recovery-initramfs/recovery-initramfs-init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-core/recovery/recovery-initramfs/recovery-initramfs-init b/meta-digi-dey/recipes-core/recovery/recovery-initramfs/recovery-initramfs-init index 59d0e995d..0e64cf8c5 100644 --- a/meta-digi-dey/recipes-core/recovery/recovery-initramfs/recovery-initramfs-init +++ b/meta-digi-dey/recipes-core/recovery/recovery-initramfs/recovery-initramfs-init @@ -233,7 +233,7 @@ format_ubi_volume() { # If the system is a multi-MTD, there must be an MTD partition by the # same name as the UBI volume - result="$(grep '\"${1}\"$' /proc/mtd)" + result="$(grep "\"${1}\"$" /proc/mtd)" if [ -n "${result}" ]; then # Find the MTD partition. local mtd_num="$(sed -ne "s/mtd\([0-9]\+\):.*\<${1}\>.*/\1/g;T;p" /proc/mtd 2>/dev/null)" From b6c453a8c1e89aa4575d4c1fa44bec4ee9af029c Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Tue, 26 Dec 2023 12:40:39 +0100 Subject: [PATCH 20/48] dey.conf: continue using stable versions of swupdate and libubootenv meta-swupdate recently added support for swupdate 2023.12 and libubootenv 0.3.5. This upgrade conflicts with our custom functionality in both packages, so keep using 2023.05 and 0.3.2 respectively so DEY 4.0 can be built without introducing possible functionality changes. Signed-off-by: Gabriel Valcazar --- meta-digi-dey/conf/distro/dey.conf | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf index 263b7642d..31dae58d3 100644 --- a/meta-digi-dey/conf/distro/dey.conf +++ b/meta-digi-dey/conf/distro/dey.conf @@ -56,6 +56,13 @@ FEATURE_PACKAGES_dey-wireless = "packagegroup-dey-wireless" # 5.65 version should be used, which is provided by the poky layer. PREFERRED_VERSION_bluez5 ?= "5.65" +# The latest available versions of swupdate and libubootenv are 2023.12 and +# 0.3.5, respectively. However, our custom patches haven't been ported or +# tested for these versions yet, so until then, continue using the versions +# we've been using in DEY 4.0 (2023.05 and 0.3.2) to guarantee stability. +PREFERRED_VERSION_swupdate ?= "2023.05" +PREFERRED_VERSION_libubootenv ?= "0.3.2" + # There's a generic opencl-headers recipe in the thud branch of # meta-openembedded, but we should use the package provided by the imx-gpu-viv # recipe in case there are NXP-specific changes in it From 87a888d35b6d403b1e734b1cffd2e34aa64c50fe Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Fri, 19 Jan 2024 09:56:35 +0100 Subject: [PATCH 21/48] weston_11.0.3: restore wl_shell functionality for LVGL demo This is needed to make the LVGL demo work on the ccimx93, which uses a newer version of weston that no longer includes wl_shell support. Restore the wl_shell functionality via a patch and enable it. https://onedigi.atlassian.net/browse/DEL-8849 Signed-off-by: Gabriel Valcazar --- .../0001-Restore-wl_shell-to-weston-11.patch | 933 ++++++++++++++++++ .../wayland/weston_11.0.3.imx.bbappend | 5 + 2 files changed, 938 insertions(+) create mode 100644 meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.3.imx/0001-Restore-wl_shell-to-weston-11.patch create mode 100644 meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_11.0.3.imx.bbappend diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.3.imx/0001-Restore-wl_shell-to-weston-11.patch b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.3.imx/0001-Restore-wl_shell-to-weston-11.patch new file mode 100644 index 000000000..0bc86f5ec --- /dev/null +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.3.imx/0001-Restore-wl_shell-to-weston-11.patch @@ -0,0 +1,933 @@ +From: Gabriel Valcazar +Date: Fri, 19 Jan 2024 09:45:19 +0100 +Subject: [PATCH] Restore wl_shell to weston 11 + +This shell was deprecated some time ago and removed in weston 11, but it's the +default shell used by LVGL's wayland backend. Until we migrate said backend to +use xdg_shell, restore wl_shell in weston 11. + +This reverts the following commits: + + * d40cedc8af9a42e1f6746fb58f4556080c6ff133 + * 7cae2a1fb0aeec24ca33ac4c7cbb268f77095cb5 + * e6b8f5a5e40cd6c0b934e8ae079c86d5193efa96 + +Signed-off-by: Gabriel Valcazar +--- + desktop-shell/shell.c | 26 +- + libweston/backend-wayland/wayland.c | 87 ++++- + libweston/desktop/internal.h | 4 + + libweston/desktop/libweston-desktop.c | 19 + + libweston/desktop/meson.build | 1 + + libweston/desktop/wl-shell.c | 497 ++++++++++++++++++++++++++ + meson.build | 6 + + meson_options.txt | 7 + + 8 files changed, 630 insertions(+), 17 deletions(-) + create mode 100644 libweston/desktop/wl-shell.c + +diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c +index 91fadd0b..fced4d76 100644 +--- a/desktop-shell/shell.c ++++ b/desktop-shell/shell.c +@@ -1163,16 +1163,16 @@ resize_grab_motion(struct weston_pointer_grab *grab, + pointer->x, pointer->y, &to_x, &to_y); + + width = resize->width; +- if (resize->edges & WESTON_DESKTOP_SURFACE_EDGE_LEFT) { ++ if (resize->edges & WL_SHELL_SURFACE_RESIZE_LEFT) { + width += wl_fixed_to_int(from_x - to_x); +- } else if (resize->edges & WESTON_DESKTOP_SURFACE_EDGE_RIGHT) { ++ } else if (resize->edges & WL_SHELL_SURFACE_RESIZE_RIGHT) { + width += wl_fixed_to_int(to_x - from_x); + } + + height = resize->height; +- if (resize->edges & WESTON_DESKTOP_SURFACE_EDGE_TOP) { ++ if (resize->edges & WL_SHELL_SURFACE_RESIZE_TOP) { + height += wl_fixed_to_int(from_y - to_y); +- } else if (resize->edges & WESTON_DESKTOP_SURFACE_EDGE_BOTTOM) { ++ } else if (resize->edges & WL_SHELL_SURFACE_RESIZE_BOTTOM) { + height += wl_fixed_to_int(to_y - from_y); + } + +@@ -1250,9 +1250,9 @@ surface_resize(struct shell_surface *shsurf, + { + struct weston_resize_grab *resize; + const unsigned resize_topbottom = +- WESTON_DESKTOP_SURFACE_EDGE_TOP | WESTON_DESKTOP_SURFACE_EDGE_BOTTOM; ++ WL_SHELL_SURFACE_RESIZE_TOP | WL_SHELL_SURFACE_RESIZE_BOTTOM; + const unsigned resize_leftright = +- WESTON_DESKTOP_SURFACE_EDGE_LEFT | WESTON_DESKTOP_SURFACE_EDGE_RIGHT; ++ WL_SHELL_SURFACE_RESIZE_LEFT | WL_SHELL_SURFACE_RESIZE_RIGHT; + const unsigned resize_any = resize_topbottom | resize_leftright; + struct weston_geometry geometry; + +@@ -1262,7 +1262,7 @@ surface_resize(struct shell_surface *shsurf, + return 0; + + /* Check for invalid edge combinations. */ +- if (edges == WESTON_DESKTOP_SURFACE_EDGE_NONE || edges > resize_any || ++ if (edges == WL_SHELL_SURFACE_RESIZE_NONE || edges > resize_any || + (edges & resize_topbottom) == resize_topbottom || + (edges & resize_leftright) == resize_leftright) + return 0; +@@ -2123,9 +2123,9 @@ desktop_surface_committed(struct weston_desktop_surface *desktop_surface, + sy = 0; + } + +- if (shsurf->resize_edges & WESTON_DESKTOP_SURFACE_EDGE_LEFT) ++ if (shsurf->resize_edges & WL_SHELL_SURFACE_RESIZE_LEFT) + sx = shsurf->last_width - surface->width; +- if (shsurf->resize_edges & WESTON_DESKTOP_SURFACE_EDGE_TOP) ++ if (shsurf->resize_edges & WL_SHELL_SURFACE_RESIZE_TOP) + sy = shsurf->last_height - surface->height; + + weston_view_to_global_float(shsurf->view, 0, 0, &from_x, &from_y); +@@ -3084,18 +3084,18 @@ resize_binding(struct weston_pointer *pointer, const struct timespec *time, + &x, &y); + + if (x < surface->width / 3) +- edges |= WESTON_DESKTOP_SURFACE_EDGE_LEFT; ++ edges |= WL_SHELL_SURFACE_RESIZE_LEFT; + else if (x < 2 * surface->width / 3) + edges |= 0; + else +- edges |= WESTON_DESKTOP_SURFACE_EDGE_RIGHT; ++ edges |= WL_SHELL_SURFACE_RESIZE_RIGHT; + + if (y < surface->height / 3) +- edges |= WESTON_DESKTOP_SURFACE_EDGE_TOP; ++ edges |= WL_SHELL_SURFACE_RESIZE_TOP; + else if (y < 2 * surface->height / 3) + edges |= 0; + else +- edges |= WESTON_DESKTOP_SURFACE_EDGE_BOTTOM; ++ edges |= WL_SHELL_SURFACE_RESIZE_BOTTOM; + + surface_resize(shsurf, pointer, edges); + } +diff --git a/libweston/backend-wayland/wayland.c b/libweston/backend-wayland/wayland.c +index bb5648d5..3ba20ff7 100644 +--- a/libweston/backend-wayland/wayland.c ++++ b/libweston/backend-wayland/wayland.c +@@ -76,6 +76,7 @@ struct wayland_backend { + struct wl_display *wl_display; + struct wl_registry *registry; + struct wl_compositor *compositor; ++ struct wl_shell *shell; + struct xdg_wm_base *xdg_wm_base; + struct zwp_fullscreen_shell_v1 *fshell; + struct wl_shm *shm; +@@ -111,6 +112,7 @@ struct wayland_output { + struct wl_output *output; + uint32_t global_id; + ++ struct wl_shell_surface *shell_surface; + struct xdg_surface *xdg_surface; + struct xdg_toplevel *xdg_toplevel; + int configure_width, configure_height; +@@ -715,6 +717,11 @@ wayland_backend_destroy_output_surface(struct wayland_output *output) + output->parent.xdg_surface = NULL; + } + ++ if (output->parent.shell_surface) { ++ wl_shell_surface_destroy(output->parent.shell_surface); ++ output->parent.shell_surface = NULL; ++ } ++ + wl_surface_destroy(output->parent.surface); + output->parent.surface = NULL; + } +@@ -787,6 +794,8 @@ wayland_output_destroy(struct weston_output *base) + free(output); + } + ++static const struct wl_shell_surface_listener shell_surface_listener; ++ + #ifdef ENABLE_EGL + static int + wayland_output_init_gl_renderer(struct wayland_output *output) +@@ -940,6 +949,8 @@ wayland_output_set_windowed(struct wayland_output *output) + + if (output->parent.xdg_toplevel) { + xdg_toplevel_unset_fullscreen(output->parent.xdg_toplevel); ++ } else if (output->parent.shell_surface) { ++ wl_shell_surface_set_toplevel(output->parent.shell_surface); + } else { + abort(); + } +@@ -949,6 +960,7 @@ wayland_output_set_windowed(struct wayland_output *output) + + static void + wayland_output_set_fullscreen(struct wayland_output *output, ++ enum wl_shell_surface_fullscreen_method method, + uint32_t framerate, struct wl_output *target) + { + if (output->frame) { +@@ -960,6 +972,9 @@ wayland_output_set_fullscreen(struct wayland_output *output, + + if (output->parent.xdg_toplevel) { + xdg_toplevel_set_fullscreen(output->parent.xdg_toplevel, target); ++ } else if (output->parent.shell_surface) { ++ wl_shell_surface_set_fullscreen(output->parent.shell_surface, ++ method, framerate, target); + } else { + abort(); + } +@@ -1089,7 +1104,7 @@ wayland_output_switch_mode(struct weston_output *output_base, + + b = to_wayland_backend(output_base->compositor); + +- if (output->parent.xdg_surface || !b->parent.fshell) ++ if (output->parent.xdg_surface || output->parent.shell_surface || !b->parent.fshell) + return -1; + + mode = wayland_output_choose_mode(output, mode); +@@ -1230,6 +1245,20 @@ wayland_backend_create_output_surface(struct wayland_output *output) + + weston_log("wayland-backend: Using xdg_wm_base\n"); + } ++ else if (b->parent.shell) { ++ output->parent.shell_surface = ++ wl_shell_get_shell_surface(b->parent.shell, ++ output->parent.surface); ++ if (!output->parent.shell_surface) { ++ wl_surface_destroy(output->parent.surface); ++ return -1; ++ } ++ ++ wl_shell_surface_add_listener(output->parent.shell_surface, ++ &shell_surface_listener, output); ++ ++ weston_log("wayland-backend: Using wl_shell\n"); ++ } + + return 0; + } +@@ -1294,9 +1323,13 @@ wayland_output_enable(struct weston_output *base) + + output->parent.draw_initial_frame = true; + } ++ } else { ++ wayland_output_set_fullscreen(output, ++ WL_SHELL_SURFACE_FULLSCREEN_METHOD_DRIVER, ++ output->mode.refresh, output->parent.output); + } + } else if (b->fullscreen) { +- wayland_output_set_fullscreen(output, 0, NULL); ++ wayland_output_set_fullscreen(output, 0, 0, NULL); + } else { + wayland_output_set_windowed(output); + } +@@ -1578,10 +1611,13 @@ wayland_output_setup_fullscreen(struct wayland_output *output, + return -1; + + /* What should size be set if conditional is false? */ +- if (b->parent.xdg_wm_base) { ++ if (b->parent.xdg_wm_base || b->parent.shell) { + if (output->parent.xdg_toplevel) + xdg_toplevel_set_fullscreen(output->parent.xdg_toplevel, + output->parent.output); ++ else if (output->parent.shell_surface) ++ wl_shell_surface_set_fullscreen(output->parent.shell_surface, ++ 0, 0, NULL); + + wl_display_roundtrip(b->parent.wl_display); + +@@ -1605,6 +1641,36 @@ err_set_size: + return -1; + } + ++static void ++shell_surface_ping(void *data, struct wl_shell_surface *shell_surface, ++ uint32_t serial) ++{ ++ wl_shell_surface_pong(shell_surface, serial); ++} ++ ++static void ++shell_surface_configure(void *data, struct wl_shell_surface *shell_surface, ++ uint32_t edges, int32_t width, int32_t height) ++{ ++ struct wayland_output *output = data; ++ ++ output->parent.configure_width = width; ++ output->parent.configure_height = height; ++ ++ /* FIXME: implement resizing */ ++} ++ ++static void ++shell_surface_popup_done(void *data, struct wl_shell_surface *shell_surface) ++{ ++} ++ ++static const struct wl_shell_surface_listener shell_surface_listener = { ++ shell_surface_ping, ++ shell_surface_configure, ++ shell_surface_popup_done ++}; ++ + /* Events received from the wayland-server this compositor is client of: */ + + /* parent input interface */ +@@ -1782,6 +1848,9 @@ input_handle_button(void *data, struct wl_pointer *pointer, + if (input->output->parent.xdg_toplevel) + xdg_toplevel_move(input->output->parent.xdg_toplevel, + input->parent.seat, serial); ++ else if (input->output->parent.shell_surface) ++ wl_shell_surface_move(input->output->parent.shell_surface, ++ input->parent.seat, serial); + frame_status_clear(input->output->frame, + FRAME_STATUS_MOVE); + return; +@@ -2135,6 +2204,9 @@ input_handle_touch_down(void *data, struct wl_touch *wl_touch, + if (output->parent.xdg_toplevel) + xdg_toplevel_move(output->parent.xdg_toplevel, + input->parent.seat, serial); ++ else if (output->parent.shell_surface) ++ wl_shell_surface_move(output->parent.shell_surface, ++ input->parent.seat, serial); + frame_status_clear(output->frame, + FRAME_STATUS_MOVE); + return; +@@ -2647,6 +2719,10 @@ registry_handle_global(void *data, struct wl_registry *registry, uint32_t name, + &xdg_wm_base_interface, 1); + xdg_wm_base_add_listener(b->parent.xdg_wm_base, + &wm_base_listener, b); ++ } else if (strcmp(interface, "wl_shell") == 0) { ++ b->parent.shell = ++ wl_registry_bind(registry, name, ++ &wl_shell_interface, 1); + } else if (strcmp(interface, "zwp_fullscreen_shell_v1") == 0) { + b->parent.fshell = + wl_registry_bind(registry, name, +@@ -2741,6 +2817,9 @@ wayland_destroy(struct weston_compositor *ec) + if (b->parent.xdg_wm_base) + xdg_wm_base_destroy(b->parent.xdg_wm_base); + ++ if (b->parent.shell) ++ wl_shell_destroy(b->parent.shell); ++ + if (b->parent.fshell) + zwp_fullscreen_shell_v1_release(b->parent.fshell); + +@@ -2808,7 +2887,7 @@ fullscreen_binding(struct weston_keyboard *keyboard, + return; + + if (input->output->frame) +- wayland_output_set_fullscreen(input->output, 0, NULL); ++ wayland_output_set_fullscreen(input->output, 0, 0, NULL); + else + wayland_output_set_windowed(input->output); + +diff --git a/libweston/desktop/internal.h b/libweston/desktop/internal.h +index 1d035d5c..93b15919 100644 +--- a/libweston/desktop/internal.h ++++ b/libweston/desktop/internal.h +@@ -241,6 +241,10 @@ weston_desktop_xdg_wm_base_create(struct weston_desktop *desktop, + struct wl_global * + weston_desktop_xdg_shell_v6_create(struct weston_desktop *desktop, + struct wl_display *display); ++struct wl_global * ++weston_desktop_wl_shell_create(struct weston_desktop *desktop, ++ struct wl_display *display); ++ + void + weston_desktop_xwayland_init(struct weston_desktop *desktop); + void +diff --git a/libweston/desktop/libweston-desktop.c b/libweston/desktop/libweston-desktop.c +index 0be9d717..cbe69942 100644 +--- a/libweston/desktop/libweston-desktop.c ++++ b/libweston/desktop/libweston-desktop.c +@@ -42,6 +42,7 @@ struct weston_desktop { + void *user_data; + struct wl_global *xdg_wm_base; /* Stable protocol xdg_shell replaces xdg_shell_unstable_v6 */ + struct wl_global *xdg_shell_v6; /* Unstable xdg_shell_unstable_v6 protocol. */ ++ struct wl_global *wl_shell; + }; + + void +@@ -76,6 +77,22 @@ weston_desktop_create(struct weston_compositor *compositor, + return NULL; + } + ++#ifdef HAVE_DEPRECATED_WL_SHELL ++ weston_log("Warning: support for deprecated wl_shell interface is " ++ "enabled. Please migrate legacy clients to xdg-shell.\n"); ++ desktop->wl_shell = ++ weston_desktop_wl_shell_create(desktop, display); ++ if (desktop->wl_shell == NULL) { ++ weston_desktop_destroy(desktop); ++ return NULL; ++ } ++#else ++ weston_log("Note: support for the deprecated wl_shell interface is " ++ "disabled. If a legacy client still needs it, it can be " ++ "re-enabled by passing -Ddeprecated-wl-shell=true to Meson " ++ "when building Weston.\n"); ++#endif ++ + weston_desktop_xwayland_init(desktop); + + return desktop; +@@ -89,6 +106,8 @@ weston_desktop_destroy(struct weston_desktop *desktop) + + weston_desktop_xwayland_fini(desktop); + ++ if (desktop->wl_shell != NULL) ++ wl_global_destroy(desktop->wl_shell); + if (desktop->xdg_shell_v6 != NULL) + wl_global_destroy(desktop->xdg_shell_v6); + if (desktop->xdg_wm_base != NULL) +diff --git a/libweston/desktop/meson.build b/libweston/desktop/meson.build +index 4588ad10..d8e1a709 100644 +--- a/libweston/desktop/meson.build ++++ b/libweston/desktop/meson.build +@@ -4,6 +4,7 @@ srcs_libweston += files([ + 'seat.c', + 'surface.c', + 'xwayland.c', ++ 'wl-shell.c', + 'xdg-shell.c', + 'xdg-shell-v6.c', + ]) +diff --git a/libweston/desktop/wl-shell.c b/libweston/desktop/wl-shell.c +new file mode 100644 +index 00000000..9efec89b +--- /dev/null ++++ b/libweston/desktop/wl-shell.c +@@ -0,0 +1,497 @@ ++/* ++ * Copyright © 2010-2012 Intel Corporation ++ * Copyright © 2011-2012 Collabora, Ltd. ++ * Copyright © 2013 Raspberry Pi Foundation ++ * Copyright © 2016 Quentin "Sardem FF7" Glidic ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the "Software"), ++ * to deal in the Software without restriction, including without limitation ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ * and/or sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice (including the next ++ * paragraph) shall be included in all copies or substantial portions of the ++ * Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER ++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING ++ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER ++ * DEALINGS IN THE SOFTWARE. ++ */ ++ ++#include "config.h" ++ ++#include ++ ++#include ++ ++#include ++#include ++ ++#include ++#include "internal.h" ++ ++#define WD_WL_SHELL_PROTOCOL_VERSION 1 ++ ++enum weston_desktop_wl_shell_surface_state { ++ NONE, ++ TOPLEVEL, ++ MAXIMIZED, ++ FULLSCREEN, ++ TRANSIENT, ++ POPUP, ++}; ++ ++struct weston_desktop_wl_shell_surface { ++ struct wl_resource *resource; ++ struct weston_desktop *desktop; ++ struct wl_display *display; ++ struct weston_desktop_surface *surface; ++ struct weston_desktop_surface *parent; ++ bool added; ++ struct weston_desktop_seat *popup_seat; ++ enum weston_desktop_wl_shell_surface_state state; ++ struct wl_listener wl_surface_resource_destroy_listener; ++}; ++ ++static void ++weston_desktop_wl_shell_surface_set_size(struct weston_desktop_surface *dsurface, ++ void *user_data, ++ int32_t width, int32_t height) ++{ ++ struct weston_desktop_wl_shell_surface *surface = user_data; ++ struct weston_surface *wsurface = ++ weston_desktop_surface_get_surface(surface->surface); ++ ++ if ((wsurface->width == width && wsurface->height == height) || ++ (width == 0 && height == 0)) ++ return; ++ ++ wl_shell_surface_send_configure(surface->resource, ++ WL_SHELL_SURFACE_RESIZE_NONE, ++ width, height); ++} ++ ++static void ++weston_desktop_wl_shell_surface_maybe_ungrab(struct weston_desktop_wl_shell_surface *surface) ++{ ++ if (surface->state != POPUP || ++ !weston_desktop_surface_get_grab(surface->surface)) ++ return; ++ ++ weston_desktop_surface_popup_ungrab(surface->surface, ++ surface->popup_seat); ++ surface->popup_seat = NULL; ++} ++ ++static void ++weston_desktop_wl_shell_surface_committed(struct weston_desktop_surface *dsurface, ++ void *user_data, ++ int32_t sx, int32_t sy) ++{ ++ struct weston_desktop_wl_shell_surface *surface = user_data; ++ struct weston_surface *wsurface = ++ weston_desktop_surface_get_surface(dsurface); ++ ++ if (wsurface->buffer_ref.buffer == NULL) ++ weston_desktop_wl_shell_surface_maybe_ungrab(surface); ++ ++ if (surface->added) ++ weston_desktop_api_committed(surface->desktop, surface->surface, ++ sx, sy); ++} ++ ++static void ++weston_desktop_wl_shell_surface_ping(struct weston_desktop_surface *dsurface, ++ uint32_t serial, void *user_data) ++{ ++ struct weston_desktop_wl_shell_surface *surface = user_data; ++ ++ wl_shell_surface_send_ping(surface->resource, serial); ++} ++ ++static void ++weston_desktop_wl_shell_surface_close(struct weston_desktop_surface *dsurface, ++ void *user_data) ++{ ++ struct weston_desktop_wl_shell_surface *surface = user_data; ++ ++ if (surface->state == POPUP) ++ wl_shell_surface_send_popup_done(surface->resource); ++} ++ ++static bool ++weston_desktop_wl_shell_surface_get_maximized(struct weston_desktop_surface *dsurface, ++ void *user_data) ++{ ++ struct weston_desktop_wl_shell_surface *surface = user_data; ++ ++ return surface->state == MAXIMIZED; ++} ++ ++static bool ++weston_desktop_wl_shell_surface_get_fullscreen(struct weston_desktop_surface *dsurface, ++ void *user_data) ++{ ++ struct weston_desktop_wl_shell_surface *surface = user_data; ++ ++ return surface->state == FULLSCREEN; ++} ++ ++static void ++weston_desktop_wl_shell_change_state(struct weston_desktop_wl_shell_surface *surface, ++ enum weston_desktop_wl_shell_surface_state state, ++ struct weston_desktop_surface *parent, ++ int32_t x, int32_t y) ++{ ++ bool to_add = (parent == NULL); ++ ++ assert(state != NONE); ++ ++ if (to_add && surface->added) { ++ surface->state = state; ++ return; ++ } ++ ++ if (surface->state != state) { ++ if (surface->state == POPUP) ++ weston_desktop_wl_shell_surface_maybe_ungrab(surface); ++ ++ if (to_add) { ++ weston_desktop_surface_unset_relative_to(surface->surface); ++ weston_desktop_api_surface_added(surface->desktop, ++ surface->surface); ++ } else if (surface->added) { ++ weston_desktop_api_surface_removed(surface->desktop, ++ surface->surface); ++ } ++ ++ surface->state = state; ++ surface->added = to_add; ++ } ++ ++ if (parent != NULL) ++ weston_desktop_surface_set_relative_to(surface->surface, parent, ++ x, y, false); ++} ++ ++static void ++weston_desktop_wl_shell_surface_destroy(struct weston_desktop_surface *dsurface, ++ void *user_data) ++{ ++ struct weston_desktop_wl_shell_surface *surface = user_data; ++ ++ wl_list_remove(&surface->wl_surface_resource_destroy_listener.link); ++ ++ weston_desktop_wl_shell_surface_maybe_ungrab(surface); ++ weston_desktop_surface_unset_relative_to(surface->surface); ++ if (surface->added) ++ weston_desktop_api_surface_removed(surface->desktop, ++ surface->surface); ++ ++ free(surface); ++} ++ ++static void ++weston_desktop_wl_shell_surface_protocol_pong(struct wl_client *wl_client, ++ struct wl_resource *resource, ++ uint32_t serial) ++{ ++ struct weston_desktop_surface *surface = wl_resource_get_user_data(resource); ++ ++ weston_desktop_client_pong(weston_desktop_surface_get_client(surface), serial); ++} ++ ++static void ++weston_desktop_wl_shell_surface_protocol_move(struct wl_client *wl_client, ++ struct wl_resource *resource, ++ struct wl_resource *seat_resource, ++ uint32_t serial) ++{ ++ struct weston_desktop_surface *dsurface = ++ wl_resource_get_user_data(resource); ++ struct weston_seat *seat = ++ wl_resource_get_user_data(seat_resource); ++ struct weston_desktop_wl_shell_surface *surface = ++ weston_desktop_surface_get_implementation_data(dsurface); ++ ++ if (seat == NULL) ++ return; ++ ++ weston_desktop_api_move(surface->desktop, dsurface, seat, serial); ++} ++ ++static void ++weston_desktop_wl_shell_surface_protocol_resize(struct wl_client *wl_client, ++ struct wl_resource *resource, ++ struct wl_resource *seat_resource, ++ uint32_t serial, ++ enum wl_shell_surface_resize edges) ++{ ++ struct weston_desktop_surface *dsurface = ++ wl_resource_get_user_data(resource); ++ struct weston_seat *seat = wl_resource_get_user_data(seat_resource); ++ struct weston_desktop_wl_shell_surface *surface = ++ weston_desktop_surface_get_implementation_data(dsurface); ++ enum weston_desktop_surface_edge surf_edges = ++ (enum weston_desktop_surface_edge) edges; ++ ++ if (seat == NULL) ++ return; ++ ++ weston_desktop_api_resize(surface->desktop, dsurface, seat, serial, surf_edges); ++} ++ ++static void ++weston_desktop_wl_shell_surface_protocol_set_toplevel(struct wl_client *wl_client, ++ struct wl_resource *resource) ++{ ++ struct weston_desktop_surface *dsurface = ++ wl_resource_get_user_data(resource); ++ struct weston_desktop_wl_shell_surface *surface = ++ weston_desktop_surface_get_implementation_data(dsurface); ++ ++ weston_desktop_wl_shell_change_state(surface, TOPLEVEL, NULL, 0, 0); ++ if (surface->parent == NULL) ++ return; ++ surface->parent = NULL; ++ weston_desktop_api_set_parent(surface->desktop, surface->surface, NULL); ++} ++ ++static void ++weston_desktop_wl_shell_surface_protocol_set_transient(struct wl_client *wl_client, ++ struct wl_resource *resource, ++ struct wl_resource *parent_resource, ++ int32_t x, int32_t y, ++ enum wl_shell_surface_transient flags) ++{ ++ struct weston_desktop_surface *dsurface = ++ wl_resource_get_user_data(resource); ++ struct weston_surface *wparent = ++ wl_resource_get_user_data(parent_resource); ++ struct weston_desktop_surface *parent; ++ struct weston_desktop_wl_shell_surface *surface = ++ weston_desktop_surface_get_implementation_data(dsurface); ++ ++ if (!weston_surface_is_desktop_surface(wparent)) ++ return; ++ ++ parent = weston_surface_get_desktop_surface(wparent); ++ if (flags & WL_SHELL_SURFACE_TRANSIENT_INACTIVE) { ++ weston_desktop_wl_shell_change_state(surface, TRANSIENT, parent, ++ x, y); ++ } else { ++ weston_desktop_wl_shell_change_state(surface, TOPLEVEL, NULL, ++ 0, 0); ++ surface->parent = parent; ++ weston_desktop_api_set_parent(surface->desktop, ++ surface->surface, parent); ++ } ++} ++ ++static void ++weston_desktop_wl_shell_surface_protocol_set_fullscreen(struct wl_client *wl_client, ++ struct wl_resource *resource, ++ enum wl_shell_surface_fullscreen_method method, ++ uint32_t framerate, ++ struct wl_resource *output_resource) ++{ ++ struct weston_desktop_surface *dsurface = ++ wl_resource_get_user_data(resource); ++ struct weston_desktop_wl_shell_surface *surface = ++ weston_desktop_surface_get_implementation_data(dsurface); ++ struct weston_output *output = NULL; ++ ++ if (output_resource != NULL) ++ output = weston_head_from_resource(output_resource)->output; ++ ++ weston_desktop_wl_shell_change_state(surface, FULLSCREEN, NULL, 0, 0); ++ weston_desktop_api_fullscreen_requested(surface->desktop, dsurface, ++ true, output); ++} ++ ++static void ++weston_desktop_wl_shell_surface_protocol_set_popup(struct wl_client *wl_client, ++ struct wl_resource *resource, ++ struct wl_resource *seat_resource, ++ uint32_t serial, ++ struct wl_resource *parent_resource, ++ int32_t x, int32_t y, ++ enum wl_shell_surface_transient flags) ++{ ++ struct weston_desktop_surface *dsurface = ++ wl_resource_get_user_data(resource); ++ struct weston_seat *wseat = wl_resource_get_user_data(seat_resource); ++ struct weston_desktop_seat *seat = weston_desktop_seat_from_seat(wseat); ++ struct weston_surface *parent = ++ wl_resource_get_user_data(parent_resource); ++ struct weston_desktop_surface *parent_surface; ++ struct weston_desktop_wl_shell_surface *surface = ++ weston_desktop_surface_get_implementation_data(dsurface); ++ ++ /* Check that if we have a valid wseat we also got a valid desktop seat */ ++ if (wseat != NULL && seat == NULL) { ++ wl_client_post_no_memory(wl_client); ++ return; ++ } ++ ++ if (!weston_surface_is_desktop_surface(parent)) ++ return; ++ ++ parent_surface = weston_surface_get_desktop_surface(parent); ++ ++ weston_desktop_wl_shell_change_state(surface, POPUP, ++ parent_surface, x, y); ++ weston_desktop_surface_popup_grab(surface->surface, seat, serial); ++ surface->popup_seat = seat; ++} ++ ++static void ++weston_desktop_wl_shell_surface_protocol_set_maximized(struct wl_client *wl_client, ++ struct wl_resource *resource, ++ struct wl_resource *output_resource) ++{ ++ struct weston_desktop_surface *dsurface = ++ wl_resource_get_user_data(resource); ++ struct weston_desktop_wl_shell_surface *surface = ++ weston_desktop_surface_get_implementation_data(dsurface); ++ ++ weston_desktop_wl_shell_change_state(surface, MAXIMIZED, NULL, 0, 0); ++ weston_desktop_api_maximized_requested(surface->desktop, dsurface, true); ++} ++ ++static void ++weston_desktop_wl_shell_surface_protocol_set_title(struct wl_client *wl_client, ++ struct wl_resource *resource, ++ const char *title) ++{ ++ struct weston_desktop_surface *surface = ++ wl_resource_get_user_data(resource); ++ ++ weston_desktop_surface_set_title(surface, title); ++} ++ ++static void ++weston_desktop_wl_shell_surface_protocol_set_class(struct wl_client *wl_client, ++ struct wl_resource *resource, ++ const char *class_) ++{ ++ struct weston_desktop_surface *surface = ++ wl_resource_get_user_data(resource); ++ ++ weston_desktop_surface_set_app_id(surface, class_); ++} ++ ++ ++static const struct wl_shell_surface_interface weston_desktop_wl_shell_surface_implementation = { ++ .pong = weston_desktop_wl_shell_surface_protocol_pong, ++ .move = weston_desktop_wl_shell_surface_protocol_move, ++ .resize = weston_desktop_wl_shell_surface_protocol_resize, ++ .set_toplevel = weston_desktop_wl_shell_surface_protocol_set_toplevel, ++ .set_transient = weston_desktop_wl_shell_surface_protocol_set_transient, ++ .set_fullscreen = weston_desktop_wl_shell_surface_protocol_set_fullscreen, ++ .set_popup = weston_desktop_wl_shell_surface_protocol_set_popup, ++ .set_maximized = weston_desktop_wl_shell_surface_protocol_set_maximized, ++ .set_title = weston_desktop_wl_shell_surface_protocol_set_title, ++ .set_class = weston_desktop_wl_shell_surface_protocol_set_class, ++}; ++ ++static const struct weston_desktop_surface_implementation weston_desktop_wl_shell_surface_internal_implementation = { ++ .set_size = weston_desktop_wl_shell_surface_set_size, ++ .committed = weston_desktop_wl_shell_surface_committed, ++ .ping = weston_desktop_wl_shell_surface_ping, ++ .close = weston_desktop_wl_shell_surface_close, ++ ++ .get_maximized = weston_desktop_wl_shell_surface_get_maximized, ++ .get_fullscreen = weston_desktop_wl_shell_surface_get_fullscreen, ++ ++ .destroy = weston_desktop_wl_shell_surface_destroy, ++}; ++ ++static void ++wl_surface_resource_destroyed(struct wl_listener *listener, ++ void *data) ++{ ++ struct weston_desktop_wl_shell_surface *surface = ++ wl_container_of(listener, surface, ++ wl_surface_resource_destroy_listener); ++ ++ /* the wl_shell_surface spec says that wl_shell_surfaces are to be ++ * destroyed automatically when the wl_surface is destroyed. */ ++ weston_desktop_surface_destroy(surface->surface); ++} ++ ++static void ++weston_desktop_wl_shell_protocol_get_shell_surface(struct wl_client *wl_client, ++ struct wl_resource *resource, ++ uint32_t id, ++ struct wl_resource *surface_resource) ++{ ++ struct weston_desktop_client *client = wl_resource_get_user_data(resource); ++ struct weston_surface *wsurface = wl_resource_get_user_data(surface_resource); ++ struct weston_desktop_wl_shell_surface *surface; ++ ++ ++ if (weston_surface_set_role(wsurface, "wl_shell_surface", resource, WL_SHELL_ERROR_ROLE) < 0) ++ return; ++ ++ surface = zalloc(sizeof(struct weston_desktop_wl_shell_surface)); ++ if (surface == NULL) { ++ wl_client_post_no_memory(wl_client); ++ return; ++ } ++ ++ surface->desktop = weston_desktop_client_get_desktop(client); ++ surface->display = weston_desktop_get_display(surface->desktop); ++ ++ surface->surface = ++ weston_desktop_surface_create(surface->desktop, client, wsurface, ++ &weston_desktop_wl_shell_surface_internal_implementation, ++ surface); ++ if (surface->surface == NULL) { ++ free(surface); ++ return; ++ } ++ ++ surface->wl_surface_resource_destroy_listener.notify = ++ wl_surface_resource_destroyed; ++ wl_resource_add_destroy_listener(wsurface->resource, ++ &surface->wl_surface_resource_destroy_listener); ++ ++ surface->resource = ++ weston_desktop_surface_add_resource(surface->surface, ++ &wl_shell_surface_interface, ++ &weston_desktop_wl_shell_surface_implementation, ++ id, NULL); ++} ++ ++ ++static const struct wl_shell_interface weston_desktop_wl_shell_implementation = { ++ .get_shell_surface = weston_desktop_wl_shell_protocol_get_shell_surface, ++}; ++ ++static void ++weston_desktop_wl_shell_bind(struct wl_client *client, void *data, ++ uint32_t version, uint32_t id) ++{ ++ struct weston_desktop *desktop = data; ++ ++ weston_desktop_client_create(desktop, client, NULL, &wl_shell_interface, ++ &weston_desktop_wl_shell_implementation, ++ version, id); ++} ++ ++struct wl_global * ++weston_desktop_wl_shell_create(struct weston_desktop *desktop, ++ struct wl_display *display) ++{ ++ return wl_global_create(display, ++ &wl_shell_interface, ++ WD_WL_SHELL_PROTOCOL_VERSION, desktop, ++ weston_desktop_wl_shell_bind); ++} +diff --git a/meson.build b/meson.build +index 6452ca05..64575226 100644 +--- a/meson.build ++++ b/meson.build +@@ -141,6 +141,12 @@ if dep_xkbcommon.version().version_compare('>= 0.5.0') + config_h.set('HAVE_XKBCOMMON_COMPOSE', '1') + endif + ++if get_option('deprecated-wl-shell') ++ warning('Support for the deprecated wl_shell interface is enabled.') ++ warning('This feature will be removed in a future version.') ++ config_h.set('HAVE_DEPRECATED_WL_SHELL', '1') ++endif ++ + dep_wayland_server = dependency('wayland-server', version: '>= 1.20.0') + dep_wayland_client = dependency('wayland-client', version: '>= 1.20.0') + dep_pixman = dependency('pixman-1', version: '>= 0.25.2') +diff --git a/meson_options.txt b/meson_options.txt +index 695eb780..203fa12d 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -132,6 +132,13 @@ option( + description: 'Weston desktop shell: default helper client selection' + ) + ++option( ++ 'deprecated-wl-shell', ++ type: 'boolean', ++ value: false, ++ description: 'Enable the deprecated wl_shell protocol' ++) ++ + option( + 'color-management-lcms', + type: 'boolean', + diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_11.0.3.imx.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_11.0.3.imx.bbappend new file mode 100644 index 000000000..58dbf02b5 --- /dev/null +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_11.0.3.imx.bbappend @@ -0,0 +1,5 @@ +# Copyright (C) 2024 Digi International Inc. + +SRC_URI += "file://0001-Restore-wl_shell-to-weston-11.patch" + +EXTRA_OEMESON += "-Ddeprecated-wl-shell=true" From dd749650bb451484609e55464ab110c4594a1ac3 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Fri, 19 Jan 2024 12:51:43 +0100 Subject: [PATCH 22/48] lvgl-demo: update to latest revision to fix wayland window glitches This revision disables LVGL's wayland client-side decorations to prevent visual glitches on some platforms and homogenize the look of the demo regardless of platforms/backend. Signed-off-by: Gabriel Valcazar --- meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb b/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb index ebe8355f8..44b19baf6 100644 --- a/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb +++ b/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb @@ -10,7 +10,7 @@ SRCBRANCH ?= "dey/master" SRC_URI = " \ gitsm://github.com/digi-embedded/lv_port_linux_frame_buffer.git;branch=${SRCBRANCH};protocol=https \ " -SRCREV = "f9426988a70f485ba7895bb1c26493f2fffcd957" +SRCREV = "0a799d22a5aaf9de18aca428579945a0a9c2c270" EXTRA_OEMAKE = "DESTDIR=${D}" From a91aa428aa9b3812b9dbd9468d3d8b9d6cf903f6 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Thu, 18 Jan 2024 13:08:22 +0100 Subject: [PATCH 23/48] README: dey-4.0-r5 release notes Signed-off-by: Arturo Buzarra --- README.md | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bb471b700..8f37a301a 100644 --- a/README.md +++ b/README.md @@ -125,11 +125,40 @@ Documentation is available online at https://www.digi.com/resources/documentatio # Downloads -* Demo images: https://ftp1.digi.com/support/digiembeddedyocto/4.0/r4/images/ -* Software Development Kit (SDK): https://ftp1.digi.com/support/digiembeddedyocto/4.0/r4/sdk/ +* Demo images: https://ftp1.digi.com/support/digiembeddedyocto/4.0/r5/images/ +* Software Development Kit (SDK): https://ftp1.digi.com/support/digiembeddedyocto/4.0/r5/sdk/ # Release Changelog +## 4.0-r5 + +* ST-based platforms + * Add support to boot signed FIT images. + * Add support to EGLFS backend for CCMP15 platform + * Add overlay to enable Cortex-M coprocessor +* NXP-based platforms + * Updated BSP for ConnectCore 93 + * U-Boot v2023.04 (based on tag 'lf-6.1.55-2.2.0' by NXP) + * Linux kernel v6.1.55 (based on tag 'lf-6.1.55-2.2.0' by NXP) + * Add overlay to enable Cortex-M coprocessor + * Added preliminary TrustFence support for ConnectCore 93 +* Add support to LVGL based images +* Improved ConnectCore Cloud Services (CCCS): + * Data backlog support to locally store samples when it is not possible to upload them + * CCCS API to set the device maintenance state of devices + * CCCS API to upload binary data points + * Report to Remote Manager when a device is using a Wi-Fi connection + * Improve firmware download speed + * Configuration file: + * Use default values if configuration file is not provided + * Allow to disable firmware update service +* Improved SWU package generation and support: + * Generalized and simplified recipes to generate the SWU packages using a custom class + * Added support to update bootloader using software update (SWU) +* Update Python XBee library +* Bootcount feature is now disabled by default. +* General bug fixing and improvements + ## 4.0-r4 * ST-based platforms From a4042f56bd0b51d8c2013903f9f202b125c076f9 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 23 Jan 2024 17:53:02 +0100 Subject: [PATCH 24/48] cosmetic: digi-defaults.inc: update Linux/U-Boot version table Signed-off-by: Arturo Buzarra --- meta-digi-arm/conf/machine/include/digi-defaults.inc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 1aa4cc4e8..078ee176a 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -10,13 +10,13 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" # # Platform Linux U-Boot # ------------------------------------------------- -# ccimx6 5.4 2017.03 -# ccimx6qp 5.4 2017.03 +# ccimx6 5.15 2017.03 +# ccimx6qp 5.15 2017.03 # ccimx6ul 5.15 2020.04 -# ccimx8x 5.4 2020.04 (packaged in imx-boot) -# ccimx8mn 5.4 2020.04 (packaged in imx-boot) -# ccimx8mm 5.4 2020.04 (packaged in imx-boot) -# ccimx93 5.15 2022.04 (packaged in imx-boot) +# ccimx8x 5.15 2020.04 (packaged in imx-boot) +# ccimx8mn 5.15 2020.04 (packaged in imx-boot) +# ccimx8mm 5.15 2020.04 (packaged in imx-boot) +# ccimx93 6.1 2023.04 (packaged in imx-boot) # ccmp15 5.15 2021.10 # ccmp13 5.15 2021.10 # From a1a176f0916bba828e11c77a7c5057f044663c45 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 23 Jan 2024 17:54:52 +0100 Subject: [PATCH 25/48] dey-image-lvgl: remove x11 graphical support for ccimx6ul platform LVGL graphical library has support for different backends, in the case of the ccimx6ul we use the fbdev directly, so we don't need the x11 support. This commit removes x11 support for the ccimx6ul platform for the dey-image-lvgl image. Signed-off-by: Arturo Buzarra --- meta-digi-dey/recipes-core/images/dey-image-lvgl.bb | 6 +++++- sdk/config/ccimx6ulsbc/conf-notes.txt | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/meta-digi-dey/recipes-core/images/dey-image-lvgl.bb b/meta-digi-dey/recipes-core/images/dey-image-lvgl.bb index 7d0fc83e9..ee8695a1c 100644 --- a/meta-digi-dey/recipes-core/images/dey-image-lvgl.bb +++ b/meta-digi-dey/recipes-core/images/dey-image-lvgl.bb @@ -1,8 +1,12 @@ # -# Copyright (C) 2023 Digi International. +# Copyright (C) 2023,2024 Digi International. # require dey-image-graphical.inc DESCRIPTION = "DEY image with LVGL graphical libraries" GRAPHICAL_CORE = "lvgl" + +# On the ccimx6ul, the only supported LVGL backend is fbdev, so there is no +# need for a X11 desktop environment. +IMAGE_FEATURES:remove:ccimx6ul = " x11-base x11-sato " diff --git a/sdk/config/ccimx6ulsbc/conf-notes.txt b/sdk/config/ccimx6ulsbc/conf-notes.txt index 44fd937f9..0e46ca7af 100644 --- a/sdk/config/ccimx6ulsbc/conf-notes.txt +++ b/sdk/config/ccimx6ulsbc/conf-notes.txt @@ -7,8 +7,7 @@ Digi Embedded Yocto provides the following image recipes: * dey-image-lvgl: graphical LVGL image - By default the image is X11-based so it provides a full SATO theme - desktop environment. + A framebuffer-based image including an LVGL demo application. * core-image-base: a console-only image From a1f68f94d4678e47b1c5c9c9a52a8c0b9bc00f14 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 23 Jan 2024 18:05:19 +0100 Subject: [PATCH 26/48] lvgl-demo: add support to initialize LVGL demo at boot This commit adds a systemd service and a sysvinit script to initialize the LVGL demo automatically on boot. Signed-off-by: Arturo Buzarra --- .../lvgl/files/lvgl-demo-init | 133 ++++++++++++++++++ .../lvgl/files/lvgl-demo-init.service | 15 ++ .../recipes-graphics/lvgl/lvgl-demo_8.3.0.bb | 42 +++++- .../packagegroups/packagegroup-dey-lvgl.bb | 1 + 4 files changed, 190 insertions(+), 1 deletion(-) create mode 100644 meta-digi-dey/recipes-graphics/lvgl/files/lvgl-demo-init create mode 100644 meta-digi-dey/recipes-graphics/lvgl/files/lvgl-demo-init.service diff --git a/meta-digi-dey/recipes-graphics/lvgl/files/lvgl-demo-init b/meta-digi-dey/recipes-graphics/lvgl/files/lvgl-demo-init new file mode 100644 index 000000000..cfb3319d3 --- /dev/null +++ b/meta-digi-dey/recipes-graphics/lvgl/files/lvgl-demo-init @@ -0,0 +1,133 @@ +#!/bin/sh +#=============================================================================== +# +# Copyright (C) 2024 by Digi International Inc. +# All rights reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. +# +# +# !Description: Initialize LVGL demo +# +#=============================================================================== + +readonly DEMO_NAME="lvgl_demo" +readonly DEMO_PATH="/usr/bin/${DEMO_NAME}" +readonly DEMO_TITLE="LVGL Demo Application" +readonly DEMO_DISPLAY="##DEMO_DISPLAY##" +readonly DEMO_ENV="##DEMO_ENV##" +readonly PID_FILE="/run/${DEMO_NAME}.pid" + +log() { + if type "systemd-cat" >/dev/null 2>/dev/null; then + systemd-cat -p "${1}" -t "${DEMO_NAME}" printf "%s" "${2}" + fi + logger -p "${1}" -t "${DEMO_NAME}" "${2}" +} + +get_demo_pid() { + local pid="$(pgrep -f ${DEMO_PATH})" + + [ -n "${pid}" ] && { echo "${pid}"; return 0; } + + return 1 +} + +check_is_running() { + local pid + + if [ -s "${PID_FILE}" ]; then + pid="$(cat ${PID_FILE})" + else + pid="$(get_demo_pid)" + echo "${pid}" > ${PID_FILE} + fi + + if [ "${pid}" ]; then + kill -0 "${pid}" >/dev/null 2>&1 && return 0 + fi + + rm -f "${PID_FILE}" + + return 1 +} + +wait_for_wayland() { + local count=20 + local wayland_socket="/run/user/0/${DEMO_DISPLAY}" + + while [ ! -S "${wayland_socket}" ]; do + sleep 1 + count=$((count-1)) + if [ "${count}" = 0 ]; then + return 1 + fi + done + sleep 1 + return 0 +} + +stop() { + check_is_running || return + + local pid="$(cat ${PID_FILE})" + kill -TERM "${pid}" >/dev/null 2>&1 + + local STOP_TIMEOUT="5" + for i in $(seq ${STOP_TIMEOUT}); do + check_is_running || { log info "stopped"; break; } + if [ "${i}" -eq ${STOP_TIMEOUT} ]; then + log warning "stop: ${DEMO_NAME} did not stop gracefully" + kill -KILL "${pid}" >/dev/null 2>&1 + fi + sleep 1 + done +} + +start() { + check_is_running && { log warning "start: ${DEMO_NAME} ALREADY running"; exit 0; } + + if [ -d "/usr/share/wayland" ]; then + wait_for_wayland + else + # Disable the cursor when displaying at full screen on fbdev + echo "0" > /sys/class/graphics/fbcon/cursor_blink + fi + + # Launch demo + env ${DEMO_ENV} ${DEMO_PATH} >/dev/null 2>&1 & + + if [ $? -eq 0 ]; then + echo $! > ${PID_FILE} + log info "$(cat ${PID_FILE})" + log info "started" + fi +} + +case "$1" in + start) + echo -n "Starting ${DEMO_TITLE}: " + start + echo "done." + ;; + stop) + stop + echo -n "Stopping ${DEMO_TITLE}: " + if [ -n "`/bin/pidof ${DEMO_PATH}`" ] ; then + echo "FAIL" + else + echo "OK" + fi + ;; + restart) + stop + sleep 1 + start + ;; + *) + echo "Usage: $0 {start|stop|restart}" + exit 1 + ;; +esac diff --git a/meta-digi-dey/recipes-graphics/lvgl/files/lvgl-demo-init.service b/meta-digi-dey/recipes-graphics/lvgl/files/lvgl-demo-init.service new file mode 100644 index 000000000..cdf5369d8 --- /dev/null +++ b/meta-digi-dey/recipes-graphics/lvgl/files/lvgl-demo-init.service @@ -0,0 +1,15 @@ +[Unit] +Description=LVGL Demo Application + +# Make sure we are started after graphic service is available +After=##WESTON_SERVICE## +Requires=##WESTON_SERVICE## + +[Service] +Type=forking +PIDFile=/run/lvgl_demo.pid +ExecStart=/etc/lvgl-demo-init start +ExecStop=/etc/lvgl-demo-init stop + +[Install] +WantedBy=multi-user.target diff --git a/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb b/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb index 44b19baf6..b6652440b 100644 --- a/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb +++ b/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb @@ -9,6 +9,8 @@ SRCBRANCH ?= "dey/master" SRC_URI = " \ gitsm://github.com/digi-embedded/lv_port_linux_frame_buffer.git;branch=${SRCBRANCH};protocol=https \ + file://lvgl-demo-init \ + file://lvgl-demo-init.service \ " SRCREV = "0a799d22a5aaf9de18aca428579945a0a9c2c270" @@ -23,7 +25,7 @@ PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', ' require lv-drivers.inc -inherit cmake +inherit cmake systemd update-rc.d S = "${WORKDIR}/git" @@ -58,9 +60,47 @@ do_configure:prepend() { -i "${S}/lv_drv_conf.h" } +WESTON_SERVICE ?= "weston.service" +WESTON_SERVICE:ccmp15 ?= "weston-launch.service" +DEMO_DISPLAY ?= "wayland-0" +DEMO_DISPLAY:ccmp15 ?= "wayland-1" +DEMO_ENV ?= "DISPLAY=:0.0 XDG_RUNTIME_DIR=/run/user/0 WAYLAND_DISPLAY=\${DEMO_DISPLAY}" +DEMO_ENV:ccimx6ul ?= "" + do_install:append() { install -d ${D}${bindir} install -m 0755 ${B}/lvgl_fb ${D}${bindir}/lvgl_demo + + # Install systemd service + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + # Install systemd unit files + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/lvgl-demo-init.service ${D}${systemd_unitdir}/system/ + sed -i -e "s,##WESTON_SERVICE##,${WESTON_SERVICE},g" \ + "${D}${systemd_unitdir}/system/lvgl-demo-init.service" + fi + + # Install wrapper bootscript to launch LVGL demo on boot + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/lvgl-demo-init ${D}${sysconfdir}/lvgl-demo-init + sed -i -e "s@##DEMO_DISPLAY##@${DEMO_DISPLAY}@g" \ + -e "s@##DEMO_ENV##@${DEMO_ENV}@g" \ + "${D}${sysconfdir}/lvgl-demo-init" + ln -sf ${sysconfdir}/lvgl-demo-init ${D}${sysconfdir}/init.d/lvgl-demo-init } +PACKAGES =+ "${PN}-init" +FILES:${PN}-init = " \ + ${sysconfdir}/lvgl-demo-init \ + ${sysconfdir}/init.d/lvgl-demo-init \ + ${systemd_unitdir}/system/lvgl-demo-init.service \ +" + +INITSCRIPT_PACKAGES += "${PN}-init" +INITSCRIPT_NAME:${PN}-init = "lvgl-demo-init" +INITSCRIPT_PARAMS:${PN}-init = "start 99 3 5 . stop 20 0 1 2 6 ." + +SYSTEMD_PACKAGES = "${PN}-init" +SYSTEMD_SERVICE:${PN}-init = "lvgl-demo-init.service" + COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8m|ccimx8x|ccimx93|ccmp15)" diff --git a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-lvgl.bb b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-lvgl.bb index f00ea6a1e..3ea3bbbc0 100644 --- a/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-lvgl.bb +++ b/meta-digi-dey/recipes-graphics/packagegroups/packagegroup-dey-lvgl.bb @@ -8,4 +8,5 @@ inherit packagegroup RDEPENDS:${PN} += " \ lvgl-demo \ + lvgl-demo-init \ " From 349b263ed954a8e425a21dc27386bf51dacaa4ea Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 23 Jan 2024 18:07:38 +0100 Subject: [PATCH 27/48] lvgl-demo: increase default application dimensions for ccimx6ul platform This commit sets the default LVGL demo dimensions to match with the resolution of the supported LVDS display, showing the application at fullscreen. Signed-off-by: Arturo Buzarra --- meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb b/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb index b6652440b..9ab53ad14 100644 --- a/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb +++ b/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb @@ -36,6 +36,8 @@ LVGL_CONFIG_DRM_CARD:mx8-generic-bsp = "/dev/dri/card1" LVGL_CONFIG_HOR_RES ?= "800" LVGL_CONFIG_VER_RES ?= "480" +LVGL_CONFIG_HOR_RES:ccimx6ul ?= "1280" +LVGL_CONFIG_VER_RES:ccimx6ul ?= "800" do_configure:prepend() { if [ "${LVGL_CONFIG_USE_DRM}" -eq 1 ] ; then From cfe613f5e98235d9b0d2ec14a3c8dbc78aa820d6 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 23 Jan 2024 18:15:05 +0100 Subject: [PATCH 28/48] lvgl-demo: set touchscreen as default input method for ccimx6ul platform ccimx6ul platform uses the fbdev backend to run LVGL graphical applications, the mouse input device is not supported by default on this platform. Signed-off-by: Arturo Buzarra --- meta-digi-dey/recipes-graphics/lvgl/lv-drivers.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-digi-dey/recipes-graphics/lvgl/lv-drivers.inc b/meta-digi-dey/recipes-graphics/lvgl/lv-drivers.inc index aca56b15c..a66614d60 100644 --- a/meta-digi-dey/recipes-graphics/lvgl/lv-drivers.inc +++ b/meta-digi-dey/recipes-graphics/lvgl/lv-drivers.inc @@ -8,6 +8,7 @@ LVGL_CONFIG_DRM_CARD ?= "/dev/dri/card0" LVGL_CONFIG_USE_EVDEV = "${@bb.utils.contains_any('PACKAGECONFIG', 'drm fbdev', '1', '0', d)}" LVGL_CONFIG_EVDEV_INPUT ?= "/dev/input/mouse0" +LVGL_CONFIG_EVDEV_INPUT:ccimx6ul ?= "/dev/input/touchscreen0" LVGL_CONFIG_USE_FBDEV = "${@bb.utils.contains('PACKAGECONFIG', 'fbdev', '1', '0', d)}" From 568d142b115e563237c71c171c4023c05a3959e8 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Tue, 23 Jan 2024 15:52:35 +0100 Subject: [PATCH 29/48] ccimx6ul: remove "-x11" suffix from dey-image-lvgl image name The ccimx6ul is the only platform that doesn't include a desktop backend in the LVGL image, so remove the desktop backend suffix from the image's name. This affects the image name itself, the corresponding SWU package and the installation scripts. Signed-off-by: Gabriel Valcazar --- meta-digi-arm/conf/machine/include/ccimx6ul.inc | 4 ++++ meta-digi-dey/recipes-core/images/dey-image-graphical.inc | 5 +++-- meta-digi-dey/recipes-core/images/dey-image-lvgl.bb | 3 +++ meta-digi-dey/recipes-digi/swu-images/dey-image-lvgl-swu.bb | 5 ++++- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc index f0e66256b..8bdbb3efe 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc @@ -77,3 +77,7 @@ UBOOT_ENV_RANGE ?= "" # Partitions to blacklist for swupdate: # bootloader, environment, safe SWUPDATE_MTD_BLACKLIST = "0 1 2" + +# ccimx6ul LVGL images don't have a desktop backend, so we don't need to append +# "-x11" to the image name in the install scripts. +GRAPHICAL_IMAGES:remove = "dey-image-lvgl" diff --git a/meta-digi-dey/recipes-core/images/dey-image-graphical.inc b/meta-digi-dey/recipes-core/images/dey-image-graphical.inc index 2856563ec..dde9d64de 100644 --- a/meta-digi-dey/recipes-core/images/dey-image-graphical.inc +++ b/meta-digi-dey/recipes-core/images/dey-image-graphical.inc @@ -1,5 +1,5 @@ # -# Copyright (C) 2016-2023 Digi International. +# Copyright (C) 2016-2024 Digi International. # DESCRIPTION = "DEY image with graphical libraries" LICENSE = "MIT" @@ -44,7 +44,8 @@ IMAGE_ROOTFS_SIZE = "8192" BAD_RECOMMENDATIONS += "eudev-hwdb" -export IMAGE_BASENAME = "dey-image-${GRAPHICAL_CORE}-${GRAPHICAL_BACKEND}" +DEFAULT_IMAGE_BASENAME ??= "dey-image-${GRAPHICAL_CORE}-${GRAPHICAL_BACKEND}" +export IMAGE_BASENAME = "${DEFAULT_IMAGE_BASENAME}" CORE_IMAGE_EXTRA_INSTALL += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'weston-xwayland', '', d)} \ diff --git a/meta-digi-dey/recipes-core/images/dey-image-lvgl.bb b/meta-digi-dey/recipes-core/images/dey-image-lvgl.bb index ee8695a1c..170ac4c5d 100644 --- a/meta-digi-dey/recipes-core/images/dey-image-lvgl.bb +++ b/meta-digi-dey/recipes-core/images/dey-image-lvgl.bb @@ -10,3 +10,6 @@ GRAPHICAL_CORE = "lvgl" # On the ccimx6ul, the only supported LVGL backend is fbdev, so there is no # need for a X11 desktop environment. IMAGE_FEATURES:remove:ccimx6ul = " x11-base x11-sato " + +# Remove GRAPHICAL_BACKEND suffix (-x11) from ccimx6ul image names +DEFAULT_IMAGE_BASENAME:ccimx6ul = "dey-image-${GRAPHICAL_CORE}" diff --git a/meta-digi-dey/recipes-digi/swu-images/dey-image-lvgl-swu.bb b/meta-digi-dey/recipes-digi/swu-images/dey-image-lvgl-swu.bb index e402e85ad..a72daf561 100644 --- a/meta-digi-dey/recipes-digi/swu-images/dey-image-lvgl-swu.bb +++ b/meta-digi-dey/recipes-digi/swu-images/dey-image-lvgl-swu.bb @@ -1,5 +1,8 @@ -# Copyright (C) 2023 Digi International Inc. +# Copyright (C) 2023,2024 Digi International Inc. require swu.inc IMG_NAME = "${@get_baseimg_pn(d)}-${GRAPHICAL_BACKEND}" + +# Remove GRAPHICAL_BACKEND suffix (-x11) from ccimx6ul image names +IMG_NAME:ccimx6ul = "${@get_baseimg_pn(d)}" From b3391941dd22a5ce925b170aab085fc58a6fd78b Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Wed, 24 Jan 2024 17:48:27 +0100 Subject: [PATCH 30/48] connectcore-demo: avoid removal of board image file for the ccimx6qpsbc Commit c4f2fce4d3d58f4de37aecda7fc09099e096dc8b added logic to do_install() that saves space by removing board image files that don't match the machine name. However, the ccimx6qpsbc uses the ccimx6sbc board image file, and it was being removed from the demo, breaking the demo's landing page. Avoid this by specifying the correct filename for the ccimx6qpsbc. Signed-off-by: Gabriel Valcazar --- .../recipes-digi/dey-examples/connectcore-demo-example.inc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-digi/dey-examples/connectcore-demo-example.inc b/meta-digi-dey/recipes-digi/dey-examples/connectcore-demo-example.inc index 707d26ae8..ff2034e72 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/connectcore-demo-example.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/connectcore-demo-example.inc @@ -30,12 +30,17 @@ S = "${WORKDIR}/connectcore-demo-example" inherit systemd update-rc.d +BOARD_IMAGE_FILE ?= "${MACHINE}_board.png" + +# The ccimx6qpsbc re-uses the ccimx6sbc board image +BOARD_IMAGE_FILE:ccimx6qpsbc = "ccimx6sbc_board.png" + do_install() { install -d ${D}/srv/www cp -r ${WORKDIR}/git/connectcore-demo-example/* ${D}/srv/www/ # Remove unused images - find ${D}/srv/www/static/images/ -type f -name '*_board.png' -not -name '${MACHINE}_board.png' -delete + find ${D}/srv/www/static/images/ -type f -name '*_board.png' -not -name '${BOARD_IMAGE_FILE}' -delete # Install systemd service if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then From 75bd0d887ba397ea5e04ef57de30dcf17050bb54 Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Wed, 24 Jan 2024 18:07:44 +0100 Subject: [PATCH 31/48] install_linux_fw_uuu: do not assing a default U-Boot file for 0x00 variants In case a HWID is not set or the variant is unknown, do not set it to a default U-Boot file but ask the user for the proper file. This case should not happen, but cover it for safety. https://onedigi.atlassian.net/browse/DEL-8855 Signed-off-by: Isaac Hermida --- .../u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh | 9 ++++----- .../u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh | 8 ++++++-- .../u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh | 7 +++++-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh index f4bed37e0..eb2eb03d3 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh @@ -100,14 +100,13 @@ echo "Determining image files to use..." if [ -z ${INSTALL_UBOOT_FILENAME} ]; then module_variant=$(getenv "module_variant") # Determine U-Boot file to program basing on SOM's variant - if [ -n "$module_variant" ] || [ "$module_variant" = "0x00" ]; then + if [ -n "$module_variant" ]; then if [ "$module_variant" = "0x01" ] || \ [ "$module_variant" = "0x02" ]; then - module_ram="2GB" - else - module_ram="1GB" + INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##2GB.imx" + elif [ "$module_variant" = "0x03" ] || \ + INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##1GB.imx" fi - INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##${module_ram}.imx" fi # U-Boot when the checked value is empty. diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh index d09fd528a..c7feaf45d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_uuu.sh @@ -102,7 +102,7 @@ if [ -z ${INSTALL_UBOOT_FILENAME} ]; then if [ -n "$soc_family" ]; then module_variant=$(getenv "module_variant") # Determine U-Boot file to program basing on SOM's variant - if [ -n "$module_variant" ] || [ "$module_variant" = "0x00" ]; then + if [ -n "$module_variant" ]; then if [ "$module_variant" = "0x12" ]; then INSTALL_UBOOT_FILENAME="u-boot-cc${soc_family}sbc2GB.imx" elif [ "$module_variant" = "0x01" ] || \ @@ -117,7 +117,11 @@ if [ -z ${INSTALL_UBOOT_FILENAME} ]; then [ "$module_variant" = "0x15" ] || \ [ "$module_variant" = "0x16" ]; then INSTALL_UBOOT_FILENAME="u-boot-cc${soc_family}sbc.imx" - else + elif [ "$module_variant" = "0x03" ] || \ + [ "$module_variant" = "0x0c" ] || \ + [ "$module_variant" = "0x0e" ] || \ + [ "$module_variant" = "0x0f" ] || \ + [ "$module_variant" = "0x13" ]; then INSTALL_UBOOT_FILENAME="u-boot-cc${soc_family}sbc512MB.imx" fi fi diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh index c6bab372e..390e9c713 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh @@ -115,7 +115,7 @@ echo "Determining image files to use..." if [ -z "${INSTALL_UBOOT_FILENAME}" ]; then module_variant=$(getenv "module_variant") # Determine U-Boot file to program basing on SOM's variant - if [ -n "$module_variant" ] || [ "$module_variant" = "0x00" ]; then + if [ -n "$module_variant" ]; then if [ "$module_variant" = "0x08" ] || \ [ "$module_variant" = "0x0a" ]; then INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##512MB.imx" @@ -123,7 +123,10 @@ if [ -z "${INSTALL_UBOOT_FILENAME}" ]; then [ "$module_variant" = "0x05" ] || \ [ "$module_variant" = "0x07" ]; then INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##1GB.imx" - else + elif [ "$module_variant" = "0x02" ] || \ + [ "$module_variant" = "0x03" ] || \ + [ "$module_variant" = "0x06" ] || \ + [ "$module_variant" = "0x09" ]; then INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##.imx" fi fi From ff22903a81d622ab1096ad6e8c1390954b7ade79 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 23 Jan 2024 13:41:52 +0100 Subject: [PATCH 32/48] cc93: standby-actions: rework the programming of resume actions There are some cases in which the loading of the Wi-Fi modules may be problematic due to timing conditions: - when a suspend operation in progress is aborted - when Bluetooth is disabled The Wi-Fi needs some time for the system to be ready before loading the modules. This commit: - Stops the Bluetooth before bringing down the Wi-Fi on suspend - Starts the Bluetooth (or adds a small delay) before bringing up the Wi-Fi on resume - Reworks the way the resume operations are programmed, to do them in reverse order (first load the Wi-Fi modules, then bring the interfaces up (if required). It does so by appending/prepending actions into a variable and dumping the contents finally to a temp file. Signed-off-by: Hector Palacios --- .../busybox/busybox/ccimx93/standby-actions | 61 +++++++++++++------ 1 file changed, 42 insertions(+), 19 deletions(-) diff --git a/meta-digi-dey/recipes-core/busybox/busybox/ccimx93/standby-actions b/meta-digi-dey/recipes-core/busybox/busybox/ccimx93/standby-actions index 432602888..4f4af7e15 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox/ccimx93/standby-actions +++ b/meta-digi-dey/recipes-core/busybox/busybox/ccimx93/standby-actions @@ -16,7 +16,8 @@ # #=============================================================================== -RESUME_ACTIONS="/tmp/resume_actions" +RESUME_FILE="/tmp/resume_actions" +RESUME_ACTIONS="" wifi_actions_needed() { [ -d "/proc/device-tree/wireless" ] && [ ! -e "/sys/firmware/devicetree/base/soc@0/bus@42800000/mmc@428b0000/keep-power-in-suspend" ] @@ -27,39 +28,61 @@ bt_actions_needed() { } if [ "${1}" = "pre" ]; then - rm -f "${RESUME_ACTIONS}" + rm -f "${RESUME_FILE}" # Stop NetworkManager before suspend systemctl stop NetworkManager + if bt_actions_needed; then + # bluetooth service relies on bluetooth-init service so + # stop it unconditionally + systemctl stop bluetooth-init + systemctl stop bluetooth + # Program the resume actions to start the services + RESUME_ACTIONS_BT="systemctl start bluetooth-init; systemctl start bluetooth;" + fi + if wifi_actions_needed; then + RESUME_ACTIONS_WIFI="" for iface in wlan0 uap0 wfd0; do if grep -qs ${iface} /var/run/ifstate; then - ifdown ${iface} && echo "ifup ${iface}" >> "${RESUME_ACTIONS}" + # Bring the interface down + ifdown ${iface} + # Program the resume action to bring it up + # (prepend to use reverse order) + RESUME_ACTIONS_WIFI="ifup ${iface};${RESUME_ACTIONS_WIFI}" fi done - { - echo "sleep 0.5" - echo "/etc/udev/scripts/load_iw612.sh" - } >> "${RESUME_ACTIONS}" + # Unload Wi-Fi modules modprobe -r moal + # Program the resume action to reload the modules + # (prepend to use reverse order) + RESUME_ACTIONS_WIFI="/etc/udev/scripts/load_iw612.sh;${RESUME_ACTIONS_WIFI}" fi - if bt_actions_needed; then - # bluetooth service relies on bluetooth-init service, so stop/start it unconditionally - { - echo "systemctl start bluetooth-init" - echo "systemctl start bluetooth" - } >> "${RESUME_ACTIONS}" - systemctl stop bluetooth-init - systemctl stop bluetooth + # Compound resume actions (enable BT first, or else add a sleep, to give + # some time to the system to be ready to load the Wi-Fi) + if [ -n "${RESUME_ACTIONS_BT}" ]; then + RESUME_ACTIONS="${RESUME_ACTIONS_BT}" + fi + if [ -n "${RESUME_ACTIONS_WIFI}" ]; then + if [ ! -n "${RESUME_ACTIONS_BT}" ]; then + RESUME_ACTIONS="sleep 0.5;" + fi + RESUME_ACTIONS="${RESUME_ACTIONS}${RESUME_ACTIONS_WIFI}" + fi + + if [ -n "${RESUME_ACTIONS}" ]; then + # Create temp file with resume actions + echo "${RESUME_ACTIONS}" > "${RESUME_FILE}" + chmod +x "${RESUME_FILE}" fi elif [ "${1}" = "post" ]; then - if [ -f ${RESUME_ACTIONS} ]; then - chmod +x "${RESUME_ACTIONS}" - eval "${RESUME_ACTIONS}" - rm -f "${RESUME_ACTIONS}" + if [ -f "${RESUME_FILE}" ]; then + eval "${RESUME_FILE}" + # Clean-up + rm -f "${RESUME_FILE}" fi # Resume NetworkManager after suspend From 68fae1420da20cd146d6de684611a80348023131 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Thu, 25 Jan 2024 13:59:18 +0100 Subject: [PATCH 33/48] packagroup-dey-examples: make recipe compatible with cc93 These are not included on the default image, but allow to build them for cc93 if requested. Signed-off-by: Hector Palacios --- .../recipes-digi/packagegroups/packagegroup-dey-examples.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb index e3943fa24..b5a24018b 100644 --- a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb +++ b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2023, Digi International Inc. +# Copyright (C) 2013-2024, Digi International Inc. SUMMARY = "DEY examples packagegroup" @@ -27,4 +27,4 @@ RDEPENDS:${PN}:append:ccimx6 = "\ dey-examples-v4l2 \ " -COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8m|ccimx8x)" +COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8m|ccimx8x|ccimx93)" From 71940ead082da5b5a37365f93dcd1b8383184862 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 25 Jan 2024 18:34:46 +0100 Subject: [PATCH 34/48] install_linux_fw_[sd/usb]: add missing comment character '#' to avoid an error An additional line was added to a comment block without the '#' character, resulting in the following error when running the script: Unknown command '-' - try 'help' Nonetheless, this error is harmless and the script continues as expected, which is the reason why we hadn't found it until now. Signed-off-by: Gabriel Valcazar --- .../u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt | 2 +- .../u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt | 2 +- .../u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt | 2 +- .../u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt | 2 +- .../u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt | 2 +- .../u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt | 2 +- .../u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt | 2 +- .../u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt | 2 +- .../u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt | 2 +- .../u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt | 2 +- .../u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt | 2 +- .../u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt | 2 +- .../recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt | 2 +- .../u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt index 503e9ceaf..b72f6d685 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt @@ -144,7 +144,7 @@ fi # - Partition the eMMC user data area for Linux # - If Dual Boot # - Update the system partitions: linux_a, linux_b, rootfs_a, rootfs_b - - Set bootlimit to 3 +# - Set bootlimit to 3 # - If Normal Boot: # - Update the system partitions: linux, recovery, rootfs # - Erase the 'update' partition diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt index d4f491057..9cb620a30 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt @@ -144,7 +144,7 @@ fi # - Partition the eMMC user data area for Linux # - If Dual Boot # - Update the system partitions: linux_a, linux_b, rootfs_a, rootfs_b - - Set bootlimit to 3 +# - Set bootlimit to 3 # - If Normal Boot: # - Update the system partitions: linux, recovery, rootfs # - Erase the 'update' partition diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt index 0f038724b..aeddcf636 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt @@ -155,7 +155,7 @@ fi # - Partition the eMMC user data area for Linux # - If Dual Boot # - Update the system partitions: linux_a, linux_b, rootfs_a, rootfs_b - - Set bootlimit to 3 +# - Set bootlimit to 3 # - If Normal Boot: # - Update the system partitions: linux, recovery, rootfs # - Erase the 'update' partition diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt index b7e65f7ad..7edd7e4a5 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt @@ -155,7 +155,7 @@ fi # - Partition the eMMC user data area for Linux # - If Dual Boot # - Update the system partitions: linux_a, linux_b, rootfs_a, rootfs_b - - Set bootlimit to 3 +# - Set bootlimit to 3 # - If Normal Boot: # - Update the system partitions: linux, recovery, rootfs # - Erase the 'update' partition diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt index c01c01e2d..b1f792351 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt @@ -151,7 +151,7 @@ fi # - Save the environment # - If Dual Boot # - Update the system partitions: linux_a, linux_b, rootfs_a, rootfs_b - - Set bootlimit to 3 +# - Set bootlimit to 3 # - If Normal Boot: # - Update the system partitions: linux, recovery, rootfs # - Erase the 'update' partition diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt index 45517feba..1e5350fad 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_usb.txt @@ -153,7 +153,7 @@ fi # - Save the environment # - If Dual Boot # - Update the system partitions: linux_a, linux_b, rootfs_a, rootfs_b - - Set bootlimit to 3 +# - Set bootlimit to 3 # - If Normal Boot: # - Update the system partitions: linux, recovery, rootfs # - Erase the 'update' partition diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt index 0d2d263bd..01bd2a074 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt @@ -120,7 +120,7 @@ fi # - Partition the eMMC user data area for Linux # - If Dual Boot # - Update the system partitions: linux_a, linux_b, rootfs_a, rootfs_b - - Set bootlimit to 3 +# - Set bootlimit to 3 # - If Normal Boot: # - Update the system partitions: linux, recovery, rootfs # - Erase the 'update' partition diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt index 5b67a563e..41e894c18 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt @@ -120,7 +120,7 @@ fi # - Partition the eMMC user data area for Linux # - If Dual Boot # - Update the system partitions: linux_a, linux_b, rootfs_a, rootfs_b - - Set bootlimit to 3 +# - Set bootlimit to 3 # - If Normal Boot: # - Update the system partitions: linux, recovery, rootfs # - Erase the 'update' partition diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt index 852de0445..3f621311a 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt @@ -132,7 +132,7 @@ fi # - Partition the eMMC user data area for Linux # - If Dual Boot # - Update the system partitions: linux_a, linux_b, rootfs_a, rootfs_b - - Set bootlimit to 3 +# - Set bootlimit to 3 # - If Normal Boot: # - Update the system partitions: linux, recovery, rootfs # - Erase the 'update' partition diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt index 963b0c50e..1438c0739 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt @@ -132,7 +132,7 @@ fi # - Partition the eMMC user data area for Linux # - If Dual Boot # - Update the system partitions: linux_a, linux_b, rootfs_a, rootfs_b - - Set bootlimit to 3 +# - Set bootlimit to 3 # - If Normal Boot: # - Update the system partitions: linux, recovery, rootfs # - Erase the 'update' partition diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt index baa7d2a84..33c853c4f 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt @@ -131,7 +131,7 @@ fi # - Partition the eMMC user data area for Linux # - If Dual Boot # - Update the system partitions: linux_a, linux_b, rootfs_a, rootfs_b - - Set bootlimit to 3 +# - Set bootlimit to 3 # - If Normal Boot: # - Update the system partitions: linux, recovery, rootfs # - Erase the 'update' partition diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt index e438d274e..fc2e67264 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt @@ -131,7 +131,7 @@ fi # - Partition the eMMC user data area for Linux # - If Dual Boot # - Update the system partitions: linux_a, linux_b, rootfs_a, rootfs_b - - Set bootlimit to 3 +# - Set bootlimit to 3 # - If Normal Boot: # - Update the system partitions: linux, recovery, rootfs # - Erase the 'update' partition diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt index cb0238c34..798a42ea1 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_sd.txt @@ -152,7 +152,7 @@ fi # environment # - If Dual Boot # - Update the system partitions: linux_a, linux_b, rootfs_a, rootfs_b - - Set bootlimit to 3 +# - Set bootlimit to 3 # - If Normal Boot: # - Update the system partitions: linux, recovery, rootfs # - Configure recovery to wipe 'update' partition diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt index 304dc9f1a..03415add1 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccmp1/install_linux_fw_usb.txt @@ -154,7 +154,7 @@ fi # environment # - If Dual Boot # - Update the system partitions: linux_a, linux_b, rootfs_a, rootfs_b - - Set bootlimit to 3 +# - Set bootlimit to 3 # - If Normal Boot: # - Update the system partitions: linux, recovery, rootfs # - Configure recovery to wipe 'update' partition From dc3eabdba0bfd0d7a16444cc088ee4f4ee77c8c4 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 25 Jan 2024 16:58:56 +0100 Subject: [PATCH 35/48] trustfence: ccimx93: disable not supported functionality Signed-off-by: Javier Viguera --- meta-digi-dey/classes/trustfence.bbclass | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-digi-dey/classes/trustfence.bbclass b/meta-digi-dey/classes/trustfence.bbclass index eb459726c..0db6afa1d 100644 --- a/meta-digi-dey/classes/trustfence.bbclass +++ b/meta-digi-dey/classes/trustfence.bbclass @@ -24,15 +24,19 @@ TRUSTFENCE_CONSOLE_DISABLE ?= "0" TRUSTFENCE_SIGN ?= "1" TRUSTFENCE_SIGN_KEYS_PATH ?= "default" TRUSTFENCE_DEK_PATH ?= "default" +TRUSTFENCE_DEK_PATH:ccimx93 ?= "0" TRUSTFENCE_DEK_PATH:ccmp1 ?= "0" TRUSTFENCE_ENCRYPT_ENVIRONMENT ?= "1" +TRUSTFENCE_ENCRYPT_ENVIRONMENT:ccimx93 ?= "0" TRUSTFENCE_SRK_REVOKE_MASK ?= "0x0" TRUSTFENCE_KEY_INDEX ?= "0" TRUSTFENCE_FIT_IMG:ccmp1 ?= "1" # Partition encryption configuration TRUSTFENCE_ENCRYPT_PARTITIONS ?= "1" +TRUSTFENCE_ENCRYPT_PARTITIONS:ccimx93 ?= "0" TRUSTFENCE_ENCRYPT_ROOTFS ?= "${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "0", "1", d)}" +TRUSTFENCE_ENCRYPT_ROOTFS:ccimx93 ?= "0" # Read-only rootfs TRUSTFENCE_READ_ONLY_ROOTFS ?= "${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "1", "0", d)}" From 65135645a24235e3865f9caf9b609720449a0eb5 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 25 Jan 2024 17:12:05 +0100 Subject: [PATCH 36/48] trustfence-sign-tools: new recipe based on u-boot v2023.04 The ccimx93 bootloader signing requires this version of the sign script, but at the moment, the updated script is not compatible with the other AHAB-based module (ccimx8x), so we cannot just update the recipe for all modules. Thus, create a new version of the recipe and use that for the ccimx93 while we still use the old version for the rest of the platforms. https://onedigi.atlassian.net/browse/DUB-1068 Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/include/ccimx93.inc | 3 +++ .../trustfence/nativesdk-trustfence-sign-tools_2023.04.bb | 6 ++++++ .../trustfence/trustfence-sign-tools-native_2023.04.bb | 6 ++++++ 3 files changed, 15 insertions(+) create mode 100644 meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb create mode 100644 meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb diff --git a/meta-digi-arm/conf/machine/include/ccimx93.inc b/meta-digi-arm/conf/machine/include/ccimx93.inc index 60193819f..4360a96ee 100644 --- a/meta-digi-arm/conf/machine/include/ccimx93.inc +++ b/meta-digi-arm/conf/machine/include/ccimx93.inc @@ -90,3 +90,6 @@ PREFERRED_VERSION_wayland-native:ccimx93 ?= "1.22.0.imx" PREFERRED_VERSION_wayland-protocols:ccimx93 ?= "1.32.imx" PREFERRED_VERSION_weston:ccimx93 ?= "11.0.3.imx" PREFERRED_VERSION_xwayland:ccimx93 ?= "23.1.1.imx" + +PREFERRED_VERSION_nativesdk-trustfence-sign-tools:ccimx93 ?= "2023.04" +PREFERRED_VERSION_trustfence-sign-tools-native:ccimx93 ?= "2023.04" diff --git a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb new file mode 100644 index 000000000..0ff254752 --- /dev/null +++ b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb @@ -0,0 +1,6 @@ +# Copyright (C) 2024, Digi International Inc. + +require nativesdk-trustfence-sign-tools_git.bb + +SRCBRANCH = "v2023.04/maint" +SRCREV = "${AUTOREV}" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb new file mode 100644 index 000000000..955934262 --- /dev/null +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb @@ -0,0 +1,6 @@ +# Copyright (C) 2024, Digi International Inc. + +require trustfence-sign-tools-native_git.bb + +SRCBRANCH = "v2023.04/maint" +SRCREV = "${AUTOREV}" From f0b588255e2fbb6333e31c6a105fe501fee78b65 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Wed, 24 Jan 2024 10:41:55 +0100 Subject: [PATCH 37/48] firmware-atheros: add optimized board data files for new AR6233 on CC6 New AR6233 chips from Qualcomm require a power reduction in the 2.4GHz band to maintain a good EVM. Generate new board data files with this optimized target power configuration, but do not replace the original board data files so this change does not affect CC6 modules with the original AR6233 chip. The new AR6233 will be populated in modules with Hardware Version=6 or higher. Load one board data file or the other based on the Hardware Version field of the HWID via a post-installation script. Board data files with optimized TX Power ('b' files): - Digi_6203-6233-US_b.bin (MD5SUM: 53db0fba1eea22d5c7248b35669234bd) - Digi_6203-6233-World_b.bin (MD5SUM: 307ea9e9364c46a243a36124c92cddc2) - Digi_6203_2_ANT-US_b.bin (MD5SUM: 741f69584f43258ec15bfccaebdb8896) - Digi_6203_2_ANT-World_b.bin (MD5SUM: 9f89d081aaef7f26292d42ad193c188d) https://onedigi.atlassian.net/browse/DEL-8851 Signed-off-by: Gonzalo Ruiz --- .../firmware-atheros/firmware-atheros.bb | 21 ++++++++++++++++++ .../firmware-atheros/Digi_6203-6233-US_b.bin | Bin 0 -> 2048 bytes .../Digi_6203-6233-World_b.bin | Bin 0 -> 2048 bytes .../firmware-atheros/Digi_6203_2_ANT-US_b.bin | Bin 0 -> 2048 bytes .../Digi_6203_2_ANT-World_b.bin | Bin 0 -> 2048 bytes 5 files changed, 21 insertions(+) create mode 100644 meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/Digi_6203-6233-US_b.bin create mode 100644 meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/Digi_6203-6233-World_b.bin create mode 100644 meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/Digi_6203_2_ANT-US_b.bin create mode 100644 meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/Digi_6203_2_ANT-World_b.bin diff --git a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb index a9a837e3e..d548bb640 100644 --- a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb +++ b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb @@ -9,9 +9,13 @@ FW_ATH6KL = " \ file://athtcmd_ram.bin \ file://athwlan.bin \ file://Digi_6203_2_ANT-US.bin \ + file://Digi_6203_2_ANT-US_b.bin \ file://Digi_6203_2_ANT-World.bin \ + file://Digi_6203_2_ANT-World_b.bin \ file://Digi_6203-6233-US.bin \ + file://Digi_6203-6233-US_b.bin \ file://Digi_6203-6233-World.bin \ + file://Digi_6203-6233-World_b.bin \ file://fw-4.bin \ file://nullTestFlow.bin \ file://utf.bin \ @@ -47,9 +51,13 @@ do_install() { athtcmd_ram.bin \ athwlan.bin \ Digi_6203_2_ANT-US.bin \ + Digi_6203_2_ANT-US_b.bin \ Digi_6203_2_ANT-World.bin \ + Digi_6203_2_ANT-World_b.bin \ Digi_6203-6233-US.bin \ + Digi_6203-6233-US_b.bin \ Digi_6203-6233-World.bin \ + Digi_6203-6233-World_b.bin \ fw-4.bin \ nullTestFlow.bin \ utf.bin \ @@ -67,6 +75,19 @@ do_install() { ln -sf Digi_6203_2_ANT-World.bin ${D}${base_libdir}/firmware/ath6k/AR6003/hw2.1.1/bdata.ANT-0x2.bin } +# Point to BDF with optimized TxPower for new AR6233 (HV=>6)" +pkg_postinst_ontarget:${PN}-ath6kl() { + MOD_VERSION="$(($(cat /proc/device-tree/digi,hwid,hv 2>/dev/null | tr -d '\0' || true)))" + if [ "${MOD_VERSION}" -ge "6" ]; then + ln -sf Digi_6203-6233-US_b.bin $D${base_libdir}/firmware/ath6k/AR6003/hw2.1.1/bdata.0x0.bin + ln -sf Digi_6203-6233-World_b.bin $D${base_libdir}/firmware/ath6k/AR6003/hw2.1.1/bdata.0x1.bin + ln -sf Digi_6203-6233-World_b.bin $D${base_libdir}/firmware/ath6k/AR6003/hw2.1.1/bdata.0x2.bin + ln -sf Digi_6203_2_ANT-US_b.bin $D${base_libdir}/firmware/ath6k/AR6003/hw2.1.1/bdata.ANT-0x0.bin + ln -sf Digi_6203_2_ANT-World_b.bin $D${base_libdir}/firmware/ath6k/AR6003/hw2.1.1/bdata.ANT-0x1.bin + ln -sf Digi_6203_2_ANT-World_b.bin $D${base_libdir}/firmware/ath6k/AR6003/hw2.1.1/bdata.ANT-0x2.bin + fi +} + # Do not create empty debug and development packages (PN-dbg PN-dev PN-staticdev) PACKAGES = "${PN}-ar3k ${PN}-ath6kl" diff --git a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/Digi_6203-6233-US_b.bin b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/Digi_6203-6233-US_b.bin new file mode 100644 index 0000000000000000000000000000000000000000..df13def2b405efc590c1d9785ca956a89c0846d0 GIT binary patch literal 2048 zcmZSJU|>)(=1*W|aLM;*W?)cAW?(pGz`$J3+V}!OGBPrRJDHdm8@R+9m{^!68W`v@ ze%Q<*rK7|E1tKgA3<(Pu70~cI93Il4tgNsU#l8TD5k&=>5k3kEGGZAZVhe~k3nKo5)SwYSbqWe{GGZbT zFa}T)M5G7C0Ga?1*$ZO;jf04QO#>P0CkF&FQX(Q@Fh(4V(FbF!gE98Q7{_4@xH$#D zfKl23A_|n`Bt$wv#2OF*mXMJU;_C!Sf*5OH3_MZ{0%8(^LZadhZjMf_24)t9MyBQ< z=Q8-z1k_~I^wcb<*;2E&=4=f*->)XDCatEgW?s#@n*BA$YYJ*gYZle~2L>Mm65?0Y z)YnX|nE}_~1+*^)Xd_HNIv-@-nwlMOc?ch-`ac7Rk1*{&(ET9Oh;u*46l~_Lf!l^D zkM4eOpy45WG8UZuj|UX=twE9fUY}xj`9Fi3o2$F4v(x{&6s=$X8Qk66J=~q0{??^< zegN`ZoL!wA>^{|{KHv7A!OPRr+sn-rj}u0v=okX8>eKA{|MR%``#bwN2E49MW18}x z7s`86m$rSze?iv(f0qEq06IE~idGdcSc|hf;9_9*iOJ|$u;t`g24D)tY5t`PIHg92 F1OSYNRx|(r literal 0 HcmV?d00001 diff --git a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/Digi_6203-6233-World_b.bin b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/Digi_6203-6233-World_b.bin new file mode 100644 index 0000000000000000000000000000000000000000..f0d1bd408c1f8aa617ae869f8314e6be5d46078f GIT binary patch literal 2048 zcmZSJU|=xc#-G5<;F6!tz`&r8%)oHWfPuN5webanWMpIrcQP?CHgJhIFtIRCG%(O* z{IHorN=FH(91KKQ7#I>3FfjD=FfgdFLIrhnfQD&_G2CEa;^X6!Sw2`Oo*E~zH2!6Bic&L|2PA~Jfm*!lVf+xtdDyN4zwdqhMeaXyrkhpPhGAFz;t zK~0o_;c^UAR96>hza&rqV*f4%1}?aI6b96O2N#tfB^4EABPAsz;S|+yBsKLdi+0E> zE2)4mP*z1=QAvgKp)Al=%D`C$1_J{$BYYGTWW+K+#1;^77DW69sX-%v>J${@WW+=w zU<{xph)55N0W<+3vKPhx8V3;pn+7u0PYwuVq(nr*V2n5zqYuVd2V?AqF^VU}j-xWNHp_ zE`v`^KutzXPtAgwEj4><&eovw{c6H$(rWr@=GCmL*L+5VDLd8A%0a& zea+;W8E_q5K>K2VHp29y^FijVso4RShwx#l|1*I22-E%p-48O2IQN50!DikXxNVs7 z=@^(l6j|1-F`xw^YLJN>Uq(fakD!QIW>!`<2GZ(WM# z2O!VI+11&>?o(ar^KJhbygWU!IAK(Zjv?@>KFzNGKaY#Qzq6lX!0Y-nrYZk< zp}aSBY1?P~7jzBqcL{I|prfOxXjK7&wK&TIE(T_wn2eqUTTY&30H$D^=3lyiQ)+}r F008xzRd@gZ literal 0 HcmV?d00001 diff --git a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/Digi_6203_2_ANT-US_b.bin b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros/Digi_6203_2_ANT-US_b.bin new file mode 100644 index 0000000000000000000000000000000000000000..b5993a9a2ce9fdcf125c7c212b48c0f665ec9887 GIT binary patch literal 2048 zcmeHFPiWIn9RBssMpkN;)hz2uZDW>s7%RkC-B74oo3!1QZN*tvu;Av}(wn__P#!I! zmqD2aJ?tcLSBn>m4nbrW#X~^cWk+{X)Wh&12om4xKeyIRVTT>`h5Yh;zwiCN@9_vw z05|fT^A?b=MQ;P}ivX`AuoT*EeXLfK3Fd-+|0zknBKb##7bMAN+I~X01_h`s)(SAM z0Thb>Vq2{_IEc*#IM@U;P1Ej20G(!2ePZXgACt|qFrUh#<+NX!y%>*&cIp6$Y_S}e znwmX7mAD*&y10c?%^yFe{}R2DA? zqS!Yi2*S}+|J;r}g*&Tj-abJjFIGkGaY5|ZI)+mZwsZhVYO+vy7wgFKE+<>$-7ZeU zlqvI!om%HPhSqu7Mj2#8<$2!iWF1U`06fEFtAN9Ul@7;h7`U7c+Fr(hqiyZ5P5?{W zta_zGwS(&Mc!&?3AfVz?1=yzs7!3pBLzOY8`ViotZJ-lir>u~}7bC2Zk`p{mc8Qb{ zDHXwur^eV6KHh}P7ZU(3o zx4%0-arvEJsgc&IH=n=h_iCYPR@04rR&KepOZ`?z1vU%_hn0vD3L5#;z;^>8;Yc(R z3jWBa#y@zGTD%ir zRtG2)0OW>pv9}k^dIVU9I+kVq4*;6$9A&NQ(~WHXB+RDL3z3C@I(cqtDqPh7$xNXX z93P)NJ)XP}o0^*+NhU8fZM1h*x-dU+AK*wUz}if?+SiBq?O3q$p8~il{Z*ixKNOMA zO0wM5FG>I6>takgqKTsD_wpVtNdeAq85;;VXjKGWN8s~%Sa%75z`7b?l>(l1 zISs4AG=kRA(LsIKBn6g_4bZ0yI2{4?VM+*W9|}CI3k(X}j1#hcTq|@#R z&!t8;kwwC4cqsTexA5+<31g$9XU3xHw&4GTefa|)^6B7h(;bP&!xO`akNI@nUGqSh xeafYuESW88A|6Q$C-&uddk)RQsW#_Z7u0JrnSx$=WdPpb9bMnN-ckBTgdb54R1^RJ literal 0 HcmV?d00001 From 26dc437a25eb8ce53b2b5eb3a65ae76662589140 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 29 Jan 2024 14:54:24 +0100 Subject: [PATCH 38/48] ccimx6qpsbc: add missing "if" condition terminator in UUU install script One of the conditions used to determine the U-Boot file was missing its terminator, breaking the script. Signed-off-by: Gabriel Valcazar --- .../u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh index eb2eb03d3..eb59fb5ee 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_uuu.sh @@ -104,7 +104,7 @@ if [ -z ${INSTALL_UBOOT_FILENAME} ]; then if [ "$module_variant" = "0x01" ] || \ [ "$module_variant" = "0x02" ]; then INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##2GB.imx" - elif [ "$module_variant" = "0x03" ] || \ + elif [ "$module_variant" = "0x03" ]; then INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##1GB.imx" fi fi From cc295eabe01a4a8e88b7f88d8e3ec97696c00fda Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Mon, 29 Jan 2024 18:27:25 +0100 Subject: [PATCH 39/48] lvgl-demo: rename bitbake variables by adding LVGL_ prefix This is to avoid duplicating names with variable DEMO_DISPLAY inside the lvgl-demo-init script itself. Signed-off-by: Hector Palacios --- .../recipes-graphics/lvgl/files/lvgl-demo-init | 4 ++-- .../recipes-graphics/lvgl/lvgl-demo_8.3.0.bb | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/meta-digi-dey/recipes-graphics/lvgl/files/lvgl-demo-init b/meta-digi-dey/recipes-graphics/lvgl/files/lvgl-demo-init index cfb3319d3..f0b3f5b41 100644 --- a/meta-digi-dey/recipes-graphics/lvgl/files/lvgl-demo-init +++ b/meta-digi-dey/recipes-graphics/lvgl/files/lvgl-demo-init @@ -16,8 +16,8 @@ readonly DEMO_NAME="lvgl_demo" readonly DEMO_PATH="/usr/bin/${DEMO_NAME}" readonly DEMO_TITLE="LVGL Demo Application" -readonly DEMO_DISPLAY="##DEMO_DISPLAY##" -readonly DEMO_ENV="##DEMO_ENV##" +readonly DEMO_DISPLAY="##LVGL_DEMO_DISPLAY##" +readonly DEMO_ENV="##LVGL_DEMO_ENV##" readonly PID_FILE="/run/${DEMO_NAME}.pid" log() { diff --git a/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb b/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb index 9ab53ad14..6b3f95e0b 100644 --- a/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb +++ b/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb @@ -64,10 +64,12 @@ do_configure:prepend() { WESTON_SERVICE ?= "weston.service" WESTON_SERVICE:ccmp15 ?= "weston-launch.service" -DEMO_DISPLAY ?= "wayland-0" -DEMO_DISPLAY:ccmp15 ?= "wayland-1" -DEMO_ENV ?= "DISPLAY=:0.0 XDG_RUNTIME_DIR=/run/user/0 WAYLAND_DISPLAY=\${DEMO_DISPLAY}" -DEMO_ENV:ccimx6ul ?= "" + +LVGL_DEMO_DISPLAY ?= "wayland-0" +LVGL_DEMO_DISPLAY:ccmp15 ?= "wayland-1" +LVGL_DEMO_DISPLAY:ccimx93 ?= "wayland-1" +LVGL_DEMO_ENV ?= "DISPLAY=:0.0 XDG_RUNTIME_DIR=/run/user/0 WAYLAND_DISPLAY=\${DEMO_DISPLAY}" +LVGL_DEMO_ENV:ccimx6ul ?= "" do_install:append() { install -d ${D}${bindir} @@ -85,8 +87,8 @@ do_install:append() { # Install wrapper bootscript to launch LVGL demo on boot install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/lvgl-demo-init ${D}${sysconfdir}/lvgl-demo-init - sed -i -e "s@##DEMO_DISPLAY##@${DEMO_DISPLAY}@g" \ - -e "s@##DEMO_ENV##@${DEMO_ENV}@g" \ + sed -i -e "s@##LVGL_DEMO_DISPLAY##@${LVGL_DEMO_DISPLAY}@g" \ + -e "s@##LVGL_DEMO_ENV##@${LVGL_DEMO_ENV}@g" \ "${D}${sysconfdir}/lvgl-demo-init" ln -sf ${sysconfdir}/lvgl-demo-init ${D}${sysconfdir}/init.d/lvgl-demo-init } From 327d9f3cd302de0dcec2dfe41f21ed3161c6c6ad Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Mon, 29 Jan 2024 18:28:49 +0100 Subject: [PATCH 40/48] graphic demos: cc93: fix display and expansion of variable The display for the cc93 is 'wayland-1'. Use backslashes before the curly braces to avoid potential expansion by bitbake variables. Signed-off-by: Hector Palacios --- .../connectcore-demo-example-webkit.bb | 5 +++-- meta-digi-dey/recipes-crank/crank-demos/crank-demos_7.2.bb | 5 +++-- meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-digi/connectcore-demo-example-webkit/connectcore-demo-example-webkit.bb b/meta-digi-dey/dynamic-layers/webkit/recipes-digi/connectcore-demo-example-webkit/connectcore-demo-example-webkit.bb index 41c370e59..e1188e5fb 100644 --- a/meta-digi-dey/dynamic-layers/webkit/recipes-digi/connectcore-demo-example-webkit/connectcore-demo-example-webkit.bb +++ b/meta-digi-dey/dynamic-layers/webkit/recipes-digi/connectcore-demo-example-webkit/connectcore-demo-example-webkit.bb @@ -1,4 +1,4 @@ -# Copyright (C) 2022, 2023 Digi International. +# Copyright (C) 2022-2024 Digi International. require recipes-digi/dey-examples/connectcore-demo-example.inc @@ -7,7 +7,8 @@ WESTON_SERVICE:ccmp15 ?= "weston-launch.service" CC_DEMO_DISPLAY ?= "wayland-0" CC_DEMO_DISPLAY:ccmp15 ?= "wayland-1" -CC_DEMO_ENV ?= "DISPLAY=:0.0 XDG_RUNTIME_DIR=/run/user/0 WAYLAND_DISPLAY=\${DEMO_DISPLAY}" +CC_DEMO_DISPLAY:ccimx93 ?= "wayland-1" +CC_DEMO_ENV ?= "DISPLAY=:0.0 XDG_RUNTIME_DIR=/run/user/0 WAYLAND_DISPLAY=\$\{DEMO_DISPLAY\}" CC_DEMO_ENV:ccimx6ul ?= "" FILESEXTRAPATHS:prepend := "${THISDIR}/../../../../recipes-digi/dey-examples/connectcore-demo-example:" diff --git a/meta-digi-dey/recipes-crank/crank-demos/crank-demos_7.2.bb b/meta-digi-dey/recipes-crank/crank-demos/crank-demos_7.2.bb index 152f7a253..c1f410960 100644 --- a/meta-digi-dey/recipes-crank/crank-demos/crank-demos_7.2.bb +++ b/meta-digi-dey/recipes-crank/crank-demos/crank-demos_7.2.bb @@ -1,4 +1,4 @@ -# Copyright (C) 2022, Digi International Inc. +# Copyright (C) 2022-2024 Digi International Inc. SUMMARY = "Crank Demo" HOMEPAGE = "https://www.cranksoftware.com/" @@ -19,7 +19,8 @@ WESTON_SERVICE:ccmp15 ?= "weston-launch.service" CRANK_DEMOS_TARBALL_PATH ?= "" CRANK_DEMO_DISPLAY ?= "wayland-0" CRANK_DEMO_DISPLAY:ccmp15 ?= "wayland-1" -CRANK_DEMO_ENV ?= "DISPLAY=:0.0 XDG_RUNTIME_DIR=/run/user/0 WAYLAND_DISPLAY=\${DEMO_DISPLAY}" +CRANK_DEMO_DISPLAY:ccimx93 ?= "wayland-1" +CRANK_DEMO_ENV ?= "DISPLAY=:0.0 XDG_RUNTIME_DIR=/run/user/0 WAYLAND_DISPLAY=\$\{DEMO_DISPLAY\}" CRANK_DEMO_ENV:ccimx6ul ?= "" CRANK_DEMO_OPTIONS ?= "-orender_mgr,multisample=0" CRANK_DEMO_OPTIONS:ccimx6ul ?= "-orender_mgr,multisample=0 -odev-input,mouse=/dev/input/mouse0 -oscreen_mgr,swcursor" diff --git a/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb b/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb index 6b3f95e0b..1da8e2b23 100644 --- a/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb +++ b/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb @@ -68,7 +68,7 @@ WESTON_SERVICE:ccmp15 ?= "weston-launch.service" LVGL_DEMO_DISPLAY ?= "wayland-0" LVGL_DEMO_DISPLAY:ccmp15 ?= "wayland-1" LVGL_DEMO_DISPLAY:ccimx93 ?= "wayland-1" -LVGL_DEMO_ENV ?= "DISPLAY=:0.0 XDG_RUNTIME_DIR=/run/user/0 WAYLAND_DISPLAY=\${DEMO_DISPLAY}" +LVGL_DEMO_ENV ?= "DISPLAY=:0.0 XDG_RUNTIME_DIR=/run/user/0 WAYLAND_DISPLAY=\$\{DEMO_DISPLAY\}" LVGL_DEMO_ENV:ccimx6ul ?= "" do_install:append() { From 4db0703a6b03e13fde69579c2fe9f336525681aa Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 29 Jan 2024 17:13:31 +0100 Subject: [PATCH 41/48] build.sh: don't build dey-image-crank for the ccimx6sbc and ccimx6qpsbc The crank engine hasn't been fully tested on these platforms yet, so remove the image from our default build. https://onedigi.atlassian.net/browse/DEL-8862 Signed-off-by: Gabriel Valcazar --- sdk/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/build.sh b/sdk/build.sh index 80f189f4d..649ecfa99 100755 --- a/sdk/build.sh +++ b/sdk/build.sh @@ -176,8 +176,8 @@ done<<-_EOF_ ccimx8mn-dvk dey-image-qt,dey-image-crank,dey-image-webkit,dey-image-lvgl ccimx8x-sbc-pro dey-image-qt,dey-image-crank,dey-image-webkit,dey-image-lvgl ccimx8x-sbc-express dey-image-qt - ccimx6qpsbc dey-image-qt,dey-image-crank,dey-image-webkit,dey-image-lvgl - ccimx6sbc dey-image-qt,dey-image-crank,dey-image-webkit,dey-image-lvgl + ccimx6qpsbc dey-image-qt,dey-image-webkit,dey-image-lvgl + ccimx6sbc dey-image-qt,dey-image-webkit,dey-image-lvgl ccimx6ulsbc core-image-base,dey-image-qt,dey-image-crank,dey-image-lvgl ccimx6ulstarter core-image-base ccimx6ulsom dey-image-mft-module-min From a58ce7e254801bf0ffc559aa81f7a0b567a6a604 Mon Sep 17 00:00:00 2001 From: David Escalona Date: Tue, 30 Jan 2024 14:58:56 +0100 Subject: [PATCH 42/48] meta-digi-dey: python3-connectcore-ble: update recipe to v1.0.7 Signed-off-by: David Escalona --- .../python3-connectcore-ble/python3-connectcore-ble_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 6910899d4..b1446e9ce 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,8 +8,8 @@ LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" SRCBRANCH ?= "master" -SRCREV = "72cc9eb39088ae6b16d32ca03c74e8885323279a" -PV = "1.0.6" +SRCREV = "70245c4f4de7f2ffae899fd7cf267d9ad6db7ae0" +PV = "1.0.7" SRC_URI = " \ ${DIGI_GITHUB_GIT}/connectcore-ble-python.git;protocol=https;branch=${SRCBRANCH} \ From 04a00b2bd0dfcabc3da14c9b10fa4fd38826467b Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 30 Jan 2024 15:46:25 +0100 Subject: [PATCH 43/48] meta-digi: update revisions for dey-4.0-r5.1 Signed-off-by: Arturo Buzarra --- .../recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend | 4 ++-- .../recipes-security/optee/optee-os-stm32mp_%.bbappend | 4 ++-- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb | 2 +- .../trustfence/nativesdk-trustfence-sign-tools_2023.04.bb | 2 +- .../trustfence/trustfence-sign-tools-native_2023.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools.inc | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb | 2 +- meta-digi-dey/recipes-digi/cccs/cccs_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 17 files changed, 25 insertions(+), 25 deletions(-) diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend index ea93c7e6d..b10eb29e7 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 = "8fdd443544f980b720586b77852307a8b8f48caf" 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 d3367b5ec..fd13da81d 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend @@ -8,9 +8,9 @@ OPTEE_URI_GITHUB = "${DIGI_GITHUB_GIT}/optee_os.git;protocol=https" OPTEE_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${OPTEE_URI_STASH}', '${OPTEE_URI_GITHUB}', d)}" SRCBRANCH = "3.16.0/stm/maint" -SRCREV = "${AUTOREV}" +SRCREV = "79d8721421218c49384686101379cbfae158d28c" 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 75199b0b0..634785380 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc @@ -27,7 +27,7 @@ INSTALL_FW_UBOOT_SCRIPTS = " \ " SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://boot.txt \ ${INSTALL_FW_UBOOT_SCRIPTS} \ " diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index 1a3fa59a3..ff3de034b 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,7 +3,7 @@ require u-boot-dey.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "1ef810133fcecacf14e09155bee10aa66fc6ade7" # Disable support to initial environment for U-Boot UBOOT_INITIAL_ENV = "" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb index 4f845bdd2..0c325e684 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 = "af77921f513e82add24e54a28a5353b9012fdaf6" COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8m|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb index 3fd75f9a8..7772d9419 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb @@ -7,7 +7,7 @@ DEPENDS += "flex-native bison-native" DEPENDS += "python3-setuptools-native" SRCBRANCH = "v2021.10/maint" -SRCREV = "${AUTOREV}" +SRCREV = "b790ac5d6d1425604deefd8885e93f1a016d73b5" UBOOT_FIT_CFG_FRAGMENTS = " \ file://fit_legacy.cfg \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb index ca022b584..2491af6ba 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2023.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "d27aefc1691a14c6edaadf35ab147ac8afe5c98a" COMPATIBLE_MACHINE = "(ccimx93)" diff --git a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb index 0ff254752..19a36e532 100644 --- a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb +++ b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb @@ -3,4 +3,4 @@ require nativesdk-trustfence-sign-tools_git.bb SRCBRANCH = "v2023.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "d27aefc1691a14c6edaadf35ab147ac8afe5c98a" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb index 955934262..a3d99728e 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb @@ -3,4 +3,4 @@ require trustfence-sign-tools-native_git.bb SRCBRANCH = "v2023.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "d27aefc1691a14c6edaadf35ab147ac8afe5c98a" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc index 676122560..4de1cf79f 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 = "af77921f513e82add24e54a28a5353b9012fdaf6" S = "${WORKDIR}" @@ -15,7 +15,7 @@ UBOOT_URI_GITHUB = "${DIGI_GITHUB_GIT}/u-boot.git;protocol=https" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${UBOOT_URI_STASH}', '${UBOOT_URI_GITHUB}', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-artifact-nxp.sh \ file://trustfence-sign-artifact-stm.sh \ file://trustfence-gen-pki-stm.sh \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 29213a4a1..b229c413a 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-4.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "7ba1cdedd456928ac77c1f11e0d070abaf505e95" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}/linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};branch=${SRCBRANCH} \ + ${QCOM_GIT_URI};nobranch=1 \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index afda6fa1e..e8707f309 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -16,7 +16,7 @@ LINUX_URI_STASH = "${DIGI_MTK_GIT}/linux/linux.git;protocol=ssh" LINUX_URI_GITHUB = "${DIGI_GITHUB_GIT}/linux.git;protocol=https" LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1', '${LINUX_URI_STASH}', '${LINUX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LINUX_GIT_URI};branch=${SRCBRANCH} \ + ${LINUX_GIT_URI};nobranch=1 \ ${@oe.utils.conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)} \ " S = "${WORKDIR}/git" 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 50d95348e..1531f6b15 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb @@ -4,8 +4,8 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v5.15/nxp/dey-4.0/maint" SRCBRANCH:stm32mpcommon = "v5.15/stm/dey-4.0/maint" -SRCREV = "${AUTOREV}" -SRCREV:stm32mpcommon = "${AUTOREV}" +SRCREV = "a2833d11fd2fd011b08a517519cdabcdc0bbacdc" +SRCREV:stm32mpcommon = "d63fecf8e08ad95309312fea08f04fbf4aec8a0c" do_assemble_fitimage:prepend:ccmp1() { # Deploy u-boot script to be included into the FIT image diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb index 1954b8b64..7251bdbf6 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb @@ -3,7 +3,7 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v6.1/nxp/dey-4.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "b4dc0adc1d267f5a9d8e9828cdf049232adb6dc8" # Blacklist btnxpuart module. It will be managed by the bluetooth-init script KERNEL_MODULE_PROBECONF += "btnxpuart" diff --git a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb index 997ea2ad2..704069286 100644 --- a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb +++ b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "libconfuse libdigiapix openssl recovery-utils swupdate zlib json-c" SRCBRANCH = "dey-4.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "4d17b8830a96019458946d2e1765b08b174160c8" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" @@ -19,7 +19,7 @@ CCCS_DEVICE_TYPE ?= "${MACHINE}" CCCS_CONF_PATH ?= "" SRC_URI = " \ - ${CC_GIT_URI};branch=${SRCBRANCH} \ + ${CC_GIT_URI};nobranch=1 \ file://cccsd-init \ file://cccsd.service \ file://cccs-gs-demo-init \ diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index 97a2d77b4..f7c3be174 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 = "78402f0e3e138023f70d9577faa11212a9dc3f61" 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..0ab1f16a2 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 = "fed0071f5d6c4f44a6189c6c4fa5bdeda5a684c3" 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 7fb5205e734887580a14bfafa0021a766187f8d6 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 30 Jan 2024 16:52:26 +0100 Subject: [PATCH 44/48] meta-digi: revert revisions to AUTOREV Signed-off-by: Arturo Buzarra --- .../recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend | 4 ++-- .../recipes-security/optee/optee-os-stm32mp_%.bbappend | 4 ++-- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb | 2 +- .../trustfence/nativesdk-trustfence-sign-tools_2023.04.bb | 2 +- .../trustfence/trustfence-sign-tools-native_2023.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools.inc | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb | 2 +- meta-digi-dey/recipes-digi/cccs/cccs_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 17 files changed, 25 insertions(+), 25 deletions(-) diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend index b10eb29e7..ea93c7e6d 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 = "8fdd443544f980b720586b77852307a8b8f48caf" +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 fd13da81d..d3367b5ec 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend @@ -8,9 +8,9 @@ OPTEE_URI_GITHUB = "${DIGI_GITHUB_GIT}/optee_os.git;protocol=https" OPTEE_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${OPTEE_URI_STASH}', '${OPTEE_URI_GITHUB}', d)}" SRCBRANCH = "3.16.0/stm/maint" -SRCREV = "79d8721421218c49384686101379cbfae158d28c" +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 634785380..75199b0b0 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc @@ -27,7 +27,7 @@ INSTALL_FW_UBOOT_SCRIPTS = " \ " SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://boot.txt \ ${INSTALL_FW_UBOOT_SCRIPTS} \ " diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index ff3de034b..1a3fa59a3 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,7 +3,7 @@ require u-boot-dey.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "1ef810133fcecacf14e09155bee10aa66fc6ade7" +SRCREV = "${AUTOREV}" # Disable support to initial environment for U-Boot UBOOT_INITIAL_ENV = "" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb index 0c325e684..4f845bdd2 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2020.04/maint" -SRCREV = "af77921f513e82add24e54a28a5353b9012fdaf6" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8m|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb index 7772d9419..3fd75f9a8 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb @@ -7,7 +7,7 @@ DEPENDS += "flex-native bison-native" DEPENDS += "python3-setuptools-native" SRCBRANCH = "v2021.10/maint" -SRCREV = "b790ac5d6d1425604deefd8885e93f1a016d73b5" +SRCREV = "${AUTOREV}" UBOOT_FIT_CFG_FRAGMENTS = " \ file://fit_legacy.cfg \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb index 2491af6ba..ca022b584 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2023.04/maint" -SRCREV = "d27aefc1691a14c6edaadf35ab147ac8afe5c98a" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx93)" diff --git a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb index 19a36e532..0ff254752 100644 --- a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb +++ b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb @@ -3,4 +3,4 @@ require nativesdk-trustfence-sign-tools_git.bb SRCBRANCH = "v2023.04/maint" -SRCREV = "d27aefc1691a14c6edaadf35ab147ac8afe5c98a" +SRCREV = "${AUTOREV}" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb index a3d99728e..955934262 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb @@ -3,4 +3,4 @@ require trustfence-sign-tools-native_git.bb SRCBRANCH = "v2023.04/maint" -SRCREV = "d27aefc1691a14c6edaadf35ab147ac8afe5c98a" +SRCREV = "${AUTOREV}" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc index 4de1cf79f..676122560 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc @@ -5,7 +5,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2020.04/maint" -SRCREV = "af77921f513e82add24e54a28a5353b9012fdaf6" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -15,7 +15,7 @@ UBOOT_URI_GITHUB = "${DIGI_GITHUB_GIT}/u-boot.git;protocol=https" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${UBOOT_URI_STASH}', '${UBOOT_URI_GITHUB}', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-artifact-nxp.sh \ file://trustfence-sign-artifact-stm.sh \ file://trustfence-gen-pki-stm.sh \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index b229c413a..29213a4a1 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-4.0/maint" -SRCREV = "7ba1cdedd456928ac77c1f11e0d070abaf505e95" +SRCREV = "${AUTOREV}" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}/linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};nobranch=1 \ + ${QCOM_GIT_URI};branch=${SRCBRANCH} \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index e8707f309..afda6fa1e 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -16,7 +16,7 @@ LINUX_URI_STASH = "${DIGI_MTK_GIT}/linux/linux.git;protocol=ssh" LINUX_URI_GITHUB = "${DIGI_GITHUB_GIT}/linux.git;protocol=https" LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1', '${LINUX_URI_STASH}', '${LINUX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LINUX_GIT_URI};nobranch=1 \ + ${LINUX_GIT_URI};branch=${SRCBRANCH} \ ${@oe.utils.conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)} \ " S = "${WORKDIR}/git" 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 1531f6b15..50d95348e 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb @@ -4,8 +4,8 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v5.15/nxp/dey-4.0/maint" SRCBRANCH:stm32mpcommon = "v5.15/stm/dey-4.0/maint" -SRCREV = "a2833d11fd2fd011b08a517519cdabcdc0bbacdc" -SRCREV:stm32mpcommon = "d63fecf8e08ad95309312fea08f04fbf4aec8a0c" +SRCREV = "${AUTOREV}" +SRCREV:stm32mpcommon = "${AUTOREV}" do_assemble_fitimage:prepend:ccmp1() { # Deploy u-boot script to be included into the FIT image diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb index 7251bdbf6..1954b8b64 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb @@ -3,7 +3,7 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v6.1/nxp/dey-4.0/maint" -SRCREV = "b4dc0adc1d267f5a9d8e9828cdf049232adb6dc8" +SRCREV = "${AUTOREV}" # Blacklist btnxpuart module. It will be managed by the bluetooth-init script KERNEL_MODULE_PROBECONF += "btnxpuart" diff --git a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb index 704069286..997ea2ad2 100644 --- a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb +++ b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "libconfuse libdigiapix openssl recovery-utils swupdate zlib json-c" SRCBRANCH = "dey-4.0/maint" -SRCREV = "4d17b8830a96019458946d2e1765b08b174160c8" +SRCREV = "${AUTOREV}" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" @@ -19,7 +19,7 @@ CCCS_DEVICE_TYPE ?= "${MACHINE}" CCCS_CONF_PATH ?= "" SRC_URI = " \ - ${CC_GIT_URI};nobranch=1 \ + ${CC_GIT_URI};branch=${SRCBRANCH} \ file://cccsd-init \ file://cccsd.service \ file://cccs-gs-demo-init \ diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index f7c3be174..97a2d77b4 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc @@ -1,11 +1,11 @@ # Copyright (C) 2019-2022 Digi International Inc. SRCBRANCH = "dey-4.0/maint" -SRCREV = "78402f0e3e138023f70d9577faa11212a9dc3f61" +SRCREV = "${AUTOREV}" DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}/dey/dey-examples.git;protocol=ssh" DEY_EXAMPLES_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=https" DEY_EXAMPLES_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DEY_EXAMPLES_STASH}', '${DEY_EXAMPLES_GITHUB}', d)}" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};nobranch=1" +SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 0ab1f16a2..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 = "fed0071f5d6c4f44a6189c6c4fa5bdeda5a684c3" +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 1d15803ff2ec75d3b67a9324cf3c4ff68dddcdb3 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Wed, 31 Jan 2024 11:38:27 +0100 Subject: [PATCH 45/48] ccimx93: installer: add helper msg to set image-name Up until recently, we were only generating dey-image-qt images for the ccimx93-dvk. Now that we are generating dey-image-lvgl images as well, make sure to print the helper message to set image-name when installing said images. Signed-off-by: Gabriel Valcazar --- .../u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt | 2 ++ .../u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt index 33c853c4f..153f27aa3 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt @@ -57,6 +57,8 @@ if test ! -e mmc ${INSTALL_MMCDEV} ${INSTALL_ROOTFS_FILENAME}; then fi fi if test "${install_abort}" = "1"; then + echo "To install a different image, set variable 'image-name', e.g.:" + echo " => setenv image-name core-image-base" echo "Aborted."; exit; fi diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt index fc2e67264..5e536006b 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt @@ -57,6 +57,8 @@ if test ! -e usb ${INSTALL_USBDEV} ${INSTALL_ROOTFS_FILENAME}; then fi fi if test "${install_abort}" = "1"; then + echo "To install a different image, set variable 'image-name', e.g.:" + echo " => setenv image-name core-image-base" echo "Aborted."; exit; fi From fd35a3149e74ca108ddae0b707c2623d6b473406 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 1 Feb 2024 14:03:59 +0100 Subject: [PATCH 46/48] weston: include NXP patch to enable cursor without having to move the mouse This is an NXP change that reverts a mainline weston commit form v9.0.0, in which the mouse cursor only gets activated when there is mouse movement. This change was only being included in the weston v10.0.X i.MX forks. For platforms that don't use these weston forks (ccimx93 uses the v11.0.X fork and ccmp15 uses mainline weston), the mouse cursor doesn't load right away when booting the system, which causes apps that are automatically launched (such as the LVGL demo) to not register the mouse, rendering said apps unresponsive to it. Port NXP's change to all of the weston versions we currently use to avoid this problem. https://onedigi.atlassian.net/browse/DEL-8865 Signed-off-by: Gabriel Valcazar --- ...-libinput-device-Enable-Set-pointer-.patch | 90 +++++++++++++++++++ .../wayland/weston_10.0.2.bbappend | 1 + ...-libinput-device-Enable-Set-pointer-.patch | 90 +++++++++++++++++++ .../wayland/weston_11.0.3.imx.bbappend | 5 +- 4 files changed, 185 insertions(+), 1 deletion(-) create mode 100644 meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston/0006-Revert-libweston-libinput-device-Enable-Set-pointer-.patch create mode 100644 meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.3.imx/0002-Revert-libweston-libinput-device-Enable-Set-pointer-.patch diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston/0006-Revert-libweston-libinput-device-Enable-Set-pointer-.patch b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston/0006-Revert-libweston-libinput-device-Enable-Set-pointer-.patch new file mode 100644 index 000000000..805c8243e --- /dev/null +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston/0006-Revert-libweston-libinput-device-Enable-Set-pointer-.patch @@ -0,0 +1,90 @@ +From: Haihua Hu +Date: Wed, 3 Aug 2022 16:34:47 +0800 +Subject: [PATCH] Revert "libweston/libinput-device: Enable/Set pointer + capabilities only on pointer movement" + +This reverts commit e825fe389ebd63470028abd828019840c1170a03. + +This commit will cause waylandsink cannot register pointer seat. +As a result, mouse cannot move waylandsink window + +(cherry picked from commit 3f8f336b5d2cf7ea7aa4e047d669d093fc46dfe6) +--- + libweston/libinput-device.c | 29 +++++------------------------ + 1 file changed, 5 insertions(+), 24 deletions(-) + +diff --git a/libweston/libinput-device.c b/libweston/libinput-device.c +index 4ea89de0..2d7a7d5f 100644 +--- a/libweston/libinput-device.c ++++ b/libweston/libinput-device.c +@@ -60,21 +60,6 @@ evdev_led_update(struct evdev_device *device, enum weston_led weston_leds) + libinput_device_led_update(device->device, leds); + } + +-static void +-ensure_pointer_capability(struct libinput_device *libinput_device) +-{ +- struct evdev_device *device = libinput_device_get_user_data(libinput_device); +- struct weston_seat *seat = device->seat; +- +- if (!libinput_device_has_capability(libinput_device, LIBINPUT_DEVICE_CAP_POINTER)) +- return; +- +- if (!(device->seat_caps & EVDEV_SEAT_POINTER)) { +- weston_seat_init_pointer(seat); +- device->seat_caps |= EVDEV_SEAT_POINTER; +- } +-} +- + static void + handle_keyboard_key(struct libinput_device *libinput_device, + struct libinput_event_keyboard *keyboard_event) +@@ -112,8 +97,6 @@ handle_pointer_motion(struct libinput_device *libinput_device, + struct timespec time; + double dx_unaccel, dy_unaccel; + +- ensure_pointer_capability(libinput_device); +- + timespec_from_usec(&time, + libinput_event_pointer_get_time_usec(pointer_event)); + dx_unaccel = libinput_event_pointer_get_dx_unaccelerated(pointer_event); +@@ -146,8 +129,6 @@ handle_pointer_motion_absolute( + double x, y; + uint32_t width, height; + +- ensure_pointer_capability(libinput_device); +- + if (!output) + return false; + +@@ -179,8 +160,6 @@ handle_pointer_button(struct libinput_device *libinput_device, + libinput_event_pointer_get_seat_button_count(pointer_event); + struct timespec time; + +- ensure_pointer_capability(libinput_device); +- + /* Ignore button events that are not seat wide state changes. */ + if ((button_state == LIBINPUT_BUTTON_STATE_PRESSED && + seat_button_count != 1) || +@@ -260,8 +239,6 @@ handle_pointer_axis(struct libinput_device *libinput_device, + bool has_vert, has_horiz; + struct timespec time; + +- ensure_pointer_capability(libinput_device); +- + has_vert = libinput_event_pointer_has_axis(pointer_event, + LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL); + has_horiz = libinput_event_pointer_has_axis(pointer_event, +@@ -738,7 +715,11 @@ evdev_device_create(struct libinput_device *libinput_device, + + device->seat_caps |= EVDEV_SEAT_KEYBOARD; + } +- ++ if (libinput_device_has_capability(libinput_device, ++ LIBINPUT_DEVICE_CAP_POINTER)) { ++ weston_seat_init_pointer(seat); ++ device->seat_caps |= EVDEV_SEAT_POINTER; ++ } + if (libinput_device_has_capability(libinput_device, + LIBINPUT_DEVICE_CAP_TOUCH)) { + if (weston_seat_init_touch(seat) < 0) { diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston_10.0.2.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston_10.0.2.bbappend index 9de6ca79c..316c894ca 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston_10.0.2.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-graphics/wayland/weston_10.0.2.bbappend @@ -5,6 +5,7 @@ SRC_URI:append:stm32mpcommon = " \ file://0002-Force-to-close-all-output.patch \ file://0004-Disable-request-to-EGL_DRM_RENDER_NODE_FILE_EXT.patch \ file://0005-clients-simple-egl-call-eglSwapInterval-after-eglMak.patch \ + file://0006-Revert-libweston-libinput-device-Enable-Set-pointer-.patch \ " SIMPLECLIENTS="egl,touch,dmabuf-v4l,dmabuf-egl" diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.3.imx/0002-Revert-libweston-libinput-device-Enable-Set-pointer-.patch b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.3.imx/0002-Revert-libweston-libinput-device-Enable-Set-pointer-.patch new file mode 100644 index 000000000..805c8243e --- /dev/null +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston-11.0.3.imx/0002-Revert-libweston-libinput-device-Enable-Set-pointer-.patch @@ -0,0 +1,90 @@ +From: Haihua Hu +Date: Wed, 3 Aug 2022 16:34:47 +0800 +Subject: [PATCH] Revert "libweston/libinput-device: Enable/Set pointer + capabilities only on pointer movement" + +This reverts commit e825fe389ebd63470028abd828019840c1170a03. + +This commit will cause waylandsink cannot register pointer seat. +As a result, mouse cannot move waylandsink window + +(cherry picked from commit 3f8f336b5d2cf7ea7aa4e047d669d093fc46dfe6) +--- + libweston/libinput-device.c | 29 +++++------------------------ + 1 file changed, 5 insertions(+), 24 deletions(-) + +diff --git a/libweston/libinput-device.c b/libweston/libinput-device.c +index 4ea89de0..2d7a7d5f 100644 +--- a/libweston/libinput-device.c ++++ b/libweston/libinput-device.c +@@ -60,21 +60,6 @@ evdev_led_update(struct evdev_device *device, enum weston_led weston_leds) + libinput_device_led_update(device->device, leds); + } + +-static void +-ensure_pointer_capability(struct libinput_device *libinput_device) +-{ +- struct evdev_device *device = libinput_device_get_user_data(libinput_device); +- struct weston_seat *seat = device->seat; +- +- if (!libinput_device_has_capability(libinput_device, LIBINPUT_DEVICE_CAP_POINTER)) +- return; +- +- if (!(device->seat_caps & EVDEV_SEAT_POINTER)) { +- weston_seat_init_pointer(seat); +- device->seat_caps |= EVDEV_SEAT_POINTER; +- } +-} +- + static void + handle_keyboard_key(struct libinput_device *libinput_device, + struct libinput_event_keyboard *keyboard_event) +@@ -112,8 +97,6 @@ handle_pointer_motion(struct libinput_device *libinput_device, + struct timespec time; + double dx_unaccel, dy_unaccel; + +- ensure_pointer_capability(libinput_device); +- + timespec_from_usec(&time, + libinput_event_pointer_get_time_usec(pointer_event)); + dx_unaccel = libinput_event_pointer_get_dx_unaccelerated(pointer_event); +@@ -146,8 +129,6 @@ handle_pointer_motion_absolute( + double x, y; + uint32_t width, height; + +- ensure_pointer_capability(libinput_device); +- + if (!output) + return false; + +@@ -179,8 +160,6 @@ handle_pointer_button(struct libinput_device *libinput_device, + libinput_event_pointer_get_seat_button_count(pointer_event); + struct timespec time; + +- ensure_pointer_capability(libinput_device); +- + /* Ignore button events that are not seat wide state changes. */ + if ((button_state == LIBINPUT_BUTTON_STATE_PRESSED && + seat_button_count != 1) || +@@ -260,8 +239,6 @@ handle_pointer_axis(struct libinput_device *libinput_device, + bool has_vert, has_horiz; + struct timespec time; + +- ensure_pointer_capability(libinput_device); +- + has_vert = libinput_event_pointer_has_axis(pointer_event, + LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL); + has_horiz = libinput_event_pointer_has_axis(pointer_event, +@@ -738,7 +715,11 @@ evdev_device_create(struct libinput_device *libinput_device, + + device->seat_caps |= EVDEV_SEAT_KEYBOARD; + } +- ++ if (libinput_device_has_capability(libinput_device, ++ LIBINPUT_DEVICE_CAP_POINTER)) { ++ weston_seat_init_pointer(seat); ++ device->seat_caps |= EVDEV_SEAT_POINTER; ++ } + if (libinput_device_has_capability(libinput_device, + LIBINPUT_DEVICE_CAP_TOUCH)) { + if (weston_seat_init_touch(seat) < 0) { diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_11.0.3.imx.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_11.0.3.imx.bbappend index 58dbf02b5..15b715f66 100644 --- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_11.0.3.imx.bbappend +++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-graphics/wayland/weston_11.0.3.imx.bbappend @@ -1,5 +1,8 @@ # Copyright (C) 2024 Digi International Inc. -SRC_URI += "file://0001-Restore-wl_shell-to-weston-11.patch" +SRC_URI += " \ + file://0001-Restore-wl_shell-to-weston-11.patch \ + file://0002-Revert-libweston-libinput-device-Enable-Set-pointer-.patch \ +" EXTRA_OEMESON += "-Ddeprecated-wl-shell=true" From 67fdbb01e8b38b9de818eac7ff86dfa26550619c Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Mon, 5 Feb 2024 21:46:08 +0100 Subject: [PATCH 47/48] meta-digi-dey: bump dey build to 4.0-r5.2 Signed-off-by: Arturo Buzarra --- meta-digi-dey/conf/distro/dey.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf index db39b4a30..b808a8ef5 100644 --- a/meta-digi-dey/conf/distro/dey.conf +++ b/meta-digi-dey/conf/distro/dey.conf @@ -4,7 +4,7 @@ require conf/distro/poky.conf YOCTO_MAJOR = "4" YOCTO_MINOR = "0" DEY_RELEASE = "5" -DEY_BUILD = "1" +DEY_BUILD = "2" # Firmware version of the system. DEY_FIRMWARE_VERSION ?= "${YOCTO_MAJOR}.${YOCTO_MINOR}.${DEY_RELEASE}.${DEY_BUILD}" From bdf80833dc37248aece788617a624afdfb8e9fc8 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Mon, 5 Feb 2024 23:11:04 +0100 Subject: [PATCH 48/48] meta-digi: update revisions for dey-4.0-r5.2 Signed-off-by: Arturo Buzarra --- .../recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend | 4 ++-- .../recipes-security/optee/optee-os-stm32mp_%.bbappend | 4 ++-- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb | 2 +- .../trustfence/nativesdk-trustfence-sign-tools_2023.04.bb | 2 +- .../trustfence/trustfence-sign-tools-native_2023.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools.inc | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb | 2 +- meta-digi-dey/recipes-digi/cccs/cccs_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 17 files changed, 25 insertions(+), 25 deletions(-) diff --git a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-bsp/trusted-firmware-a/tf-a-stm32mp_%.bbappend index ea93c7e6d..b10eb29e7 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 = "8fdd443544f980b720586b77852307a8b8f48caf" 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 d3367b5ec..fd13da81d 100644 --- a/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend +++ b/meta-digi-arm/dynamic-layers/stm-st-stm32mp/recipes-security/optee/optee-os-stm32mp_%.bbappend @@ -8,9 +8,9 @@ OPTEE_URI_GITHUB = "${DIGI_GITHUB_GIT}/optee_os.git;protocol=https" OPTEE_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${OPTEE_URI_STASH}', '${OPTEE_URI_GITHUB}', d)}" SRCBRANCH = "3.16.0/stm/maint" -SRCREV = "${AUTOREV}" +SRCREV = "79d8721421218c49384686101379cbfae158d28c" 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 75199b0b0..634785380 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey.inc @@ -27,7 +27,7 @@ INSTALL_FW_UBOOT_SCRIPTS = " \ " SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://boot.txt \ ${INSTALL_FW_UBOOT_SCRIPTS} \ " diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index 1a3fa59a3..ff3de034b 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,7 +3,7 @@ require u-boot-dey.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "1ef810133fcecacf14e09155bee10aa66fc6ade7" # Disable support to initial environment for U-Boot UBOOT_INITIAL_ENV = "" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb index 4f845bdd2..0c325e684 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 = "af77921f513e82add24e54a28a5353b9012fdaf6" COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8m|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb index 3fd75f9a8..7772d9419 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2021.10.bb @@ -7,7 +7,7 @@ DEPENDS += "flex-native bison-native" DEPENDS += "python3-setuptools-native" SRCBRANCH = "v2021.10/maint" -SRCREV = "${AUTOREV}" +SRCREV = "b790ac5d6d1425604deefd8885e93f1a016d73b5" UBOOT_FIT_CFG_FRAGMENTS = " \ file://fit_legacy.cfg \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb index ca022b584..2491af6ba 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2023.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "d27aefc1691a14c6edaadf35ab147ac8afe5c98a" COMPATIBLE_MACHINE = "(ccimx93)" diff --git a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb index 0ff254752..19a36e532 100644 --- a/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb +++ b/meta-digi-arm/recipes-digi/trustfence/nativesdk-trustfence-sign-tools_2023.04.bb @@ -3,4 +3,4 @@ require nativesdk-trustfence-sign-tools_git.bb SRCBRANCH = "v2023.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "d27aefc1691a14c6edaadf35ab147ac8afe5c98a" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb index 955934262..a3d99728e 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools-native_2023.04.bb @@ -3,4 +3,4 @@ require trustfence-sign-tools-native_git.bb SRCBRANCH = "v2023.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "d27aefc1691a14c6edaadf35ab147ac8afe5c98a" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools.inc index 676122560..4de1cf79f 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 = "af77921f513e82add24e54a28a5353b9012fdaf6" S = "${WORKDIR}" @@ -15,7 +15,7 @@ UBOOT_URI_GITHUB = "${DIGI_GITHUB_GIT}/u-boot.git;protocol=https" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${UBOOT_URI_STASH}', '${UBOOT_URI_GITHUB}', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-artifact-nxp.sh \ file://trustfence-sign-artifact-stm.sh \ file://trustfence-gen-pki-stm.sh \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 29213a4a1..b229c413a 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-4.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "7ba1cdedd456928ac77c1f11e0d070abaf505e95" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}/linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};branch=${SRCBRANCH} \ + ${QCOM_GIT_URI};nobranch=1 \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index afda6fa1e..e8707f309 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -16,7 +16,7 @@ LINUX_URI_STASH = "${DIGI_MTK_GIT}/linux/linux.git;protocol=ssh" LINUX_URI_GITHUB = "${DIGI_GITHUB_GIT}/linux.git;protocol=https" LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1', '${LINUX_URI_STASH}', '${LINUX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LINUX_GIT_URI};branch=${SRCBRANCH} \ + ${LINUX_GIT_URI};nobranch=1 \ ${@oe.utils.conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)} \ " S = "${WORKDIR}/git" 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 50d95348e..1531f6b15 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.15.bb @@ -4,8 +4,8 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v5.15/nxp/dey-4.0/maint" SRCBRANCH:stm32mpcommon = "v5.15/stm/dey-4.0/maint" -SRCREV = "${AUTOREV}" -SRCREV:stm32mpcommon = "${AUTOREV}" +SRCREV = "a2833d11fd2fd011b08a517519cdabcdc0bbacdc" +SRCREV:stm32mpcommon = "d63fecf8e08ad95309312fea08f04fbf4aec8a0c" do_assemble_fitimage:prepend:ccmp1() { # Deploy u-boot script to be included into the FIT image diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb index 1954b8b64..6e6510316 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb @@ -3,7 +3,7 @@ require recipes-kernel/linux/linux-dey.inc SRCBRANCH = "v6.1/nxp/dey-4.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "e6c0189b4eefb37def8558d238103023df167a7a" # Blacklist btnxpuart module. It will be managed by the bluetooth-init script KERNEL_MODULE_PROBECONF += "btnxpuart" diff --git a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb index 997ea2ad2..7dce0cc2d 100644 --- a/meta-digi-dey/recipes-digi/cccs/cccs_git.bb +++ b/meta-digi-dey/recipes-digi/cccs/cccs_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "libconfuse libdigiapix openssl recovery-utils swupdate zlib json-c" SRCBRANCH = "dey-4.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "dcf2cd2e041d3305f2da9ba248dd52e5bf24b008" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" @@ -19,7 +19,7 @@ CCCS_DEVICE_TYPE ?= "${MACHINE}" CCCS_CONF_PATH ?= "" SRC_URI = " \ - ${CC_GIT_URI};branch=${SRCBRANCH} \ + ${CC_GIT_URI};nobranch=1 \ file://cccsd-init \ file://cccsd.service \ file://cccs-gs-demo-init \ diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index 97a2d77b4..f7c3be174 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 = "78402f0e3e138023f70d9577faa11212a9dc3f61" 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..0ab1f16a2 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 = "fed0071f5d6c4f44a6189c6c4fa5bdeda5a684c3" 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 \