From f2286f3d26e710d7b9221b385d1a6e6dbfd11e2c Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Mon, 7 Jun 2021 12:56:58 +0200 Subject: [PATCH 01/34] meta-digi: branch to dey-3.2/maint Signed-off-by: Hector Palacios --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb | 2 +- .../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 +- 7 files changed, 7 insertions(+), 7 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 37588de0d..46d81582d 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}" # Disable support to initial environment for U-Boot diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb index 2b3f9a8f7..94b7ce03c 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" -SRCBRANCH = "v2020.04/master" +SRCBRANCH = "v2020.04/maint" SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m|ccimx6ul)" 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 135f203bc..97cee424b 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 = "v2020.04/master" +SRCBRANCH = "v2020.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..46809973d 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.2/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 43449189a..407f673c7 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.70/master" +SRCBRANCH = "v5.4/dey-3.2/maint" SRCREV = "${AUTOREV}" # Select internal or Github Linux repo 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 8254dc160..c138dad14 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-2021 Digi International Inc. -SRCBRANCH = "master" +SRCBRANCH = "dey-3.2/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 bf7d8bef8..221eceaee 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.2/maint" SRCREV = "${AUTOREV}" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" From da766b29d56f0d2f98c556bf6990a495370c5961 Mon Sep 17 00:00:00 2001 From: Hector Bujanda Date: Tue, 8 Jun 2021 00:24:42 +0200 Subject: [PATCH 02/34] mca: added GPIO-refreshed watchdog overlays for ccimx8 platforms https://onedigi.atlassian.net/browse/DEL-7494 Signed-off-by: Hector Bujanda --- meta-digi-arm/conf/machine/ccimx8mm-dvk.conf | 1 + meta-digi-arm/conf/machine/ccimx8mn-dvk.conf | 1 + meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf | 1 + 3 files changed, 3 insertions(+) diff --git a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf index 3fe3696c3..2bbfc74cd 100644 --- a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf @@ -21,6 +21,7 @@ UBOOT_DTB_NAME = "ccimx8mm-dvk.dtb" KERNEL_DEVICETREE ?= " \ digi/ccimx8mm-dvk.dtb \ + digi/_ov_board_gpio-watchdog_ccimx8m-dvk.dtbo \ digi/_ov_board_hsd101pfw2-lvds_ccimx8m-dvk.dtbo \ digi/_ov_board_lvds_ccimx8m-dvk.dtbo \ digi/_ov_board_user-leds_ccimx8m-dvk.dtbo \ diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf index 31871ce18..fe9e43638 100644 --- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf @@ -21,6 +21,7 @@ UBOOT_DTB_NAME = "ccimx8mn-dvk.dtb" KERNEL_DEVICETREE ?= " \ digi/ccimx8mn-dvk.dtb \ + digi/_ov_board_gpio-watchdog_ccimx8m-dvk.dtbo \ digi/_ov_board_hsd101pfw2-lvds_ccimx8m-dvk.dtbo \ digi/_ov_board_lvds_ccimx8m-dvk.dtbo \ digi/_ov_board_user-leds_ccimx8m-dvk.dtbo \ diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf index 62df43636..2c3a9eebf 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf @@ -15,6 +15,7 @@ UBOOT_CONFIG[ccimx8x_sbc_pro512MB] = "ccimx8x_sbc_pro512MB_defconfig,,u-boot-dtb KERNEL_DEVICETREE ?= " \ digi/ccimx8x-sbc-pro.dtb \ digi/_ov_board_flexcan1_ccimx8x-sbc-pro.dtbo \ + digi/_ov_board_gpio-watchdog_ccimx8x-sbc-pro.dtbo \ digi/_ov_board_hsd101pfw2-lvds_ccimx8x-sbc-pro.dtbo \ digi/_ov_board_lpuart3_ccimx8x-sbc-pro.dtbo \ digi/_ov_board_lt9812-hdmi-dsi0_ccimx8x-sbc-pro.dtbo \ From 51babaa55bad3c5ae0b98baa437c4f8f7bcd968b Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Mon, 7 Jun 2021 19:07:30 +0200 Subject: [PATCH 03/34] swu-images: create a common sw-description file. Signed-off-by: Mike Engel --- .../swu-images/files/ccimx6ul/sw-description | 20 ------- .../swu-images/files/sw-description | 56 +++++++++++++------ 2 files changed, 40 insertions(+), 36 deletions(-) delete mode 100644 meta-digi-dey/recipes-digi/swu-images/files/ccimx6ul/sw-description diff --git a/meta-digi-dey/recipes-digi/swu-images/files/ccimx6ul/sw-description b/meta-digi-dey/recipes-digi/swu-images/files/ccimx6ul/sw-description deleted file mode 100644 index be20fab5f..000000000 --- a/meta-digi-dey/recipes-digi/swu-images/files/ccimx6ul/sw-description +++ /dev/null @@ -1,20 +0,0 @@ -software = -{ - version = "##SW_VERSION##"; - description = "##DESCRIPTION##"; - - images: ( - { - filename = "##BOOTIMG_NAME##"; - volume = "##BOOT_DEV##"; - type = "ubivol"; - sha256 = "@##BOOTIMG_NAME##"; - }, - { - filename = "##ROOTIMG_NAME##"; - volume = "##ROOTFS_DEV##"; - type = "ubivol"; - sha256 = "@##ROOTIMG_NAME##"; - } - ); -} diff --git a/meta-digi-dey/recipes-digi/swu-images/files/sw-description b/meta-digi-dey/recipes-digi/swu-images/files/sw-description index e2b1e365b..727581d36 100644 --- a/meta-digi-dey/recipes-digi/swu-images/files/sw-description +++ b/meta-digi-dey/recipes-digi/swu-images/files/sw-description @@ -3,21 +3,45 @@ software = version = "##SW_VERSION##"; description = "##DESCRIPTION##"; - images: ( - { - filename = "##BOOTIMG_NAME##"; - device = "##BOOT_DEV##"; - type = "raw"; - sha256 = "@##BOOTIMG_NAME##"; - installed-directly = true; - }, - { - filename = "##ROOTIMG_NAME##"; - device = "##ROOTFS_DEV##"; - type = "raw"; - sha256 = "@##ROOTIMG_NAME##"; - installed-directly = true; + mmc = { + platform: { + images: ( + { + filename = "##BOOTIMG_NAME##"; + device = "##BOOT_DEV##"; + type = "raw"; + sha256 = "@##BOOTIMG_NAME##"; + installed-directly = true; + }, + { + filename = "##ROOTIMG_NAME##"; + device = "##ROOTFS_DEV##"; + type ="raw"; + sha256 = "@##ROOTIMG_NAME##"; + installed-directly = true; + } + ); } - ); - ##PREINSTALL_SCRIPT## + ##PREINSTALL_SCRIPT## + }; + mtd = { + platform: { + images: ( + { + filename = "##BOOTIMG_NAME##"; + volume = "##BOOT_DEV##"; + type = "ubivol"; + sha256 = "@##BOOTIMG_NAME##"; + installed-directly = true; + }, + { + filename = "##ROOTIMG_NAME##"; + volume = "##ROOTFS_DEV##"; + type ="ubivol"; + sha256 = "@##ROOTIMG_NAME##"; + installed-directly = true; + } + ); + }; + }; } From 5c77cbb50296c852bc56d9c15d738f3de4acda87 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Mon, 7 Jun 2021 19:08:40 +0200 Subject: [PATCH 04/34] recovery: add swupdate parameter to select image description. This commit adds some swupdate parameter to select the sw-description configuration depending on the used platform. Signed-off-by: Mike Engel --- .../recovery-initramfs/recovery-initramfs-init | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 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 132bdb7df..61a02119d 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 @@ -377,9 +377,9 @@ check_swu_package() { # Check software update package. if [ -f "${PUBLIC_KEY}" ]; then - swupdate -c -v -i "${update_package}" -k "${PUBLIC_KEY}" > "${SWUPDATE_OUTPUT}" + swupdate -c -v -i "${update_package}" -e "${SWUPDATE_IMAGE_SET}" -k "${PUBLIC_KEY}" > "${SWUPDATE_OUTPUT}" else - swupdate -c -v -i "${update_package}" > "${SWUPDATE_OUTPUT}" + swupdate -c -v -e "${SWUPDATE_IMAGE_SET}" -i "${update_package}" > "${SWUPDATE_OUTPUT}" fi if [ "$?" != "0" ]; then @@ -572,6 +572,13 @@ for p in ${BLACKLISTED}; do encrypt_partitions=$(remove_entry "${encrypt_partitions}" "${p}") done +# Select update package image +if [ "$(is_nand)" = "yes" ]; then + SWUPDATE_IMAGE_SET="mtd,platform" +else + SWUPDATE_IMAGE_SET="mmc,platform" +fi + # On eMMC, if the 'update' partition is encrypted, we need to mount it manually if [ "$(is_nand)" = "no" ] && contains "${ENC_PARTS}" "update"; then update_block="/dev/mmcblk0p$(fdisk -l /dev/mmcblk0 | sed -ne "s,^[^0-9]*\([0-9]\+\).*\.*,\1,g;T;p")" @@ -804,9 +811,9 @@ if [ -n "${update_package_bool}" ]; then progress -wp & # Execute the software update. if [ -f "${PUBLIC_KEY}" ]; then - swupdate -f "${SW_CONFIG}" -i "${update_package}" -k "${PUBLIC_KEY}" + swupdate -e "${SWUPDATE_IMAGE_SET}" -f "${SW_CONFIG}" -i "${update_package}" -k "${PUBLIC_KEY}" else - swupdate -f "${SW_CONFIG}" -i "${update_package}" + swupdate -e "${SWUPDATE_IMAGE_SET}" -f "${SW_CONFIG}" -i "${update_package}" fi if [ "$?" = "0" ]; then log "Firmware update process succeed!" From ec0341358ac6ee4e92e535cb661dc4ac0d011db9 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 15 Jun 2021 11:24:25 +0200 Subject: [PATCH 05/34] u-boot-dey: fix closing quotes on U-Boot install scripts Signed-off-by: Hector Palacios --- .../u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt | 2 +- .../u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt | 2 +- .../u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt | 2 +- .../u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt | 2 +- .../u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt | 2 +- .../u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt | 2 +- .../u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt | 2 +- .../u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt | 2 +- .../u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt index f7268a619..1b50d223e 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt @@ -48,7 +48,7 @@ for g in ${GRAPHICAL_IMAGES}; do BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" fi done -if test "${BASEFILENAME} = "0"; then +if test "${BASEFILENAME}" = "0"; then BASEFILENAME="${image-name}" fi setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt index dcdae6227..e7da89ee7 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_usb.txt @@ -48,7 +48,7 @@ for g in ${GRAPHICAL_IMAGES}; do BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" fi done -if test "${BASEFILENAME} = "0"; then +if test "${BASEFILENAME}" = "0"; then BASEFILENAME="${image-name}" fi setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt index f37280de9..7131e5476 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_sd.txt @@ -59,7 +59,7 @@ for g in ${GRAPHICAL_IMAGES}; do BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" fi done -if test "${BASEFILENAME} = "0"; then +if test "${BASEFILENAME}" = "0"; then BASEFILENAME="${image-name}" fi setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt index 1bef598c7..9ef4d3038 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt @@ -59,7 +59,7 @@ for g in ${GRAPHICAL_IMAGES}; do BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" fi done -if test "${BASEFILENAME} = "0"; then +if test "${BASEFILENAME}" = "0"; then BASEFILENAME="${image-name}" fi setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt index 7285bc1d0..68c043aa7 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_sd.txt @@ -52,7 +52,7 @@ for g in ${GRAPHICAL_IMAGES}; do BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" fi done -if test "${BASEFILENAME} = "0"; then +if test "${BASEFILENAME}" = "0"; then BASEFILENAME="${image-name}" fi setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.ubifs diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt index 157dab1ff..0c5fd88e2 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_sd.txt @@ -19,7 +19,7 @@ for g in ${GRAPHICAL_IMAGES}; do BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" fi done -if test "${BASEFILENAME} = "0"; then +if test "${BASEFILENAME}" = "0"; then BASEFILENAME="${image-name}" fi setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt index 578d7b7ab..3da66fdb4 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_usb.txt @@ -19,7 +19,7 @@ for g in ${GRAPHICAL_IMAGES}; do BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" fi done -if test "${BASEFILENAME} = "0"; then +if test "${BASEFILENAME}" = "0"; then BASEFILENAME="${image-name}" fi setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt index d19cc9a86..921dd2d81 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_sd.txt @@ -90,7 +90,7 @@ for g in ${GRAPHICAL_IMAGES}; do BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" fi done -if test "${BASEFILENAME} = "0"; then +if test "${BASEFILENAME}" = "0"; then BASEFILENAME="${image-name}" fi setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt index 16c8a1578..6f47f7dba 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt @@ -90,7 +90,7 @@ for g in ${GRAPHICAL_IMAGES}; do BASEFILENAME="${image-name}-##GRAPHICAL_BACKEND##" fi done -if test "${BASEFILENAME} = "0"; then +if test "${BASEFILENAME}" = "0"; then BASEFILENAME="${image-name}" fi setenv INSTALL_LINUX_FILENAME ${BASEFILENAME}-##MACHINE##.boot.vfat From 6b17713b104f778156ac21f2ac044eae82c8915e Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 15 Jun 2021 11:53:03 +0200 Subject: [PATCH 06/34] u-boot: ccimx6sbc: fix script test of temp variable install_abort is a temp variable so 'test -n' doesn't work on it. This was fixed in all scripts except the USB script of ccimx6sbc. Signed-off-by: Hector Palacios --- .../u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt index 9ef4d3038..5e2614777 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/install_linux_fw_usb.txt @@ -73,7 +73,7 @@ for install_f in ${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_R install_abort=1; fi; done -if test -n "${install_abort}"; then +if test "${install_abort}" = "1"; then echo "Aborted."; exit; fi From b4fc41ced6f7d6af391ee21d12de1e347c1d6f54 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Tue, 15 Jun 2021 08:28:41 +0200 Subject: [PATCH 07/34] firmware_qualcomm: ccimx6ul: add blocking test fix to BDF Update US Board Data File to include the changes required to pass the EN 300 328 V2.2.2 blocking test. The new BDF is: - bdwlan30_US.bin (24140b5c28256cadfd95bc28fc574733) https://onedigi.atlassian.net/browse/DEL-7576 Signed-off-by: Gonzalo Ruiz --- .../ccimx6ul/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/ccimx6ul/bdwlan30_US.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/ccimx6ul/bdwlan30_US.bin index f955f9e045d640df3dca900cc6857f64ac04f747..380be31907afe407e0e3a835559a8d1509a74b15 100644 GIT binary patch delta 71 zcmdmEzsH_skNlOmjVu;&`VR99nH3DOc@+%KpkNW8cwB%5LtKm{1Sf#$$&4%u8P5XA F^#BRC6siCK delta 30 icmdmEzsH_skNjG`jVu;&lbKj9aGYfT1IEdWEGqz(i3l42 From 8722d0c4e6f1859b2debdce7f7196d738e7e69fa Mon Sep 17 00:00:00 2001 From: Francisco Gil Martinez Date: Tue, 22 Jun 2021 12:54:10 +0200 Subject: [PATCH 08/34] ccimx6ul: gstreamer: add missing video capture plugins https://onedigi.atlassian.net/browse/DEL-7596 Signed-off-by: Francisco Gil Martinez --- .../packagegroups/packagegroup-dey-gstreamer.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb b/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb index 29ab48764..c81ba15b9 100644 --- a/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb +++ b/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-gstreamer.bb @@ -27,6 +27,8 @@ MACHINE_GSTREAMER_1_0_PKGS_ccimx6ul = " \ gstreamer1.0-plugins-good-video4linux2 \ gstreamer1.0-plugins-good-videofilter \ gstreamer1.0-plugins-good-vpx \ + gstreamer1.0-plugins-good-avi \ + gstreamer1.0-plugins-good-jpeg \ " MACHINE_GSTREAMER_1_0_EXTRA_INSTALL ?= "" From 4219e6c36c3d18236e817f187ecbea420d194bf8 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Fri, 18 Jun 2021 09:24:48 +0200 Subject: [PATCH 09/34] webkit: upgrade packages to include i.MX performance improvements Igalia has included performance improvements for i.MX platforms in the latest versions of different packages related to webkit. Even though the recipes for these versions are not yet available in meta-webkit, we can add our own to meta-digi to take advantage of these improvements. Update the cog patches so they apply cleanly over v0.9.90. https://onedigi.atlassian.net/browse/DEL-7578 Signed-off-by: Gabriel Valcazar --- ...latform-parameter-and-hardcode-the-F.patch | 21 ++++++++---------- ...tform-fdo-always-use-fullscreen-mode.patch | 22 ++++++++++++------- .../webkit/recipes-browser/cog/cog_0.9.90.bb | 10 +++++++++ .../recipes-browser/libwpe/libwpe_1.10.0.bb | 8 +++++++ .../wpebackend-fdo/wpebackend-fdo_1.9.92.bb | 7 ++++++ .../wpewebkit/wpewebkit_2.32.1.bb | 11 ++++++++++ 6 files changed, 59 insertions(+), 20 deletions(-) create mode 100644 meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog_0.9.90.bb create mode 100644 meta-digi-dey/dynamic-layers/webkit/recipes-browser/libwpe/libwpe_1.10.0.bb create mode 100644 meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpebackend-fdo/wpebackend-fdo_1.9.92.bb create mode 100644 meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_2.32.1.bb diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog/0001-cog-remove-the-platform-parameter-and-hardcode-the-F.patch b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog/0001-cog-remove-the-platform-parameter-and-hardcode-the-F.patch index ba486efc5..1c95a3570 100644 --- a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog/0001-cog-remove-the-platform-parameter-and-hardcode-the-F.patch +++ b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog/0001-cog-remove-the-platform-parameter-and-hardcode-the-F.patch @@ -1,5 +1,5 @@ From: Gabriel Valcazar -Date: Tue, 10 Nov 2020 16:32:15 +0100 +Date: Wed, 23 Jun 2021 10:05:24 +0200 Subject: [PATCH 1/2] cog: remove the --platform parameter and hardcode the FDO platform @@ -8,38 +8,36 @@ platforms, so always use the FDO one by default. Signed-off-by: Gabriel Valcazar --- - cog.c | 27 ++++----------------------- - 1 file changed, 4 insertions(+), 23 deletions(-) + cog.c | 25 ++++--------------------- + 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/cog.c b/cog.c -index 950b14d..5f47d87 100644 +index 2fdc7b2..bb64506 100644 --- a/cog.c +++ b/cog.c -@@ -43,10 +43,7 @@ static struct { +@@ -40,10 +40,7 @@ static struct { + GStrv dir_handlers; GStrv arguments; char *background_color; - #if !COG_USE_WEBKITGTK - union { - char *platform_name; - CogPlatform *platform; - }; + CogPlatform *platform; - #endif // !COG_USE_WEBKITGTK union { char *action_name; -@@ -95,11 +92,6 @@ static GOptionEntry s_cli_options[] = + enum webprocess_fail_action action_id; +@@ -92,9 +89,6 @@ static GOptionEntry s_cli_options[] = { "bg-color", 'b', 0, G_OPTION_ARG_STRING, &s_options.background_color, "Background color, as a CSS name or in #RRGGBBAA hex syntax (default: white)", "BG_COLOR" }, --#if !COG_USE_WEBKITGTK - { "platform", 'P', 0, G_OPTION_ARG_STRING, &s_options.platform_name, - "Platform plug-in to use.", - "NAME" }, --#endif // !COG_USE_WEBKITGTK { "web-extensions-dir", '\0', 0, G_OPTION_ARG_STRING, &s_options.web_extensions_dir, "Load Web Extensions from given directory.", "PATH"}, -@@ -301,21 +293,10 @@ platform_setup (CogShell *shell) +@@ -299,21 +293,10 @@ platform_setup (CogShell *shell) * a given platform. */ @@ -63,4 +61,3 @@ index 950b14d..5f47d87 100644 + strerror (errno)); return FALSE; } - diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog/0002-cog-platform-fdo-always-use-fullscreen-mode.patch b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog/0002-cog-platform-fdo-always-use-fullscreen-mode.patch index 3c4687e89..4626a6398 100644 --- a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog/0002-cog-platform-fdo-always-use-fullscreen-mode.patch +++ b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog/0002-cog-platform-fdo-always-use-fullscreen-mode.patch @@ -1,19 +1,19 @@ From: Gabriel Valcazar -Date: Tue, 10 Nov 2020 16:36:21 +0100 +Date: Wed, 23 Jun 2021 10:17:59 +0200 Subject: [PATCH 2/2] cog-platform-fdo: always use fullscreen mode Otherwise, the browser will spawn on a random place on the desktop every time. Signed-off-by: Gabriel Valcazar --- - platform/cog-platform-fdo.c | 44 ++++++++++--------------------------- - 1 file changed, 12 insertions(+), 32 deletions(-) + platform/fdo/cog-platform-fdo.c | 50 ++++++++++----------------------- + 1 file changed, 15 insertions(+), 35 deletions(-) -diff --git a/platform/cog-platform-fdo.c b/platform/cog-platform-fdo.c -index 7bdf075..08b0b21 100644 ---- a/platform/cog-platform-fdo.c -+++ b/platform/cog-platform-fdo.c -@@ -1911,39 +1911,19 @@ create_window (GError **error) +diff --git a/platform/fdo/cog-platform-fdo.c b/platform/fdo/cog-platform-fdo.c +index c7e1eea..4f6c0c7 100644 +--- a/platform/fdo/cog-platform-fdo.c ++++ b/platform/fdo/cog-platform-fdo.c +@@ -2134,42 +2134,22 @@ create_window (GError **error) configure_surface_geometry (0, 0); } @@ -26,6 +26,9 @@ index 7bdf075..08b0b21 100644 - - if (wl_data.xdg_shell != NULL) { - xdg_toplevel_set_fullscreen (win_data.xdg_toplevel, NULL); +- } else if (wl_data.fshell != NULL) { +- win_data.should_resize_to_largest_output = true; +- resize_to_largest_output (); - } else if (wl_data.shell != NULL) { - wl_shell_surface_set_fullscreen (win_data.shell_surface, - WL_SHELL_SURFACE_FULLSCREEN_METHOD_SCALE, @@ -54,6 +57,9 @@ index 7bdf075..08b0b21 100644 - } + if (wl_data.xdg_shell != NULL) { + xdg_toplevel_set_fullscreen (win_data.xdg_toplevel, NULL); ++ } else if (wl_data.fshell != NULL) { ++ win_data.should_resize_to_largest_output = true; ++ resize_to_largest_output (); + } else if (wl_data.shell != NULL) { + wl_shell_surface_set_fullscreen (win_data.shell_surface, + WL_SHELL_SURFACE_FULLSCREEN_METHOD_SCALE, diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog_0.9.90.bb b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog_0.9.90.bb new file mode 100644 index 000000000..4bef62e4a --- /dev/null +++ b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog_0.9.90.bb @@ -0,0 +1,10 @@ +require recipes-browser/cog/cog.inc +require conf/include/devupstream.inc + +SRC_URI = "https://wpewebkit.org/releases/${P}.tar.xz" +SRC_URI[sha256sum] = "933adc74e7b2b7f879a0159b073aa601d58865621891c443d1c2481f9eee6c97" + +SRC_URI_class-devupstream = "git://github.com/Igalia/cog.git;protocol=https;branch=cog-0.10" +SRCREV_class-devupstream = "1e422e5055f72e9914341ce9535aaf375b821946" + +DEPENDS += "wpewebkit (>= 2.30) wpebackend-fdo (>= 1.8)" diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/libwpe/libwpe_1.10.0.bb b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/libwpe/libwpe_1.10.0.bb new file mode 100644 index 000000000..54d2068ae --- /dev/null +++ b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/libwpe/libwpe_1.10.0.bb @@ -0,0 +1,8 @@ +require recipes-browser/libwpe/libwpe.inc +require conf/include/devupstream.inc + +SRC_URI = "https://wpewebkit.org/releases//${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "2415e270d45e3595ed4052bc105f733744dc2d3677e12ff4a831e5029841084d" + +SRC_URI_class-devupstream = "git://github.com/WebPlatformForEmbedded/libwpe.git;protocol=https;branch=libwpe-1.10" +SRCREV_class-devupstream = "55877263583716303a893945418ec23cffdfcbbf" diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpebackend-fdo/wpebackend-fdo_1.9.92.bb b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpebackend-fdo/wpebackend-fdo_1.9.92.bb new file mode 100644 index 000000000..b591e4923 --- /dev/null +++ b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpebackend-fdo/wpebackend-fdo_1.9.92.bb @@ -0,0 +1,7 @@ +require recipes-browser/wpebackend-fdo/wpebackend-fdo.inc +inherit meson + +SRC_URI = "https://wpewebkit.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "5c2f7fab6623e0964bc0d1b4a01719f0" +SRC_URI[sha1sum] = "d07fdfec0df53c57e3ed36a1efffecf30d1b418c" +SRC_URI[sha256sum] = "fc5b388a91d6f2c22803e1a21a6759a314b4539e5169c6e272bfc953a05fbb85" diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_2.32.1.bb b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_2.32.1.bb new file mode 100644 index 000000000..466da5744 --- /dev/null +++ b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_2.32.1.bb @@ -0,0 +1,11 @@ +require recipes-browser/wpewebkit/wpewebkit.inc + +SRC_URI = "https://wpewebkit.org/releases/${P}.tar.xz" +SRC_URI[md5sum] = "1dd3f56b8eba16266166d757acb979fc" +SRC_URI[sha1sum] = "c5b3a48d886375a6982dd2dc5c9cc2f92f5a9690" +SRC_URI[sha256sum] = "7b6b39a12ccf3f84da4cc6ac59e02fbe328f7476eaeb9c23de9b9288c2c2f39c" + +DEPENDS += "libwpe" +RCONFLICTS_${PN} = "libwpe (< 1.8) wpebackend-fdo (< 1.8)" + +LIC_FILES_CHKSUM = "file://Source/WebCore/LICENSE-LGPL-2.1;md5=a778a33ef338abbaf8b8a7c36b6eec80 " From 2c7f14ba98e53e52fc9063f5a2198aa8bfe38774 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Fri, 18 Jun 2021 09:28:08 +0200 Subject: [PATCH 10/34] webkit: stop hardcoding versions in .bbappend files By default, we only support the latest versions of the webkit packages anyway, so use a wildcard so we don't have to update the recipes every time a new version is available. https://onedigi.atlassian.net/browse/DEL-7578 Signed-off-by: Gabriel Valcazar --- .../recipes-browser/cog/{cog_0.8.0.bbappend => cog_%.bbappend} | 0 .../wpewebkit/{wpewebkit_2.32.0.bbappend => wpewebkit_%.bbappend} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/{cog_0.8.0.bbappend => cog_%.bbappend} (100%) rename meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/{wpewebkit_2.32.0.bbappend => wpewebkit_%.bbappend} (100%) diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog_0.8.0.bbappend b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog_%.bbappend similarity index 100% rename from meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog_0.8.0.bbappend rename to meta-digi-dey/dynamic-layers/webkit/recipes-browser/cog/cog_%.bbappend diff --git a/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_2.32.0.bbappend b/meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_%.bbappend similarity index 100% rename from meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_2.32.0.bbappend rename to meta-digi-dey/dynamic-layers/webkit/recipes-browser/wpewebkit/wpewebkit_%.bbappend From 2a72f64c404222f19f2a072ca5085d87e35c62d4 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Wed, 23 Jun 2021 12:34:43 +0200 Subject: [PATCH 11/34] dey.conf: use the latest available versions of WebKit recipes Otherwise, Yocto will use the recipes in meta-webkit, which are slightly older. https://onedigi.atlassian.net/browse/DEL-7578 Signed-off-by: Gabriel Valcazar --- meta-digi-dey/conf/distro/dey.conf | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf index a731c2fa5..ee59aa9e2 100644 --- a/meta-digi-dey/conf/distro/dey.conf +++ b/meta-digi-dey/conf/distro/dey.conf @@ -67,6 +67,12 @@ PREFERRED_VERSION_libsoc = "git" # recipe in case there are NXP-specific changes in it PREFERRED_PROVIDER_opencl-headers ?= "imx-gpu-viv" +# Use the latest versions of the WebKit recipes +PREFERRED_VERSION_cog = "0.9.90" +PREFERRED_VERSION_libwpe = "1.10.0" +PREFERRED_VERSION_wpebackend-fdo = "1.9.92" +PREFERRED_VERSION_wpewebkit = "2.32.1" + # Use the FDO backend for WPE WebKit PREFERRED_PROVIDER_virtual/wpebackend = "wpebackend-fdo" From 3e75c1ed347f6b41e75f7f015281655991c32388 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Mon, 21 Jun 2021 09:37:47 +0200 Subject: [PATCH 12/34] recovery-initramfs: launch mdev as daemon 'mdev -s' run on ramfs initialization is able to mount external media already detected but fails to automatically mount any media detected afterwards. Running it as a daemon first it will also be able to mount any media detected after 'mdev -s' is run. Use argument '-d' to first run mdev as daemon in background. Move 2 seconds delay to after mdev has been initialized to give external hardware all the time possible to be successfully detected and mounted. https://onedigi.atlassian.net/browse/DEL-7285 Signed-off-by: Gonzalo Ruiz --- .../recovery/recovery-initramfs/recovery-initramfs-init | 7 ++++--- 1 file changed, 4 insertions(+), 3 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 61a02119d..e94758352 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 @@ -484,14 +484,15 @@ mount -t sysfs sysfs /sys mount -t devtmpfs devtmpfs /dev mount -t tmpfs tmpfs /tmp -# 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 -d mdev -s +# Give some time for the devices to settle down so mdev can mount all of them +sleep 2 + # Run all shell scripts in postinstall folder run-parts /etc/*-postinsts From 09f5454c49d7f8f02771ce336fddc8c972735b48 Mon Sep 17 00:00:00 2001 From: Francisco Gil Martinez Date: Thu, 24 Jun 2021 15:50:43 +0200 Subject: [PATCH 13/34] u-boot-dey: fix install script for cc8x Signed-off-by: Francisco Gil Martinez --- .../u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt index 6f47f7dba..39f96a9f1 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_usb.txt @@ -110,7 +110,7 @@ if test "${install_abort}" = "1"; then fi echo "############################################################" -echo "# Linux firmware install from micro SD #" +echo "# Linux firmware install from USB #" echo "############################################################" echo "" echo " This process will erase your eMMC and will install the following files" @@ -193,7 +193,7 @@ setenv bootcmd " echo \">> Installing linux image file ${INSTALL_LINUX_FILENAME}\"; echo \"\"; echo \"\"; - update linux mmc ${INSTALL_MMCDEV} ${INSTALL_LINUX_FILENAME}; + update linux usb ${INSTALL_USBDEV} ${INSTALL_LINUX_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update linux partition!\"; echo \"\"; From 3096af0069b3e419fbf57f46f6410ebf42b7ae25 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Fri, 25 Jun 2021 13:24:45 +0200 Subject: [PATCH 14/34] u-boot-dey: install-uuu: fix when U-Boot cannot be determined The install script of cc8x had errors (using double '==' instead of single on comparisions). Besides fixing this typo, this commit changes the logic to: - default to 2GB U-Boot for variants other than the ones in the list. - consider variant code 0x00 (not programmed HWID) as a failure. thus forcing the user to specify the file on the command line. This second action is done also on the cc6ul script. Reported-by: Hector Bujanda Signed-off-by: Hector Palacios --- .../u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh | 2 +- .../u-boot-dey/ccimx8x/install_linux_fw_uuu.sh | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh index c6971b7b0..8c48714e0 100755 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh @@ -87,7 +87,7 @@ uuu fb: ucmd setenv stdout serial,fastboot if [ -z "${INSTALL_UBOOT_FILENAME}" ]; then module_variant=$(getenv "module_variant") # Determine U-Boot file to program basing on SOM's variant - if [ -n "$module_variant" ]; then + if [ -n "$module_variant" || "$module_variant" = "0x00" ]; then if [ "$module_variant" = "0x08" ] || \ [ "$module_variant" = "0x09" ]; then INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##512MB.imx" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh index 88eed85b3..a51502e1b 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh @@ -101,16 +101,16 @@ if [ -z ${INSTALL_UBOOT_FILENAME} ]; then if [ -z "${module_ram}" ]; then module_variant=$(getenv "module_variant") # Determine U-Boot file to program basing on SOM's variant - if [ -n "$module_variant" ]; then - if [ "$module_variant" == "0x01" ] || \ - [ "$module_variant" == "0x04" ] || \ - [ "$module_variant" == "0x05" ]; then + if [ -n "$module_variant" || "$module_variant" = "0x00" ]; then + if [ "$module_variant" = "0x01" ] || \ + [ "$module_variant" = "0x04" ] || \ + [ "$module_variant" = "0x05" ]; then module_ram="1GB" - elif [ "$module_variant" == "0x02" ] || \ - [ "$module_variant" == "0x03" ]; then - module_ram="2GB" - else + elif [ "$module_variant" = "0x06" ] || \ + [ "$module_variant" = "0x09" ]; then module_ram="512MB" + else + module_ram="2GB" fi INSTALL_UBOOT_FILENAME="imx-boot-##MACHINE##-${soc_rev}-${module_ram}_${bus_width}.bin" fi From 4838aa4849e7a410e449dbcfa5131cef42966ee7 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Mon, 28 Jun 2021 09:50:46 +0200 Subject: [PATCH 15/34] u-boot-dey: fix typo on script name of help text Reported-by: Hector Bujanda Signed-off-by: Hector Palacios --- .../u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh | 6 +++--- .../u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh index 8c48714e0..1dedc6e9b 100755 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh @@ -112,11 +112,11 @@ if [ -z "${INSTALL_UBOOT_FILENAME}" ]; then echo "" echo "1. Add U-boot file name, depending on your ConnectCore 8X variant, to script command line:" echo " - For a SOM with 1GB DDR3, run:" - echo " => ./install_linux_fs_uuu.sh -u u-boot-##MACHINE##1GB.imx" + echo " => ./install_linux_fw_uuu.sh -u u-boot-##MACHINE##1GB.imx" echo " - For a SOM with 512MB DDR3, run:" - echo " => ./install_linux_fs_uuu.sh -u u-boot-##MACHINE##512MB.imx" + echo " => ./install_linux_fw_uuu.sh -u u-boot-##MACHINE##512MB.imx" echo " - For a SOM with 256MB DDR3, run:" - echo " => ./install_linux_fs_uuu.sh -u u-boot-##MACHINE##.imx" + echo " => ./install_linux_fw_uuu.sh -u u-boot-##MACHINE##.imx" echo "" echo "2. Run the install script again." echo "" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh index a51502e1b..6748d1095 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh @@ -130,13 +130,13 @@ if [ -z ${INSTALL_UBOOT_FILENAME} ]; then echo "" echo "1. Add U-boot file name, depending on your ConnectCore 8X variant, to script command line:" echo " - For a QuadXPlus CPU with 1GB LPDDR4, run:" - echo " => ./install_linux_fs_uuu.sh -u imx-boot-##MACHINE##-${soc_rev}-1GB_32bit.bin" + echo " => ./install_linux_fw_uuu.sh -u imx-boot-##MACHINE##-${soc_rev}-1GB_32bit.bin" echo " - For a QuadXPlus CPU with 2GB LPDDR4, run:" - echo " => ./install_linux_fs_uuu.sh -u imx-boot-##MACHINE##-${soc_rev}-2GB_32bit.bin" + echo " => ./install_linux_fw_uuu.sh -u imx-boot-##MACHINE##-${soc_rev}-2GB_32bit.bin" echo " - For a DualX CPU with 1GB LPDDR4, run:" - echo " => ./install_linux_fs_uuu.sh -u imx-boot-##MACHINE##-${soc_rev}-1GB_16bit.bin" + echo " => ./install_linux_fw_uuu.sh -u imx-boot-##MACHINE##-${soc_rev}-1GB_16bit.bin" echo " - For a DualX CPU with 512MB LPDDR4, run:" - echo " => ./install_linux_fs_uuu.sh -u imx-boot-##MACHINE##-${soc_rev}-512MB_16bit.bin" + echo " => ./install_linux_fw_uuu.sh -u imx-boot-##MACHINE##-${soc_rev}-512MB_16bit.bin" echo "" echo "2. Run the install script again." echo "" From 6316ec9cc5d008201c9b2fa68258179210590b47 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Wed, 23 Jun 2021 16:26:12 +0200 Subject: [PATCH 16/34] meta-digi: Add Google Coral support recipes This commit adds the required libraries and packages to exercise the Google Coral devices with Digi Embedded Yocto. https://onedigi.atlassian.net/browse/DEL-7547 Signed-off-by: Arturo Buzarra --- .../recipes-bsp/libedgetpu/libedgetpu_13.0.bb | 37 ++++++++++ .../tensorflow-lite/tensorflow-lite_2.5.0.bb | 46 +++++++++++++ meta-digi-dey/conf/distro/dey.conf | 3 + .../python3-pycoral/python3-pycoral_1.0.1.bb | 68 +++++++++++++++++++ 4 files changed, 154 insertions(+) create mode 100644 meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu_13.0.bb create mode 100644 meta-digi-arm/recipes-bsp/tensorflow-lite/tensorflow-lite_2.5.0.bb create mode 100644 meta-digi-dey/recipes-devtools/python3-pycoral/python3-pycoral_1.0.1.bb diff --git a/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu_13.0.bb b/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu_13.0.bb new file mode 100644 index 000000000..aebd42ece --- /dev/null +++ b/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu_13.0.bb @@ -0,0 +1,37 @@ +SUMMARY = "Edge TPU runtime library for Coral devices" +HOMEPAGE = "https://coral.googlesource.com/edgetpu" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://libedgetpu/LICENSE.txt;md5=c0e85c67b919e863a1a7a3da109dc40d" + +SRC_URI = "https://dl.google.com/coral/edgetpu_api/edgetpu_runtime_20210119.zip" +SRC_URI[md5sum] = "5c0b992d73683e395d6993761064d2df" +SRC_URI[sha256sum] = "b23b2c5a227d7f0e65dcc91585028d27c12e764f8ce4c4db3f114be4a49af3ae" + +S = "${WORKDIR}/edgetpu_runtime" + +RDEPENDS_${PN} = "libusb1" + +# The library files in direct correspond to max frequency, those in throttled correspond to reduced frequency. +LIBEDGETPU_TYPE = "direct" +LIBEDGETPU_ARCH = "aarch64" + +do_install() { + install -d ${D}${sysconfdir}/udev/rules.d + install -m 0644 ${S}/libedgetpu/edgetpu-accelerator.rules \ + ${D}${sysconfdir}/udev/rules.d/99-edgetpu-accelerator.rules + + install -d ${D}/${libdir} + install -m 755 ${S}/libedgetpu/${LIBEDGETPU_TYPE}/${LIBEDGETPU_ARCH}/libedgetpu.so.1.0 \ + ${D}/${libdir}/libedgetpu.so.1.0 + ln -sf ${libdir}/libedgetpu.so.1.0 ${D}/${libdir}/libedgetpu.so.1 + ln -sf ${libdir}/libedgetpu.so.1.0 ${D}/${libdir}/libedgetpu.so + + install -d ${D}/${includedir} + install -m 755 ${S}/libedgetpu/edgetpu.h ${D}/${includedir}/edgetpu.h +} + +FILES_${PN} += "${libdir}/libedgetpu.so \ + ${includedir}/edgetpu.h \ +" + +INSANE_SKIP_${PN} += "already-stripped" diff --git a/meta-digi-arm/recipes-bsp/tensorflow-lite/tensorflow-lite_2.5.0.bb b/meta-digi-arm/recipes-bsp/tensorflow-lite/tensorflow-lite_2.5.0.bb new file mode 100644 index 000000000..8a4fbab12 --- /dev/null +++ b/meta-digi-arm/recipes-bsp/tensorflow-lite/tensorflow-lite_2.5.0.bb @@ -0,0 +1,46 @@ +SUMMARY = "TensorFlow Lite Python Library" +DESCRIPTION = "TensorFlow Lite is the official solution for running machine learning models on mobile and embedded devices." +SECTION = "devel/python" +HOMEPAGE = "https://www.tensorflow.org/lite/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/tflite_runtime-2.5.0.dist-info/METADATA;md5=8c4b9e107a64b0121980a8705094014b" + +PYTHON_PACKAGE = "tflite_runtime-2.5.0-cp38-cp38-linux_aarch64.whl" + +SRC_URI = "https://github.com/google-coral/pycoral/releases/download/v1.0.1/${PYTHON_PACKAGE};downloadfilename=${PYTHON_PACKAGE};subdir=${BP}" +SRC_URI[md5sum] = "9c47617e1fa0bdca673a78b8b6688d64" +SRC_URI[sha256sum] = "b87a4c152be05d3585521a1d5418f7645a4fb82965772489b983e93aae6bd9ac" + +DEPENDS = "python3 python3-pip-native python3-wheel-native" + +RDEPENDS_${PN} = "${PYTHON_PN} \ + ${PYTHON_PN}-numpy \ +" + +inherit python3native + +do_unpack[depends] += "unzip-native:do_populate_sysroot" + +do_unpack_extra(){ + [ -d ${S} ] || mkdir -p ${S} + cd ${S} + unzip -q -o ${S}/${PYTHON_PACKAGE} -d ${S} +} +addtask unpack_extra after do_unpack before do_patch + +do_install() { + # Install pip package + install -d ${D}/${PYTHON_SITEPACKAGES_DIR} + ${STAGING_BINDIR_NATIVE}/pip3 install --disable-pip-version-check -v \ + -t ${D}/${PYTHON_SITEPACKAGES_DIR} --no-cache-dir --no-deps \ + ${WORKDIR}/${BP}/tflite_runtime-*.whl +} + +FILES_${PN} += "\ + ${libdir}/${PYTHON_DIR}/site-packages/* \ +" + +INSANE_SKIP_${PN} += "already-stripped" + +COMPATIBLE_MACHINE = "(-)" +COMPATIBLE_MACHINE_aarch64 = "(.*)" diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf index ee59aa9e2..614150a65 100644 --- a/meta-digi-dey/conf/distro/dey.conf +++ b/meta-digi-dey/conf/distro/dey.conf @@ -76,6 +76,9 @@ PREFERRED_VERSION_wpewebkit = "2.32.1" # Use the FDO backend for WPE WebKit PREFERRED_PROVIDER_virtual/wpebackend = "wpebackend-fdo" +# Use recipe from our meta-digi layer +PREFERRED_VERSION_tensorflow-lite ?= "2.5.0" + SDK_NAME = "${DISTRO}-${TCLIBC}-${SDKMACHINE}-${IMAGE_BASENAME}-${TUNE_PKGARCH}-${MACHINE}" SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}/${MACHINE}" diff --git a/meta-digi-dey/recipes-devtools/python3-pycoral/python3-pycoral_1.0.1.bb b/meta-digi-dey/recipes-devtools/python3-pycoral/python3-pycoral_1.0.1.bb new file mode 100644 index 000000000..a4c39d351 --- /dev/null +++ b/meta-digi-dey/recipes-devtools/python3-pycoral/python3-pycoral_1.0.1.bb @@ -0,0 +1,68 @@ +SUMMARY = "Python Library for Coral devices" +DESCRIPTION = "Python Library to run inferences and perform on-device transfer learning with TensorFlow Lite models on Coral devices" +SECTION = "devel/python" +HOMEPAGE = "https://coral.ai/software/#pycoral-api" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${S}/pycoral-1.0.1.dist-info/LICENSE;md5=d8927f3331d2b3e321b7dd1925166d25" + +PYTHON_PACKAGE = "pycoral-1.0.1-cp38-cp38-linux_aarch64.whl" + +SRC_URI = "git://github.com/google-coral/pycoral.git;protocol=https" +SRCREV = "d4b9f572fa3baef9d854483a171e02a6b3f9dbd0" + +SRC_URI += "https://github.com/google-coral/pycoral/releases/download/v1.0.1/${PYTHON_PACKAGE};downloadfilename=${PYTHON_PACKAGE};subdir=${BP};name=python-wheel" +SRC_URI[python-wheel.md5sum] = "ea89677a47d7d81d2558b8dbbae44d95" +SRC_URI[python-wheel.sha256sum] = "894468447192fbcf946157db0f3b6424ece6d70bcec1243892d27cd7b521f176" + +DEPENDS = "python3 python3-pip-native python3-wheel-native curl-native ca-certificates-native" + +RDEPENDS_${PN} = "${PYTHON_PN} \ + ${PYTHON_PN}-numpy \ + ${PYTHON_PN}-pycairo \ + ${PYTHON_PN}-pygobject \ + ${PYTHON_PN}-pillow \ + libedgetpu \ + tensorflow-lite \ +" + +inherit python3native + +do_unpack[depends] += "unzip-native:do_populate_sysroot" + +do_unpack_extra(){ + [ -d ${S} ] || mkdir -p ${S} + cd ${S} + unzip -q -o ${S}/${PYTHON_PACKAGE} -d ${S} +} +addtask unpack_extra after do_unpack before do_patch + + +do_configure() { + export CURL_CA_BUNDLE=${STAGING_DIR_NATIVE}/etc/ssl/certs/ca-certificates.crt + + cd ${WORKDIR}/git + bash examples/install_requirements.sh classify_image.py +} + +do_install() { + # Install examples + install -d ${D}/opt/pycoral + install -m 0555 ${WORKDIR}/git/test_data/* ${D}/opt/pycoral + install -m 0555 ${WORKDIR}/git/examples/classify_image.py ${D}/opt/pycoral + + # Install pip package + install -d ${D}/${PYTHON_SITEPACKAGES_DIR} + ${STAGING_BINDIR_NATIVE}/pip3 install --disable-pip-version-check -v \ + -t ${D}/${PYTHON_SITEPACKAGES_DIR} --no-cache-dir --no-deps \ + ${WORKDIR}/${BP}/pycoral-*.whl +} + +FILES_${PN} += "\ + ${libdir}/${PYTHON_DIR}/site-packages/* \ + /opt/pycoral/* \ +" + +INSANE_SKIP_${PN} += "already-stripped" + +COMPATIBLE_MACHINE = "(-)" +COMPATIBLE_MACHINE_aarch64 = "(.*)" From 0c9a497de91fd07e3059569bea1ec3ddec4ee511 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Fri, 25 Jun 2021 19:55:21 +0200 Subject: [PATCH 17/34] meta-digi: Add Edge TPU simple camera examples This commit adds the Edge TPU simple camera examples to exercise the Google Coral devices with Digi Embedded Yocto. https://onedigi.atlassian.net/browse/DEL-7547 Signed-off-by: Arturo Buzarra --- ...er-fix-video-sink-for-wayland-images.patch | 27 +++++++++++++++ .../libedgetpu/libedgetpu-examples_git.bb | 34 +++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 meta-digi-arm/recipes-bsp/libedgetpu/files/0001-gstreamer-fix-video-sink-for-wayland-images.patch create mode 100644 meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-examples_git.bb diff --git a/meta-digi-arm/recipes-bsp/libedgetpu/files/0001-gstreamer-fix-video-sink-for-wayland-images.patch b/meta-digi-arm/recipes-bsp/libedgetpu/files/0001-gstreamer-fix-video-sink-for-wayland-images.patch new file mode 100644 index 000000000..acf910e78 --- /dev/null +++ b/meta-digi-arm/recipes-bsp/libedgetpu/files/0001-gstreamer-fix-video-sink-for-wayland-images.patch @@ -0,0 +1,27 @@ +From: Arturo Buzarra +Date: Mon, 28 Jun 2021 15:00:58 +0200 +Subject: [PATCH] gstreamer: fix video sink for wayland images + +Signed-off-by: Arturo Buzarra +--- + gstreamer/gstreamer.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gstreamer/gstreamer.py b/gstreamer/gstreamer.py +index 2676439..e055d77 100644 +--- a/gstreamer/gstreamer.py ++++ b/gstreamer/gstreamer.py +@@ -249,11 +249,11 @@ def run_pipeline(user_function, + scale_caps = 'video/x-raw,width={width},height={height}'.format(width=scale[0], height=scale[1]) + PIPELINE += """ ! tee name=t + t. ! {leaky_q} ! videoconvert ! videoscale ! {scale_caps} ! videobox name=box autocrop=true + ! {sink_caps} ! {sink_element} + t. ! {leaky_q} ! videoconvert +- ! rsvgoverlay name=overlay ! videoconvert ! ximagesink sync=false ++ ! rsvgoverlay name=overlay ! videoconvert ! waylandsink sync=false + """ + + SINK_ELEMENT = 'appsink name=appsink emit-signals=true max-buffers=1 drop=true' + SINK_CAPS = 'video/x-raw,format=RGB,width={width},height={height}' + LEAKY_Q = 'queue max-size-buffers=1 leaky=downstream' +-- diff --git a/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-examples_git.bb b/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-examples_git.bb new file mode 100644 index 000000000..f505fa88c --- /dev/null +++ b/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-examples_git.bb @@ -0,0 +1,34 @@ +SUMMARY = "Edge TPU simple camera examples" +HOMEPAGE = "https://coral.ai/examples" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRCREV = "19335531f599133e054ec2ddcc31733d24031ba5" +SRC_URI = "git://github.com/google-coral/examples-camera.git;protocol=https \ + file://0001-gstreamer-fix-video-sink-for-wayland-images.patch \ + " + +S = "${WORKDIR}/git" + +inherit gobject-introspection + +RDEPENDS_${PN} = "python3-pycoral \ + gstreamer1.0-plugins-base \ +" + +do_configure() { + bash download_models.sh +} + +do_install() { + # Install Gstreamer examples + install -d ${D}/opt/libedgetpu + install -d ${D}/opt/libedgetpu/all_models + install -d ${D}/opt/libedgetpu/gstreamer + rm -f ${S}/gstreamer/install_requirements.sh + install -m 0555 ${S}/all_models/* ${D}/opt/libedgetpu/all_models/ + install -m 0555 ${S}/gstreamer/* ${D}/opt/libedgetpu/gstreamer/ +} + +FILES_${PN} += "/opt/libedgetpu/* \ +" From bbdf745661ce4dde540e1c0babab5d716ee63382 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 21 Jun 2021 17:55:34 +0200 Subject: [PATCH 18/34] dey-image-qt: compress .ext4 images by default Since these images are highly compressable, this greatly reduces the amount of space taken up by build artifacts. Modify the code used to generate the .sdcard and .installer.zip files so that they contain the decompressed .ext4 image. https://onedigi.atlassian.net/browse/DEL-7582 Signed-off-by: Gabriel Valcazar --- meta-digi-arm/classes/image_types_digi.bbclass | 8 +++++++- meta-digi-arm/conf/machine/ccimx6qpsbc.conf | 2 +- meta-digi-arm/conf/machine/ccimx6sbc.conf | 2 +- meta-digi-arm/conf/machine/ccimx8mm-dvk.conf | 2 +- meta-digi-arm/conf/machine/ccimx8mn-dvk.conf | 2 +- meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf | 2 +- meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf | 2 +- meta-digi-dey/classes/dey-image-installer.bbclass | 9 +++++++++ 8 files changed, 22 insertions(+), 7 deletions(-) diff --git a/meta-digi-arm/classes/image_types_digi.bbclass b/meta-digi-arm/classes/image_types_digi.bbclass index f30b47b04..38e08b3d4 100644 --- a/meta-digi-arm/classes/image_types_digi.bbclass +++ b/meta-digi-arm/classes/image_types_digi.bbclass @@ -291,11 +291,17 @@ IMAGE_CMD_sdcard() { SDIMG_BOOT="$(readlink -e ${SDIMG_BOOTLOADER})" fi + # Decompress rootfs image + gzip -d -k ${SDIMG_ROOTFS}.gz + # Burn bootloader, boot and rootfs partitions 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) + + # Delete the decompressed rootfs image + rm -f ${SDIMG_ROOTFS} } # The sdcard image requires the boot and rootfs images to be built before -IMAGE_TYPEDEP_sdcard = "${SDIMG_BOOTFS_TYPE} ${SDIMG_ROOTFS_TYPE}" +IMAGE_TYPEDEP_sdcard = "${SDIMG_BOOTFS_TYPE} ${SDIMG_ROOTFS_TYPE}.gz" diff --git a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf index 5895509ae..f169eb2f3 100644 --- a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf @@ -47,4 +47,4 @@ XBEE_TTY ?= "ttymxc4" BOOT_SCRIPTS = "boot.scr:boot.scr" # Flash image types -IMAGE_FSTYPES ?= "boot.vfat ext4 sdcard tar.bz2 recovery.vfat" +IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard tar.bz2 recovery.vfat" diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf index 9f2cc2818..ba2da795c 100644 --- a/meta-digi-arm/conf/machine/ccimx6sbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf @@ -47,4 +47,4 @@ XBEE_TTY ?= "ttymxc4" BOOT_SCRIPTS = "boot.scr:boot.scr" # Flash image types -IMAGE_FSTYPES ?= "boot.vfat ext4 sdcard tar.bz2 recovery.vfat" +IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard tar.bz2 recovery.vfat" diff --git a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf index 2bbfc74cd..fe7e879db 100644 --- a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf @@ -44,4 +44,4 @@ XBEE_TTY ?= "ttymxc3" BOOT_SCRIPTS = "boot.scr:boot.scr" # Flash image types -IMAGE_FSTYPES ?= "boot.vfat ext4 sdcard tar.bz2 recovery.vfat" +IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard tar.bz2 recovery.vfat" diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf index fe9e43638..e46efb2de 100644 --- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf @@ -46,4 +46,4 @@ XBEE_TTY ?= "ttymxc3" BOOT_SCRIPTS = "boot.scr:boot.scr" # Flash image types -IMAGE_FSTYPES ?= "boot.vfat ext4 sdcard tar.bz2 recovery.vfat" +IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard tar.bz2 recovery.vfat" diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf index 5aba0390b..c30713074 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf @@ -33,4 +33,4 @@ XBEE_TTY ?= "ttyLP0" BOOT_SCRIPTS = "boot.scr:boot.scr" # Flash image types -IMAGE_FSTYPES ?= "boot.vfat ext4 sdcard tar.bz2 recovery.vfat" +IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard tar.bz2 recovery.vfat" diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf index 2c3a9eebf..77f81c01d 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf @@ -46,4 +46,4 @@ BOOT_SCRIPTS = "boot.scr:boot.scr" UBOOT_HAS_FASTBOOT = "true" # Flash image types -IMAGE_FSTYPES ?= "boot.vfat ext4 sdcard tar.bz2 recovery.vfat" +IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard tar.bz2 recovery.vfat" diff --git a/meta-digi-dey/classes/dey-image-installer.bbclass b/meta-digi-dey/classes/dey-image-installer.bbclass index 17ad6ed7c..bf5908d18 100644 --- a/meta-digi-dey/classes/dey-image-installer.bbclass +++ b/meta-digi-dey/classes/dey-image-installer.bbclass @@ -27,6 +27,10 @@ generate_installer_zip () { if readlink -e "${DEPLOY_DIR_IMAGE}/install_linux_fw_uuu.sh"; then INSTALLER_FILELIST="${INSTALLER_FILELIST} ${DEPLOY_DIR_IMAGE}/install_linux_fw_uuu.sh" fi + # Decompress the ext4.gz image, if any + if readlink -e "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext4.gz" >/dev/null; then + gzip -d -k -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext4.gz + fi for ext in ${FSTYPES_WHITELIST}; do if readlink -e "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${ext}" >/dev/null; then INSTALLER_FILELIST="${INSTALLER_FILELIST} ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${ext}" @@ -50,6 +54,11 @@ _EOF_ zip -j ${IMGDEPLOYDIR}/${IMAGE_NAME}.installer.zip ${INSTALLER_FILELIST} ${IMGDEPLOYDIR}/README.txt rm -f ${IMGDEPLOYDIR}/README.txt + # Delete the decompressed ext4 image, if any + if readlink -e "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext4" >/dev/null; then + rm -f ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext4 + fi + # Create the symlink if [ -n "${IMAGE_LINK_NAME}" ] && [ -e "${IMGDEPLOYDIR}/${IMAGE_NAME}.installer.zip" ]; then ln -sf ${IMAGE_NAME}.installer.zip ${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.installer.zip From d3a6920a07079962508eb17a45a85a3219640822 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 21 Jun 2021 18:00:17 +0200 Subject: [PATCH 19/34] dey-image-qt: compress .sdcard images by default These images are comprised of the bootloader, linux and rootfs images. Since the rootfs images are highly compressable, we can compress the .sdcard file as well to reduce the space taken up by build artifacts. https://onedigi.atlassian.net/browse/DEL-7582 Signed-off-by: Gabriel Valcazar --- meta-digi-arm/conf/machine/ccimx6qpsbc.conf | 2 +- meta-digi-arm/conf/machine/ccimx6sbc.conf | 2 +- meta-digi-arm/conf/machine/ccimx8mm-dvk.conf | 2 +- meta-digi-arm/conf/machine/ccimx8mn-dvk.conf | 2 +- meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf | 2 +- meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf index f169eb2f3..b2fb3f108 100644 --- a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf @@ -47,4 +47,4 @@ XBEE_TTY ?= "ttymxc4" BOOT_SCRIPTS = "boot.scr:boot.scr" # Flash image types -IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard tar.bz2 recovery.vfat" +IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard.gz tar.bz2 recovery.vfat" diff --git a/meta-digi-arm/conf/machine/ccimx6sbc.conf b/meta-digi-arm/conf/machine/ccimx6sbc.conf index ba2da795c..0bc0af470 100644 --- a/meta-digi-arm/conf/machine/ccimx6sbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6sbc.conf @@ -47,4 +47,4 @@ XBEE_TTY ?= "ttymxc4" BOOT_SCRIPTS = "boot.scr:boot.scr" # Flash image types -IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard tar.bz2 recovery.vfat" +IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard.gz tar.bz2 recovery.vfat" diff --git a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf index fe7e879db..80eb3904b 100644 --- a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf @@ -44,4 +44,4 @@ XBEE_TTY ?= "ttymxc3" BOOT_SCRIPTS = "boot.scr:boot.scr" # Flash image types -IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard tar.bz2 recovery.vfat" +IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard.gz tar.bz2 recovery.vfat" diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf index e46efb2de..7e8a98695 100644 --- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf @@ -46,4 +46,4 @@ XBEE_TTY ?= "ttymxc3" BOOT_SCRIPTS = "boot.scr:boot.scr" # Flash image types -IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard tar.bz2 recovery.vfat" +IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard.gz tar.bz2 recovery.vfat" diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf index c30713074..209297c1f 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf @@ -33,4 +33,4 @@ XBEE_TTY ?= "ttyLP0" BOOT_SCRIPTS = "boot.scr:boot.scr" # Flash image types -IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard tar.bz2 recovery.vfat" +IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard.gz tar.bz2 recovery.vfat" diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf index 77f81c01d..24c7fb465 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf @@ -46,4 +46,4 @@ BOOT_SCRIPTS = "boot.scr:boot.scr" UBOOT_HAS_FASTBOOT = "true" # Flash image types -IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard tar.bz2 recovery.vfat" +IMAGE_FSTYPES ?= "boot.vfat ext4.gz sdcard.gz tar.bz2 recovery.vfat" From a707e9877554917b159324a9cbe061109c485dc1 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Tue, 22 Jun 2021 09:11:22 +0200 Subject: [PATCH 20/34] swu-images: include compressed .ext4.gz rootfs image in SWU package swupdate has the necessary logic to handle compressed images, so take advantage of this to save space and reduce update package transfer times. https://onedigi.atlassian.net/browse/DEL-7582 Signed-off-by: Gabriel Valcazar --- meta-digi-dey/recipes-digi/swu-images/files/sw-description | 1 + meta-digi-dey/recipes-digi/swu-images/swu.inc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-digi/swu-images/files/sw-description b/meta-digi-dey/recipes-digi/swu-images/files/sw-description index 727581d36..498ac549b 100644 --- a/meta-digi-dey/recipes-digi/swu-images/files/sw-description +++ b/meta-digi-dey/recipes-digi/swu-images/files/sw-description @@ -18,6 +18,7 @@ software = device = "##ROOTFS_DEV##"; type ="raw"; sha256 = "@##ROOTIMG_NAME##"; + compressed = "zlib"; installed-directly = true; } ); diff --git a/meta-digi-dey/recipes-digi/swu-images/swu.inc b/meta-digi-dey/recipes-digi/swu-images/swu.inc index 8188324c4..78aa76d3f 100644 --- a/meta-digi-dey/recipes-digi/swu-images/swu.inc +++ b/meta-digi-dey/recipes-digi/swu-images/swu.inc @@ -22,7 +22,7 @@ DESCRIPTION = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT_ROOTFS', True) == BOOTFS_EXT ?= ".boot.vfat" BOOTFS_EXT_ccimx6ul ?= ".boot.ubifs" -ROOTFS_EXT ?= ".ext4" +ROOTFS_EXT ?= ".ext4.gz" ROOTFS_EXT_ccimx6ul ?= ".ubifs" BOOT_DEV_NAME ?= "/dev/mmcblk0p1" From bf67c2eef4585a0a3fa55306b2ab5ca0d0f49c89 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Tue, 29 Jun 2021 12:44:57 +0200 Subject: [PATCH 21/34] u-boot-dey: add image decompression logic to UUU installation scripts We document how to use this script from the Yocto image directory. Now that the *.ext4 files are compressed by default, the script needs to automatically decompress said files before starting the update process. https://onedigi.atlassian.net/browse/DEL-7582 Signed-off-by: Gabriel Valcazar --- .../u-boot-dey/ccimx8m/install_linux_fw_uuu.sh | 17 +++++++++++++++++ .../u-boot-dey/ccimx8x/install_linux_fw_uuu.sh | 17 +++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh index 48ecd611a..811f895cb 100755 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh @@ -101,6 +101,18 @@ INSTALL_LINUX_FILENAME="${BASEFILENAME}-##MACHINE##.boot.vfat" INSTALL_RECOVERY_FILENAME="${BASEFILENAME}-##MACHINE##.recovery.vfat" INSTALL_ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4" +COMPRESSED_ROOTFS_IMAGE="${INSTALL_ROOTFS_FILENAME}.gz" + +# If the rootfs image is compressed, make sure to decompress it before the update +if [ -f ${COMPRESSED_ROOTFS_IMAGE} ] && [ ! -f ${INSTALL_ROOTFS_FILENAME} ]; then + echo "\033[36m" + echo "=====================================================================================" + echo "Decompressing rootfs image '${COMPRESSED_ROOTFS_IMAGE}'" + echo "=====================================================================================" + echo "\033[0m" + gzip -d -k -f "${COMPRESSED_ROOTFS_IMAGE}" +fi + # Verify existance of files before starting the update FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME} ${INSTALL_ROOTFS_FILENAME}" for f in ${FILES}; do @@ -198,6 +210,11 @@ part_update "recovery" "${INSTALL_RECOVERY_FILENAME}" # Update Rootfs part_update "rootfs" "${INSTALL_ROOTFS_FILENAME}" +# If the rootfs image was originally compressed, remove the uncompressed image +if [ -f ${COMPRESSED_ROOTFS_IMAGE} ] && [ -f ${INSTALL_ROOTFS_FILENAME} ]; then + rm -f "${INSTALL_ROOTFS_FILENAME}" +fi + # Configure u-boot to boot into recovery mode uuu fb: ucmd setenv boot_recovery yes uuu fb: ucmd setenv recovery_command wipe_update diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh index 6748d1095..a07ed7777 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh @@ -163,6 +163,18 @@ INSTALL_LINUX_FILENAME="${BASEFILENAME}-##MACHINE##.boot.vfat" INSTALL_RECOVERY_FILENAME="${BASEFILENAME}-##MACHINE##.recovery.vfat" INSTALL_ROOTFS_FILENAME="${BASEFILENAME}-##MACHINE##.ext4" +COMPRESSED_ROOTFS_IMAGE="${INSTALL_ROOTFS_FILENAME}.gz" + +# If the rootfs image is compressed, make sure to decompress it before the update +if [ -f ${COMPRESSED_ROOTFS_IMAGE} ] && [ ! -f ${INSTALL_ROOTFS_FILENAME} ]; then + echo "\033[36m" + echo "=====================================================================================" + echo "Decompressing rootfs image '${COMPRESSED_ROOTFS_IMAGE}'" + echo "=====================================================================================" + echo "\033[0m" + gzip -d -k -f "${COMPRESSED_ROOTFS_IMAGE}" +fi + # Verify existance of files before starting the update FILES="${INSTALL_UBOOT_FILENAME} ${INSTALL_LINUX_FILENAME} ${INSTALL_RECOVERY_FILENAME} ${INSTALL_ROOTFS_FILENAME}" for f in ${FILES}; do @@ -260,6 +272,11 @@ part_update "recovery" "${INSTALL_RECOVERY_FILENAME}" # Update Rootfs part_update "rootfs" "${INSTALL_ROOTFS_FILENAME}" +# If the rootfs image was originally compressed, remove the uncompressed image +if [ -f ${COMPRESSED_ROOTFS_IMAGE} ] && [ -f ${INSTALL_ROOTFS_FILENAME} ]; then + rm -f "${INSTALL_ROOTFS_FILENAME}" +fi + # Configure u-boot to boot into recovery mode uuu fb: ucmd setenv boot_recovery yes uuu fb: ucmd setenv recovery_command wipe_update From adb00d0f490f1a745c1e0bf0fce9d02833f5fc4a Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 29 Jun 2021 19:11:52 +0200 Subject: [PATCH 22/34] meta-digi: Add Edge TPU Keyphrase Detector example Split each example in a different recipe. https://onedigi.atlassian.net/browse/DEL-7592 Signed-off-by: Arturo Buzarra --- ...amples_git.bb => libedgetpu-camera_git.bb} | 11 ++++--- .../libedgetpu/libedgetpu-keyword_git.bb | 33 +++++++++++++++++++ 2 files changed, 39 insertions(+), 5 deletions(-) rename meta-digi-arm/recipes-bsp/libedgetpu/{libedgetpu-examples_git.bb => libedgetpu-camera_git.bb} (67%) create mode 100644 meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-keyword_git.bb diff --git a/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-examples_git.bb b/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-camera_git.bb similarity index 67% rename from meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-examples_git.bb rename to meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-camera_git.bb index f505fa88c..eb5ce2ab5 100644 --- a/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-examples_git.bb +++ b/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-camera_git.bb @@ -23,12 +23,13 @@ do_configure() { do_install() { # Install Gstreamer examples install -d ${D}/opt/libedgetpu - install -d ${D}/opt/libedgetpu/all_models - install -d ${D}/opt/libedgetpu/gstreamer + install -d ${D}/opt/libedgetpu/camera + install -d ${D}/opt/libedgetpu/camera/all_models + install -d ${D}/opt/libedgetpu/camera/gstreamer rm -f ${S}/gstreamer/install_requirements.sh - install -m 0555 ${S}/all_models/* ${D}/opt/libedgetpu/all_models/ - install -m 0555 ${S}/gstreamer/* ${D}/opt/libedgetpu/gstreamer/ + install -m 0555 ${S}/all_models/* ${D}/opt/libedgetpu/camera/all_models/ + install -m 0555 ${S}/gstreamer/* ${D}/opt/libedgetpu/camera/gstreamer/ } -FILES_${PN} += "/opt/libedgetpu/* \ +FILES_${PN} += "/opt/libedgetpu/camera/* \ " diff --git a/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-keyword_git.bb b/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-keyword_git.bb new file mode 100644 index 000000000..7915f82d9 --- /dev/null +++ b/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-keyword_git.bb @@ -0,0 +1,33 @@ +SUMMARY = "Edge TPU keyphrase detector" +HOMEPAGE = "https://coral.ai/examples" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRCREV = "43a5fd0578c75c9140b4f057de74f2dbac96ceff" +SRC_URI = "git://github.com/google-coral/project-keyword-spotter.git;protocol=https" + +S = "${WORKDIR}/git" + +RDEPENDS_${PN} = "python3-pycoral \ + python3-pyaudio \ +" + +do_install() { + # Install Gstreamer examples + install -d ${D}/opt/libedgetpu + install -d ${D}/opt/libedgetpu/keyword + install -d ${D}/opt/libedgetpu/keyword/models + install -d ${D}/opt/libedgetpu/keyword/config + + install -m 0555 ${S}/models/* ${D}/opt/libedgetpu/keyword/models/ + install -m 0555 ${S}/run_model.py ${D}/opt/libedgetpu/keyword + install -m 0555 ${S}/mel_features.py ${D}/opt/libedgetpu/keyword + install -m 0555 ${S}/model.py ${D}/opt/libedgetpu/keyword + install -m 0555 ${S}/audio_recorder.py ${D}/opt/libedgetpu/keyword + + install -m 0555 ${S}/config/labels_gc2.raw.txt ${D}/opt/libedgetpu/keyword/config + install -m 0555 ${S}/config/commands_v2.txt ${D}/opt/libedgetpu/keyword/config +} + +FILES_${PN} += "/opt/libedgetpu/keyword/* \ +" From e405acfd7d160fc72cc825ff9e33f1a4ee2ddca2 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Wed, 30 Jun 2021 16:58:48 +0200 Subject: [PATCH 23/34] cloudconnector: add swupdate dependencies to build on-the-fly support Signed-off-by: Mike Engel --- meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index d5501cdd7..8ec9448fb 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" -DEPENDS = "confuse openssl recovery-utils zlib" +DEPENDS = "confuse openssl recovery-utils swupdate zlib" SRCBRANCH = "master" SRCREV = "${AUTOREV}" From f3791f3bc393f9b2c3e3f79c0156f865ddff4ac4 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Wed, 30 Jun 2021 20:17:13 +0200 Subject: [PATCH 24/34] meta-digi: Add Edge TPU Person segmentation example https://onedigi.atlassian.net/browse/DEL-7603 Signed-off-by: Arturo Buzarra --- .../libedgetpu/libedgetpu-bodypix_git.bb | 36 ++++++++++++++ .../python3-scipy/python3-scipy_1.7.0.bb | 48 +++++++++++++++++++ .../python3-svgwrite_1.4.1.bb | 13 +++++ 3 files changed, 97 insertions(+) create mode 100644 meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-bodypix_git.bb create mode 100644 meta-digi-dey/recipes-devtools/python3-scipy/python3-scipy_1.7.0.bb create mode 100644 meta-digi-dey/recipes-devtools/python3-svgwrite/python3-svgwrite_1.4.1.bb diff --git a/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-bodypix_git.bb b/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-bodypix_git.bb new file mode 100644 index 000000000..7e5599657 --- /dev/null +++ b/meta-digi-arm/recipes-bsp/libedgetpu/libedgetpu-bodypix_git.bb @@ -0,0 +1,36 @@ +SUMMARY = "Edge TPU keyphrase detector" +HOMEPAGE = "https://coral.ai/examples" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +SRCREV = "655a354df5f939602ff6b9da2cbc4d2c78898107" +SRC_URI = "git://github.com/google-coral/project-bodypix.git;protocol=https" + +S = "${WORKDIR}/git" + +RDEPENDS_${PN} = "python3-pycoral \ + python3-svgwrite \ + python3-scipy \ + libusb1 \ +" + +do_install() { + # Install Gstreamer examples + install -d ${D}/opt/libedgetpu + install -d ${D}/opt/libedgetpu/bodypix + install -d ${D}/opt/libedgetpu/bodypix/models + install -d ${D}/opt/libedgetpu/bodypix/posenet_lib + install -d ${D}/opt/libedgetpu/bodypix/posenet_lib/aarch64 + + install -m 0555 ${S}/models/bodypix_mobilenet* ${D}/opt/libedgetpu/bodypix/models/ + install -m 0555 ${S}/bodypix.py ${D}/opt/libedgetpu/bodypix + install -m 0555 ${S}/gstreamer.py ${D}/opt/libedgetpu/bodypix + install -m 0555 ${S}/pose_engine.py ${D}/opt/libedgetpu/bodypix + + install -m 0555 ${S}/posenet_lib/aarch64/posenet_decoder.so ${D}/opt/libedgetpu/bodypix/posenet_lib/aarch64 +} + +FILES_${PN} += "/opt/libedgetpu/bodypix/* \ +" + +INSANE_SKIP_${PN} += "already-stripped" diff --git a/meta-digi-dey/recipes-devtools/python3-scipy/python3-scipy_1.7.0.bb b/meta-digi-dey/recipes-devtools/python3-scipy/python3-scipy_1.7.0.bb new file mode 100644 index 000000000..74fb1c86b --- /dev/null +++ b/meta-digi-dey/recipes-devtools/python3-scipy/python3-scipy_1.7.0.bb @@ -0,0 +1,48 @@ +DESCRIPTION = "Open-source software for mathematics, science, and engineering. It includes modules for statistics, optimization, integration, linear algebra, Fourier transforms, signal and image processing, ODE solvers, and more." +SECTION = "devel/python" +HOMEPAGE = "https://www.scipy.org" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://${S}/scipy-1.7.0.dist-info/LICENSE.txt;md5=caecddab96f03de0092b62333ea77f91" + +PYTHON_PACKAGE = "scipy-1.7.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl" + +SRC_URI = "https://files.pythonhosted.org/packages/d0/8d/3dbb59d78218b6a76f1ddb55db60ea5459fa7968655acb21252a59a10bc3/${PYTHON_PACKAGE};subdir=${BP}" +SRC_URI[md5sum] = "e2e369078c6b7ca29c952cb9971bc154" +SRC_URI[sha256sum] = "bd4399d4388ca0239a4825e312b3e61b60f743dd6daf49e5870837716502a92a" + +DEPENDS = "python3 python3-pip-native python3-wheel-native" + +RDEPENDS_${PN} = "${PYTHON_PN} \ + ${PYTHON_PN}-numpy \ +" +RPROVIDES_${PN} += "\ + libgfortran-daac5196.so.5.0.0(GFORTRAN_8)(64bit) \ +" + +inherit python3native + +do_unpack[depends] += "unzip-native:do_populate_sysroot" + +do_unpack_extra(){ + [ -d ${S} ] || mkdir -p ${S} + cd ${S} + unzip -q -o ${S}/${PYTHON_PACKAGE} -d ${S} +} +addtask unpack_extra after do_unpack before do_patch + +do_install() { + # Install pip package + install -d ${D}/${PYTHON_SITEPACKAGES_DIR} + ${STAGING_BINDIR_NATIVE}/pip3 install --disable-pip-version-check -v \ + -t ${D}/${PYTHON_SITEPACKAGES_DIR} --no-cache-dir --no-deps \ + ${WORKDIR}/${BP}/scipy-*.whl +} + +FILES_${PN} += "\ + ${libdir}/${PYTHON_DIR}/site-packages/* \ +" + +INSANE_SKIP_${PN} += "already-stripped" + +COMPATIBLE_MACHINE = "(-)" +COMPATIBLE_MACHINE_aarch64 = "(.*)" diff --git a/meta-digi-dey/recipes-devtools/python3-svgwrite/python3-svgwrite_1.4.1.bb b/meta-digi-dey/recipes-devtools/python3-svgwrite/python3-svgwrite_1.4.1.bb new file mode 100644 index 000000000..27bebf2dd --- /dev/null +++ b/meta-digi-dey/recipes-devtools/python3-svgwrite/python3-svgwrite_1.4.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Python library to create SVG drawings" +SECTION = "devel/python" +HOMEPAGE = "https://github.com/mozman/svgwrite" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=3e14f2d1a8674ddcbbd8b51762250049" + +inherit pypi setuptools3 + +PYPI_PACKAGE = "svgwrite" +PYPI_PACKAGE_EXT = "zip" + +SRC_URI[md5sum] = "6132f0d8611ac0d5a8a8731636aa03f8" +SRC_URI[sha256sum] = "e220a4bf189e7e214a55e8a11421d152b5b6fb1dd660c86a8b6b61fe8cc2ac48" From 7531148b9da63a26efab340dcef3aaa6dcb37eca Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Fri, 2 Jul 2021 14:38:59 +0200 Subject: [PATCH 25/34] meta-digi: prepare for dey-3.2-r1.1 Signed-off-by: Gonzalo Ruiz --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 5c60d3dd1..8f5f848f8 100644 --- a/README.md +++ b/README.md @@ -115,6 +115,13 @@ Documentation is available online at https://www.digi.com/resources/documentatio * Updated busybox to v1.32.0 * Updated NetworkManager to v1.22.14 * Package upgrades and security fixes +* Added support for Dual boot mechanism +* Added support for Google Coral AI devices +* Trustfence: added support for generic partition encryption +* MCA: added support for GPIO-refreshed watchdog +* Improved WebKit performance +* Improved installation scripts +* Updated CC6UL RF calibration # Known Issues and Limitations From d98487a3098fab431d6801ca56164ae90937fcbd Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Fri, 2 Jul 2021 14:42:09 +0200 Subject: [PATCH 26/34] meta-digi: update revisions for dey-3.2-r1.1 Signed-off-by: Gonzalo Ruiz --- 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_2020.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 ++-- 9 files changed, 15 insertions(+), 15 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 3732e1caa..7f2675778 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 46d81582d..40a6fd97c 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,7 +3,7 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "31e1721d47b6b045af59fb2dedcb75a1456a8071" # Disable support to initial environment for U-Boot UBOOT_INITIAL_ENV = "" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb index 94b7ce03c..e32662a41 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2020.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "b94328749d34d95d0902ff43e9adf8898061fb62" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m|ccimx6ul)" 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 97cee424b..52dac91e7 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 = "v2020.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "b94328749d34d95d0902ff43e9adf8898061fb62" 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 46809973d..c082595fb 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.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "6ea9a55b5e1023959588235c9f9a19d1e63bb21b" 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 407f673c7..021bb6de3 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" SRCBRANCH = "v5.4/dey-3.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "43e12e2c1baaaf2532f453cbb9f83c5d4aee2b96" # 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 8ec9448fb..177819170 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 swupdate zlib" SRCBRANCH = "master" -SRCREV = "${AUTOREV}" +SRCREV = "8086df3e607770d76005a8fbb3bcdbc36d01235b" 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 c138dad14..f88fb8eb8 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-2021 Digi International Inc. SRCBRANCH = "dey-3.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "c8257ea56e2758d81824627bec668184b80bcacb" 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 221eceaee..9a12fd7af 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.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "4b8d7d93dc285bb81401acfcb8243e69daabc976" 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 95c8629cba2fa9f90c881cc35398b6c686b522a6 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Fri, 2 Jul 2021 14:42:19 +0200 Subject: [PATCH 27/34] meta-digi: revert revisions to AUTOREV Signed-off-by: Gonzalo Ruiz --- 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_2020.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 ++-- 9 files changed, 15 insertions(+), 15 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 7f2675778..3732e1caa 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 40a6fd97c..46d81582d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,7 +3,7 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "31e1721d47b6b045af59fb2dedcb75a1456a8071" +SRCREV = "${AUTOREV}" # Disable support to initial environment for U-Boot UBOOT_INITIAL_ENV = "" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb index e32662a41..94b7ce03c 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2020.04/maint" -SRCREV = "b94328749d34d95d0902ff43e9adf8898061fb62" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m|ccimx6ul)" 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 52dac91e7..97cee424b 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 = "v2020.04/maint" -SRCREV = "b94328749d34d95d0902ff43e9adf8898061fb62" +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 c082595fb..46809973d 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.2/maint" -SRCREV = "6ea9a55b5e1023959588235c9f9a19d1e63bb21b" +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 021bb6de3..407f673c7 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" SRCBRANCH = "v5.4/dey-3.2/maint" -SRCREV = "43e12e2c1baaaf2532f453cbb9f83c5d4aee2b96" +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 177819170..8ec9448fb 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 swupdate zlib" SRCBRANCH = "master" -SRCREV = "8086df3e607770d76005a8fbb3bcdbc36d01235b" +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 f88fb8eb8..c138dad14 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-2021 Digi International Inc. SRCBRANCH = "dey-3.2/maint" -SRCREV = "c8257ea56e2758d81824627bec668184b80bcacb" +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 9a12fd7af..221eceaee 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.2/maint" -SRCREV = "4b8d7d93dc285bb81401acfcb8243e69daabc976" +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 7d3c5bcccf366d52c76a3973becdb628bc3378ed Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 5 Jul 2021 14:34:06 +0200 Subject: [PATCH 28/34] u-boot-dey: install-uuu: fix bash-ism in condition that checks the variant The current syntax only works properly when running the script through bash. Change this so that it works for other shells as well. While at it, fix a typo in the message that appears when the variant can't be detected in the 6UL script. Signed-off-by: Gabriel Valcazar --- .../u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh | 4 ++-- .../u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh index 1dedc6e9b..d093a4792 100755 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ul/install_linux_fw_uuu.sh @@ -87,7 +87,7 @@ uuu fb: ucmd setenv stdout serial,fastboot if [ -z "${INSTALL_UBOOT_FILENAME}" ]; then module_variant=$(getenv "module_variant") # Determine U-Boot file to program basing on SOM's variant - if [ -n "$module_variant" || "$module_variant" = "0x00" ]; then + if [ -n "$module_variant" ] || [ "$module_variant" = "0x00" ]; then if [ "$module_variant" = "0x08" ] || \ [ "$module_variant" = "0x09" ]; then INSTALL_UBOOT_FILENAME="u-boot-##MACHINE##512MB.imx" @@ -110,7 +110,7 @@ if [ -z "${INSTALL_UBOOT_FILENAME}" ]; then echo "" echo "[ERROR] Cannot determine U-Boot file for this module!" echo "" - echo "1. Add U-boot file name, depending on your ConnectCore 8X variant, to script command line:" + echo "1. Add U-boot file name, depending on your ConnectCore 6UL variant, to script command line:" echo " - For a SOM with 1GB DDR3, run:" echo " => ./install_linux_fw_uuu.sh -u u-boot-##MACHINE##1GB.imx" echo " - For a SOM with 512MB DDR3, run:" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh index a07ed7777..cbe7960d7 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh @@ -101,7 +101,7 @@ if [ -z ${INSTALL_UBOOT_FILENAME} ]; then if [ -z "${module_ram}" ]; then module_variant=$(getenv "module_variant") # Determine U-Boot file to program basing on SOM's variant - if [ -n "$module_variant" || "$module_variant" = "0x00" ]; then + if [ -n "$module_variant" ] || [ "$module_variant" = "0x00" ]; then if [ "$module_variant" = "0x01" ] || \ [ "$module_variant" = "0x04" ] || \ [ "$module_variant" = "0x05" ]; then From a800fdb555edfc83ff9c60a67ecc0a21a399fe3b Mon Sep 17 00:00:00 2001 From: Hector Bujanda Date: Mon, 5 Jul 2021 20:00:50 +0200 Subject: [PATCH 29/34] mca-tool: update to v1.24 Includes: - add support for getting properties from the ROM bootloader. - flash layout extra check by asking flash size to the MCA bootloader. - flash layout extra check by asking flash size to the MCA. Signed-off-by: Hector Bujanda --- .../mca/{mca-tool_1.23.bb => mca-tool_1.24.bb} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename meta-digi-arm/recipes-digi/mca/{mca-tool_1.23.bb => mca-tool_1.24.bb} (62%) diff --git a/meta-digi-arm/recipes-digi/mca/mca-tool_1.23.bb b/meta-digi-arm/recipes-digi/mca/mca-tool_1.24.bb similarity index 62% rename from meta-digi-arm/recipes-digi/mca/mca-tool_1.23.bb rename to meta-digi-arm/recipes-digi/mca/mca-tool_1.24.bb index 97dae5aed..5db9fd18f 100644 --- a/meta-digi-arm/recipes-digi/mca/mca-tool_1.23.bb +++ b/meta-digi-arm/recipes-digi/mca/mca-tool_1.24.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] = "eeb242ee2baeda8a9a1a48dea634b6ea" -SRC_URI[arm.sha256sum] = "40794e0c3baad39b04f2d1640c29620a08036fb36b18583d4f7828fe860bcd89" +SRC_URI[arm.md5sum] = "bbeded0a955a026d302cd4ee212d920e" +SRC_URI[arm.sha256sum] = "33de60f59bfa3e4b867bd872f05413a823852a1e33b21efcddd714454978bb9a" # AARCH64 tarball SRC_URI_aarch64 = "${DIGI_PKG_SRC}/${PKGNAME}-${PV}-${TUNE_ARCH}.tar.gz;name=aarch64" -SRC_URI[aarch64.md5sum] = "bd90f295095fead2e58bfa2f6b995c8f" -SRC_URI[aarch64.sha256sum] = "64dd676dff0ffee143d22268e0512b40fe428ecf8b5e31496f738fb9b1a8a01f" +SRC_URI[aarch64.md5sum] = "cf64de7f5aad9cd6a102afd18aebd8bb" +SRC_URI[aarch64.sha256sum] = "c4652b8c0dd54315d7890c47798199948ea595a7dea8de5b6d68a1bfd3853557" S = "${WORKDIR}/${PKGNAME}-${PV}" From afb57ef521a387a22fef24f38ba7c836b3abe82f Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Mon, 5 Jul 2021 18:14:56 +0200 Subject: [PATCH 30/34] cloudconnector: move swupdate dependencies into meta-digi-dualboot layer Signed-off-by: Mike Engel --- meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index 8ec9448fb..d5501cdd7 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" -DEPENDS = "confuse openssl recovery-utils swupdate zlib" +DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" SRCREV = "${AUTOREV}" From 7076d9f24e2580eb42495bd3d544f7e026d0dd0f Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Tue, 6 Jul 2021 18:08:36 +0200 Subject: [PATCH 31/34] install_linux_fw_uuu: reconfigure fastboot after partitioning Fastboot is configured on boot with the current MMC configuration. If we create a GPT partition table, we need to restart fastboot before we try to program any partition with the 'flash' fastboot command. Set 'fastboot_dev' to a different device, 'sata' for example an back to 'mmc' to trigger a fastboot restart after creating the partition table on blank devices. Signed-off-by: Gonzalo Ruiz --- .../u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh | 4 ++++ .../u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh index 811f895cb..3f023b794 100755 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh @@ -201,6 +201,10 @@ uuu fb: acmd reset # Wait for the target to reset sleep 3 +# Restart fastboot with the latest MMC partition configuration +uuu fb: ucmd setenv fastboot_dev sata +uuu fb: ucmd setenv fastboot_dev mmc + # Update Linux part_update "linux" "${INSTALL_LINUX_FILENAME}" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh index cbe7960d7..d86079624 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/install_linux_fw_uuu.sh @@ -260,6 +260,10 @@ uuu fb: acmd reset # Wait for the target to reset sleep 3 +# Restart fastboot with the latest MMC partition configuration +uuu fb: ucmd setenv fastboot_dev sata +uuu fb: ucmd setenv fastboot_dev mmc + # Set fastboot buffer address to $loadaddr, just in case uuu fb: ucmd setenv fastboot_buffer \${loadaddr} From 534df51e1c495c4383e9355fe0a0830dd4e252c8 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Tue, 6 Jul 2021 18:12:08 +0200 Subject: [PATCH 32/34] install_linux_fw_uuu: cc8m: ensure fastboot_buffer value This command was already present on the script used for CC8X. Add it here so the scripts are as much alike as possible. Signed-off-by: Gonzalo Ruiz --- .../u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh index 3f023b794..3543c2d77 100755 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8m/install_linux_fw_uuu.sh @@ -205,6 +205,9 @@ sleep 3 uuu fb: ucmd setenv fastboot_dev sata uuu fb: ucmd setenv fastboot_dev mmc +# Set fastboot buffer address to $loadaddr, just in case +uuu fb: ucmd setenv fastboot_buffer \${loadaddr} + # Update Linux part_update "linux" "${INSTALL_LINUX_FILENAME}" From 1a23e5f24986b5a597c5fbe4afbda7851dd98b18 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Wed, 7 Jul 2021 12:34:53 +0200 Subject: [PATCH 33/34] meta-digi: prepare for dey-3.2-r1.2 Add scfw, mca-tool and trustfence-tool version updates to changelog. Update OpenSSL version to v1.1.1k in the changelog. Signed-off-by: Gonzalo Ruiz --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8f5f848f8..fb6d50069 100644 --- a/README.md +++ b/README.md @@ -111,10 +111,13 @@ Documentation is available online at https://www.digi.com/resources/documentatio * Updated Qt 5.15.2 * Updated bluez5 to v5.55 * Updated gstreamer1.0 to v1.16.3 - * Updated OpenSSL to v1.1.1i + * Updated OpenSSL to v1.1.1k * Updated busybox to v1.32.0 * Updated NetworkManager to v1.22.14 * Package upgrades and security fixes +* Updated i.MX8 SCU firmware to v1.7.1.1 +* Updated mca-tool to v1.24 +* Updated trustfence-tool to v2.5 * Added support for Dual boot mechanism * Added support for Google Coral AI devices * Trustfence: added support for generic partition encryption From aa92d2d13acf35a5ffc04a7e8b74a5096b2b0b7a Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Wed, 7 Jul 2021 12:36:11 +0200 Subject: [PATCH 34/34] meta-digi: update revisions for dey-3.2-r1.2 Signed-off-by: Gonzalo Ruiz --- 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_2020.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 ++-- 9 files changed, 15 insertions(+), 15 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 3732e1caa..7f2675778 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 46d81582d..40a6fd97c 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,7 +3,7 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "31e1721d47b6b045af59fb2dedcb75a1456a8071" # Disable support to initial environment for U-Boot UBOOT_INITIAL_ENV = "" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb index 94b7ce03c..e32662a41 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2020.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2020.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "b94328749d34d95d0902ff43e9adf8898061fb62" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m|ccimx6ul)" 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 97cee424b..52dac91e7 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 = "v2020.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "b94328749d34d95d0902ff43e9adf8898061fb62" 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 46809973d..c082595fb 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.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "6ea9a55b5e1023959588235c9f9a19d1e63bb21b" 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 407f673c7..021bb6de3 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -5,10 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" SRCBRANCH = "v5.4/dey-3.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "43e12e2c1baaaf2532f453cbb9f83c5d4aee2b96" # 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..bb00811de 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 = "1986e2c8ad759e0d8d0037a9462875f6d082d323" 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 c138dad14..f88fb8eb8 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-2021 Digi International Inc. SRCBRANCH = "dey-3.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "c8257ea56e2758d81824627bec668184b80bcacb" 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 221eceaee..9a12fd7af 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.2/maint" -SRCREV = "${AUTOREV}" +SRCREV = "4b8d7d93dc285bb81401acfcb8243e69daabc976" 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 \