From 0115fe8fa7ee5ffabeffe4f85e83c6db6236484f Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 1 Jun 2020 13:43:29 +0200 Subject: [PATCH 01/42] switch to building from maintenance branches for dey-3.0 Signed-off-by: Gabriel Valcazar --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb | 4 ++-- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 2 +- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 2 +- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 2 +- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) 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 b49765d0d..3cf75fbd9 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 @@ -2,7 +2,7 @@ require digi-u-boot.inc -SRCBRANCH = "v2017.03/master" +SRCBRANCH = "v2017.03/maint" SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index efe133157..dd3b5a540 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -2,7 +2,7 @@ require digi-u-boot.inc -SRCBRANCH = "v2018.03/master" +SRCBRANCH = "v2018.03/maint" SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb index 604ebbc43..ae6f36af7 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" -SRCBRANCH = "v2019.04/master" +SRCBRANCH = "v2019.04/maint" SRCREV = "${AUTOREV}" -COMPATIBLE_MACHINE = "(ccimx8x)" \ No newline at end of file +COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index 17d1ab0b6..7be37ae3e 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 DEPENDS = "trustfence-cst coreutils util-linux" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}" -SRCBRANCH = "v2019.04/master" +SRCBRANCH = "v2019.04/maint" SRCREV = "${AUTOREV}" S = "${WORKDIR}" 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 73d8df971..4437359c9 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 @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca # Reference Qualcomm tag/version PV = "v4.0.11.213X" -SRCBRANCH = "qca65X4/master" +SRCBRANCH = "qca65X4/dey-3.0/maint" SRCREV = "${AUTOREV}" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index ee2c7e7b7..3fe0b2f82 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" -SRCBRANCH = "v5.4.3/master" +SRCBRANCH = "v5.4/dey-3.0/maint" SRCBRANCH_ccimx6 = "v4.9/dey-2.6/maint" SRCREV = "${AUTOREV}" 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 ba8ece33b..eeacd53d5 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc @@ -1,6 +1,6 @@ # Copyright (C) 2019, Digi International Inc. -SRCBRANCH = "master" +SRCBRANCH = "dey-3.0/maint" SRCREV = "${AUTOREV}" DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 8dd3c771f..2e62dbcf5 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" -SRCBRANCH ?= "master" +SRCBRANCH ?= "dey-3.0/maint" SRCREV = "${AUTOREV}" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" From 64aa64773a2538d246c49a97bb9042c8bafefe42 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Wed, 3 Jun 2020 11:14:55 +0200 Subject: [PATCH 02/42] gstreamer: update base package to version 1.16.2 Gstreamer package was updated to v1.16.2 in poky layer, so we need to update the base files used in meta-digi. Signed-off-by: Arturo Buzarra --- .../gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb | 2 +- .../gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb | 2 +- .../gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb | 2 +- .../recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb | 2 +- .../recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.16.imx.bb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb index 4498f4386..0883c8543 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb +++ b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.imx.bb @@ -1,4 +1,4 @@ -require recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.1.bb +require recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.16.2.bb DEPENDS += "jpeg libdrm" DEPENDS_append_imxgpu2d = " virtual/libg2d" diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb index 37f47564a..f88b7e5b0 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb +++ b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.imx.bb @@ -1,4 +1,4 @@ -require recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.1.bb +require recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.16.2.bb PV = "1.16.0.imx" diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb index 47b9104c7..ca4ff3323 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb +++ b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.imx.bb @@ -1,4 +1,4 @@ -require recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb +require recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb PV = "1.16.0.imx" diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb index 25ee5337f..99595498f 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb +++ b/meta-digi-dey/recipes-multimedia/gstreamer/gstreamer1.0_1.16.imx.bb @@ -1,4 +1,4 @@ -require recipes-multimedia/gstreamer/gstreamer1.0_1.16.1.bb +require recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb PV = "1.16.0.imx" diff --git a/meta-digi-dey/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.16.imx.bb b/meta-digi-dey/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.16.imx.bb index 393a92069..12573ba39 100644 --- a/meta-digi-dey/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.16.imx.bb +++ b/meta-digi-dey/recipes-qt/qt5/gstreamer1.0-plugins-good-qt_1.16.imx.bb @@ -1,4 +1,4 @@ -require recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.1.bb +require recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.bb FILESEXTRAPATHS_prepend := "${COREBASE}/meta/recipes-multimedia/gstreamer/files:" From a52c5d4ac2935d2dd9626790d25cd6405487d453 Mon Sep 17 00:00:00 2001 From: Hector Bujanda Date: Wed, 3 Jun 2020 10:06:33 +0200 Subject: [PATCH 03/42] mca-tool: update to v1.22 Includes: - add io reset support including edge detection. https://jira.digi.com/browse/CC6UL-1132 Signed-off-by: Pedro Perez de Heredia --- .../mca/{mca-tool_1.20.bb => mca-tool_1.22.bb} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename meta-digi-arm/recipes-digi/mca/{mca-tool_1.20.bb => mca-tool_1.22.bb} (62%) diff --git a/meta-digi-arm/recipes-digi/mca/mca-tool_1.20.bb b/meta-digi-arm/recipes-digi/mca/mca-tool_1.22.bb similarity index 62% rename from meta-digi-arm/recipes-digi/mca/mca-tool_1.20.bb rename to meta-digi-arm/recipes-digi/mca/mca-tool_1.22.bb index 0e5e7bf00..807c20d13 100644 --- a/meta-digi-arm/recipes-digi/mca/mca-tool_1.20.bb +++ b/meta-digi-arm/recipes-digi/mca/mca-tool_1.22.bb @@ -8,13 +8,13 @@ PKGNAME = "mca_tool" # ARM tarball SRC_URI_arm = "${DIGI_PKG_SRC}/${PKGNAME}-${PV}-${TUNE_ARCH}.tar.gz;name=arm" -SRC_URI[arm.md5sum] = "2007a858cd8f82ae2ddbff43f437335a" -SRC_URI[arm.sha256sum] = "d9a0c1ca1c9f20041602edd585c31bd79b75bc8d8a74648d1809350e731af3d5" +SRC_URI[arm.md5sum] = "2b2ce463139be67bd9929c7ce145ae42" +SRC_URI[arm.sha256sum] = "2a241dbaad099cf2d526eff6bbfdbd7c548e4391cc6751bb9eaa22d16c3cd5e4" # AARCH64 tarball SRC_URI_aarch64 = "${DIGI_PKG_SRC}/${PKGNAME}-${PV}-${TUNE_ARCH}.tar.gz;name=aarch64" -SRC_URI[aarch64.md5sum] = "600451f7312a130c63f3b3b5c7abdbb6" -SRC_URI[aarch64.sha256sum] = "1acc7498943662e7e5bd26a67d2733a4814823170ba0756313459cb0e68e6e5f" +SRC_URI[aarch64.md5sum] = "c5f235c29fd663fde135095016daed4f" +SRC_URI[aarch64.sha256sum] = "9a0fd1bb053d9be0ede344ba22b0811528547130ef6c78432548a27dcd8f460c" S = "${WORKDIR}/${PKGNAME}-${PV}" From 616e2059d3a83d390bada8cff10733fcd6bef7df Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Wed, 3 Jun 2020 16:25:19 +0200 Subject: [PATCH 04/42] meta-digi-arm: uboot: Add kernel parameter to center custom logo https://jira.digi.com/browse/DUB-948 Signed-off-by: Arturo Buzarra --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt | 1 + meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt | 1 + meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt | 1 + .../recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt | 1 + .../recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt | 1 + 5 files changed, 5 insertions(+) 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 fcf0886e4..7c9012a1e 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 @@ -32,4 +32,5 @@ else # We are booting from the SD card. setenv mmcroot /dev/mmcblk${mmcbootdev}p2 fi +setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs} dboot linux mmc ${mmcbootdev}:${mmcpart} 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 422e9399c..95f55ff61 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 @@ -62,4 +62,5 @@ else # We are booting from the SD card. setenv mmcroot /dev/mmcblk${mmcbootdev}p2 fi +setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs} dboot linux mmc ${mmcbootdev}:${mmcpart} 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 dcd797ba7..09e5b0ec1 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 @@ -26,4 +26,5 @@ if test "${mtdbootpart}" = "recovery"; then else true fi +setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs} dboot linux nand ${mtdbootpart} 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 0200b0d50..37758ec4f 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 @@ -26,4 +26,5 @@ if test "${mtdbootpart}" = "recovery"; then else true fi +setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs} dboot linux nand ${mtdbootpart} 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 6815fc994..cfd7ac100 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 @@ -47,4 +47,5 @@ else # We are booting from the SD card. setenv mmcroot /dev/mmcblk${mmcbootdev}p2 fi +setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs} dboot linux mmc ${mmcbootdev}:${mmcpart} From c6a1fb6881f9a78d75881db2797309e310048a8f Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 5 May 2020 13:27:36 +0200 Subject: [PATCH 05/42] build.sh: add support to use an external downloads dir Signed-off-by: Arturo Buzarra --- sdk/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/build.sh b/sdk/build.sh index bccf7344d..bc89ce535 100755 --- a/sdk/build.sh +++ b/sdk/build.sh @@ -186,7 +186,7 @@ _EOF_ YOCTO_IMGS_DIR="${WORKSPACE}/images" YOCTO_INST_DIR="${WORKSPACE}/digi-yocto-sdk.$(echo ${DY_REVISION} | tr '/' '_')" -YOCTO_DOWNLOAD_DIR="${WORKSPACE}/downloads" +YOCTO_DOWNLOAD_DIR="${DY_DOWNLOADS:-${WORKSPACE}}/downloads" YOCTO_PROJ_DIR="${WORKSPACE}/projects" CPUS="$(grep -c processor /proc/cpuinfo)" From 8af14c257e0dd6324e281fc714334e4cad89e0cf Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 4 Jun 2020 13:58:31 +0200 Subject: [PATCH 06/42] digi-sc-firmware: update to v1.4.0.3 This adds support to configure the PF8100/PF8200 PMIC via Linux Signed-off-by: Gabriel Valcazar --- ...igi-sc-firmware_1.4.0.2.bb => digi-sc-firmware_1.4.0.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-digi-arm/recipes-bsp/digi-sc-firmware/{digi-sc-firmware_1.4.0.2.bb => digi-sc-firmware_1.4.0.3.bb} (89%) diff --git a/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.4.0.2.bb b/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.4.0.3.bb similarity index 89% rename from meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.4.0.2.bb rename to meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.4.0.3.bb index 9067689da..ba354088a 100644 --- a/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.4.0.2.bb +++ b/meta-digi-arm/recipes-bsp/digi-sc-firmware/digi-sc-firmware_1.4.0.3.bb @@ -11,8 +11,8 @@ inherit pkgconfig deploy SRC_URI = "${DIGI_PKG_SRC}/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "bcf3402c9d6a394dad8d518a73cb27ad" -SRC_URI[sha256sum] = "bd5fb8a35d9fbb0e10f93513e52a3ce3e105e4a80d82624a0be4e73eb95b1352" +SRC_URI[md5sum] = "24a8d857d5ecc81f08457f2f4512e779" +SRC_URI[sha256sum] = "769282b099f97af6132e75f505056f3e7914dd8557778af8169db28fcf28727a" S = "${WORKDIR}/${PN}-${PV}" From 1a600bcdede1931441084d63669d6a469c6558e7 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Thu, 28 May 2020 09:41:12 +0200 Subject: [PATCH 07/42] u-boot-dey: allow bootscript signing for ccimx8mn TRUSTFENCE_SIGN_MODE for ccimx8mn is "HAB", although the BOOTLOADER_IMAGE_RECIPE is "imx-boot". https://jira.digi.com/browse/DEL-7024 Signed-off-by: Gonzalo Ruiz --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 1599ddcd7..6903319c7 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -171,7 +171,7 @@ do_deploy_append() { [ -n "${TRUSTFENCE_SIGN_MODE}" ] && export CONFIG_SIGN_MODE="${TRUSTFENCE_SIGN_MODE}" # Sign boot script - if [ "${TRUSTFENCE_SIGN_MODE}" = "HAB" ] && [ "${BOOTLOADER_IMAGE_RECIPE}" = "u-boot" ]; then + if [ "${TRUSTFENCE_SIGN_MODE}" = "HAB" ]; then TMP_SIGNED_BOOTSCR="$(mktemp ${WORKDIR}/bootscr-signed.XXXXXX)" trustfence-sign-kernel.sh -p "${DIGI_FAMILY}" -b "${DEPLOYDIR}/boot.scr" "${TMP_SIGNED_BOOTSCR}" mv "${TMP_SIGNED_BOOTSCR}" "${DEPLOYDIR}/boot.scr" From ce979e9323e87eac7637645dae3a4bb43bf8058a Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Thu, 28 May 2020 15:34:17 +0200 Subject: [PATCH 08/42] u-boot-dey: simplify trustfence signing process Signing with AHAB mode only requires an additional prior step, so reuse as much code as possible. https://jira.digi.com/browse/DEL-7047 Signed-off-by: Gonzalo Ruiz --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 6903319c7..a0d5f28fc 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -171,11 +171,14 @@ do_deploy_append() { [ -n "${TRUSTFENCE_SIGN_MODE}" ] && export CONFIG_SIGN_MODE="${TRUSTFENCE_SIGN_MODE}" # Sign boot script - if [ "${TRUSTFENCE_SIGN_MODE}" = "HAB" ]; then - TMP_SIGNED_BOOTSCR="$(mktemp ${WORKDIR}/bootscr-signed.XXXXXX)" - trustfence-sign-kernel.sh -p "${DIGI_FAMILY}" -b "${DEPLOYDIR}/boot.scr" "${TMP_SIGNED_BOOTSCR}" - mv "${TMP_SIGNED_BOOTSCR}" "${DEPLOYDIR}/boot.scr" + if [ "${TRUSTFENCE_SIGN_MODE}" = "AHAB" ]; then + mkimage_imx8 -soc ${MX8_SOC_VAR} -rev ${MX8_CHIP_REV} -c -ap ${DEPLOYDIR}/boot.scr a35 ${RAM_CONTAINER_LOC_BOOT} -out boot.scr-mkimg + mv "boot.scr-mkimg" "${DEPLOYDIR}/boot.scr" fi + + TMP_SIGNED_BOOTSCR="$(mktemp ${WORKDIR}/bootscr-signed.XXXXXX)" + trustfence-sign-kernel.sh -p "${DIGI_FAMILY}" -b "${DEPLOYDIR}/boot.scr" "${TMP_SIGNED_BOOTSCR}" + mv "${TMP_SIGNED_BOOTSCR}" "${DEPLOYDIR}/boot.scr" fi rm -f ${TMP_BOOTSCR} } @@ -188,11 +191,6 @@ do_deploy_append_ccimx8x() { install -d ${DEPLOYDIR}/${BOOT_TOOLS} mv ${DEPLOYDIR}/u-boot* ${DEPLOYDIR}/${BOOT_TOOLS}/ mv ${DEPLOYDIR}/${UBOOT_SYMLINK}-* ${DEPLOYDIR}/${BOOT_TOOLS}/ - if [ "${TRUSTFENCE_SIGN}" = "1" ]; then - mkimage_imx8 -soc ${MX8_SOC_VAR} -rev ${MX8_CHIP_REV} -c -ap ${DEPLOYDIR}/boot.scr a35 ${RAM_CONTAINER_LOC_BOOT} -out ${DEPLOYDIR}/boot-mkimg.scr - trustfence-sign-kernel.sh -p "${DIGI_FAMILY}" -b "${DEPLOYDIR}/boot-mkimg.scr" "${DEPLOYDIR}/boot.scr" - rm -f ${DEPLOYDIR}/boot-mkimg.scr - fi } do_deploy_append_ccimx8mn() { From ae98d4974863e68316151ae536b5902b156db585 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Thu, 28 May 2020 16:00:05 +0200 Subject: [PATCH 09/42] linux-dey: simplify trustfence signing process Signing with AHAB mode only requires an additional prior step, so reuse as much code as possible. Also, for Image.gz images, sign the uncompressed Image and later compress the result. https://jira.digi.com/browse/DEL-7047 Signed-off-by: Gonzalo Ruiz --- .../recipes-kernel/linux/linux-dey.inc | 80 +++++++++---------- 1 file changed, 39 insertions(+), 41 deletions(-) diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index 6919f7f24..fd44dbe5d 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -25,49 +25,47 @@ trustfence_sign() { [ -n "${TRUSTFENCE_SIGN_MODE}" ] && export CONFIG_SIGN_MODE="${TRUSTFENCE_SIGN_MODE}" # Sign/encrypt the kernel images - if [ "${TRUSTFENCE_SIGN_MODE}" = "HAB" ]; then - for type in ${KERNEL_IMAGETYPES}; do - KERNEL_IMAGE="${type}-${KERNEL_IMAGE_NAME}.bin" - TMP_KERNEL_IMAGE_SIGNED="$(mktemp ${KERNEL_IMAGE}-signed.XXXXXX)" - trustfence-sign-kernel.sh -p "${DIGI_FAMILY}" -l "${KERNEL_IMAGE}" "${TMP_KERNEL_IMAGE_SIGNED}" - mv "${TMP_KERNEL_IMAGE_SIGNED}" "${KERNEL_IMAGE}" - done + for type in ${KERNEL_IMAGETYPES}; do + KERNEL_IMAGE="${type}-${KERNEL_IMAGE_NAME}.bin" + if [ "${type}" = "Image.gz" ]; then + # Sign the uncompressed Image + KERNEL_IMAGE=${WORKDIR}/build/arch/arm64/boot/Image + fi - # Sign/encrypt the device tree blobs - for DTB in ${KERNEL_DEVICETREE}; do - DTB=`normalize_dtb "${DTB}"` - DTB_EXT=${DTB##*.} - DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` - DTB_IMAGE="${DTB_BASE_NAME}-${KERNEL_IMAGE_NAME}.${DTB_EXT}" - TMP_DTB_IMAGE_SIGNED="$(mktemp ${DTB_IMAGE}-signed.XXXXXX)" - trustfence-sign-kernel.sh -p "${DIGI_FAMILY}" -d "${DTB_IMAGE}" "${TMP_DTB_IMAGE_SIGNED}" - mv "${TMP_DTB_IMAGE_SIGNED}" "${DTB_IMAGE}" - done - elif [ "${TRUSTFENCE_SIGN_MODE}" = "AHAB" ]; then - # Sign the kernel images - for type in ${KERNEL_IMAGETYPES}; do - KERNEL_IMAGE="${type}-${KERNEL_IMAGE_NAME}.bin" - mkimage_imx8 -soc ${MX8_SOC_VAR} -rev ${MX8_CHIP_REV} -c -ap ${WORKDIR}/build/arch/arm64/boot/Image a35 ${RAM_CONTAINER_LOC_BOOT} -out flash_os.bin - trustfence-sign-kernel.sh -p "${DIGI_FAMILY}" -l "flash_os.bin" "${type}-${MACHINE}-signed.bin" - gzip ${type}-${MACHINE}-signed.bin - mv ${type}-${MACHINE}-signed.bin.gz "${KERNEL_IMAGE}" - done + if [ "${TRUSTFENCE_SIGN_MODE}" = "AHAB" ]; then + mkimage_imx8 -soc ${MX8_SOC_VAR} -rev ${MX8_CHIP_REV} -c -ap ${KERNEL_IMAGE} a35 ${RAM_CONTAINER_LOC_BOOT} -out ${KERNEL_IMAGE}-mkimg + mv "${KERNEL_IMAGE}-mkimg" "${KERNEL_IMAGE}" + fi - # Sign/encrypt the device tree blobs - for DTB in ${KERNEL_DEVICETREE}; do - DTB=`normalize_dtb "${DTB}"` - DTB_EXT=${DTB##*.} - DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` - DTB_IMAGE="${DTB_BASE_NAME}-${KERNEL_IMAGE_NAME}.${DTB_EXT}" - mkimage_imx8 -soc ${MX8_SOC_VAR} -rev ${MX8_CHIP_REV} -c -ap ${DTB_IMAGE} a35 ${RAM_CONTAINER_LOC_DTB} -out ${DTB_IMAGE}-mkimg-signed - trustfence-sign-kernel.sh -p "${DIGI_FAMILY}" -d "${DTB_IMAGE}-mkimg-signed" "${DTB_IMAGE}-signed" - mv "${DTB_IMAGE}-signed" "${DTB_IMAGE}" - rm -f ${DTB_IMAGE}-mkimg-signed - done - else - bberror "Unkown TRUSTFENCE_SIGN_MODE value" - exit 1 - fi + TMP_KERNEL_IMAGE_SIGNED="$(mktemp ${KERNEL_IMAGE}-signed.XXXXXX)" + trustfence-sign-kernel.sh -p "${DIGI_FAMILY}" -l "${KERNEL_IMAGE}" "${TMP_KERNEL_IMAGE_SIGNED}" + + if [ "${type}" = "Image.gz" ]; then + # Compress the signed Image and restore the original filename + gzip "${TMP_KERNEL_IMAGE_SIGNED}" + mv "${TMP_KERNEL_IMAGE_SIGNED}.gz" "${TMP_KERNEL_IMAGE_SIGNED}" + KERNEL_IMAGE="${type}-${KERNEL_IMAGE_NAME}.bin" + fi + + mv "${TMP_KERNEL_IMAGE_SIGNED}" "${KERNEL_IMAGE}" + done + + # Sign/encrypt the device tree blobs + for DTB in ${KERNEL_DEVICETREE}; do + DTB=`normalize_dtb "${DTB}"` + DTB_EXT=${DTB##*.} + DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` + DTB_IMAGE="${DTB_BASE_NAME}-${KERNEL_IMAGE_NAME}.${DTB_EXT}" + + if [ "${TRUSTFENCE_SIGN_MODE}" = "AHAB" ]; then + mkimage_imx8 -soc ${MX8_SOC_VAR} -rev ${MX8_CHIP_REV} -c -ap ${DTB_IMAGE} a35 ${RAM_CONTAINER_LOC_DTB} -out ${DTB_IMAGE}-mkimg + mv "${DTB_IMAGE}-mkimg" "${DTB_IMAGE}" + fi + + TMP_DTB_IMAGE_SIGNED="$(mktemp ${DTB_IMAGE}-signed.XXXXXX)" + trustfence-sign-kernel.sh -p "${DIGI_FAMILY}" -d "${DTB_IMAGE}" "${TMP_DTB_IMAGE_SIGNED}" + mv "${TMP_DTB_IMAGE_SIGNED}" "${DTB_IMAGE}" + done } trustfence_sign[dirs] = "${DEPLOYDIR}" From 9b4a03c14c991a82c974a0bc7573515c10ec2fa3 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Thu, 28 May 2020 16:26:40 +0200 Subject: [PATCH 10/42] trustfence: [cosmetic] rename script to trustfence-sign-artifact The signing script is used for signing multiple artifacts, not just the kernel, so rename it for a broader use. https://jira.digi.com/browse/DEL-7047 Signed-off-by: Gonzalo Ruiz --- meta-digi-arm/classes/image_types_digi.bbclass | 2 +- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 2 +- ...ence-sign-kernel.sh => trustfence-sign-artifact.sh} | 5 +++-- .../trustfence/trustfence-sign-tools_git.bb | 10 +++++----- meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 4 ++-- 5 files changed, 12 insertions(+), 11 deletions(-) rename meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/{trustfence-sign-kernel.sh => trustfence-sign-artifact.sh} (98%) diff --git a/meta-digi-arm/classes/image_types_digi.bbclass b/meta-digi-arm/classes/image_types_digi.bbclass index 60bd5d6b7..c0c205986 100644 --- a/meta-digi-arm/classes/image_types_digi.bbclass +++ b/meta-digi-arm/classes/image_types_digi.bbclass @@ -212,7 +212,7 @@ trustence_sign_cpio() { mv "${1}-mkimg" "${1}" fi # Sign/encrypt the ramdisk - trustfence-sign-kernel.sh -p "${DIGI_FAMILY}" -i "${1}" "${1}.tf" + trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -i "${1}" "${1}.tf" else # Copy the image with no changes cp "${1}" "${1}.tf" diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index a0d5f28fc..ab5f70ee9 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -177,7 +177,7 @@ do_deploy_append() { fi TMP_SIGNED_BOOTSCR="$(mktemp ${WORKDIR}/bootscr-signed.XXXXXX)" - trustfence-sign-kernel.sh -p "${DIGI_FAMILY}" -b "${DEPLOYDIR}/boot.scr" "${TMP_SIGNED_BOOTSCR}" + trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -b "${DEPLOYDIR}/boot.scr" "${TMP_SIGNED_BOOTSCR}" mv "${TMP_SIGNED_BOOTSCR}" "${DEPLOYDIR}/boot.scr" fi rm -f ${TMP_BOOTSCR} diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-kernel.sh b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh similarity index 98% rename from meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-kernel.sh rename to meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh index bdba4933a..98b8db448 100755 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-kernel.sh +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh @@ -1,7 +1,7 @@ #!/bin/sh #=============================================================================== # -# trustfence-sign-kernel.sh +# trustfence-sign-artifact.sh # # Copyright (C) 2016-2020 by Digi International Inc. # All rights reserved. @@ -12,10 +12,11 @@ # # # Description: -# Script for building signed and encrypted kernel uImages using NXP CST. +# Script for building signed and encrypted artifacts using NXP CST. # # The following environment variables define the script behaviour: # CONFIG_SIGN_KEYS_PATH: (mandatory) path to the CST folder by NXP with keys generated. +# CONFIG_SIGN_MODE: (mandatory) Signing method: HAB/AHAB # CONFIG_KEY_INDEX: (optional) key index to use for signing. Default is 0. # CONFIG_DEK_PATH: (optional) Path to keyfile. Define it to generate # encrypted images diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index 7be37ae3e..af708ccae 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -16,10 +16,10 @@ UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT SRC_URI = " \ ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ - file://trustfence-sign-kernel.sh;name=kernel-script \ - file://sign_hab;name=kernel-sign \ - file://encrypt_hab;name=kernel-encrypt \ - file://sign_ahab;name=kernel-sign \ + file://trustfence-sign-artifact.sh;name=artifact-sign-script \ + file://sign_hab;name=artifact-hab-sign \ + file://encrypt_hab;name=artifact-hab-encrypt \ + file://sign_ahab;name=artifact-ahab-sign \ " do_configure[noexec] = "1" @@ -36,7 +36,7 @@ do_install() { bberror "Unkown TRUSTFENCE_SIGN_MODE value" exit 1 fi - install -m 0755 trustfence-sign-kernel.sh ${D}${bindir}/ + install -m 0755 trustfence-sign-artifact.sh ${D}${bindir}/ install -m 0755 git/scripts/csf_templates/* ${D}${bindir}/csf_templates # Select U-Boot sign script depending on U-Boot including an SPL image diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index fd44dbe5d..8805527d6 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -38,7 +38,7 @@ trustfence_sign() { fi TMP_KERNEL_IMAGE_SIGNED="$(mktemp ${KERNEL_IMAGE}-signed.XXXXXX)" - trustfence-sign-kernel.sh -p "${DIGI_FAMILY}" -l "${KERNEL_IMAGE}" "${TMP_KERNEL_IMAGE_SIGNED}" + trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -l "${KERNEL_IMAGE}" "${TMP_KERNEL_IMAGE_SIGNED}" if [ "${type}" = "Image.gz" ]; then # Compress the signed Image and restore the original filename @@ -63,7 +63,7 @@ trustfence_sign() { fi TMP_DTB_IMAGE_SIGNED="$(mktemp ${DTB_IMAGE}-signed.XXXXXX)" - trustfence-sign-kernel.sh -p "${DIGI_FAMILY}" -d "${DTB_IMAGE}" "${TMP_DTB_IMAGE_SIGNED}" + trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -d "${DTB_IMAGE}" "${TMP_DTB_IMAGE_SIGNED}" mv "${TMP_DTB_IMAGE_SIGNED}" "${DTB_IMAGE}" done } From 5b23f09622619b243a697b91370ea9dc420f3269 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Thu, 28 May 2020 09:51:16 +0200 Subject: [PATCH 11/42] trustfence-sign-artifact: verify CONFIG_SIGN_MODE argument is set If CONFIG_SIGN_MODE is unset, we were assuming the sign mode to be AHAB whereas it is preferable to abort the signing process and notify with an error message. https://jira.digi.com/browse/DEL-7024 Signed-off-by: Gonzalo Ruiz --- .../trustfence-sign-tools/trustfence-sign-artifact.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh index 98b8db448..1c9822bbe 100755 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh @@ -83,6 +83,10 @@ if [ -z "${CONFIG_SIGN_KEYS_PATH}" ]; then exit 1 fi [ -d "${CONFIG_SIGN_KEYS_PATH}" ] || mkdir "${CONFIG_SIGN_KEYS_PATH}" +if [ -z "${CONFIG_SIGN_MODE}" ]; then + echo "Undefined CONFIG_SIGN_MODE"; + exit 1 +fi if [ "${CONFIG_SIGN_MODE}" = "HAB" ]; then if [ -n "${CONFIG_DEK_PATH}" ]; then From 02646996b9493bf56e8a7cad8be2749eb6f95676 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Thu, 28 May 2020 09:33:25 +0200 Subject: [PATCH 12/42] imx-boot: add dtbs parameter to print_fit_hab build https://jira.digi.com/browse/DEL-7024 Signed-off-by: Gonzalo Ruiz --- meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend index 0c30f4f23..4eaec6f61 100644 --- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend +++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend @@ -116,7 +116,7 @@ do_compile () { if [ "${TRUSTFENCE_SIGN}" = "1" ]; then # Log HAB FIT information bbnote "building ${SOC_TARGET} - print_fit_hab" - make SOC=${SOC_TARGET} print_fit_hab > mkimage-print_fit_hab.log 2>&1 + make SOC=${SOC_TARGET} dtbs=${UBOOT_DTB_NAME} print_fit_hab > mkimage-print_fit_hab.log 2>&1 fi fi done From ea2ffcfee86bc96a31c758dbed37c2a2d375a26e Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Thu, 4 Jun 2020 11:41:03 +0200 Subject: [PATCH 13/42] trustfence: introduce AHAB container creation into script https://jira.digi.com/browse/DEL-7024 Signed-off-by: Gonzalo Ruiz --- .../classes/image_types_digi.bbclass | 4 -- .../conf/machine/include/ccimx8x.inc | 8 --- .../recipes-bsp/u-boot/digi-u-boot.inc | 5 -- .../trustfence-sign-artifact.sh | 60 +++++++++++-------- .../recipes-kernel/linux/linux-dey.inc | 10 ---- 5 files changed, 35 insertions(+), 52 deletions(-) diff --git a/meta-digi-arm/classes/image_types_digi.bbclass b/meta-digi-arm/classes/image_types_digi.bbclass index c0c205986..b982091ec 100644 --- a/meta-digi-arm/classes/image_types_digi.bbclass +++ b/meta-digi-arm/classes/image_types_digi.bbclass @@ -207,10 +207,6 @@ trustence_sign_cpio() { [ -n "${TRUSTFENCE_DEK_PATH}" ] && [ "${TRUSTFENCE_DEK_PATH}" != "0" ] && export CONFIG_DEK_PATH="${TRUSTFENCE_DEK_PATH}" [ -n "${TRUSTFENCE_SIGN_MODE}" ] && export CONFIG_SIGN_MODE="${TRUSTFENCE_SIGN_MODE}" - if [ "${TRUSTFENCE_SIGN_MODE}" = "AHAB" ]; then - mkimage_imx8 -soc ${MX8_SOC_VAR} -rev ${MX8_CHIP_REV} -c -ap ${1} a35 ${RAM_CONTAINER_LOC_TF} -out ${1}-mkimg - mv "${1}-mkimg" "${1}" - fi # Sign/encrypt the ramdisk trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -i "${1}" "${1}.tf" else diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc index 35587f451..b4f79cf6f 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8x.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc @@ -68,18 +68,10 @@ KERNEL_IMAGETYPE = "Image.gz" VIRTUAL-RUNTIME_init_manager ?= "systemd" VIRTUAL-RUNTIME_initscripts ?= "initscripts" -# For i.MX 8 silicon chip revision -MX8_CHIP_REV ?= "B0" -MX8_SOC_VAR ?= "QX" - # TrustFence TRUSTFENCE_SIGN_MODE = "AHAB" # TODO: not yet supported TRUSTFENCE_ENCRYPT_ENVIRONMENT = "0" -# For Trustfence container header RAM locations -RAM_CONTAINER_LOC_BOOT = "0x80280000" -RAM_CONTAINER_LOC_DTB = "0x82000000" -RAM_CONTAINER_LOC_TF = "0x82100000" # Adding 'wayland' along with 'x11' enables the xwayland backend # Vulkan is necessary for wayland to build diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index ab5f70ee9..922d34d2d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -171,11 +171,6 @@ do_deploy_append() { [ -n "${TRUSTFENCE_SIGN_MODE}" ] && export CONFIG_SIGN_MODE="${TRUSTFENCE_SIGN_MODE}" # Sign boot script - if [ "${TRUSTFENCE_SIGN_MODE}" = "AHAB" ]; then - mkimage_imx8 -soc ${MX8_SOC_VAR} -rev ${MX8_CHIP_REV} -c -ap ${DEPLOYDIR}/boot.scr a35 ${RAM_CONTAINER_LOC_BOOT} -out boot.scr-mkimg - mv "boot.scr-mkimg" "${DEPLOYDIR}/boot.scr" - fi - TMP_SIGNED_BOOTSCR="$(mktemp ${WORKDIR}/bootscr-signed.XXXXXX)" trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -b "${DEPLOYDIR}/boot.scr" "${TMP_SIGNED_BOOTSCR}" mv "${TMP_SIGNED_BOOTSCR}" "${DEPLOYDIR}/boot.scr" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh index 1c9822bbe..8502b34ab 100755 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh @@ -88,6 +88,36 @@ if [ -z "${CONFIG_SIGN_MODE}" ]; then exit 1 fi +# Get RAM_START address +if [ "${PLATFORM}" = "ccimx6" ]; then + CONFIG_FDT_LOADADDR="0x18000000" + CONFIG_RAMDISK_LOADADDR="0x19000000" + CONFIG_KERNEL_LOADADDR="0x12000000" +elif [ "${PLATFORM}" = "ccimx6ul" ]; then + CONFIG_FDT_LOADADDR="0x83000000" + CONFIG_RAMDISK_LOADADDR="0x83800000" + CONFIG_KERNEL_LOADADDR="0x80800000" +elif [ "${PLATFORM}" = "ccimx8x" ]; then + CONFIG_FDT_LOADADDR="0x82000000" + CONFIG_RAMDISK_LOADADDR="0x82100000" + CONFIG_KERNEL_LOADADDR="0x80280000" +else + echo "Invalid platform: ${PLATFORM}" + echo "Supported platforms: ccimx6, ccimx6ul, ccimx8x" + exit 1 +fi + +[ "${ARTIFACT_DTB}" = "y" ] && CONFIG_RAM_START="${CONFIG_FDT_LOADADDR}" +[ "${ARTIFACT_INITRAMFS}" = "y" ] && CONFIG_RAM_START="${CONFIG_RAMDISK_LOADADDR}" +[ "${ARTIFACT_KERNEL}" = "y" ] && CONFIG_RAM_START="${CONFIG_KERNEL_LOADADDR}" +# bootscripts are loaded to $loadaddr, just like the kernel +[ "${ARTIFACT_BOOTSCRIPT}" = "y" ] && CONFIG_RAM_START="${CONFIG_KERNEL_LOADADDR}" + +if [ -z "${CONFIG_RAM_START}" ]; then + echo "Specify the type of image to process (-b, -i, -d, or -l)" + exit 1 +fi + if [ "${CONFIG_SIGN_MODE}" = "HAB" ]; then if [ -n "${CONFIG_DEK_PATH}" ]; then if [ ! -f "${CONFIG_DEK_PATH}" ]; then @@ -102,31 +132,6 @@ if [ "${CONFIG_SIGN_MODE}" = "HAB" ]; then fi ENCRYPT="true" fi - - if [ "${PLATFORM}" = "ccimx6" ]; then - CONFIG_FDT_LOADADDR="0x18000000" - CONFIG_RAMDISK_LOADADDR="0x19000000" - CONFIG_KERNEL_LOADADDR="0x12000000" - elif [ "${PLATFORM}" = "ccimx6ul" ]; then - CONFIG_FDT_LOADADDR="0x83000000" - CONFIG_RAMDISK_LOADADDR="0x83800000" - CONFIG_KERNEL_LOADADDR="0x80800000" - else - echo "Invalid platform: ${PLATFORM}" - echo "Supported platforms: ccimx6, ccimx6ul" - exit 1 - fi - - [ "${ARTIFACT_DTB}" = "y" ] && CONFIG_RAM_START="${CONFIG_FDT_LOADADDR}" - [ "${ARTIFACT_INITRAMFS}" = "y" ] && CONFIG_RAM_START="${CONFIG_RAMDISK_LOADADDR}" - [ "${ARTIFACT_KERNEL}" = "y" ] && CONFIG_RAM_START="${CONFIG_KERNEL_LOADADDR}" - # bootscripts are loaded to $loadaddr, just like the kernel - [ "${ARTIFACT_BOOTSCRIPT}" = "y" ] && CONFIG_RAM_START="${CONFIG_KERNEL_LOADADDR}" - - if [ -z "${CONFIG_RAM_START}" ]; then - echo "Specify the type of image to process (-b, -i, -d, or -l)" - exit 1 - fi fi # Default values @@ -314,6 +319,11 @@ if [ "${CONFIG_SIGN_MODE}" = "HAB" ]; then objcopy -I binary -O binary --pad-to "${sig_len}" --gap-fill="${GAP_FILLER}" "${TARGET}" else + # Prepare the image container + mkimage_imx8 -soc "QX" -rev "B0" -c -ap ${UIMAGE_PATH} a35 ${CONFIG_RAM_START} -out temp-mkimg + mv temp-mkimg "${UIMAGE_PATH}" + + # Sign the image CURRENT_PATH="$(pwd)" cst -o "${TARGET}" -i "${CURRENT_PATH}/csf_descriptor" >/dev/null if [ $? -ne 0 ]; then diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index 8805527d6..7dd6dbc43 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -32,11 +32,6 @@ trustfence_sign() { KERNEL_IMAGE=${WORKDIR}/build/arch/arm64/boot/Image fi - if [ "${TRUSTFENCE_SIGN_MODE}" = "AHAB" ]; then - mkimage_imx8 -soc ${MX8_SOC_VAR} -rev ${MX8_CHIP_REV} -c -ap ${KERNEL_IMAGE} a35 ${RAM_CONTAINER_LOC_BOOT} -out ${KERNEL_IMAGE}-mkimg - mv "${KERNEL_IMAGE}-mkimg" "${KERNEL_IMAGE}" - fi - TMP_KERNEL_IMAGE_SIGNED="$(mktemp ${KERNEL_IMAGE}-signed.XXXXXX)" trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -l "${KERNEL_IMAGE}" "${TMP_KERNEL_IMAGE_SIGNED}" @@ -57,11 +52,6 @@ trustfence_sign() { DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` DTB_IMAGE="${DTB_BASE_NAME}-${KERNEL_IMAGE_NAME}.${DTB_EXT}" - if [ "${TRUSTFENCE_SIGN_MODE}" = "AHAB" ]; then - mkimage_imx8 -soc ${MX8_SOC_VAR} -rev ${MX8_CHIP_REV} -c -ap ${DTB_IMAGE} a35 ${RAM_CONTAINER_LOC_DTB} -out ${DTB_IMAGE}-mkimg - mv "${DTB_IMAGE}-mkimg" "${DTB_IMAGE}" - fi - TMP_DTB_IMAGE_SIGNED="$(mktemp ${DTB_IMAGE}-signed.XXXXXX)" trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -d "${DTB_IMAGE}" "${TMP_DTB_IMAGE_SIGNED}" mv "${TMP_DTB_IMAGE_SIGNED}" "${DTB_IMAGE}" From 98abd4bc28dbb23aa324f0481e6df31dc6893702 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Thu, 28 May 2020 09:53:17 +0200 Subject: [PATCH 14/42] trustfence-sign-artifact: add support for ccimx8mn signing LINUX_ARM64 images include the padding length in the size property of their header, so for these images read the header size property instead of calculating it with 'stat'. https://jira.digi.com/browse/DEL-7024 Signed-off-by: Gonzalo Ruiz --- .../trustfence-sign-artifact.sh | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh index 8502b34ab..255a8b95a 100755 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh @@ -55,7 +55,7 @@ Usage: ${SCRIPT_NAME} [OPTIONS] input-unsigned-image output-signed-image -i sign/encrypt initramfs -l sign/encrypt Linux image -Supported platforms: ccimx6, ccimx6ul, ccimx8x +Supported platforms: ccimx6, ccimx6ul, ccimx8x, ccimx8mn EOF } @@ -101,9 +101,13 @@ elif [ "${PLATFORM}" = "ccimx8x" ]; then CONFIG_FDT_LOADADDR="0x82000000" CONFIG_RAMDISK_LOADADDR="0x82100000" CONFIG_KERNEL_LOADADDR="0x80280000" +elif [ "${PLATFORM}" = "ccimx8mn" ]; then + CONFIG_FDT_LOADADDR="0x43000000" + CONFIG_RAMDISK_LOADADDR="0x43800000" + CONFIG_KERNEL_LOADADDR="0x40480000" else echo "Invalid platform: ${PLATFORM}" - echo "Supported platforms: ccimx6, ccimx6ul, ccimx8x" + echo "Supported platforms: ccimx6, ccimx6ul, ccimx8x, ccimx8mn" exit 1 fi @@ -176,6 +180,22 @@ elif [ "${CONFIG_SIGN_MODE}" = "AHAB" ]; then fi fi +LINUX64_MAGIC="0x644d5241" + +get_image_size() +{ + # Check if LINUX_ARM64 image magic number is found + magic_number="$(hexdump -n 4 -s 56 -e '/4 "0x%08x\t" "\n"' ${UIMAGE_PATH})" + if [ ${magic_number} = "${LINUX64_MAGIC}" ]; then + # LINUX_ARM64, read the size from the file header + image_size="$(hexdump -n 4 -s 16 -e '/4 "0x%08x\t" "\n"' ${UIMAGE_PATH})" + else + # Unknown image type, return the actual filesize + image_size="$(stat -L -c %s ${UIMAGE_PATH})" + fi + echo ${image_size} +} + SRK_TABLE="$(pwd)/SRK_table.bin" if [ "${CONFIG_SIGN_MODE}" = "HAB" ]; then HAB_VER="hab_ver 4" @@ -189,7 +209,7 @@ if [ "${CONFIG_SIGN_MODE}" = "HAB" ]; then dek_blob_offset="$((CONFIG_KERNEL_LOADADDR - DEK_BLOB_OFFSET))" # Compute the layout: sizes and offsets. - uimage_size="$(stat -L -c %s ${UIMAGE_PATH})" + uimage_size="$(get_image_size)" uimage_offset="0x0" pad_len="$(((uimage_size + 0x1000 - 1) & ~(0x1000 - 1)))" auth_len="$((pad_len + 0x20))" From 283e6b06388563f3123b32d97d0585e56ae67d60 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Thu, 28 May 2020 09:56:49 +0200 Subject: [PATCH 15/42] trustfence-sign-artifact: set CONFIG_CSF_SIZE to 0x2000 for ccimx8mn https://jira.digi.com/browse/DEL-7024 Signed-off-by: Gonzalo Ruiz --- .../trustfence-sign-artifact.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh index 255a8b95a..f22c96e91 100755 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh @@ -68,13 +68,6 @@ fi UIMAGE_PATH="$(readlink -e ${1})" TARGET="$(readlink -m ${2})" -# Negative offset with respect to CONFIG_RAM_START in which U-Boot -# copies the DEK blob. -if [ "${CONFIG_SIGN_MODE}" = "HAB" ]; then - DEK_BLOB_OFFSET="0x100" - CONFIG_CSF_SIZE="0x4000" -fi - # Read user configuration file (if used) [ -f .config ] && . ./.config @@ -93,10 +86,12 @@ if [ "${PLATFORM}" = "ccimx6" ]; then CONFIG_FDT_LOADADDR="0x18000000" CONFIG_RAMDISK_LOADADDR="0x19000000" CONFIG_KERNEL_LOADADDR="0x12000000" + CONFIG_CSF_SIZE="0x4000" elif [ "${PLATFORM}" = "ccimx6ul" ]; then CONFIG_FDT_LOADADDR="0x83000000" CONFIG_RAMDISK_LOADADDR="0x83800000" CONFIG_KERNEL_LOADADDR="0x80800000" + CONFIG_CSF_SIZE="0x4000" elif [ "${PLATFORM}" = "ccimx8x" ]; then CONFIG_FDT_LOADADDR="0x82000000" CONFIG_RAMDISK_LOADADDR="0x82100000" @@ -105,6 +100,7 @@ elif [ "${PLATFORM}" = "ccimx8mn" ]; then CONFIG_FDT_LOADADDR="0x43000000" CONFIG_RAMDISK_LOADADDR="0x43800000" CONFIG_KERNEL_LOADADDR="0x40480000" + CONFIG_CSF_SIZE="0x2000" else echo "Invalid platform: ${PLATFORM}" echo "Supported platforms: ccimx6, ccimx6ul, ccimx8x, ccimx8mn" @@ -123,6 +119,9 @@ if [ -z "${CONFIG_RAM_START}" ]; then fi if [ "${CONFIG_SIGN_MODE}" = "HAB" ]; then + # Negative offset with respect to CONFIG_RAM_START in which U-Boot + # copies the DEK blob. + DEK_BLOB_OFFSET="0x100" if [ -n "${CONFIG_DEK_PATH}" ]; then if [ ! -f "${CONFIG_DEK_PATH}" ]; then echo "DEK not found. Generating random 256 bit DEK." From 38d95cf361ef5eae91a9b437f99c4fa20e3ee6a0 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Thu, 28 May 2020 15:25:10 +0200 Subject: [PATCH 16/42] trustfence: add support to sign/encrypt DTB overlays https://jira.digi.com/browse/DEL-7024 Signed-off-by: Gonzalo Ruiz --- .../trustfence-sign-tools/trustfence-sign-artifact.sh | 8 ++++++-- meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh index f22c96e91..52eba706d 100755 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh @@ -33,12 +33,13 @@ done SCRIPT_NAME="$(basename ${0})" SCRIPT_PATH="$(cd $(dirname ${0}) && pwd)" -while getopts "bdilp:" c; do +while getopts "bdilop:" c; do case "${c}" in b) ARTIFACT_BOOTSCRIPT="y";; d) ARTIFACT_DTB="y";; i) ARTIFACT_INITRAMFS="y";; l) ARTIFACT_KERNEL="y";; + o) ARTIFACT_DTB_OVERLAY="y";; p) PLATFORM="${OPTARG}";; esac done @@ -54,6 +55,7 @@ Usage: ${SCRIPT_NAME} [OPTIONS] input-unsigned-image output-signed-image -d sign/encrypt DTB -i sign/encrypt initramfs -l sign/encrypt Linux image + -o sign/encrypt DTB overlay Supported platforms: ccimx6, ccimx6ul, ccimx8x, ccimx8mn @@ -112,9 +114,11 @@ fi [ "${ARTIFACT_KERNEL}" = "y" ] && CONFIG_RAM_START="${CONFIG_KERNEL_LOADADDR}" # bootscripts are loaded to $loadaddr, just like the kernel [ "${ARTIFACT_BOOTSCRIPT}" = "y" ] && CONFIG_RAM_START="${CONFIG_KERNEL_LOADADDR}" +# DTB overlays are loaded to $initrd_addr, just like the ramdisk +[ "${ARTIFACT_DTB_OVERLAY}" = "y" ] && CONFIG_RAM_START="${CONFIG_RAMDISK_LOADADDR}" if [ -z "${CONFIG_RAM_START}" ]; then - echo "Specify the type of image to process (-b, -i, -d, or -l)" + echo "Specify the type of image to process (-b, -i, -d, -l, or -o)" exit 1 fi diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index 7dd6dbc43..07015ad45 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -53,7 +53,11 @@ trustfence_sign() { DTB_IMAGE="${DTB_BASE_NAME}-${KERNEL_IMAGE_NAME}.${DTB_EXT}" TMP_DTB_IMAGE_SIGNED="$(mktemp ${DTB_IMAGE}-signed.XXXXXX)" - trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -d "${DTB_IMAGE}" "${TMP_DTB_IMAGE_SIGNED}" + if [ "${DTB_EXT}" = "dtbo" ]; then + trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -o "${DTB_IMAGE}" "${TMP_DTB_IMAGE_SIGNED}" + else + trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -d "${DTB_IMAGE}" "${TMP_DTB_IMAGE_SIGNED}" + fi mv "${TMP_DTB_IMAGE_SIGNED}" "${DTB_IMAGE}" done } From 0775c592b99d11d1ae69fe3ed8a3791881e5501c Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Thu, 4 Jun 2020 11:42:15 +0200 Subject: [PATCH 17/42] ccimx8: set trustfence to only build signed images Disable all encryption support by default on CC8X and CC8MN platforms so the default built images can be directly built. Signed-off-by: Gonzalo Ruiz --- meta-digi-arm/conf/machine/include/ccimx8mn.inc | 4 +++- meta-digi-arm/conf/machine/include/ccimx8x.inc | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/ccimx8mn.inc b/meta-digi-arm/conf/machine/include/ccimx8mn.inc index 46997bed8..2dbc85263 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8mn.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8mn.inc @@ -60,7 +60,9 @@ VIRTUAL-RUNTIME_initscripts ?= "initscripts" # TrustFence TRUSTFENCE_SIGN_MODE = "HAB" -# TODO: not yet supported +# TODO: Encryption not yet supported +TRUSTFENCE_DEK_PATH = "0" +TRUSTFENCE_INITRAMFS_IMAGE = "" TRUSTFENCE_ENCRYPT_ENVIRONMENT = "0" # Adding 'wayland' along with 'x11' enables the xwayland backend diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc index b4f79cf6f..be580ff8c 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8x.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc @@ -70,7 +70,9 @@ VIRTUAL-RUNTIME_initscripts ?= "initscripts" # TrustFence TRUSTFENCE_SIGN_MODE = "AHAB" -# TODO: not yet supported +# TODO: Encryption not yet supported +TRUSTFENCE_DEK_PATH = "0" +TRUSTFENCE_INITRAMFS_IMAGE = "" TRUSTFENCE_ENCRYPT_ENVIRONMENT = "0" # Adding 'wayland' along with 'x11' enables the xwayland backend From ec0cf65c8ea1582d62ec27bdb25d45e73734e6cd Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Mon, 8 Jun 2020 12:47:34 +0200 Subject: [PATCH 18/42] qtbase: remove i.MX8MN patches because it was fixed in meta-freescale layer Revert partially commit 1fb65f08 ("qtbase: apply imxgpu2d patches to imx8mn platforms as well"), since it was fixed in meta-freescale layer in the commit 626e271b ("qtbase: Add i.MX 8 configuration") Signed-off-by: Arturo Buzarra --- meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend | 8 -------- 1 file changed, 8 deletions(-) diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend index 0613b8b63..aebffbf37 100644 --- a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend +++ b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend @@ -14,14 +14,6 @@ IMX_BACKEND = \ SRC_URI_append = " \ file://qt5-${IMX_BACKEND}.sh \ " -# Technically, we should add the following patches to imxgpu platforms, but -# doing so duplicates them for imxgpu2d platforms and causes build errors. -# As of now, the only SoC that is imxgpu and not imxgpu2d is the i.MX8MN, so -# append the patches to that SoC only. -SRC_URI_append_mx8mn = " \ - file://0014-Add-IMX-GPU-support.patch \ - file://0001-egl.prf-Fix-build-error-when-egl-headers-need-platfo.patch \ -" SRC_URI_append_imxgpu3d = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', \ '', \ From 95e7f61f33727bf655bbed7ea416934992e0eebc Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 8 Jun 2020 17:08:42 +0200 Subject: [PATCH 19/42] firmware-imx: add custom sdma-firmware service for the ccimx8mn-dvk This service is the same as the one provided by NXP, but with altered dependencies. Start it before the kernel modules are loaded so the firmware is ready by the time the mcp25xxfd module is loaded. https://jira.digi.com/browse/DEL-7114 Signed-off-by: Gabriel Valcazar --- .../files/ccimx8mn-dvk/sdma-firmware.service | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 meta-digi-arm/recipes-bsp/firmware-imx/files/ccimx8mn-dvk/sdma-firmware.service diff --git a/meta-digi-arm/recipes-bsp/firmware-imx/files/ccimx8mn-dvk/sdma-firmware.service b/meta-digi-arm/recipes-bsp/firmware-imx/files/ccimx8mn-dvk/sdma-firmware.service new file mode 100644 index 000000000..918cce6c9 --- /dev/null +++ b/meta-digi-arm/recipes-bsp/firmware-imx/files/ccimx8mn-dvk/sdma-firmware.service @@ -0,0 +1,15 @@ +# The SDMA firmware needs to be loaded in order for the kernel to carry out +# SPI tranfers with DMA. Such transfers are required when probing the mcp25xxfd +# module, so make sure the firmware is loaded before the module is by adding +# the appropriate dependencies in this service. + +[Unit] +Description=User Space SDMA Firmware Loading +Before=systemd-modules-load.service +DefaultDependencies=no + +[Service] +ExecStart=/etc/sdma + +[Install] +WantedBy=sysinit.target From 25738b4ac5d6574b36a65d0cdf9bf6b569f0cd67 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Fri, 12 Jun 2020 11:45:32 +0200 Subject: [PATCH 20/42] imx-mkimage: remove legacy native configurations This recipe is now built as native and nativesdk by means of the BBCLASSEXTEND configuration. Remove every remaining legacy native configuration since all will be covered by the class extension. Signed-off-by: Gonzalo Ruiz --- meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.bb | 2 -- meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.inc | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.bb b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.bb index d76f879c2..3d009967e 100644 --- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.bb +++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.bb @@ -8,8 +8,6 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SECTION = "BSP" -inherit native deploy - CFLAGS = "-O2 -Wall -std=c99 -I ${STAGING_INCDIR} -L ${STAGING_LIBDIR}" REV_CHIP ?= "B0" diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.inc b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.inc index 973d475eb..9cb78f4ae 100644 --- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.inc +++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.inc @@ -1,6 +1,6 @@ # Copyright 2017-2019 NXP - -DEPENDS = "zlib-native openssl-native" + +DEPENDS = "zlib openssl" SRCBRANCH = "imx_5.4.3_2.0.0" IMX_MKIMAGE_SRC ?= "git://source.codeaurora.org/external/imx/imx-mkimage.git;protocol=https" From 09991407dff12b92a098e823d1222cb35cc27205 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Fri, 12 Jun 2020 11:51:51 +0200 Subject: [PATCH 21/42] imx-mkimage: fix compilation issue for nativesdk builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The '-fmacro-prefix' option is a new GCC option introduced in gcc version 8. To keep compatibility with previous GCC versions, remove this option from the DEBUG_PREFIX_MAP list so nativesdk builds are able to compile this recipe. Following is the compilation issue avoided by this patch: | gcc: error: unrecognized command line option ‘-fmacro-prefix-map=/tmp/work/x86_64-nativesdk-deysdk-linux/nativesdk-imx-mkimage/git-r0=/usr/src/debug/nativesdk-imx-mkimage/git-r0’ Signed-off-by: Gonzalo Ruiz --- meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.bb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.bb b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.bb index 3d009967e..511bb6195 100644 --- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.bb +++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.bb @@ -8,6 +8,11 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SECTION = "BSP" +# Beware: applied last to first +DEBUG_PREFIX_MAP = "-fdebug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ + -fdebug-prefix-map=${STAGING_DIR_HOST}= \ + -fdebug-prefix-map=${STAGING_DIR_NATIVE}= \ +" CFLAGS = "-O2 -Wall -std=c99 -I ${STAGING_INCDIR} -L ${STAGING_LIBDIR}" REV_CHIP ?= "B0" From b6edb0076f0a3088a05413f1693c95249757239d Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Sun, 14 Jun 2020 12:27:18 +0200 Subject: [PATCH 22/42] imx-boot: add 'signed' to the signed images prefix Signed imx-boot files had the '-signed' appended at the end of the file. Add it after the file prefix instead, so it is easier to replace using an unsigned file for a signed one just by changing the file prefix. https://jira.digi.com/browse/DEL-7024 Signed-off-by: Gonzalo Ruiz --- meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend index 4eaec6f61..e8bee4732 100644 --- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend +++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend @@ -212,11 +212,11 @@ do_deploy_append () { # Sign U-boot image if [ "${UBOOT_RAM_COMBINATIONS}" = "" ]; then - trustfence-sign-uboot.sh ${DEPLOYDIR}/${UBOOT_PREFIX}-${MACHINE}.bin ${DEPLOYDIR}/${UBOOT_PREFIX}-${MACHINE}-signed.bin + trustfence-sign-uboot.sh ${DEPLOYDIR}/${UBOOT_PREFIX}-${MACHINE}.bin ${DEPLOYDIR}/${UBOOT_PREFIX}-signed-${MACHINE}.bin else for ramc in ${UBOOT_RAM_COMBINATIONS}; do for rev in ${SOC_REVISIONS}; do - trustfence-sign-uboot.sh ${DEPLOYDIR}/${UBOOT_PREFIX}-${MACHINE}-${rev}-${ramc}.bin ${DEPLOYDIR}/${UBOOT_PREFIX}-${MACHINE}-${rev}-${ramc}-signed.bin + trustfence-sign-uboot.sh ${DEPLOYDIR}/${UBOOT_PREFIX}-${MACHINE}-${rev}-${ramc}.bin ${DEPLOYDIR}/${UBOOT_PREFIX}-signed-${MACHINE}-${rev}-${ramc}.bin done done fi From d88969aac27f611205abfc678d977eb820ab1f2c Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Sun, 14 Jun 2020 12:33:28 +0200 Subject: [PATCH 23/42] imx-boot: sign images for every target in IMXBOOT_TARGETS https://jira.digi.com/browse/DEL-7024 Signed-off-by: Gonzalo Ruiz --- .../recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend index e8bee4732..e3230de14 100644 --- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend +++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend @@ -212,11 +212,15 @@ do_deploy_append () { # Sign U-boot image if [ "${UBOOT_RAM_COMBINATIONS}" = "" ]; then - trustfence-sign-uboot.sh ${DEPLOYDIR}/${UBOOT_PREFIX}-${MACHINE}.bin ${DEPLOYDIR}/${UBOOT_PREFIX}-signed-${MACHINE}.bin + for target in ${IMXBOOT_TARGETS}; do + trustfence-sign-uboot.sh ${DEPLOYDIR}/${UBOOT_PREFIX}-${MACHINE}.bin-${target} ${DEPLOYDIR}/${UBOOT_PREFIX}-signed-${MACHINE}.bin-${target} + done else for ramc in ${UBOOT_RAM_COMBINATIONS}; do for rev in ${SOC_REVISIONS}; do - trustfence-sign-uboot.sh ${DEPLOYDIR}/${UBOOT_PREFIX}-${MACHINE}-${rev}-${ramc}.bin ${DEPLOYDIR}/${UBOOT_PREFIX}-signed-${MACHINE}-${rev}-${ramc}.bin + for target in ${IMXBOOT_TARGETS}; do + trustfence-sign-uboot.sh ${DEPLOYDIR}/${UBOOT_PREFIX}-${MACHINE}-${rev}-${ramc}.bin-${target} ${DEPLOYDIR}/${UBOOT_PREFIX}-signed-${MACHINE}-${rev}-${ramc}.bin-${target} + done done done fi From e8f721a0b2eefd21956100e5ef5e918d4f5d76f6 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Sun, 14 Jun 2020 12:37:01 +0200 Subject: [PATCH 24/42] trustfence: use correct imx-boot image for sdcard When the Bootloader is an 'imx-boot', select the correct imx-boot signed image to compose the sdcard artifact. https://jira.digi.com/browse/DEL-7024 Signed-off-by: Gonzalo Ruiz --- meta-digi-arm/classes/image_types_digi.bbclass | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/meta-digi-arm/classes/image_types_digi.bbclass b/meta-digi-arm/classes/image_types_digi.bbclass index b982091ec..c695d2e44 100644 --- a/meta-digi-arm/classes/image_types_digi.bbclass +++ b/meta-digi-arm/classes/image_types_digi.bbclass @@ -280,14 +280,19 @@ IMAGE_CMD_sdcard() { parted -s ${SDIMG} -- unit KiB mkpart primary ext2 $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) -1s parted -s ${SDIMG} unit KiB print - # FIXME: adapt trustfence handling for imx-boot # Set u-boot image to flash depending on whether TRUSTFENCE_SIGN is enabled if [ "${TRUSTFENCE_SIGN}" = "1" ]; then - SDIMG_BOOTLOADER="$(readlink -e ${SDIMG_BOOTLOADER} | sed -e 's,u-boot-,u-boot-signed-,g')" + if [ "${BOOTLOADER_IMAGE_RECIPE}" = "u-boot" ]; then + SDIMG_BOOT="$(readlink -e ${SDIMG_BOOTLOADER} | sed -e 's,u-boot-,u-boot-signed-,g')" + else + SDIMG_BOOT="$(readlink -e ${SDIMG_BOOTLOADER} | sed -e 's,imx-boot-,imx-boot-signed-,g')" + fi + else + SDIMG_BOOT="$(readlink -e ${SDIMG_BOOTLOADER})" fi # Burn bootloader, boot and rootfs partitions - dd if=${SDIMG_BOOTLOADER} of=${SDIMG} conv=notrunc,fsync seek=${BOOTLOADER_SEEK} bs=1K + dd if=${SDIMG_BOOT} of=${SDIMG} conv=notrunc,fsync seek=${BOOTLOADER_SEEK} bs=1K dd if=${SDIMG_BOOTFS} of=${SDIMG} conv=notrunc,fsync seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc,fsync seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024 + ${BOOT_SPACE_ALIGNED} \* 1024) } From 7143ea953417a4058843e201179c01172d7efe70 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Sun, 14 Jun 2020 13:02:44 +0200 Subject: [PATCH 25/42] trustfence: use correct u-boot image for sdcard When the Bootloader is an 'u-boot' select the correct u-boot signed image to compose the sdcard artifact. Signed u-boot artifacts start with 'u-boot-dtb-signed-'. Signed-off-by: Gonzalo Ruiz --- meta-digi-arm/classes/image_types_digi.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-arm/classes/image_types_digi.bbclass b/meta-digi-arm/classes/image_types_digi.bbclass index c695d2e44..f30b47b04 100644 --- a/meta-digi-arm/classes/image_types_digi.bbclass +++ b/meta-digi-arm/classes/image_types_digi.bbclass @@ -283,7 +283,7 @@ IMAGE_CMD_sdcard() { # Set u-boot image to flash depending on whether TRUSTFENCE_SIGN is enabled if [ "${TRUSTFENCE_SIGN}" = "1" ]; then if [ "${BOOTLOADER_IMAGE_RECIPE}" = "u-boot" ]; then - SDIMG_BOOT="$(readlink -e ${SDIMG_BOOTLOADER} | sed -e 's,u-boot-,u-boot-signed-,g')" + SDIMG_BOOT="$(readlink -e ${SDIMG_BOOTLOADER} | sed -e 's,u-boot-,u-boot-dtb-signed-,g')" else SDIMG_BOOT="$(readlink -e ${SDIMG_BOOTLOADER} | sed -e 's,imx-boot-,imx-boot-signed-,g')" fi From 82157675d80b6bd8ce689f4dc89f5b6e8942c1a1 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Mon, 15 Jun 2020 11:21:36 +0200 Subject: [PATCH 26/42] trustfence-sign-artifact: ccimx8x: preserve original image Perform AHAB signing process without altering the original file. https://jira.digi.com/browse/DEL-7024 Signed-off-by: Gonzalo Ruiz --- .../trustfence-sign-tools/trustfence-sign-artifact.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh index 52eba706d..7bc77bfae 100755 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh @@ -278,12 +278,15 @@ else # Other constants KERNEL_START_OFFSET="0x0" KERNEL_SIG_BLOCK_OFFSET="0x90" - KERNEL_NAME="${1}" HAB_VER="ahab" DIGEST="sign_digest" DIGEST_ALGO="sha512" + # Prepare the image container + mkimage_imx8 -soc "QX" -rev "B0" -c -ap ${UIMAGE_PATH} a35 ${CONFIG_RAM_START} -out temp-mkimg + KERNEL_NAME="$(readlink -e temp-mkimg)" + # Compute the layout: sizes and offsets. container_header_offset="${KERNEL_START_OFFSET}" signature_block_offset="${KERNEL_SIG_BLOCK_OFFSET}" @@ -342,10 +345,6 @@ if [ "${CONFIG_SIGN_MODE}" = "HAB" ]; then objcopy -I binary -O binary --pad-to "${sig_len}" --gap-fill="${GAP_FILLER}" "${TARGET}" else - # Prepare the image container - mkimage_imx8 -soc "QX" -rev "B0" -c -ap ${UIMAGE_PATH} a35 ${CONFIG_RAM_START} -out temp-mkimg - mv temp-mkimg "${UIMAGE_PATH}" - # Sign the image CURRENT_PATH="$(pwd)" cst -o "${TARGET}" -i "${CURRENT_PATH}/csf_descriptor" >/dev/null @@ -357,4 +356,4 @@ fi [ "${ENCRYPT}" = "true" ] && ENCRYPTED_MSG="and encrypted " echo "Signed ${ENCRYPTED_MSG}image ready: ${TARGET}" -rm -f "${SRK_TABLE}" csf_descriptor csf.bin 2> /dev/null +rm -f "${SRK_TABLE}" csf_descriptor csf.bin temp-mkimg 2> /dev/null From ea8447ec7f5bf6e4f4be6bdca707947b448c7e41 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Thu, 26 Mar 2020 15:35:51 +0100 Subject: [PATCH 27/42] firmware-qualcomm: Add CTL tables to CC8X US BDF Add Compliance Test Limits (CTL) information for FCC, CE and TELEC certifications to the CC8X US Board Data File. The rest of the file (calibration, target power levels, etc.) remains intact. Updated file: - bdwlan30_US.bin (MD5SUM: 100a982b33b4a2cfeb34cdea794dc6d6) https://jira.digi.com/browse/DEL-6995 Signed-off-by: Gonzalo Ruiz --- .../firmware-qualcomm/ccimx8x/bdwlan30_US.bin | Bin 8124 -> 8124 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/ccimx8x/bdwlan30_US.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/ccimx8x/bdwlan30_US.bin index 8d48bbef5abdcb1042fee4503f31bbb1e5fc8c08..a687cedbd232e9ef4a69c02d7422c193aa56d63c 100644 GIT binary patch delta 401 zcmdmEzsH_sk9oM-!jiA#PAF7$6uW5XBuO92CJH!5twXDk34q5g`)6$HOlM0_fsVQc;moQBqP7 z5)l$01O`AFtQbh3i$_R>17+RVfZ{;fogGL35jz`LJsX=KR05;`B*DtMd7}h3(_{li J&c%DASOFU+@QY3rUvL5APJ|z zE(1Cc0?@@lDj^6$gH-{UFaVPW^J_p#Yak??2I+ Date: Mon, 15 Jun 2020 18:05:57 +0200 Subject: [PATCH 28/42] firmware-qualcomm: rename pcie UTF firmware file When loading the wireless driver in test mode, the UTF firmware file is loaded. On pcie chips, the UTF file is expected to be named 'utf.bin'. On sdio chips, the UTF file is expected to be named 'utf30.bin'. Rename the pcie UTF file to match this requirement. md5sum ---------------------------------------------------------- qca65X4_pcie: utf.bin -> 41cfb4e50613cd0eeb0fa99a005131bd qca65X4_sdio: utf30.bin -> 4743dee015047752e433e69f4db89974 https://jira.digi.com/browse/DEL-7086 Signed-off-by: Gonzalo Ruiz --- .../firmware-qualcomm/firmware-qualcomm.bb | 2 +- .../qca65X4_pcie_proprietary/{utf30.bin => utf.bin} | Bin 2 files changed, 1 insertion(+), 1 deletion(-) rename meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/{utf30.bin => utf.bin} (100%) diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb index 9fb83e6d3..c2b7c0bab 100644 --- a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb +++ b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb @@ -34,7 +34,7 @@ FW_QCA65X4_PCIE_PROPRIETARY = " \ file://LICENCE.atheros_firmware \ file://qca65X4_pcie_proprietary/otp30.bin \ file://qca65X4_pcie_proprietary/qwlan30.bin \ - file://qca65X4_pcie_proprietary/utf30.bin \ + file://qca65X4_pcie_proprietary/utf.bin \ " # Firmware files for QCA6574 (Qualcomm community driver) diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/utf30.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/utf.bin similarity index 100% rename from meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/utf30.bin rename to meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/qca65X4_pcie_proprietary/utf.bin From 96c2b2f759a422a827c1e31db78fb66aa931c9fb Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 15 Jun 2020 20:03:29 +0200 Subject: [PATCH 29/42] wireless: rework regulatory domain dependencies depending on the platform Starting with Linux v4.15, regulatory domains are no longer handled via CRDA, but via the kernel and a flexible database instead. Said database is included in the wireless-regdb-static package, which conflicts with the old wireless-regdb package. To accomodate for this new package, add CRDA as a dependency for ccimx6 platforms only, and incorporate wireless-regdb-static for the rest of the platforms. Additionally, the ccimx6 kernel should inherit the kernel_wireless_regdb .bbclass so the plaintext database is copied to the kernel sources, but since we use the same recipe for all kernel versions and ccimx6 platforms are not yet supported in zeus, omit this change for now. Remove the package-base .bbappend, since only ccimx6ulstarter images include that packagegroup and they require wireless-regdb-static, anyway. By adding the regulatory database, we avoid delays when going to suspend, caused by the kernel waiting for the database to appear. https://jira.digi.com/browse/DEL-7133 Signed-off-by: Gabriel Valcazar --- .../recipes-core/packagegroup/packagegroup-base.bbappend | 4 ---- .../packagegroups/packagegroup-dey-wireless.bb | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 meta-digi-arm/recipes-core/packagegroup/packagegroup-base.bbappend diff --git a/meta-digi-arm/recipes-core/packagegroup/packagegroup-base.bbappend b/meta-digi-arm/recipes-core/packagegroup/packagegroup-base.bbappend deleted file mode 100644 index 4b6196654..000000000 --- a/meta-digi-arm/recipes-core/packagegroup/packagegroup-base.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright (C) 2020 Digi International. - -# wireless-regdb-static conflicts with wireless-regdb required by crda -RDEPENDS_packagegroup-base-wifi_remove = "wireless-regdb-static" diff --git a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb index 369d627c4..c3ec1f8a8 100644 --- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb +++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb @@ -7,12 +7,14 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup RDEPENDS_${PN} = "\ - crda \ hostapd \ iw \ + wireless-regdb-static \ wpa-supplicant \ wpa-supplicant-cli \ wpa-supplicant-passphrase \ " RDEPENDS_${PN}_remove_ccimx6sbc = "hostapd" +RDEPENDS_${PN}_remove_ccimx6 = "wireless-regdb-static" +RDEPENDS_${PN}_append_ccimx6 = " crda" From 8c141889d28eaa8846cb6a71bf211d6868388a44 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 15 Jun 2020 21:17:29 +0200 Subject: [PATCH 30/42] ccimx8: add firmware-imx-regulatory Aside from adding the wireless-regdb-static support, this NXP package needs to be included in the rootfs so the regulatory fw gets loaded in userspace. https://jira.digi.com/browse/DEL-7133 Signed-off-by: Gabriel Valcazar --- meta-digi-arm/conf/machine/include/ccimx8mn.inc | 2 +- meta-digi-arm/conf/machine/include/ccimx8x.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/ccimx8mn.inc b/meta-digi-arm/conf/machine/include/ccimx8mn.inc index 2dbc85263..e08c8a983 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8mn.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8mn.inc @@ -34,7 +34,7 @@ WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-mod HAS_WIFI_VIRTWLANS = "true" # Firmware -MACHINE_FIRMWARE ?= "firmware-imx-sdma firmware-imx-easrc" +MACHINE_FIRMWARE ?= "firmware-imx-sdma firmware-imx-easrc firmware-imx-regulatory" MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6564-bt', '', d)}" MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6564-wifi', '', d)}" diff --git a/meta-digi-arm/conf/machine/include/ccimx8x.inc b/meta-digi-arm/conf/machine/include/ccimx8x.inc index be580ff8c..77fe85cfa 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8x.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8x.inc @@ -44,7 +44,7 @@ WIRELESS_MODULE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-mod HAS_WIFI_VIRTWLANS = "true" # Firmware -MACHINE_FIRMWARE ?= "firmware-imx-vpu-imx8 firmware-imx-sdma" +MACHINE_FIRMWARE ?= "firmware-imx-vpu-imx8 firmware-imx-sdma firmware-imx-regulatory" MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_BT', '1', 'firmware-qualcomm-qca6574-bt', '', d)}" MACHINE_FIRMWARE_append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-qualcomm-qca6574-wifi', '', d)}" From ee2a502fe5e8d1e2a609f8b7954a7ea2dc8f35c4 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Tue, 16 Jun 2020 11:26:21 +0200 Subject: [PATCH 31/42] imx-digi-base: append to MACHINE_EXTRA_RRECOMMENDS instead of setting it The cryptoauthlib package is being added in digi-defaults.inc, which is parsed before this file. Setting the variable here overwrites its previous value, causing the cryptoauthlib package to be left out of the rootfs. Append to the variable instead of overwriting it to avoid this. Signed-off-by: Gabriel Valcazar --- meta-digi-arm/conf/machine/include/imx-digi-base.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc index 1423e092e..54bce7bf4 100644 --- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc +++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc @@ -9,7 +9,7 @@ XSERVER = "xserver-xorg \ ${XSERVER_DRIVER}" # Ship kernel modules -MACHINE_EXTRA_RRECOMMENDS = "kernel-modules" +MACHINE_EXTRA_RRECOMMENDS += "kernel-modules" # Tunes for hard/soft float-point selection. Note that we allow building for # thumb support giving distros the chance to enable thumb by setting From 5ee0b61010c8eeb36b62f76f93595e7d2aaae62c Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Tue, 16 Jun 2020 11:28:41 +0200 Subject: [PATCH 32/42] libp11: remove recipe This recipe was originally ported from the zeus branch of poky into the dey-2.6 meta-digi branch to support the pkcs11 feature in cryptoauthlib. Now that we've migrated to zeus, the recipe is now duplicated and no longer necessary. Signed-off-by: Gabriel Valcazar --- .../recipes-support/libp11/libp11_0.4.10.bb | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 meta-digi-dey/recipes-support/libp11/libp11_0.4.10.bb diff --git a/meta-digi-dey/recipes-support/libp11/libp11_0.4.10.bb b/meta-digi-dey/recipes-support/libp11/libp11_0.4.10.bb deleted file mode 100644 index b40223e8a..000000000 --- a/meta-digi-dey/recipes-support/libp11/libp11_0.4.10.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Library for using PKCS" -DESCRIPTION = "\ -Libp11 is a library implementing a small layer on top of PKCS \ -make using PKCS" -HOMEPAGE = "https://github.com/OpenSC/libp11" -BUGTRACKER = "https://github.com/OpenSC/libp11/issues" -SECTION = "Development/Libraries" -LICENSE = "LGPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29" -DEPENDS = "libtool openssl" - -SRC_URI = "git://github.com/OpenSC/libp11.git" -SRCREV = "973d31f3f58d5549ddd8b1f822ce8f72186f9d68" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-static" - -do_install_append () { - rm -rf ${D}${docdir}/${BPN} -} - -FILES_${PN} += "${libdir}/engines*/pkcs11.so" -FILES_${PN}-dev += "${libdir}/engines*/libpkcs11${SOLIBSDEV}" From 931898968c3449562e50729738b9ad9685174db7 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 16 Jun 2020 17:47:57 +0200 Subject: [PATCH 33/42] README: Update dey-3.0-r1 changelog https://jira.digi.com/browse/DEL-7120 Signed-off-by: Arturo Buzarra --- README.md | 62 +++++++------------------------------------------------ 1 file changed, 7 insertions(+), 55 deletions(-) diff --git a/README.md b/README.md index e5105793a..aa5bd0acc 100644 --- a/README.md +++ b/README.md @@ -50,32 +50,6 @@ Software for the following hardware platforms is in production support: * [CC-WMX6UL-KIT](https://www.digi.com/products/models/cc-wmx6ul-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/3.0/cc6ul/yocto-gs_index)) * [CC-SBP-WMX-JN58](https://www.digi.com/products/models/cc-sbp-wmx-jn58) -## ConnectCore 6 Plus -* ConnectCore 6 Plus System-on-Module (SOM) - * [CC-WMX-KK8D-TN](https://www.digi.com/products/models/cc-wmx-kk8d-tn) -* ConnectCore 6 Plus professional development kit - * [CC-WMX6P-KIT](https://www.digi.com/products/models/cc-wmx6p-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/3.0/cc6plus/yocto-gs_index)) - -## ConnectCore 6 -* ConnectCore 6 System-on-Module (SOM) - * [CC-WMX-J97C-TN](https://www.digi.com/products/models/cc-wmx-j97c-tn) - * [CC-WMX-L96C-TE](https://www.digi.com/products/models/cc-wmx-l96c-te) - * [CC-WMX-L87C-TE](https://www.digi.com/products/models/cc-wmx-l87c-te) - * [CC-MX-L76C-Z1](https://www.digi.com/products/models/cc-mx-l76c-z1) - * [CC-MX-L86C-Z1](https://www.digi.com/products/models/cc-mx-l86c-z1) - * [CC-MX-L96C-Z1](https://www.digi.com/products/models/cc-mx-l96c-z1) - * [CC-WMX-L76C-TE](https://www.digi.com/products/models/cc-wmx-l76c-te) - * CC-WMX-K87C-FJA - * CC-WMX-K77C-TE - * CC-WMX-L97D-TN - * CC-WMX-J98C-FJA - * CC-WMX-J98C-FJA-1 -* ConnectCore 6 Jumpstart Development Kit (SBC with Connectore 6 module) - * [CC-WMX6-KIT](https://www.digi.com/products/models/cc-wmx6-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/3.0/cc6/yocto-gs_index)) - * [CC-SB-WMX-J97C-1](https://www.digi.com/products/models/cc-sb-wmx-j97c-1) - * [CC-SB-WMX-L87C-1](https://www.digi.com/products/models/cc-sb-wmx-l87c-1) - * [CC-SB-WMX-L76C-1](https://www.digi.com/products/models/cc-sb-wmx-l76c-1) - Previous versions of Digi Embedded Yocto include support for additional Digi hardware. @@ -110,7 +84,11 @@ Documentation is available online at https://www.digi.com/resources/documentatio * Updated OpenSSL to v1.1.1d * Package upgrades and security fixes * Updated kernel version to v5.4 for i.MX8X, i.MX8MN and i.MX6UL platforms -* Updated U-Boot to version 2019.04-r1 for i.MX8X platform +* Updated U-Boot to version 2017.03-r6 for i.MX6UL platform +* Updated U-Boot to version 2018.03-r4 for i.MX8MN platform +* Updated U-Boot to version 2019.04-r2 for i.MX8X platform +* Added support for ConnectCore 8M Nano v2 SOM +* Added initial TrustFence support for ConnectCore 8M Nano # Known Issues and Limitations @@ -134,8 +112,8 @@ updated list can be found on the online documentation. * When working as an access point, DFS-capable channels in the 5GHz band are not supported. * For P2P connections Digi recommends "Negotiated GO" modes. The QCA6564 - devices (ConnectCore 6UL, ConnectCore 6 Plus, ConnectCore 8M Nano) fail to - join autonomous groups. + devices (ConnectCore 6UL and ConnectCore 8M Nano) fail to join autonomous + groups. * Trustfence is not yet supported on the ConnectCore 8M Nano. ## ConnectCore 8M Nano @@ -167,32 +145,6 @@ updated list can be found on the online documentation. reducing the maximum throughput of this interface. * The QCA6564 wireless chip does not support Wake On Wireless LAN. -## ConnectCore 6 Plus - -* ConnectCore 6 Plus System-on-Module (SOM) - * NXP i.MX6QP processor has a documented errata (ERR004512) whereby the maximum - performance of the Gigabit FEC is limited to 400Mbps (total for Tx and Rx). -* ConnectCore 6 Plus SBC - * The Micrel PHY KSZ9031 may take between five and six seconds to - auto-negotiate with Gigabit switches. - -## ConnectCore 6 - -* ConnectCore 6 System-on-Module (SOM) - * NXP i.MX6 processor has a documented errata (ERR004512) whereby the maximum - performance of the Gigabit FEC is limited to 400Mbps (total for Tx and Rx). - * The Qualcomm AR6233 firmware does not support the following configuration - modes: - * Concurrent modes involving P2P mode, such as P2P + softAP or P2P + STA. - * Bluetooth + softAP + STA concurrent mode. - * A maximum of five clients are supported when using Qualcomm's AR6233 in - softAP mode. - * A maximum of ten connected devices are supported when using Qualcomm's AR6233 - Bluetooth Low Energy mode. -* ConnectCore 6 SBC - * The Micrel PHY KSZ9031 may take between five and six seconds to - auto-negotiate with Gigabit switches. - # Support Contact Information For support questions please contact Digi Technical Support: From bd8955cd45f3a0c00c4b975e2e0831d54b7ba476 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 16 Jun 2020 17:10:52 +0200 Subject: [PATCH 34/42] meta-digi: update revisions for dey-3.0-r1.1 https://jira.digi.com/browse/DEL-7120 Signed-off-by: Arturo Buzarra --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.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_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 4 ++-- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 922d34d2d..8daa0b582 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ " SRC_URI_append = " \ 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 3cf75fbd9..6795afdf7 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,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "02f584b6daa9c56e533830e002730384eb88c047" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index dd3b5a540..1de0ea446 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2018.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "0a1d40008552b0413a6a96fa408d58befbcc2b7c" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb index ae6f36af7..4b27c2295 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2019.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "bf20e4c3882b1a0a1756a246b576941cd7ae454f" COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index af708ccae..614a1ad69 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -7,7 +7,7 @@ DEPENDS = "trustfence-cst coreutils util-linux" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}" SRCBRANCH = "v2019.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "bf20e4c3882b1a0a1756a246b576941cd7ae454f" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 4437359c9..f6e08314e 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-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};branch=${SRCBRANCH} \ + ${QCOM_GIT_URI};nobranch=1 \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 3fe0b2f82..8e5baa6ca 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" SRCBRANCH = "v5.4/dey-3.0/maint" SRCBRANCH_ccimx6 = "v4.9/dey-2.6/maint" -SRCREV = "${AUTOREV}" +SRCREV = "d098aaabb7db56752ad1d0663adda07e59ced8f4" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${LINUX_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index d5501cdd7..a906fad5d 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "${AUTOREV}" +SRCREV = "35943b2466c9357cdd4e5c165f26149d82ed51f6" 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" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${CC_GIT_URI};nobranch=1" S = "${WORKDIR}/git" 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 eeacd53d5..4219caf06 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, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "a2412edf382f340781ef972082270c9b17e95f96" 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 2e62dbcf5..04883a5d3 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "bce0bfff451c67c5387ebdaa9b5da1bde82750ca" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,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 b793b3faae19d487334e5504b3d086f8ffb51590 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 16 Jun 2020 18:02:42 +0200 Subject: [PATCH 35/42] meta-digi: revert revisions to AUTOREV --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.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_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 4 ++-- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 8daa0b582..922d34d2d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ " SRC_URI_append = " \ 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 6795afdf7..3cf75fbd9 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,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "02f584b6daa9c56e533830e002730384eb88c047" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index 1de0ea446..dd3b5a540 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2018.03/maint" -SRCREV = "0a1d40008552b0413a6a96fa408d58befbcc2b7c" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb index 4b27c2295..ae6f36af7 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2019.04/maint" -SRCREV = "bf20e4c3882b1a0a1756a246b576941cd7ae454f" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index 614a1ad69..af708ccae 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -7,7 +7,7 @@ DEPENDS = "trustfence-cst coreutils util-linux" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}" SRCBRANCH = "v2019.04/maint" -SRCREV = "bf20e4c3882b1a0a1756a246b576941cd7ae454f" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index f6e08314e..4437359c9 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-3.0/maint" -SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" +SRCREV = "${AUTOREV}" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};nobranch=1 \ + ${QCOM_GIT_URI};branch=${SRCBRANCH} \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 8e5baa6ca..3fe0b2f82 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" SRCBRANCH = "v5.4/dey-3.0/maint" SRCBRANCH_ccimx6 = "v4.9/dey-2.6/maint" -SRCREV = "d098aaabb7db56752ad1d0663adda07e59ced8f4" +SRCREV = "${AUTOREV}" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};nobranch=1" +SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index a906fad5d..d5501cdd7 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "35943b2466c9357cdd4e5c165f26149d82ed51f6" +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" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};nobranch=1" +SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" 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 4219caf06..eeacd53d5 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, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "a2412edf382f340781ef972082270c9b17e95f96" +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 04883a5d3..2e62dbcf5 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "bce0bfff451c67c5387ebdaa9b5da1bde82750ca" +SRCREV = "${AUTOREV}" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,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 48f8720a232febb5c207cbf058bc3add837af102 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Wed, 17 Jun 2020 17:18:46 +0200 Subject: [PATCH 36/42] recovery-initramfs: register mdev regardless of /proc/sys/kernel/hotplug Busybox's device manager mdev was originally meant to be set up by writing its path to /proc/sys/kernel/hotplug before launching it, but that entry no longer exists in Linux v5.4's procfs and mdev can be launched directly. Since mdev is the element in the recovery initramfs that is in charge of mounting all partitions where .swu packages can be found (update partition on the eMMC/MTD, uSD and USB), checking for the existence of the hotplug entry in the procfs before launching mdev in v5.4 was preventing the partitions from being mounted, and causing all software updates to fail. While at it, move the two second delay to before mdev is launched, so all partitions can be mounted. Otherwise, some devices such as the USB might not be ready when mdev is launched, causing its partition to not be mounted. https://jira.digi.com/browse/DEL-7143 Signed-off-by: Gabriel Valcazar --- .../recovery-initramfs/recovery-initramfs-init | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) 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 f3b74bd0e..02c590551 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 @@ -374,17 +374,14 @@ mount -t sysfs sysfs /sys mount -t devtmpfs devtmpfs /dev mount -t tmpfs tmpfs /tmp -# Register mdev as device manager -if [ -f /proc/sys/kernel/hotplug ]; then - echo > /dev/mdev.seq - echo > /dev/mdev.log - echo "/sbin/mdev" > /proc/sys/kernel/hotplug - mdev -s -fi - -# Give some time for the devices to settle down +# Give some time for the devices to settle down so mdev can mount all of them sleep 2 +# Register mdev as device manager +echo > /dev/mdev.seq +echo > /dev/mdev.log +mdev -s + # Run all shell scripts in postinstall folder run-parts /etc/*-postinsts From 168800c3b577752429a68e02a3c3e4a132930d86 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Fri, 19 Jun 2020 16:29:15 +0200 Subject: [PATCH 37/42] trustfence-sign-artifact: [cosmetic] bring together DTB parameters Signed-off-by: Gonzalo Ruiz --- .../trustfence-sign-tools/trustfence-sign-artifact.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh index 7bc77bfae..21ba2b42d 100755 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact.sh @@ -53,9 +53,9 @@ Usage: ${SCRIPT_NAME} [OPTIONS] input-unsigned-image output-signed-image -p select platform for the project -b sign/encrypt bootscript -d sign/encrypt DTB + -o sign/encrypt DTB overlay -i sign/encrypt initramfs -l sign/encrypt Linux image - -o sign/encrypt DTB overlay Supported platforms: ccimx6, ccimx6ul, ccimx8x, ccimx8mn From a75b801e1e484502fe70d5df79508100c9f913da Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Mon, 22 Jun 2020 17:07:37 +0200 Subject: [PATCH 38/42] meta-digi: update revisions for dey-3.0-r1.2 Signed-off-by: Arturo Buzarra --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.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_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 4 ++-- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 922d34d2d..8daa0b582 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ " SRC_URI_append = " \ 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 3cf75fbd9..6795afdf7 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,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "02f584b6daa9c56e533830e002730384eb88c047" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index dd3b5a540..1de0ea446 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2018.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "0a1d40008552b0413a6a96fa408d58befbcc2b7c" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb index ae6f36af7..4b27c2295 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2019.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "bf20e4c3882b1a0a1756a246b576941cd7ae454f" COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index af708ccae..614a1ad69 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -7,7 +7,7 @@ DEPENDS = "trustfence-cst coreutils util-linux" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}" SRCBRANCH = "v2019.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "bf20e4c3882b1a0a1756a246b576941cd7ae454f" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 4437359c9..f6e08314e 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-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};branch=${SRCBRANCH} \ + ${QCOM_GIT_URI};nobranch=1 \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 3fe0b2f82..b197d1959 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" SRCBRANCH = "v5.4/dey-3.0/maint" SRCBRANCH_ccimx6 = "v4.9/dey-2.6/maint" -SRCREV = "${AUTOREV}" +SRCREV = "af1db6a2d26f3eed61e6cbc60edc2b4ba4bc9f0d" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${LINUX_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index d5501cdd7..a906fad5d 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "${AUTOREV}" +SRCREV = "35943b2466c9357cdd4e5c165f26149d82ed51f6" 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" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${CC_GIT_URI};nobranch=1" S = "${WORKDIR}/git" 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 eeacd53d5..4219caf06 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, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "a2412edf382f340781ef972082270c9b17e95f96" 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 2e62dbcf5..04883a5d3 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "bce0bfff451c67c5387ebdaa9b5da1bde82750ca" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,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 d36bce0ee40fe12f22b2e72e9a925bd7a76601db Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Mon, 22 Jun 2020 17:37:52 +0200 Subject: [PATCH 39/42] meta-digi: revert revisions to AUTOREV --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.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_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 4 ++-- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 8daa0b582..922d34d2d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ " SRC_URI_append = " \ 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 6795afdf7..3cf75fbd9 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,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "02f584b6daa9c56e533830e002730384eb88c047" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index 1de0ea446..dd3b5a540 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2018.03/maint" -SRCREV = "0a1d40008552b0413a6a96fa408d58befbcc2b7c" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb index 4b27c2295..ae6f36af7 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2019.04/maint" -SRCREV = "bf20e4c3882b1a0a1756a246b576941cd7ae454f" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index 614a1ad69..af708ccae 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -7,7 +7,7 @@ DEPENDS = "trustfence-cst coreutils util-linux" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}" SRCBRANCH = "v2019.04/maint" -SRCREV = "bf20e4c3882b1a0a1756a246b576941cd7ae454f" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index f6e08314e..4437359c9 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-3.0/maint" -SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" +SRCREV = "${AUTOREV}" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};nobranch=1 \ + ${QCOM_GIT_URI};branch=${SRCBRANCH} \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index b197d1959..3fe0b2f82 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" SRCBRANCH = "v5.4/dey-3.0/maint" SRCBRANCH_ccimx6 = "v4.9/dey-2.6/maint" -SRCREV = "af1db6a2d26f3eed61e6cbc60edc2b4ba4bc9f0d" +SRCREV = "${AUTOREV}" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};nobranch=1" +SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index a906fad5d..d5501cdd7 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "35943b2466c9357cdd4e5c165f26149d82ed51f6" +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" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};nobranch=1" +SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" 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 4219caf06..eeacd53d5 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, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "a2412edf382f340781ef972082270c9b17e95f96" +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 04883a5d3..2e62dbcf5 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "bce0bfff451c67c5387ebdaa9b5da1bde82750ca" +SRCREV = "${AUTOREV}" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,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 45c3f1e0efc754a575bed305941ec1a849fa3530 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Mon, 22 Jun 2020 23:03:12 +0200 Subject: [PATCH 40/42] imx-boot: ccimx8x: do not sign flash_regression_linux_m4 files imx-boot files for target flash_regression_linux_m4 fail the signature process, so skip them while signing the rest of the targets. https://jira.digi.com/browse/DEL-7158 Signed-off-by: Gonzalo Ruiz --- meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend index e3230de14..bca66452a 100644 --- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend +++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend @@ -219,7 +219,10 @@ do_deploy_append () { for ramc in ${UBOOT_RAM_COMBINATIONS}; do for rev in ${SOC_REVISIONS}; do for target in ${IMXBOOT_TARGETS}; do - trustfence-sign-uboot.sh ${DEPLOYDIR}/${UBOOT_PREFIX}-${MACHINE}-${rev}-${ramc}.bin-${target} ${DEPLOYDIR}/${UBOOT_PREFIX}-signed-${MACHINE}-${rev}-${ramc}.bin-${target} + # Do not sign "flash_regression_linux_m4" target files + if [ "${target}" != "flash_regression_linux_m4" ]; then + trustfence-sign-uboot.sh ${DEPLOYDIR}/${UBOOT_PREFIX}-${MACHINE}-${rev}-${ramc}.bin-${target} ${DEPLOYDIR}/${UBOOT_PREFIX}-signed-${MACHINE}-${rev}-${ramc}.bin-${target} + fi done done done From 5ebc893b585e0cc76b93ef79842e6d68de5fd510 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 25 Jun 2020 12:15:52 +0200 Subject: [PATCH 41/42] meta-digi: update revisions for dey-3.0-r1.3 Signed-off-by: Gabriel Valcazar --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.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_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 4 ++-- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 922d34d2d..8daa0b582 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ " SRC_URI_append = " \ 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 3cf75fbd9..48598ea0e 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,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "69a8871447895afcc01f431861d02632645ef109" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index dd3b5a540..1de0ea446 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2018.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "0a1d40008552b0413a6a96fa408d58befbcc2b7c" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb index ae6f36af7..4b27c2295 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2019.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "bf20e4c3882b1a0a1756a246b576941cd7ae454f" COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index af708ccae..614a1ad69 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -7,7 +7,7 @@ DEPENDS = "trustfence-cst coreutils util-linux" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}" SRCBRANCH = "v2019.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "bf20e4c3882b1a0a1756a246b576941cd7ae454f" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 4437359c9..f6e08314e 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-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};branch=${SRCBRANCH} \ + ${QCOM_GIT_URI};nobranch=1 \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 3fe0b2f82..258c60dba 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" SRCBRANCH = "v5.4/dey-3.0/maint" SRCBRANCH_ccimx6 = "v4.9/dey-2.6/maint" -SRCREV = "${AUTOREV}" +SRCREV = "410709202ec2935a0303b39ca1400f5b41455d8c" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${LINUX_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index d5501cdd7..a906fad5d 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "${AUTOREV}" +SRCREV = "35943b2466c9357cdd4e5c165f26149d82ed51f6" 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" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${CC_GIT_URI};nobranch=1" S = "${WORKDIR}/git" 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 eeacd53d5..4219caf06 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, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "a2412edf382f340781ef972082270c9b17e95f96" 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 2e62dbcf5..04883a5d3 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "bce0bfff451c67c5387ebdaa9b5da1bde82750ca" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,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 332438f5b755067f2790814c803ac20e3b4f4ecf Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 25 Jun 2020 13:08:41 +0200 Subject: [PATCH 42/42] meta-digi: revert revisions to AUTOREV --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.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_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 4 ++-- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 8daa0b582..922d34d2d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ " SRC_URI_append = " \ 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 48598ea0e..3cf75fbd9 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,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "69a8871447895afcc01f431861d02632645ef109" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index 1de0ea446..dd3b5a540 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2018.03/maint" -SRCREV = "0a1d40008552b0413a6a96fa408d58befbcc2b7c" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb index 4b27c2295..ae6f36af7 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2019.04/maint" -SRCREV = "bf20e4c3882b1a0a1756a246b576941cd7ae454f" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index 614a1ad69..af708ccae 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -7,7 +7,7 @@ DEPENDS = "trustfence-cst coreutils util-linux" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}" SRCBRANCH = "v2019.04/maint" -SRCREV = "bf20e4c3882b1a0a1756a246b576941cd7ae454f" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index f6e08314e..4437359c9 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-3.0/maint" -SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" +SRCREV = "${AUTOREV}" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};nobranch=1 \ + ${QCOM_GIT_URI};branch=${SRCBRANCH} \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 258c60dba..3fe0b2f82 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" SRCBRANCH = "v5.4/dey-3.0/maint" SRCBRANCH_ccimx6 = "v4.9/dey-2.6/maint" -SRCREV = "410709202ec2935a0303b39ca1400f5b41455d8c" +SRCREV = "${AUTOREV}" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};nobranch=1" +SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index a906fad5d..d5501cdd7 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "35943b2466c9357cdd4e5c165f26149d82ed51f6" +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" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};nobranch=1" +SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" 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 4219caf06..eeacd53d5 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, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "a2412edf382f340781ef972082270c9b17e95f96" +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 04883a5d3..2e62dbcf5 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "bce0bfff451c67c5387ebdaa9b5da1bde82750ca" +SRCREV = "${AUTOREV}" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,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 \