From c4932093f2cad16ddbcba7013fe3f4fca4e7eed2 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Wed, 15 Jul 2020 06:44:36 +0200 Subject: [PATCH 01/63] ccimx8x: add missing HDMI bridge overlay to KERNEL_DEVICETREE MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reported-by: Alfonso Martín Rey Signed-off-by: Hector Palacios --- meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf index 358bb6d4f..86bb396ad 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf @@ -19,6 +19,7 @@ KERNEL_DEVICETREE ?= " \ digi/ccimx8x_ov_wifi.dtbo \ digi/ccimx8x-sbc-pro_ov_flexcan1.dtbo \ digi/ccimx8x-sbc-pro_ov_lpuart3.dtbo \ + digi/ccimx8x-sbc-pro_ov_lt9812-hdmi-dsi0.dtbo \ digi/ccimx8x-sbc-pro_ov_lvds1.dtbo \ digi/ccimx8x-sbc-pro_ov_parallel-camera.dtbo \ digi/ccimx8x-sbc-pro_ov_pcie-card.dtbo \ From f8e6bf523e846f2c6e86f04c4c42ae8db641927a Mon Sep 17 00:00:00 2001 From: Francisco Gil Martinez Date: Wed, 22 Jul 2020 15:45:59 +0200 Subject: [PATCH 02/63] libdigiapix: spi: fix wrong index in configuration files Since kernel 5.4 the index was set to 0 instead of 32766 Signed-off-by: Francisco Gil Martinez --- .../libdigiapix-git/ccimx8x-sbc-express/libdigiapix.conf | 2 +- .../libdigiapix-git/ccimx8x-sbc-pro/libdigiapix.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-express/libdigiapix.conf b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-express/libdigiapix.conf index b58d4c589..be39d1709 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-express/libdigiapix.conf +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-express/libdigiapix.conf @@ -17,7 +17,7 @@ DEFAULT_I2C_BUS = 1 [SPI] # SPI-3 on Expansion connector. -DEFAULT_SPI = 32766,0 +DEFAULT_SPI = 0,0 [PWM] diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-pro/libdigiapix.conf b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-pro/libdigiapix.conf index 16e62818c..b5a8f6c4b 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-pro/libdigiapix.conf +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-pro/libdigiapix.conf @@ -21,7 +21,7 @@ DEFAULT_I2C_BUS = 3 [SPI] # SPI-0 on Expansion connector. -DEFAULT_SPI = 32766,0 +DEFAULT_SPI = 0,0 [PWM] From f6a8de006791184b0087143ef8759e38a0f2e8b9 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Thu, 16 Jul 2020 08:17:32 +0200 Subject: [PATCH 03/63] sysinfo: adapt script after removal of deprecated fsl_otp driver - OTP section - Use just one fixed path to the OTP nvmem device descriptor (instead of a loop). - Use '-v' for dumping all values with hexdump. - TrustFence section - For cc8x, determine if the device is closed by checking a new boolean property on the DT: digi,tf-open|closed - For the rest, check the SEC_CONFIG[1] bit using the new nvmem descriptor. - Change log from 'Device status' to 'Security status' - Report UNKNOWN if nvmem device does not exist. Signed-off-by: Hector Palacios https://jira.digi.com/browse/DEL-7185 --- .../recipes-digi/sysinfo/sysinfo/sysinfo | 39 ++++++++++++------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo b/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo index 03f93b264..ca3e7cd44 100755 --- a/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo +++ b/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo @@ -235,18 +235,17 @@ make_report(){ echo "- -" echo "--------------------------------------" echo "" - if [ -d /sys/fsl_otp ]; then - for f in /sys/fsl_otp/*; do - echo -e "$f:\t$(cat $f)" - done + if grep -qs '\' /proc/device-tree/compatible; then + OTP_PATH="/sys/devices/platform/scu/scu\:imx8qx-ocotp/imx-scu-ocotp0" + else + OTP_PATH="/sys/bus/nvmem/devices/imx-ocotp0" + fi + + if [ -e ${OTP_PATH}/nvmem ]; then + echo "${OTP_PATH}:" + hexdump -C -v ${OTP_PATH}/nvmem echo "" fi - for d in /sys/bus/nvmem/devices/imx-ocotp*; do - [ -e $d ] || continue - echo "$d:" - hexdump -C $d/nvmem - echo "" - done echo "--------------------------------------" echo "- -" @@ -255,11 +254,23 @@ make_report(){ echo "--------------------------------------" echo "" - if [ -e /sys/fsl_otp/HW_OCOTP_CFG5 ]; then - if [ "$(($(cat /sys/fsl_otp/HW_OCOTP_CFG5) & 2))" != "0" ]; then - echo "Device status: [CLOSED]" + if grep -qs '\' /proc/device-tree/compatible; then + if [ -f "/proc/device-tree/digi,tf-closed" ]; then + echo "Security status: [CLOSED]" + elif [ -f "/proc/device-tree/digi,tf-open" ]; then + echo "Security status: [OPEN]" + fi + else + if [ -e ${OTP_PATH}/nvmem ]; then + # Check SEC_CONFIG on OCOTP_CFG5 (ADDR=6) bit 1. + SEC_CONFIG_WORD=$(dd if=${OTP_PATH}/nvmem of=/dev/stdout bs=4 skip=6 count=1 status=none | hexdump -n 4 -v -e '1/4 "%08x\n"') + if [ "$((${SEC_CONFIG_WORD} & 0x2))" != "0" ]; then + echo "Security status: [CLOSED]" + else + echo "Security status: [OPEN]" + fi else - echo "Device status: [OPEN]" + echo "Security status: [UNKNOWN]" fi fi From 8ced3627660ac5b443e959cf7ce9747e259dd767 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Fri, 17 Jul 2020 11:36:34 +0200 Subject: [PATCH 04/63] u-boot-fw-utils: update patch to support encrypted env The encryption of the U-Boot environment uses the HWID as key modifier. The HWID was being read using the fsl_otp driver sysfs entries and over two words. The driver is now deprecated and also the cc8x and cc8m platforms have different number of HWID words. This patch modifies the function that reads the HWID words by using new entries on the device tree 'digi,hwid_X' where X is the index of the HWID word. It also removes the need to select CONFIG_MD5 which is already auto-selected on sandbox_defconfig by other config switches. Signed-off-by: Hector Palacios https://jira.digi.com/browse/DEL-7185 --- ...ent-support-for-environment-encrypti.patch | 93 +++++++++---------- 1 file changed, 44 insertions(+), 49 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-implement-support-for-environment-encrypti.patch b/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-implement-support-for-environment-encrypti.patch index 126e7804f..f16b37ed5 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-implement-support-for-environment-encrypti.patch +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-implement-support-for-environment-encrypti.patch @@ -1,31 +1,25 @@ -From: "Diaz de Grenu, Jose" -Date: Tue, 23 Aug 2016 13:05:05 +0200 -Subject: [PATCH 1/4] tools: env: implement support for environment encryption - by CAAM +From: Hector Palacios +Date: Fri, 17 Jul 2020 07:08:50 +0200 +Subject: [PATCH] tools: env: implement support for environment encryption by + CAAM -https://jira.digi.com/browse/DEL-2836 +Use the md5sum of HWID words (on the device tree) as key modifier. Signed-off-by: Diaz de Grenu, Jose Signed-off-by: Gonzalo Ruiz +Signed-off-by: Hector Palacios + +https://jira.digi.com/browse/DEL-7185 +https://jira.digi.com/browse/DEL-2836 --- - configs/sandbox_defconfig | 1 + - tools/env/Makefile | 2 +- - tools/env/caam_keyblob.h | 45 ++++++++++++ - tools/env/fw_env.c | 140 ++++++++++++++++++++++++++++++++++++++ - 4 files changed, 187 insertions(+), 1 deletion(-) + tools/env/Makefile | 2 +- + tools/env/caam_keyblob.h | 45 +++++++++++++ + tools/env/fw_env.c | 141 +++++++++++++++++++++++++++++++++++++++ + 3 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 tools/env/caam_keyblob.h -diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig -index 6894262b89..f01e70b1c4 100644 ---- a/configs/sandbox_defconfig -+++ b/configs/sandbox_defconfig -@@ -219,3 +219,4 @@ CONFIG_TEST_FDTDEC=y - CONFIG_UNIT_TEST=y - CONFIG_UT_TIME=y - CONFIG_UT_DM=y -+CONFIG_MD5=y diff --git a/tools/env/Makefile b/tools/env/Makefile -index b627796e94..fc7c44baa2 100644 +index b627796e949e..fc7c44baa2b7 100644 --- a/tools/env/Makefile +++ b/tools/env/Makefile @@ -24,7 +24,7 @@ hostprogs-y := fw_printenv @@ -39,7 +33,7 @@ index b627796e94..fc7c44baa2 100644 diff --git a/tools/env/caam_keyblob.h b/tools/env/caam_keyblob.h new file mode 100644 -index 0000000000..1cdf3946c1 +index 000000000000..1cdf3946c1ba --- /dev/null +++ b/tools/env/caam_keyblob.h @@ -0,0 +1,45 @@ @@ -89,7 +83,7 @@ index 0000000000..1cdf3946c1 + +#endif /* CAAM_KEYBLOB_H */ diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c -index eef12dd2b7..b804314093 100644 +index a5d75958e1b6..228d11c070e6 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -24,6 +24,7 @@ @@ -100,7 +94,7 @@ index eef12dd2b7..b804314093 100644 #include #include -@@ -37,9 +38,19 @@ +@@ -37,9 +38,17 @@ #include @@ -114,13 +108,11 @@ index eef12dd2b7..b804314093 100644 + */ +#define BLOB_OVERHEAD 48 +#define CAAM_KEY_DEV "/dev/caam_kb" -+ -+#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0])) + struct env_opts default_opts = { #ifdef CONFIG_FILE .config_file = CONFIG_FILE -@@ -117,6 +128,7 @@ static struct environment environment = { +@@ -117,6 +126,7 @@ static struct environment environment = { }; static int have_redund_env; @@ -128,7 +120,7 @@ index eef12dd2b7..b804314093 100644 static unsigned char active_flag = 1; /* obsolete_flag must be 0 to efficiently set it on NOR flash without erasing */ -@@ -442,6 +454,103 @@ char *fw_getdefenv(char *name) +@@ -442,6 +452,106 @@ char *fw_getdefenv(char *name) return NULL; } @@ -140,34 +132,37 @@ index eef12dd2b7..b804314093 100644 + caam_encryption_flag = 1; +} + ++#define MAX_HWID_WORDS 4 +static int env_caam_get_keymod(unsigned char output[16]) +{ + int i; + int len; + int fd; -+ char buff[32]; -+ uint32_t ocotp_hwid[2]; -+ const char *ocotp_hwid_file[2] = { -+ "/sys/fsl_otp/HW_OCOTP_MAC0", -+ "/sys/fsl_otp/HW_OCOTP_MAC1" -+ }; ++ uint32_t ocotp_hwid[MAX_HWID_WORDS]; ++ const char dt_prop[32]; + -+ for (i = 0; i < ARRAY_SIZE(ocotp_hwid); i++) { -+ fd = open(ocotp_hwid_file[i], O_RDONLY); -+ if (fd < 0) -+ return fd; -+ len = read(fd, buff, sizeof(buff)); -+ if (len < 0) { ++ for (i = 0; i < MAX_HWID_WORDS; i++) { ++ sprintf(dt_prop, "/proc/device-tree/digi,hwid_%d", i); ++ if (access(dt_prop, F_OK) != -1) { ++ char buf[sizeof(uint32_t)]; ++ ++ fd = open(dt_prop, O_RDONLY); ++ if (fd < 0) ++ return fd; ++ len = read(fd, buf, sizeof(uint32_t)); ++ if (len < 0) { ++ close(fd); ++ return -1; ++ } ++ ocotp_hwid[i] = ntohl(*(uint32_t *)buf); + close(fd); -+ return -1; ++ } else { ++ break; + } -+ /* drop last character (new line) */ -+ buff[len - 1] = '\0'; -+ ocotp_hwid[i] = strtoul(buff, NULL, 0); -+ close(fd); + } + -+ md5((unsigned char *)(&ocotp_hwid), sizeof(ocotp_hwid), output); ++ /* Calculate md5sum on the raw HWID array */ ++ md5((unsigned char *)(&ocotp_hwid), sizeof(uint32_t) * i, output); + + return 0; +} @@ -232,7 +227,7 @@ index eef12dd2b7..b804314093 100644 /* * Print the current definition of one, or more, or all * environment variables -@@ -505,9 +614,20 @@ int fw_printenv(int argc, char *argv[], int value_only, struct env_opts *opts) +@@ -505,9 +615,20 @@ int fw_printenv(int argc, char *argv[], int value_only, struct env_opts *opts) int fw_env_flush(struct env_opts *opts) { @@ -253,7 +248,7 @@ index eef12dd2b7..b804314093 100644 /* * Update CRC */ -@@ -1396,6 +1516,8 @@ int fw_env_open(struct env_opts *opts) +@@ -1396,6 +1517,8 @@ int fw_env_open(struct env_opts *opts) struct env_image_single *single; struct env_image_redundant *redundant; @@ -262,7 +257,7 @@ index eef12dd2b7..b804314093 100644 if (!opts) opts = &default_opts; -@@ -1434,6 +1556,15 @@ int fw_env_open(struct env_opts *opts) +@@ -1434,6 +1557,15 @@ int fw_env_open(struct env_opts *opts) crc0 = crc32(0, (uint8_t *)environment.data, ENV_SIZE); @@ -278,7 +273,7 @@ index eef12dd2b7..b804314093 100644 crc0_ok = (crc0 == *environment.crc); if (!have_redund_env) { if (!crc0_ok) { -@@ -1491,6 +1622,15 @@ int fw_env_open(struct env_opts *opts) +@@ -1491,6 +1623,15 @@ int fw_env_open(struct env_opts *opts) crc1 = crc32(0, (uint8_t *)redundant->data, ENV_SIZE); From fc1a73675826bd6abcb7e5ad72d48ffca84a28a7 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Fri, 17 Jul 2020 12:40:04 +0200 Subject: [PATCH 05/63] recovery: change the way to determine if the device is closed The old fsl_otp driver is deprecated and we need to determine if the device is closed using a new property of the device tree called 'digi,tf-closed'. Assume the device is open if the property is not found. Signed-off-by: Hector Palacios https://jira.digi.com/browse/DEL-7185 --- .../recovery-utils/lib/recovery.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/meta-digi-dey/recipes-core/recovery/recovery-utils/recovery-utils/lib/recovery.c b/meta-digi-dey/recipes-core/recovery/recovery-utils/recovery-utils/lib/recovery.c index 40b5e2fb2..1f4c1b9ab 100644 --- a/meta-digi-dey/recipes-core/recovery/recovery-utils/recovery-utils/lib/recovery.c +++ b/meta-digi-dey/recipes-core/recovery/recovery-utils/recovery-utils/lib/recovery.c @@ -94,21 +94,15 @@ err: */ static int is_device_closed(void) { - const char *path = "/sys/fsl_otp/HW_OCOTP_CFG5"; - FILE *fd = NULL; - unsigned int value = 0; - long open = 0; + const char *path_closed = "/proc/device-tree/digi,tf-closed"; - if ((fd = fopen(path, "r")) == NULL) { - fprintf(stderr, "Cannot check device status. Assuming closed...\n"); + if (access(path_closed, F_OK) != -1) return 1; - } + else + fprintf(stderr, + "Cannot check device status. Assuming open...\n"); - open = (fscanf(fd, "%x", &value) == 1) && (value & OTP_CLOSED_BIT); - - fclose(fd); - - return open; + return 0; } /* From aa63318cf1dc52aa0f91a8cf62cc2205c6a287bc Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 25 Jun 2020 12:15:52 +0200 Subject: [PATCH 06/63] meta-digi: update revisions for dey-3.0-r1.4 Signed-off-by: Gabriel Valcazar --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 4 ++-- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 922d34d2d..8daa0b582 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index 3cf75fbd9..cf704d0ef 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "2b3019187febca17b1bdcc22253bd96c303771fa" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index dd3b5a540..9df979d3f 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2018.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "96bc8bb2421563f5c4defa9fbe8dd6e5010ac318" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb index ae6f36af7..21953d734 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2019.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "2a2bab2587c331b92ea516b3d588dd0538603d6b" COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index af708ccae..93b16cd24 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -7,7 +7,7 @@ DEPENDS = "trustfence-cst coreutils util-linux" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}" SRCBRANCH = "v2019.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "2a2bab2587c331b92ea516b3d588dd0538603d6b" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 4437359c9..f6e08314e 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};branch=${SRCBRANCH} \ + ${QCOM_GIT_URI};nobranch=1 \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 3fe0b2f82..14b5ec9d4 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" SRCBRANCH = "v5.4/dey-3.0/maint" SRCBRANCH_ccimx6 = "v4.9/dey-2.6/maint" -SRCREV = "${AUTOREV}" +SRCREV = "290d39a991460f750be7b20104499a4f441fb716" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${LINUX_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index d5501cdd7..a906fad5d 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "${AUTOREV}" +SRCREV = "35943b2466c9357cdd4e5c165f26149d82ed51f6" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${CC_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index eeacd53d5..70fe084db 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc @@ -1,11 +1,11 @@ # Copyright (C) 2019, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "1317384494f56ac3d10e7dee3ac968b944f02468" DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" DEY_EXAMPLES_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=https" DEY_EXAMPLES_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DEY_EXAMPLES_STASH}', '${DEY_EXAMPLES_GITHUB}', d)}" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${DEY_EXAMPLES_GIT_URI};nobranch=1" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 2e62dbcf5..04883a5d3 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "bce0bfff451c67c5387ebdaa9b5da1bde82750ca" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ + ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From 51c7498af0c31cae25076fa20bf2a163d89da859 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 24 Aug 2020 12:07:44 +0200 Subject: [PATCH 07/63] meta-digi: revert revisions to AUTOREV --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 4 ++-- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 8daa0b582..922d34d2d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index cf704d0ef..3cf75fbd9 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "2b3019187febca17b1bdcc22253bd96c303771fa" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index 9df979d3f..dd3b5a540 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2018.03/maint" -SRCREV = "96bc8bb2421563f5c4defa9fbe8dd6e5010ac318" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb index 21953d734..ae6f36af7 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2019.04/maint" -SRCREV = "2a2bab2587c331b92ea516b3d588dd0538603d6b" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index 93b16cd24..af708ccae 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -7,7 +7,7 @@ DEPENDS = "trustfence-cst coreutils util-linux" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}" SRCBRANCH = "v2019.04/maint" -SRCREV = "2a2bab2587c331b92ea516b3d588dd0538603d6b" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index f6e08314e..4437359c9 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-3.0/maint" -SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" +SRCREV = "${AUTOREV}" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};nobranch=1 \ + ${QCOM_GIT_URI};branch=${SRCBRANCH} \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 14b5ec9d4..3fe0b2f82 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" SRCBRANCH = "v5.4/dey-3.0/maint" SRCBRANCH_ccimx6 = "v4.9/dey-2.6/maint" -SRCREV = "290d39a991460f750be7b20104499a4f441fb716" +SRCREV = "${AUTOREV}" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};nobranch=1" +SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index a906fad5d..d5501cdd7 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "35943b2466c9357cdd4e5c165f26149d82ed51f6" +SRCREV = "${AUTOREV}" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};nobranch=1" +SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index 70fe084db..eeacd53d5 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc @@ -1,11 +1,11 @@ # Copyright (C) 2019, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "1317384494f56ac3d10e7dee3ac968b944f02468" +SRCREV = "${AUTOREV}" DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" DEY_EXAMPLES_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=https" DEY_EXAMPLES_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DEY_EXAMPLES_STASH}', '${DEY_EXAMPLES_GITHUB}', d)}" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};nobranch=1" +SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 04883a5d3..2e62dbcf5 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "bce0bfff451c67c5387ebdaa9b5da1bde82750ca" +SRCREV = "${AUTOREV}" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ + ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From 89c2e830d8eca80f3972ced4f678a4e810d96ae7 Mon Sep 17 00:00:00 2001 From: Mattias Lindblad Date: Mon, 24 Aug 2020 21:21:54 +0200 Subject: [PATCH 08/63] busybox: standby: update busybox timeout syntax Signed-off-by: Mattias Lindblad Reviewed-by: Hector Palacios --- meta-digi-dey/recipes-core/busybox/busybox/ccimx6qpsbc/standby | 2 +- .../recipes-core/busybox/busybox/ccimx6qpsbc/standby-actions | 2 +- meta-digi-dey/recipes-core/busybox/busybox/ccimx6sbc/standby | 2 +- .../recipes-core/busybox/busybox/ccimx6sbc/standby-actions | 2 +- meta-digi-dey/recipes-core/busybox/busybox/ccimx6ul/standby | 2 +- .../recipes-core/busybox/busybox/ccimx6ul/standby-actions | 2 +- meta-digi-dey/recipes-core/busybox/busybox/ccimx8mn/standby | 2 +- .../recipes-core/busybox/busybox/ccimx8mn/standby-actions | 2 +- meta-digi-dey/recipes-core/busybox/busybox/ccimx8x/standby | 2 +- .../recipes-core/busybox/busybox/ccimx8x/standby-actions | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta-digi-dey/recipes-core/busybox/busybox/ccimx6qpsbc/standby b/meta-digi-dey/recipes-core/busybox/busybox/ccimx6qpsbc/standby index 5b4231e42..e6d8a31a5 100755 --- a/meta-digi-dey/recipes-core/busybox/busybox/ccimx6qpsbc/standby +++ b/meta-digi-dey/recipes-core/busybox/busybox/ccimx6qpsbc/standby @@ -56,7 +56,7 @@ resume_interfaces() { if [ -d "/proc/device-tree/wireless" ]; then # Trigger wireless module loading event, and wait until the interface exists udevadm trigger --action=add --attr-match="modalias=sdio:c00v0271d050A" - timeout -t 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null + timeout 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null # Bring up the interfaces that were bring down on suspend for i in $(echo ${RESUME_IFACES} | tr ' ' '\n' | sort); do diff --git a/meta-digi-dey/recipes-core/busybox/busybox/ccimx6qpsbc/standby-actions b/meta-digi-dey/recipes-core/busybox/busybox/ccimx6qpsbc/standby-actions index a2baa3db2..0099a53aa 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox/ccimx6qpsbc/standby-actions +++ b/meta-digi-dey/recipes-core/busybox/busybox/ccimx6qpsbc/standby-actions @@ -41,7 +41,7 @@ elif [ "${1}" == "post" ]; then if [ -d "/proc/device-tree/wireless" ]; then # Trigger wireless module loading event, and wait until the interface exists udevadm trigger --action=add --attr-match="modalias=sdio:c00v0271d050A" - timeout -t 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null + timeout 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null # Bring up the interfaces that were brought down on suspend for i in $(cat /tmp/suspend_wlan_ifaces | tr ' ' '\n' | sort); do diff --git a/meta-digi-dey/recipes-core/busybox/busybox/ccimx6sbc/standby b/meta-digi-dey/recipes-core/busybox/busybox/ccimx6sbc/standby index 58ce08bf6..89d57d3c4 100755 --- a/meta-digi-dey/recipes-core/busybox/busybox/ccimx6sbc/standby +++ b/meta-digi-dey/recipes-core/busybox/busybox/ccimx6sbc/standby @@ -56,7 +56,7 @@ resume_interfaces() { if [ -d "/proc/device-tree/wireless" ]; then # Trigger wireless module loading event, and wait until the interface exists udevadm trigger --action=add --attr-match="modalias=sdio:c00v0271d0301" - timeout -t 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null + timeout 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null # Bring up the interfaces that were bring down on suspend for i in $(echo ${RESUME_IFACES} | tr ' ' '\n' | sort); do diff --git a/meta-digi-dey/recipes-core/busybox/busybox/ccimx6sbc/standby-actions b/meta-digi-dey/recipes-core/busybox/busybox/ccimx6sbc/standby-actions index 56ce080fd..9c8d5d1f0 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox/ccimx6sbc/standby-actions +++ b/meta-digi-dey/recipes-core/busybox/busybox/ccimx6sbc/standby-actions @@ -41,7 +41,7 @@ elif [ "${1}" == "post" ]; then if [ -d "/proc/device-tree/wireless" ]; then # Trigger wireless module loading event, and wait until the interface exists udevadm trigger --action=add --attr-match="modalias=sdio:c00v0271d0301" - timeout -t 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null + timeout 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null # Bring up the interfaces that were brought down on suspend for i in $(cat /tmp/suspend_wlan_ifaces | tr ' ' '\n' | sort); do diff --git a/meta-digi-dey/recipes-core/busybox/busybox/ccimx6ul/standby b/meta-digi-dey/recipes-core/busybox/busybox/ccimx6ul/standby index 9efc21b44..1f1c9efb1 100755 --- a/meta-digi-dey/recipes-core/busybox/busybox/ccimx6ul/standby +++ b/meta-digi-dey/recipes-core/busybox/busybox/ccimx6ul/standby @@ -56,7 +56,7 @@ resume_interfaces() { if [ -d "/proc/device-tree/wireless" ]; then # Trigger wireless module loading event, and wait until the interface exists udevadm trigger --action=add --attr-match="modalias=sdio:c00v0271d050A" - timeout -t 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null + timeout 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null # Bring up the interfaces that were bring down on suspend for i in $(echo ${RESUME_IFACES} | tr ' ' '\n' | sort); do diff --git a/meta-digi-dey/recipes-core/busybox/busybox/ccimx6ul/standby-actions b/meta-digi-dey/recipes-core/busybox/busybox/ccimx6ul/standby-actions index a2baa3db2..0099a53aa 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox/ccimx6ul/standby-actions +++ b/meta-digi-dey/recipes-core/busybox/busybox/ccimx6ul/standby-actions @@ -41,7 +41,7 @@ elif [ "${1}" == "post" ]; then if [ -d "/proc/device-tree/wireless" ]; then # Trigger wireless module loading event, and wait until the interface exists udevadm trigger --action=add --attr-match="modalias=sdio:c00v0271d050A" - timeout -t 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null + timeout 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null # Bring up the interfaces that were brought down on suspend for i in $(cat /tmp/suspend_wlan_ifaces | tr ' ' '\n' | sort); do diff --git a/meta-digi-dey/recipes-core/busybox/busybox/ccimx8mn/standby b/meta-digi-dey/recipes-core/busybox/busybox/ccimx8mn/standby index e86e1c0a1..b5b47210d 100755 --- a/meta-digi-dey/recipes-core/busybox/busybox/ccimx8mn/standby +++ b/meta-digi-dey/recipes-core/busybox/busybox/ccimx8mn/standby @@ -56,7 +56,7 @@ resume_interfaces() { if [ -d "/proc/device-tree/wireless" ]; then # Trigger wireless module loading event, and wait until the interface exists udevadm trigger --action=add --attr-match="modalias=sdio:c00v0271d050A" - timeout -t 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null + timeout 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null # Bring up the interfaces that were bring down on suspend for i in $(echo ${RESUME_IFACES} | tr ' ' '\n' | sort); do diff --git a/meta-digi-dey/recipes-core/busybox/busybox/ccimx8mn/standby-actions b/meta-digi-dey/recipes-core/busybox/busybox/ccimx8mn/standby-actions index 987e9d3b4..c6bf84654 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox/ccimx8mn/standby-actions +++ b/meta-digi-dey/recipes-core/busybox/busybox/ccimx8mn/standby-actions @@ -41,7 +41,7 @@ elif [ "${1}" == "post" ]; then if [ -d "/proc/device-tree/wireless" ]; then # Trigger wireless module loading event, and wait until the interface exists udevadm trigger --action=add --attr-match="modalias=sdio:c00v0271d050A" - timeout -t 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null + timeout 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null # Bring up the interfaces that were brought down on suspend for i in $(cat /tmp/suspend_wlan_ifaces | tr ' ' '\n' | sort); do diff --git a/meta-digi-dey/recipes-core/busybox/busybox/ccimx8x/standby b/meta-digi-dey/recipes-core/busybox/busybox/ccimx8x/standby index 2830b7ac8..6d369e54a 100755 --- a/meta-digi-dey/recipes-core/busybox/busybox/ccimx8x/standby +++ b/meta-digi-dey/recipes-core/busybox/busybox/ccimx8x/standby @@ -56,7 +56,7 @@ resume_interfaces() { if [ -d "/proc/device-tree/wireless" ]; then # Trigger wireless module loading event, and wait until the interface exists udevadm trigger --action=add --attr-match="modalias=pci:v0000168Cd0000003Esv*sd*bc*sc*i*" - timeout -t 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null + timeout 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null # Bring up the interfaces that were bring down on suspend for i in $(echo ${RESUME_IFACES} | tr ' ' '\n' | sort); do diff --git a/meta-digi-dey/recipes-core/busybox/busybox/ccimx8x/standby-actions b/meta-digi-dey/recipes-core/busybox/busybox/ccimx8x/standby-actions index 6f5c40247..3d3a4a85d 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox/ccimx8x/standby-actions +++ b/meta-digi-dey/recipes-core/busybox/busybox/ccimx8x/standby-actions @@ -41,7 +41,7 @@ elif [ "${1}" == "post" ]; then if [ -d "/proc/device-tree/wireless" ]; then # Trigger wireless module loading event, and wait until the interface exists udevadm trigger --action=add --attr-match="modalias=pci:v0000168Cd0000003Esv*sd*bc*sc*i*" - timeout -t 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null + timeout 5 sh -c "while [ ! -d /sys/class/net/wlan0 ]; do sleep .2; done" 2>/dev/null # Bring up the interfaces that were brought down on suspend for i in $(cat /tmp/suspend_wlan_ifaces | tr ' ' '\n' | sort); do From 84d3506432e6dc09aa5936c780a1d209d035717d Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 25 Jun 2020 12:15:52 +0200 Subject: [PATCH 09/63] meta-digi: update revisions for dey-3.0-r1.5 Signed-off-by: Gabriel Valcazar --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 4 ++-- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 922d34d2d..8daa0b582 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index 3cf75fbd9..cf704d0ef 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "2b3019187febca17b1bdcc22253bd96c303771fa" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index dd3b5a540..9df979d3f 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2018.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "96bc8bb2421563f5c4defa9fbe8dd6e5010ac318" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb index ae6f36af7..21953d734 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2019.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "2a2bab2587c331b92ea516b3d588dd0538603d6b" COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index af708ccae..93b16cd24 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -7,7 +7,7 @@ DEPENDS = "trustfence-cst coreutils util-linux" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}" SRCBRANCH = "v2019.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "2a2bab2587c331b92ea516b3d588dd0538603d6b" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 4437359c9..f6e08314e 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};branch=${SRCBRANCH} \ + ${QCOM_GIT_URI};nobranch=1 \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 3fe0b2f82..97445a71f 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" SRCBRANCH = "v5.4/dey-3.0/maint" SRCBRANCH_ccimx6 = "v4.9/dey-2.6/maint" -SRCREV = "${AUTOREV}" +SRCREV = "9072682725b11354b9cae0394d5284eb95cb8d92" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${LINUX_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index d5501cdd7..a906fad5d 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "${AUTOREV}" +SRCREV = "35943b2466c9357cdd4e5c165f26149d82ed51f6" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${CC_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index eeacd53d5..70fe084db 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc @@ -1,11 +1,11 @@ # Copyright (C) 2019, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "1317384494f56ac3d10e7dee3ac968b944f02468" DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" DEY_EXAMPLES_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=https" DEY_EXAMPLES_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DEY_EXAMPLES_STASH}', '${DEY_EXAMPLES_GITHUB}', d)}" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${DEY_EXAMPLES_GIT_URI};nobranch=1" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 2e62dbcf5..04883a5d3 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "bce0bfff451c67c5387ebdaa9b5da1bde82750ca" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ + ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From 5ea641fc1484d5cf9e8212ba14d813762b2b204e Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Tue, 25 Aug 2020 11:34:18 +0200 Subject: [PATCH 10/63] meta-digi: revert revisions to AUTOREV --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 4 ++-- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 8daa0b582..922d34d2d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index cf704d0ef..3cf75fbd9 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "2b3019187febca17b1bdcc22253bd96c303771fa" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index 9df979d3f..dd3b5a540 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2018.03/maint" -SRCREV = "96bc8bb2421563f5c4defa9fbe8dd6e5010ac318" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb index 21953d734..ae6f36af7 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2019.04/maint" -SRCREV = "2a2bab2587c331b92ea516b3d588dd0538603d6b" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index 93b16cd24..af708ccae 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -7,7 +7,7 @@ DEPENDS = "trustfence-cst coreutils util-linux" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}" SRCBRANCH = "v2019.04/maint" -SRCREV = "2a2bab2587c331b92ea516b3d588dd0538603d6b" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index f6e08314e..4437359c9 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-3.0/maint" -SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" +SRCREV = "${AUTOREV}" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};nobranch=1 \ + ${QCOM_GIT_URI};branch=${SRCBRANCH} \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 97445a71f..3fe0b2f82 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" SRCBRANCH = "v5.4/dey-3.0/maint" SRCBRANCH_ccimx6 = "v4.9/dey-2.6/maint" -SRCREV = "9072682725b11354b9cae0394d5284eb95cb8d92" +SRCREV = "${AUTOREV}" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};nobranch=1" +SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index a906fad5d..d5501cdd7 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "35943b2466c9357cdd4e5c165f26149d82ed51f6" +SRCREV = "${AUTOREV}" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};nobranch=1" +SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index 70fe084db..eeacd53d5 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc @@ -1,11 +1,11 @@ # Copyright (C) 2019, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "1317384494f56ac3d10e7dee3ac968b944f02468" +SRCREV = "${AUTOREV}" DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" DEY_EXAMPLES_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=https" DEY_EXAMPLES_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DEY_EXAMPLES_STASH}', '${DEY_EXAMPLES_GITHUB}', d)}" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};nobranch=1" +SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 04883a5d3..2e62dbcf5 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "bce0bfff451c67c5387ebdaa9b5da1bde82750ca" +SRCREV = "${AUTOREV}" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ + ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From 27be059de47d2620fa0d7a5052b0a5d0e92dc4f1 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Wed, 16 Sep 2020 10:48:08 +0200 Subject: [PATCH 11/63] digi: switch recipes to maint branches Signed-off-by: Hector Palacios --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 4 ++-- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb | 4 ++-- 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 | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 2 +- 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, 14 insertions(+), 14 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index b49765d0d..243ff2143 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 @@ -1,8 +1,8 @@ -# Copyright (C) 2018,2019 Digi International +# Copyright (C) 2018-2020 Digi International require digi-u-boot.inc -SRCBRANCH = "v2017.03/master" +SRCBRANCH = "v2017.03/maint" SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index efe133157..dd3b5a540 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -2,7 +2,7 @@ require digi-u-boot.inc -SRCBRANCH = "v2018.03/master" +SRCBRANCH = "v2018.03/maint" SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb index 99287edae..2fda3537b 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb @@ -1,11 +1,11 @@ -# Copyright (C) 2019 Digi International +# Copyright (C) 2019,2020 Digi International require digi-u-boot.inc LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" -SRCBRANCH = "v2019.04/master" +SRCBRANCH = "v2019.04/maint" SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x)" 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 1d522300e..ef49e0c04 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)" 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 23e190c78..de5c09fad 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 @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2018 Digi International +# Copyright (C) 2017-2020 Digi International SUMMARY = "TrustFence signing and encryption scripts" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425 DEPENDS = "trustfence-cst coreutils util-linux" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}" -SRCBRANCH = "v2019.04/master" +SRCBRANCH = "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..4437359c9 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca # Reference Qualcomm tag/version PV = "v4.0.11.213X" -SRCBRANCH = "qca65X4/master" +SRCBRANCH = "qca65X4/dey-3.0/maint" SRCREV = "${AUTOREV}" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 772b3971c..3fe0b2f82 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -4,7 +4,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" -SRCBRANCH = "v5.4.24/master" +SRCBRANCH = "v5.4/dey-3.0/maint" SRCBRANCH_ccimx6 = "v4.9/dey-2.6/maint" SRCREV = "${AUTOREV}" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index ba8ece33b..4e66757e4 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc @@ -1,6 +1,6 @@ -# Copyright (C) 2019, Digi International Inc. +# Copyright (C) 2019,2020, Digi International Inc. -SRCBRANCH = "master" +SRCBRANCH = "dey-3.0/maint" SRCREV = "${AUTOREV}" DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 8dd3c771f..9d977bb28 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -1,4 +1,4 @@ -# Copyright (C) 2017 Digi International Inc. +# Copyright (C) 2017-2020 Digi International Inc. SUMMARY = "Digi APIX library" DESCRIPTION = "C library to access and manage your ConnectCore platform interfaces in an easy manner" @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" -SRCBRANCH ?= "master" +SRCBRANCH ?= "dey-3.0/maint" SRCREV = "${AUTOREV}" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" From 4d0ae35a5281a5f07f45deb62d5ba1fe39c18404 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Wed, 16 Sep 2020 12:02:39 +0200 Subject: [PATCH 12/63] trustfence-cst: add byacc-native as a dependency when building the SDK The CST package requires byacc to compile, and even though this dependency is met when building images for the target, said dependency needs to be made explicit when the package is built for the SDK in order to avoid build errors. Signed-off-by: Gabriel Valcazar --- meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst.inc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst.inc b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst.inc index 005d65f9a..dae46cd48 100644 --- a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst.inc +++ b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst.inc @@ -7,6 +7,11 @@ LICENSE = "CLOSED" DEPENDS = "openssl byacc flex" +# Explicitly add byacc-native as a dependency when building the package for the +# SDK, otherwise, it won't get installed in the sysroot, causing a compilation +# error. +DEPENDS_append_class-nativesdk = " byacc-native" + SRC_URI = " \ ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'file://cst-${PV}.tgz', '', d)} \ file://0001-gen_auth_encrypted_data-reuse-existing-DEK-file.patch \ From f8f8228d67b2bf2984bf345718a9bcf99deb9912 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Fri, 28 Aug 2020 11:15:48 +0200 Subject: [PATCH 13/63] recipes-kernel: use Linux v5.4 on the ccimx6/6qp Remove all v4.9 recipes and build Linux using the same branch on all platforms. The .inc files were only needed because of the existence of multiple Linux versions, but that's not the case anymore, so remove them. https://jira.digi.com/browse/DEL-7221 Signed-off-by: Gabriel Valcazar --- meta-digi-arm/conf/machine/include/ccimx6.inc | 3 - .../recipes-kernel/linux/linux-dey-src.inc | 1 - .../recipes-kernel/linux/linux-dey.inc | 89 ------------------ .../recipes-kernel/linux/linux-dey_4.9.bb | 5 - .../recipes-kernel/linux/linux-dey_5.4.bb | 92 ++++++++++++++++++- .../linux/linux-imx-headers.inc | 54 ----------- .../linux/linux-imx-headers_4.9.bb | 5 - .../linux/linux-imx-headers_5.4.bb | 57 +++++++++++- 8 files changed, 143 insertions(+), 163 deletions(-) delete mode 100644 meta-digi-arm/recipes-kernel/linux/linux-dey.inc delete mode 100644 meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb delete mode 100644 meta-digi-arm/recipes-kernel/linux/linux-imx-headers.inc delete mode 100644 meta-digi-arm/recipes-kernel/linux/linux-imx-headers_4.9.bb diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc index d646fa6f0..89abccc94 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6.inc @@ -20,9 +20,6 @@ STORAGE_MEDIA = "mmc" # Wireless external module WIRELESS_MODULE ?= "" -# Use our recipe of linux-imx-headers instead of the meta-freescale one -PREFERRED_VERSION_linux-imx-headers ?= "4.9" - # Firmware MACHINE_FIRMWARE ?= "firmware-imx-sdma" MACHINE_FIRMWARE_append_mx6q = " firmware-imx-vpu-imx6q" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 3fe0b2f82..0774cb146 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" SRCBRANCH = "v5.4/dey-3.0/maint" -SRCBRANCH_ccimx6 = "v4.9/dey-2.6/maint" SRCREV = "${AUTOREV}" # Select internal or Github Linux repo diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc deleted file mode 100644 index 07015ad45..000000000 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright (C) 2013-2018 Digi International - -SUMMARY = "Linux kernel for Digi boards" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" - -DEPENDS += "lzop-native bc-native" -DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}" - -inherit kernel fsl-kernel-localversion - -require recipes-kernel/linux/linux-dey-src.inc -require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'linux-virtualization.inc', '', d)} - -# Use custom provided 'defconfig' if variable KERNEL_DEFCONFIG is cleared -SRC_URI += "${@oe.utils.conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)}" - -do_deploy[postfuncs] += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence_sign', '', d)}" - -trustfence_sign() { - # Set environment variables for trustfence configuration - export CONFIG_SIGN_KEYS_PATH="${TRUSTFENCE_SIGN_KEYS_PATH}" - [ -n "${TRUSTFENCE_KEY_INDEX}" ] && export CONFIG_KEY_INDEX="${TRUSTFENCE_KEY_INDEX}" - [ -n "${TRUSTFENCE_DEK_PATH}" ] && [ "${TRUSTFENCE_DEK_PATH}" != "0" ] && export CONFIG_DEK_PATH="${TRUSTFENCE_DEK_PATH}" - [ -n "${TRUSTFENCE_SIGN_MODE}" ] && export CONFIG_SIGN_MODE="${TRUSTFENCE_SIGN_MODE}" - - # Sign/encrypt the kernel images - for type in ${KERNEL_IMAGETYPES}; do - KERNEL_IMAGE="${type}-${KERNEL_IMAGE_NAME}.bin" - if [ "${type}" = "Image.gz" ]; then - # Sign the uncompressed Image - KERNEL_IMAGE=${WORKDIR}/build/arch/arm64/boot/Image - fi - - TMP_KERNEL_IMAGE_SIGNED="$(mktemp ${KERNEL_IMAGE}-signed.XXXXXX)" - trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -l "${KERNEL_IMAGE}" "${TMP_KERNEL_IMAGE_SIGNED}" - - if [ "${type}" = "Image.gz" ]; then - # Compress the signed Image and restore the original filename - gzip "${TMP_KERNEL_IMAGE_SIGNED}" - mv "${TMP_KERNEL_IMAGE_SIGNED}.gz" "${TMP_KERNEL_IMAGE_SIGNED}" - KERNEL_IMAGE="${type}-${KERNEL_IMAGE_NAME}.bin" - fi - - mv "${TMP_KERNEL_IMAGE_SIGNED}" "${KERNEL_IMAGE}" - done - - # Sign/encrypt the device tree blobs - for DTB in ${KERNEL_DEVICETREE}; do - DTB=`normalize_dtb "${DTB}"` - DTB_EXT=${DTB##*.} - DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` - DTB_IMAGE="${DTB_BASE_NAME}-${KERNEL_IMAGE_NAME}.${DTB_EXT}" - - TMP_DTB_IMAGE_SIGNED="$(mktemp ${DTB_IMAGE}-signed.XXXXXX)" - if [ "${DTB_EXT}" = "dtbo" ]; then - trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -o "${DTB_IMAGE}" "${TMP_DTB_IMAGE_SIGNED}" - else - trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -d "${DTB_IMAGE}" "${TMP_DTB_IMAGE_SIGNED}" - fi - mv "${TMP_DTB_IMAGE_SIGNED}" "${DTB_IMAGE}" - done -} -trustfence_sign[dirs] = "${DEPLOYDIR}" - -do_deploy[vardeps] += "TRUSTFENCE_SIGN_KEYS_PATH TRUSTFENCE_KEY_INDEX TRUSTFENCE_DEK_PATH" - -FILES_${KERNEL_PACKAGE_NAME}-image += "/boot/config-${KERNEL_VERSION}" - -# Don't include kernels in standard images -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" - -# A user can provide his own kernel 'defconfig' file by: -# - setting the variable KERNEL_DEFCONFIG to a custom kernel configuration file -# inside the kernel repository. -# - setting the variable KERNEL_DEFCONFIG to a kernel configuration file using -# the full path to the file. -# - clearing the variable KERNEL_DEFCONFIG and providing a kernel configuration -# file in the layer (in this case the file must be named 'defconfig'). -# Otherwise the default platform's kernel configuration file will be taken from -# the Linux source code tree. -do_copy_defconfig[vardeps] += "KERNEL_DEFCONFIG" -do_copy_defconfig[dirs] = "${S}" -do_copy_defconfig () { - if [ -n "${KERNEL_DEFCONFIG}" ]; then - cp -f ${KERNEL_DEFCONFIG} ${WORKDIR}/defconfig - fi -} -addtask copy_defconfig after do_patch before do_preconfigure diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb deleted file mode 100644 index 3669cb577..000000000 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.9.bb +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (C) 2019 Digi International - -require recipes-kernel/linux/linux-dey.inc - -COMPATIBLE_MACHINE = "(ccimx6)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb index 5d06efec1..19dad04c0 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_5.4.bb @@ -1,5 +1,91 @@ -# Copyright (C) 2020 Digi International +# Copyright (C) 2013-2020 Digi International -require recipes-kernel/linux/linux-dey.inc +SUMMARY = "Linux kernel for Digi boards" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" -COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8x|ccimx8m)" +DEPENDS += "lzop-native bc-native" +DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}" + +inherit kernel fsl-kernel-localversion + +require recipes-kernel/linux/linux-dey-src.inc +require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'linux-virtualization.inc', '', d)} + +# Use custom provided 'defconfig' if variable KERNEL_DEFCONFIG is cleared +SRC_URI += "${@oe.utils.conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)}" + +do_deploy[postfuncs] += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence_sign', '', d)}" + +trustfence_sign() { + # Set environment variables for trustfence configuration + export CONFIG_SIGN_KEYS_PATH="${TRUSTFENCE_SIGN_KEYS_PATH}" + [ -n "${TRUSTFENCE_KEY_INDEX}" ] && export CONFIG_KEY_INDEX="${TRUSTFENCE_KEY_INDEX}" + [ -n "${TRUSTFENCE_DEK_PATH}" ] && [ "${TRUSTFENCE_DEK_PATH}" != "0" ] && export CONFIG_DEK_PATH="${TRUSTFENCE_DEK_PATH}" + [ -n "${TRUSTFENCE_SIGN_MODE}" ] && export CONFIG_SIGN_MODE="${TRUSTFENCE_SIGN_MODE}" + + # Sign/encrypt the kernel images + for type in ${KERNEL_IMAGETYPES}; do + KERNEL_IMAGE="${type}-${KERNEL_IMAGE_NAME}.bin" + if [ "${type}" = "Image.gz" ]; then + # Sign the uncompressed Image + KERNEL_IMAGE=${WORKDIR}/build/arch/arm64/boot/Image + fi + + TMP_KERNEL_IMAGE_SIGNED="$(mktemp ${KERNEL_IMAGE}-signed.XXXXXX)" + trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -l "${KERNEL_IMAGE}" "${TMP_KERNEL_IMAGE_SIGNED}" + + if [ "${type}" = "Image.gz" ]; then + # Compress the signed Image and restore the original filename + gzip "${TMP_KERNEL_IMAGE_SIGNED}" + mv "${TMP_KERNEL_IMAGE_SIGNED}.gz" "${TMP_KERNEL_IMAGE_SIGNED}" + KERNEL_IMAGE="${type}-${KERNEL_IMAGE_NAME}.bin" + fi + + mv "${TMP_KERNEL_IMAGE_SIGNED}" "${KERNEL_IMAGE}" + done + + # Sign/encrypt the device tree blobs + for DTB in ${KERNEL_DEVICETREE}; do + DTB=`normalize_dtb "${DTB}"` + DTB_EXT=${DTB##*.} + DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"` + DTB_IMAGE="${DTB_BASE_NAME}-${KERNEL_IMAGE_NAME}.${DTB_EXT}" + + TMP_DTB_IMAGE_SIGNED="$(mktemp ${DTB_IMAGE}-signed.XXXXXX)" + if [ "${DTB_EXT}" = "dtbo" ]; then + trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -o "${DTB_IMAGE}" "${TMP_DTB_IMAGE_SIGNED}" + else + trustfence-sign-artifact.sh -p "${DIGI_FAMILY}" -d "${DTB_IMAGE}" "${TMP_DTB_IMAGE_SIGNED}" + fi + mv "${TMP_DTB_IMAGE_SIGNED}" "${DTB_IMAGE}" + done +} +trustfence_sign[dirs] = "${DEPLOYDIR}" + +do_deploy[vardeps] += "TRUSTFENCE_SIGN_KEYS_PATH TRUSTFENCE_KEY_INDEX TRUSTFENCE_DEK_PATH" + +FILES_${KERNEL_PACKAGE_NAME}-image += "/boot/config-${KERNEL_VERSION}" + +# Don't include kernels in standard images +RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" + +# A user can provide his own kernel 'defconfig' file by: +# - setting the variable KERNEL_DEFCONFIG to a custom kernel configuration file +# inside the kernel repository. +# - setting the variable KERNEL_DEFCONFIG to a kernel configuration file using +# the full path to the file. +# - clearing the variable KERNEL_DEFCONFIG and providing a kernel configuration +# file in the layer (in this case the file must be named 'defconfig'). +# Otherwise the default platform's kernel configuration file will be taken from +# the Linux source code tree. +do_copy_defconfig[vardeps] += "KERNEL_DEFCONFIG" +do_copy_defconfig[dirs] = "${S}" +do_copy_defconfig () { + if [ -n "${KERNEL_DEFCONFIG}" ]; then + cp -f ${KERNEL_DEFCONFIG} ${WORKDIR}/defconfig + fi +} +addtask copy_defconfig after do_patch before do_preconfigure + +COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8x|ccimx8m|ccimx6)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-imx-headers.inc b/meta-digi-arm/recipes-kernel/linux/linux-imx-headers.inc deleted file mode 100644 index 6449c3c40..000000000 --- a/meta-digi-arm/recipes-kernel/linux/linux-imx-headers.inc +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 2017-2018 NXP -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "Installs i.MX-specific kernel headers" -DESCRIPTION = "Installs i.MX-specific kernel headers to userspace. \ -New headers are installed in ${includedir}/imx." -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" - -require recipes-kernel/linux/linux-dey-src.inc - -S = "${WORKDIR}/git" - -do_compile[noexec] = "1" - -IMX_UAPI_HEADERS = " \ - dma-buf.h \ - hantrodec.h \ - hx280enc.h \ - ion.h \ - ipu.h \ - isl29023.h \ - mxc_asrc.h \ - mxc_dcic.h \ - mxc_mlb.h \ - mxc_sim_interface.h \ - mxc_v4l2.h \ - mxcfb.h \ - pxp_device.h \ - pxp_dma.h \ - videodev2.h \ -" - -do_install() { - # We install all headers inside of B so we can copy only the - # whitelisted ones, and there is no risk of a new header to be - # installed by mistake. - oe_runmake headers_install INSTALL_HDR_PATH=${B}${exec_prefix} - - # FIXME: The ion.h is still on staging so "promote" it for now - cp ${S}/drivers/staging/android/uapi/ion.h ${B}${includedir}/linux - - # Install whitelisted headers only - for h in ${IMX_UAPI_HEADERS}; do - install -D -m 0644 ${B}${includedir}/linux/$h \ - ${D}${includedir}/imx/linux/$h - done -} - -DEPENDS += "rsync-native" - -ALLOW_EMPTY_${PN} = "1" - -PACKAGE_ARCH = "${MACHINE_SOCARCH}" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_4.9.bb b/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_4.9.bb deleted file mode 100644 index b2479c47f..000000000 --- a/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_4.9.bb +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (C) 2019 Digi International - -require recipes-kernel/linux/linux-imx-headers.inc - -COMPATIBLE_MACHINE = "(ccimx6)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_5.4.bb b/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_5.4.bb index ee876eaf0..bf3d9eb6e 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_5.4.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-imx-headers_5.4.bb @@ -1,5 +1,56 @@ -# Copyright (C) 2020 Digi International +# Copyright 2017-2018 NXP +# Released under the MIT license (see COPYING.MIT for the terms) -require recipes-kernel/linux/linux-imx-headers.inc +SUMMARY = "Installs i.MX-specific kernel headers" +DESCRIPTION = "Installs i.MX-specific kernel headers to userspace. \ +New headers are installed in ${includedir}/imx." +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" -COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8x|ccimx8m)" +require recipes-kernel/linux/linux-dey-src.inc + +S = "${WORKDIR}/git" + +do_compile[noexec] = "1" + +IMX_UAPI_HEADERS = " \ + dma-buf.h \ + hantrodec.h \ + hx280enc.h \ + ion.h \ + ipu.h \ + isl29023.h \ + mxc_asrc.h \ + mxc_dcic.h \ + mxc_mlb.h \ + mxc_sim_interface.h \ + mxc_v4l2.h \ + mxcfb.h \ + pxp_device.h \ + pxp_dma.h \ + videodev2.h \ +" + +do_install() { + # We install all headers inside of B so we can copy only the + # whitelisted ones, and there is no risk of a new header to be + # installed by mistake. + oe_runmake headers_install INSTALL_HDR_PATH=${B}${exec_prefix} + + # FIXME: The ion.h is still on staging so "promote" it for now + cp ${S}/drivers/staging/android/uapi/ion.h ${B}${includedir}/linux + + # Install whitelisted headers only + for h in ${IMX_UAPI_HEADERS}; do + install -D -m 0644 ${B}${includedir}/linux/$h \ + ${D}${includedir}/imx/linux/$h + done +} + +DEPENDS += "rsync-native" + +ALLOW_EMPTY_${PN} = "1" + +PACKAGE_ARCH = "${MACHINE_SOCARCH}" + +COMPATIBLE_MACHINE = "(ccimx6ul|ccimx8x|ccimx8m|ccimx6)" From 47ae15ee545fda243068dcf95aac311d17386b3f Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Fri, 28 Aug 2020 11:17:16 +0200 Subject: [PATCH 14/63] imx-alsa-plugins: remove workaround for ccimx6 platforms This workaround is no longer needed since ccimx6/6qp now use Linux v5.4 https://jira.digi.com/browse/DEL-7221 Signed-off-by: Gabriel Valcazar --- .../recipes-multimedia/alsa/imx-alsa-plugins_git.bbappend | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 meta-digi-dey/recipes-multimedia/alsa/imx-alsa-plugins_git.bbappend diff --git a/meta-digi-dey/recipes-multimedia/alsa/imx-alsa-plugins_git.bbappend b/meta-digi-dey/recipes-multimedia/alsa/imx-alsa-plugins_git.bbappend deleted file mode 100644 index 18d480d34..000000000 --- a/meta-digi-dey/recipes-multimedia/alsa/imx-alsa-plugins_git.bbappend +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (C) 2019, Digi International Inc. - -# ccimx6/ccimx6qp platforms use kernel v4.9, which is incompatible with the -# latest revision of the imx-alsa-plugins code due to UAPI changes. For these -# platforms, use an older revision which is functionally the same, but using -# the v4.9 UAPI. -SRCREV_ccimx6 = "9a63071e7734bd164017f3761b8d1944c017611f" From c38d8ed84e676938596410fbfd0da48313f1d4d0 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Mon, 14 Sep 2020 12:36:19 +0200 Subject: [PATCH 15/63] meta-digi-dey: gstreamer: Remove unneeded patch for CCIMX6 https://jira.digi.com/browse/DEL-7221 Signed-off-by: Mike Engel --- ...d-define-a-G2D_AMPHION_INTERLACED-ma.patch | 27 ------------------- .../gstreamer/imx-gst1.0-plugin_%.bbappend | 1 - 2 files changed, 28 deletions(-) delete mode 100644 meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0002-imx_2d_device_g2d-define-a-G2D_AMPHION_INTERLACED-ma.patch diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0002-imx_2d_device_g2d-define-a-G2D_AMPHION_INTERLACED-ma.patch b/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0002-imx_2d_device_g2d-define-a-G2D_AMPHION_INTERLACED-ma.patch deleted file mode 100644 index 1fa126876..000000000 --- a/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin/0002-imx_2d_device_g2d-define-a-G2D_AMPHION_INTERLACED-ma.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Gabriel Valcazar -Date: Fri, 20 Jul 2018 18:04:55 +0200 -Subject: [PATCH] imx_2d_device_g2d: define a G2D_AMPHION_INTERLACED macro - -Currently, this symbol is not present in the libg2d used by imx6 platforms, so -this is a workaround to get the package to compile. - -https://jira.digi.com/browse/DEL-6078 - -Signed-off-by: Gabriel Valcazar ---- - libs/device-2d/imx_2d_device_g2d.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libs/device-2d/imx_2d_device_g2d.c b/libs/device-2d/imx_2d_device_g2d.c -index 56dc550..e5d58c3 100755 ---- a/libs/device-2d/imx_2d_device_g2d.c -+++ b/libs/device-2d/imx_2d_device_g2d.c -@@ -27,6 +27,8 @@ - GST_DEBUG_CATEGORY_EXTERN (imx2ddevice_debug); - #define GST_CAT_DEFAULT imx2ddevice_debug - -+#define G2D_AMPHION_INTERLACED 0x10 -+ - typedef struct _Imx2DDeviceG2d { - gint capabilities; - struct g2d_surfaceEx src; diff --git a/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend b/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend index 1e1c8de7e..d4213ce64 100644 --- a/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend +++ b/meta-digi-dey/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend @@ -6,4 +6,3 @@ SRC_URI += " \ file://0001-gstimxv4l2-map-dev-video1-to-dev-fb0.patch \ file://0002-imx-gst1.0-plugin-fix-build-using-MUSL-C-library.patch \ " -SRC_URI_append_ccimx6 = " file://0002-imx_2d_device_g2d-define-a-G2D_AMPHION_INTERLACED-ma.patch" From 4a68333fef00ec001a2cc8fb1d17b7230334dbf7 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Mon, 14 Sep 2020 14:20:00 +0200 Subject: [PATCH 16/63] meta-digi-arm: machine: Add xwayland support to CCIMX6 platforms With this change, the ccimx6sbc and ccimx6qpsbc default images will now use the xwayland backend instead of x11. https://jira.digi.com/browse/DEL-7221 Signed-off-by: Mike Engel --- meta-digi-arm/conf/machine/include/ccimx6.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc index 89abccc94..69becb213 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6.inc @@ -41,3 +41,6 @@ MACHINE_FEATURES += "accel-graphics accel-video wifi bluetooth pci" # TrustFence TRUSTFENCE_SIGN_MODE = "HAB" + +# Adding 'wayland' along with 'x11' enables the xwayland backend +DISTRO_FEATURES_append = " wayland" From 1fe0af568f251c0db26224bd7e8b5ff2ed6e4bf1 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Tue, 15 Sep 2020 13:11:05 +0200 Subject: [PATCH 17/63] weston-init: uncomment "use-g2d=1" from weston.ini on the ccimx6sbc Without this option, moving any element on the desktop (cursor or windows) will cause an undesired "trailing" effect, where parts of the moved elements remain on the desktop. https://jira.digi.com/browse/DEL-7221 Signed-off-by: Gabriel Valcazar --- meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend b/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend index bb0b16be9..0e885d562 100644 --- a/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-digi-dey/recipes-graphics/wayland/weston-init.bbappend @@ -17,6 +17,11 @@ INI_UNCOMMENT_ASSIGNMENTS_append_mx8mp = " \ use-g2d=1 \ " +# Digi: use g2d on ccimx6sbc to fix desktop window issue +INI_UNCOMMENT_ASSIGNMENTS_append_ccimx6sbc = " \ + use-g2d=1 \ +" + do_install_append() { install -Dm0755 ${WORKDIR}/profile ${D}${sysconfdir}/profile.d/weston.sh From eda2f4177e9246b21da436efa9187ee2203c85df Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 17 Sep 2020 15:15:16 +0200 Subject: [PATCH 18/63] weston: add a patch to fix issues on the ccimx6 The ccimx6 uses the g2d weston renderer to avoid graphical glitches, but the default renderer code doesn't handle suspend/resume cycles properly, causing other issues (notably in the framerate and the desktop not showing 66% of the time when resuming from suspend). Add a patch to mitigate these issues. https://jira.digi.com/browse/DEL-7236 Signed-off-by: Gabriel Valcazar --- ...nderer-try-re-adjusting-fb-if-the-FB.patch | 81 +++++++++++++++++++ .../wayland/weston_%.bbappend | 3 + 2 files changed, 84 insertions(+) create mode 100644 meta-digi-dey/recipes-graphics/wayland/weston/0001-libweston-g2d-renderer-try-re-adjusting-fb-if-the-FB.patch create mode 100644 meta-digi-dey/recipes-graphics/wayland/weston_%.bbappend diff --git a/meta-digi-dey/recipes-graphics/wayland/weston/0001-libweston-g2d-renderer-try-re-adjusting-fb-if-the-FB.patch b/meta-digi-dey/recipes-graphics/wayland/weston/0001-libweston-g2d-renderer-try-re-adjusting-fb-if-the-FB.patch new file mode 100644 index 000000000..eb4d702b3 --- /dev/null +++ b/meta-digi-dey/recipes-graphics/wayland/weston/0001-libweston-g2d-renderer-try-re-adjusting-fb-if-the-FB.patch @@ -0,0 +1,81 @@ +From: Gabriel Valcazar +Date: Thu, 17 Sep 2020 13:16:04 +0200 +Subject: [PATCH] libweston: g2d-renderer: try re-adjusting fb if the + FBIOPAN_DISPLAY ioctl fails + +By default, the g2d renderer works with 3 buffers, and uses the FBIOPAN_DISPLAY +ioctl to have the kernel switch between them everytime the output has to be +shown. Because of this, when the renderer is initialized, it will increase the +framebuffer's yres_virtual parameter so it is 3 times the size of yres +(vertical resolution). + +However, when the system goes through a suspend/resume iteration, the +framebuffer's yres_virtual parameter will change back to its original value, +causing the FBIOPAN_DISPLAY ioctl to fail when using the 2nd and 3rd buffers, +which is 2 out of 3 times whenever something changes in the output. This has +three direct effects: + +* Constant "FBIOPAN_DISPLAY failed" messages in the weston log +* Choppy framerate (due to the renderer only being able to show 1/3 of the + total output frames) +* A 2/3 chance that the desktop will not show after resuming from suspend until + there's movement on the screen + +To avoid this, whenever a FBIOPAN_DISPLAY ioctl fails, check if the +yres_virtual attribute read from the kernel is different from the one saved in +the renderer and, if so, update it once again and retry the ioctl. This adds +some additional overhead in case of a FBIOPAN_DISPLAY failure, but these have +only been observed in the specific suspend/resume scenario, not in an average +use case. + +The only drawback to this workaround is that there's a 1/3 chance that the +display will go blank for a very small period of time when resuming from +suspend. This is due to the framebuffer being reconfigured and, although +undesireable, is much less bothersome than the original issue. + +https://jira.digi.com/browse/DEL-7236 + +Signed-off-by: Gabriel Valcazar +--- + libweston/renderer-g2d/g2d-renderer.c | 24 +++++++++++++++++++++++- + 1 file changed, 23 insertions(+), 1 deletion(-) + +diff --git a/libweston/renderer-g2d/g2d-renderer.c b/libweston/renderer-g2d/g2d-renderer.c +index 456190a3..cfc2e8b6 100644 +--- a/libweston/renderer-g2d/g2d-renderer.c ++++ b/libweston/renderer-g2d/g2d-renderer.c +@@ -528,12 +528,34 @@ static void + g2d_flip_surface(struct weston_output *output) + { + struct g2d_output_state *go = get_output_state(output); ++ struct fb_var_screeninfo aux_varinfo; + go->fb_info.varinfo.yoffset = go->activebuffer * go->fb_info.y_resolution; + + if(ioctl(go->fb_info.fb_fd, FBIOPAN_DISPLAY, &(go->fb_info.varinfo)) < 0) + { +- weston_log("FBIOPAN_DISPLAY Failed\n"); ++ /* Check if yres_virtual has changed (it happens on suspend/resume) */ ++ if (ioctl(go->fb_info.fb_fd, FBIOGET_VSCREENINFO, &aux_varinfo) < 0) { ++ weston_log("FBIOGET_VSCREENINFO Failed\n"); ++ goto out; ++ } ++ ++ /* If yres_virtual has changed, adjust it and try flipping the surface again */ ++ if (aux_varinfo.yres_virtual != go->fb_info.varinfo.yres_virtual) { ++ aux_varinfo.yres_virtual = aux_varinfo.yres * go->nNumBuffers; ++ if (ioctl(go->fb_info.fb_fd, FBIOPUT_VSCREENINFO, &aux_varinfo) < 0) { ++ weston_log("FBIOPUT_VSCREENINFO Failed\n"); ++ goto out; ++ } ++ ++ if(ioctl(go->fb_info.fb_fd, FBIOPAN_DISPLAY, &(go->fb_info.varinfo)) < 0) { ++ weston_log("FBIOPAN_DISPLAY Failed\n"); ++ } ++ } else { ++ weston_log("FBIOPAN_DISPLAY Failed\n"); ++ } + } ++ ++out: + go->activebuffer = (go->activebuffer + 1) % go->nNumBuffers; + } diff --git a/meta-digi-dey/recipes-graphics/wayland/weston_%.bbappend b/meta-digi-dey/recipes-graphics/wayland/weston_%.bbappend new file mode 100644 index 000000000..ddc30ee6d --- /dev/null +++ b/meta-digi-dey/recipes-graphics/wayland/weston_%.bbappend @@ -0,0 +1,3 @@ +# Copyright (C) 2020 Digi International. + +SRC_URI_append_ccimx6sbc = " file://0001-libweston-g2d-renderer-try-re-adjusting-fb-if-the-FB.patch" From 358305ffb840f56e9379346a29a42bdc5b22924b Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Thu, 17 Sep 2020 19:32:22 +0200 Subject: [PATCH 19/63] trustfence: enable encrypted environment for CC8MN Signed-off-by: Gonzalo Ruiz --- meta-digi-arm/conf/machine/include/ccimx8mn.inc | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-digi-arm/conf/machine/include/ccimx8mn.inc b/meta-digi-arm/conf/machine/include/ccimx8mn.inc index e94d7e96e..ac0ee1ff2 100644 --- a/meta-digi-arm/conf/machine/include/ccimx8mn.inc +++ b/meta-digi-arm/conf/machine/include/ccimx8mn.inc @@ -62,7 +62,6 @@ VIRTUAL-RUNTIME_initscripts ?= "initscripts" TRUSTFENCE_SIGN_MODE = "HAB" # TODO: Encryption not yet supported TRUSTFENCE_DEK_PATH = "0" -TRUSTFENCE_ENCRYPT_ENVIRONMENT = "0" # Adding 'wayland' along with 'x11' enables the xwayland backend # Vulkan is necessary for wayland to build From 0069380c6b0cb51d85d0956f082822828e1eb5bc Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Thu, 17 Sep 2020 10:37:47 +0200 Subject: [PATCH 20/63] meta-digi: update config templates for CC6/CC6QP platforms Both platforms were updated to use the XWayland desktop. Signed-off-by: Arturo Buzarra --- sdk/config/ccimx6qpsbc/conf-notes.txt | 8 ++++---- sdk/config/ccimx6sbc/conf-notes.txt | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sdk/config/ccimx6qpsbc/conf-notes.txt b/sdk/config/ccimx6qpsbc/conf-notes.txt index ed1cd5158..e42d80e4f 100644 --- a/sdk/config/ccimx6qpsbc/conf-notes.txt +++ b/sdk/config/ccimx6qpsbc/conf-notes.txt @@ -2,13 +2,13 @@ Digi Embedded Yocto provides the following image recipes: * dey-image-qt: graphical QT image - By default the image is X11-based so it provides a full SATO theme + By default the image is XWayland-based so it provides a full Weston desktop environment. - To compile the image for the framebuffer (instead of X11) add the - following line to the project's conf/local.conf: + To compile the image for the framebuffer (instead of XWayland) add + the following line to the project's conf/local.conf: - DISTRO_FEATURES_remove = "x11" + DISTRO_FEATURES_remove = "x11 wayland" * dey-image-aws: console-only image supporting Amazon Web Services IoT diff --git a/sdk/config/ccimx6sbc/conf-notes.txt b/sdk/config/ccimx6sbc/conf-notes.txt index ed1cd5158..e42d80e4f 100644 --- a/sdk/config/ccimx6sbc/conf-notes.txt +++ b/sdk/config/ccimx6sbc/conf-notes.txt @@ -2,13 +2,13 @@ Digi Embedded Yocto provides the following image recipes: * dey-image-qt: graphical QT image - By default the image is X11-based so it provides a full SATO theme + By default the image is XWayland-based so it provides a full Weston desktop environment. - To compile the image for the framebuffer (instead of X11) add the - following line to the project's conf/local.conf: + To compile the image for the framebuffer (instead of XWayland) add + the following line to the project's conf/local.conf: - DISTRO_FEATURES_remove = "x11" + DISTRO_FEATURES_remove = "x11 wayland" * dey-image-aws: console-only image supporting Amazon Web Services IoT From c40a92b3bb111f7105edbf0892678b99ff1c964e Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Wed, 16 Sep 2020 16:36:31 +0200 Subject: [PATCH 21/63] recipes-graphics: xorg-server: refresh patch to fix warning build This patch was updated to match with xorg-xserver v 1.20.5 Signed-off-by: Arturo Buzarra --- ...S-5186-Per-Specification-EGL_NATIVE_PIXMAP_KHR-req.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg/0001-MGS-5186-Per-Specification-EGL_NATIVE_PIXMAP_KHR-req.patch b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg/0001-MGS-5186-Per-Specification-EGL_NATIVE_PIXMAP_KHR-req.patch index 3e24fcfe9..e91c493a5 100644 --- a/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg/0001-MGS-5186-Per-Specification-EGL_NATIVE_PIXMAP_KHR-req.patch +++ b/meta-digi-dey/recipes-graphics/xorg-xserver/xserver-xorg/0001-MGS-5186-Per-Specification-EGL_NATIVE_PIXMAP_KHR-req.patch @@ -15,10 +15,10 @@ Signed-off-by: Prabhu Sundararaj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/xwayland/xwayland-glamor-gbm.c b/hw/xwayland/xwayland-glamor-gbm.c -index 80655fd16..e8c623e56 100644 +index a211e09..f5be403 100644 --- a/hw/xwayland/xwayland-glamor-gbm.c +++ b/hw/xwayland/xwayland-glamor-gbm.c -@@ -174,7 +174,7 @@ xwl_glamor_gbm_create_pixmap_for_bo(ScreenPtr screen, struct gbm_bo *bo, +@@ -166,7 +166,7 @@ xwl_glamor_gbm_create_pixmap_for_bo(ScreenPtr screen, struct gbm_bo *bo, xwl_pixmap->bo = bo; xwl_pixmap->buffer = NULL; xwl_pixmap->image = eglCreateImageKHR(xwl_screen->egl_display, @@ -26,7 +26,7 @@ index 80655fd16..e8c623e56 100644 + EGL_NO_CONTEXT /*xwl_screen->egl_context*/, EGL_NATIVE_PIXMAP_KHR, xwl_pixmap->bo, NULL); - if (xwl_pixmap->image == EGL_NO_IMAGE_KHR) + -- 2.17.1 From 4db64974c1afebe472ca4055fdd7664b58fb77f4 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Wed, 23 Sep 2020 13:44:19 +0200 Subject: [PATCH 22/63] imx-mkimage: ccimx8mn: preserve dtb file after running make With the latest version of imx-mkimage, the original dtb file is being removed at the end of the build. Add a patch to preserve it and be able to run several builds during the same compile run, like we do for imx-boot signing. Signed-off-by: Gonzalo Ruiz --- ...8m-soc.mak-preserve-dtbs-after-build.patch | 42 +++++++++++++++++++ .../imx-mkimage/imx-boot_1.0.bbappend | 2 + .../imx-mkimage/imx-mkimage_git.bb | 2 + 3 files changed, 46 insertions(+) create mode 100644 meta-digi-arm/recipes-bsp/imx-mkimage/files/0001-imx8m-soc.mak-preserve-dtbs-after-build.patch diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/files/0001-imx8m-soc.mak-preserve-dtbs-after-build.patch b/meta-digi-arm/recipes-bsp/imx-mkimage/files/0001-imx8m-soc.mak-preserve-dtbs-after-build.patch new file mode 100644 index 000000000..7c4fb2c82 --- /dev/null +++ b/meta-digi-arm/recipes-bsp/imx-mkimage/files/0001-imx8m-soc.mak-preserve-dtbs-after-build.patch @@ -0,0 +1,42 @@ +From: Gonzalo Ruiz +Date: Wed, 23 Sep 2020 10:15:08 +0200 +Subject: [PATCH] imx8m: soc.mak: preserve dtbs after build + +On commit ab433440269bbd5383b47ee60957e9906cda0b3b a dtb preprocess +was introduced to have compatibility with old U-Boots. + +As part of those changes, the content of variable $(dtbs) was deleted +at the end of the build. + +Since we added the dtbs variable as an argument, building is causing the +original dtb file to be removed, and a second build is failing since the +file pointed at by the dtbs variable does no longer exist. + +Remove the file removal to avoid this. + +Signed-off-by: Gonzalo Ruiz +--- + iMX8M/soc.mak | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/iMX8M/soc.mak b/iMX8M/soc.mak +index b7b3986..fa84c6a 100644 +--- a/iMX8M/soc.mak ++++ b/iMX8M/soc.mak +@@ -143,7 +143,7 @@ u-boot.itb: $(dtbs) + ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs) + DEK_BLOB_LOAD_ADDR=$(DEK_BLOB_LOAD_ADDR) TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) ./mkimage_fit_atf.sh $(dtbs) > u-boot.its + ./mkimage_uboot -E -p 0x3000 -f u-boot.its u-boot.itb +- @rm -f u-boot.its $(dtbs) ++ @rm -f u-boot.its + + dtbs_ddr3l = valddr3l.dtb + $(dtbs_ddr3l): +@@ -256,7 +256,6 @@ print_fit_hab: u-boot-nodtb.bin bl31.bin $(dtbs) + ./$(PAD_IMAGE) bl31.bin + ./$(PAD_IMAGE) u-boot-nodtb.bin $(dtbs) + TEE_LOAD_ADDR=$(TEE_LOAD_ADDR) ATF_LOAD_ADDR=$(ATF_LOAD_ADDR) VERSION=$(VERSION) ./print_fit_hab.sh $(PRINT_FIT_HAB_OFFSET) $(dtbs) +- @rm -f $(dtbs) + + print_fit_hab_ddr4: u-boot-nodtb.bin bl31.bin $(dtbs_ddr4_evk) + ./$(PAD_IMAGE) tee.bin diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend index 918378d8d..53440c60c 100644 --- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend +++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend @@ -1,6 +1,8 @@ # Copyright 2019,2020 Digi International, Inc. inherit boot-artifacts +SRC_URI_append_ccimx8mn = " file://0001-imx8m-soc.mak-preserve-dtbs-after-build.patch" + IMX_EXTRA_FIRMWARE_ccimx8x = "digi-sc-firmware imx-seco" DEPENDS_append_ccimx8x = " coreutils-native" diff --git a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.bb b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.bb index 511bb6195..1b80cfd32 100644 --- a/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.bb +++ b/meta-digi-arm/recipes-bsp/imx-mkimage/imx-mkimage_git.bb @@ -8,6 +8,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SECTION = "BSP" +SRC_URI_append_ccimx8mn = " file://0001-imx8m-soc.mak-preserve-dtbs-after-build.patch" + # Beware: applied last to first DEBUG_PREFIX_MAP = "-fdebug-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR} \ -fdebug-prefix-map=${STAGING_DIR_HOST}= \ From c9d4bbbd948bee0a773c1401e209b971085240dc Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Wed, 23 Sep 2020 14:19:12 +0200 Subject: [PATCH 23/63] layer.conf: remove weston-init from the BBMASK We originally ignored the weston-init.bbappend in meta-freescale back in thud because we were basing our recipe off of NXP's sumo BSP, and NXP's weston-init customizations were incompatible with the ones in meta-freescale. Remove it from the BBMASK to be able to incorporate the customizations in meta-freescale. Signed-off-by: Gabriel Valcazar --- meta-digi-dey/conf/layer.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-digi-dey/conf/layer.conf b/meta-digi-dey/conf/layer.conf index d3a402b40..91a959614 100644 --- a/meta-digi-dey/conf/layer.conf +++ b/meta-digi-dey/conf/layer.conf @@ -15,7 +15,6 @@ BBFILE_PATTERN_digi-dey := "^${LAYERDIR}/" BBFILE_PRIORITY_digi-dey = "6" BBMASK += "meta-freescale/recipes-graphics/drm/libdrm_%.bbappend" -BBMASK += "meta-freescale/recipes-graphics/wayland/weston-init.bbappend" LAYERDEPENDS_digi-dey = "core digi-arm" LAYERDEPENDS_digi-dey += "openembedded-layer networking-layer webserver qt5-layer swupdate" From 66471fd0c2f9db81411e20a146a5a932351d5bed Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Fri, 25 Sep 2020 10:23:45 +0200 Subject: [PATCH 24/63] ccimx6qpsbc: bootscript: hardcode imx6qp soc_family for all SOC variants In the ccimx6sbc, since each SOC has a separate set of device trees, we can use the soc_family environment variable when generating the name of the final device tree in the bootscript. However, for the ccimx6qpsbc, there is only one set of device trees with the "imx6qp" prefix, even though there are SOC variants such as the imx6dp. Running the bootscript on a ccimx6qpsbc with an imx6dp SOC assembled will result in a failure, since it will look for a non-existing device tree starting with a "imx6dp" prefix. Stop using the soc_family variable and hardcode "imx6qp" instead. Signed-off-by: Gabriel Valcazar --- .../recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt index 7c9012a1e..0af8ee3f9 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt @@ -6,15 +6,15 @@ # Set device tree filename depending on the board ID (if defined) # if test -n "${board_id}"; then - setenv fdt_file ${soc_family}-ccimx6qpsbc-id${board_id}.dtb + setenv fdt_file imx6qp-ccimx6qpsbc-id${board_id}.dtb else # # Set device tree filename depending on the hardware variant # if test "${module_variant}" = "0x01"; then - setenv fdt_file ${soc_family}-ccimx6qpsbc-wb.dtb + setenv fdt_file imx6qp-ccimx6qpsbc-wb.dtb else - setenv fdt_file ${soc_family}-ccimx6qpsbc-wb.dtb + setenv fdt_file imx6qp-ccimx6qpsbc-wb.dtb fi fi From fe6d67ad2c33819ee7f79138c352242dffb77c47 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Fri, 25 Sep 2020 13:29:58 +0200 Subject: [PATCH 25/63] u-boot: fix scripts for variants with old-style HWID Wrapping unterminated lines doesn't work for scripts (even if they contain the backslash). Substitute with full non-wrapped if/elif sentences. Signed-off-by: Hector Palacios https://jira.digi.com/browse/DEL-7252 --- .../ccimx8x-sbc-express/install_linux_fw_sd.txt | 10 ++++++---- .../u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt | 10 ++++++---- .../recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt | 8 +++++--- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt index cef4f9334..56f16d909 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt @@ -31,11 +31,13 @@ else if test -n "${module_variant}"; then if test "${module_variant}" = "0x01"; then setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1GB_32bit.bin; - elif test "${module_variant}" = "0x02" || \ - test "${module_variant}" = "0x03"; then + elif test "${module_variant}" = "0x02"; then setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-2GB_32bit.bin; - elif test "${module_variant}" = "0x04" || \ - test "${module_variant}" = "0x05"; then + elif test "${module_variant}" = "0x03"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-2GB_32bit.bin; + elif test "${module_variant}" = "0x04"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1GB_16bit.bin; + elif test "${module_variant}" = "0x05"; then setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1GB_16bit.bin; fi fi diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt index 4f9fe3265..9aa482a53 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt @@ -42,11 +42,13 @@ else if test -n "${module_variant}"; then if test "${module_variant}" = "0x01"; then setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_32bit.bin; - elif test "${module_variant}" = "0x02" || \ - test "${module_variant}" = "0x03"; then + elif test "${module_variant}" = "0x02"; then setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-2GB_32bit.bin; - elif test "${module_variant}" = "0x04" || \ - test "${module_variant}" = "0x05"; then + elif test "${module_variant}" = "0x03"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-2GB_32bit.bin; + elif test "${module_variant}" = "0x04"; then + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_16bit.bin; + elif test "${module_variant}" = "0x05"; then setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_16bit.bin; elif test "${module_variant}" = "0x06"; then setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-512GB_16bit.bin; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt index c1e68612c..dd3edbecb 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt @@ -27,9 +27,11 @@ else # # Set overlays depending on the hardware variant # - if test "${module_variant}" = "0x01" || - test "${module_variant}" = "0x02" || - test "${module_variant}" = "0x04"; then + if test "${module_variant}" = "0x01"; then + setenv overlays ccimx8x_ov_bt.dtbo,ccimx8x_ov_wifi.dtbo,${overlays} + elif test "${module_variant}" = "0x02"; then + setenv overlays ccimx8x_ov_bt.dtbo,ccimx8x_ov_wifi.dtbo,${overlays} + elif test "${module_variant}" = "0x04"; then setenv overlays ccimx8x_ov_bt.dtbo,ccimx8x_ov_wifi.dtbo,${overlays} fi fi From 5cb7ecc3a529c20ec65b5ef4f4ae6e094972f919 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Thu, 25 Jun 2020 12:15:52 +0200 Subject: [PATCH 26/63] meta-digi: update revisions for dey-3.0-r1.6 Signed-off-by: Gabriel Valcazar --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 4 ++-- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 922d34d2d..8daa0b582 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index 3cf75fbd9..cf704d0ef 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "2b3019187febca17b1bdcc22253bd96c303771fa" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index dd3b5a540..9df979d3f 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2018.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "96bc8bb2421563f5c4defa9fbe8dd6e5010ac318" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb index ae6f36af7..21953d734 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2019.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "2a2bab2587c331b92ea516b3d588dd0538603d6b" COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index af708ccae..93b16cd24 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -7,7 +7,7 @@ DEPENDS = "trustfence-cst coreutils util-linux" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}" SRCBRANCH = "v2019.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "2a2bab2587c331b92ea516b3d588dd0538603d6b" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 4437359c9..f6e08314e 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};branch=${SRCBRANCH} \ + ${QCOM_GIT_URI};nobranch=1 \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 3fe0b2f82..97445a71f 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" SRCBRANCH = "v5.4/dey-3.0/maint" SRCBRANCH_ccimx6 = "v4.9/dey-2.6/maint" -SRCREV = "${AUTOREV}" +SRCREV = "9072682725b11354b9cae0394d5284eb95cb8d92" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${LINUX_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index d5501cdd7..a906fad5d 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "${AUTOREV}" +SRCREV = "35943b2466c9357cdd4e5c165f26149d82ed51f6" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${CC_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index eeacd53d5..70fe084db 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc @@ -1,11 +1,11 @@ # Copyright (C) 2019, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "1317384494f56ac3d10e7dee3ac968b944f02468" DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" DEY_EXAMPLES_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=https" DEY_EXAMPLES_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DEY_EXAMPLES_STASH}', '${DEY_EXAMPLES_GITHUB}', d)}" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${DEY_EXAMPLES_GIT_URI};nobranch=1" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 2e62dbcf5..04883a5d3 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "bce0bfff451c67c5387ebdaa9b5da1bde82750ca" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ + ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From ff756dd8f7715f1e898aab0635719a5d4a7c899e Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 28 Sep 2020 13:50:28 +0200 Subject: [PATCH 27/63] meta-digi: revert revisions to AUTOREV --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb | 2 +- .../recipes-digi/trustfence/trustfence-sign-tools_git.bb | 4 ++-- .../kernel-module-qualcomm/kernel-module-qualcomm.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc | 4 ++-- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc | 4 ++-- meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 8daa0b582..922d34d2d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index cf704d0ef..3cf75fbd9 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "2b3019187febca17b1bdcc22253bd96c303771fa" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index 9df979d3f..dd3b5a540 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2018.03/maint" -SRCREV = "96bc8bb2421563f5c4defa9fbe8dd6e5010ac318" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb index 21953d734..ae6f36af7 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" DEPENDS += "flex-native bison-native" SRCBRANCH = "v2019.04/maint" -SRCREV = "2a2bab2587c331b92ea516b3d588dd0538603d6b" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index 93b16cd24..af708ccae 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb @@ -7,7 +7,7 @@ DEPENDS = "trustfence-cst coreutils util-linux" DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN_MODE', 'AHAB', 'imx-mkimage', '', d)}" SRCBRANCH = "v2019.04/maint" -SRCREV = "2a2bab2587c331b92ea516b3d588dd0538603d6b" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index f6e08314e..4437359c9 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-3.0/maint" -SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" +SRCREV = "${AUTOREV}" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};nobranch=1 \ + ${QCOM_GIT_URI};branch=${SRCBRANCH} \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 97445a71f..3fe0b2f82 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc @@ -6,10 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" LOCALVERSION = "-dey" SRCBRANCH = "v5.4/dey-3.0/maint" SRCBRANCH_ccimx6 = "v4.9/dey-2.6/maint" -SRCREV = "9072682725b11354b9cae0394d5284eb95cb8d92" +SRCREV = "${AUTOREV}" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};nobranch=1" +SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index a906fad5d..d5501cdd7 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "35943b2466c9357cdd4e5c165f26149d82ed51f6" +SRCREV = "${AUTOREV}" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};nobranch=1" +SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index 70fe084db..eeacd53d5 100644 --- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc +++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc @@ -1,11 +1,11 @@ # Copyright (C) 2019, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "1317384494f56ac3d10e7dee3ac968b944f02468" +SRCREV = "${AUTOREV}" DEY_EXAMPLES_STASH = "${DIGI_MTK_GIT}dey/dey-examples.git;protocol=ssh" DEY_EXAMPLES_GITHUB = "${DIGI_GITHUB_GIT}/dey-examples.git;protocol=https" DEY_EXAMPLES_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DEY_EXAMPLES_STASH}', '${DEY_EXAMPLES_GITHUB}', d)}" -SRC_URI = "${DEY_EXAMPLES_GIT_URI};nobranch=1" +SRC_URI = "${DEY_EXAMPLES_GIT_URI};branch=${SRCBRANCH}" diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb index 04883a5d3..2e62dbcf5 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "bce0bfff451c67c5387ebdaa9b5da1bde82750ca" +SRCREV = "${AUTOREV}" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ + ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From 3b0cf4eb768820ef2fc01f27cc23ee507f6aa313 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 28 Sep 2020 10:28:53 +0200 Subject: [PATCH 28/63] qtbase: use platform-specific qt5.sh scripts instead of backend-specific ones We have specific scripts per platform to export the qt5 environment variables, because using the default backend-specific scripts ported from the meta-imx layer results in mismatches in specific cases (for example, 6UL framebuffer images only support linuxfb, but the qt5-fb.sh script exports eglfs instead). Signed-off-by: Gabriel Valcazar --- meta-digi-dey/recipes-qt/qt5/qtbase/qt5-fb.sh | 2 -- meta-digi-dey/recipes-qt/qt5/qtbase/qt5-wayland.sh | 2 -- meta-digi-dey/recipes-qt/qt5/qtbase/qt5-x11.sh | 2 -- meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend | 10 +++------- 4 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 meta-digi-dey/recipes-qt/qt5/qtbase/qt5-fb.sh delete mode 100644 meta-digi-dey/recipes-qt/qt5/qtbase/qt5-wayland.sh delete mode 100644 meta-digi-dey/recipes-qt/qt5/qtbase/qt5-x11.sh diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-fb.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-fb.sh deleted file mode 100644 index 34fa033af..000000000 --- a/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-fb.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -export QT_QPA_PLATFORM=eglfs diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-wayland.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-wayland.sh deleted file mode 100644 index 6779c9d12..000000000 --- a/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-wayland.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -export QT_QPA_PLATFORM=wayland diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-x11.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-x11.sh deleted file mode 100644 index 8bbd73b94..000000000 --- a/meta-digi-dey/recipes-qt/qt5/qtbase/qt5-x11.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -export QT_QPA_PLATFORM=xcb diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend index aebffbf37..c1ed65746 100644 --- a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend +++ b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend @@ -6,13 +6,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -IMX_BACKEND = \ - "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland',\ - bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ - 'fb', d), d)}" - +# Digi: we use a custom script per platform, not per backend like NXP does SRC_URI_append = " \ - file://qt5-${IMX_BACKEND}.sh \ + file://qt5.sh \ " SRC_URI_append_imxgpu3d = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', \ @@ -52,7 +48,7 @@ do_install_append () { sed -i 's,-L${STAGING_DIR_HOST}/usr/lib,,' ${D}${libdir}/pkgconfig/Qt5*.pc fi install -d ${D}${sysconfdir}/profile.d/ - install -m 0755 ${WORKDIR}/qt5-${IMX_BACKEND}.sh ${D}${sysconfdir}/profile.d/qt5.sh + install -m 0755 ${WORKDIR}/qt5.sh ${D}${sysconfdir}/profile.d/qt5.sh } FILES_${PN} += "${sysconfdir}/profile.d/qt5.sh" From f1c1bbdffb5edce15e272ac6b5446e44eeecca18 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Fri, 25 Sep 2020 18:51:09 +0200 Subject: [PATCH 29/63] auto-serial-console: add systemd support Add systemd auto-getty.service to run agetty on the console defined in the kernel command line on platforms with systemd support. This service replaces serial-getty@.service as the one responsible for opening a tty port and prompting for a login name when TRUSTFENCE_CONSOLE_DISABLE is configured. https://jira.digi.com/browse/DEL-7242 Signed-off-by: Gonzalo Ruiz --- .../auto-serial-console/auto-getty-systemd | 24 +++++++++++++++++ .../{auto-getty => auto-getty-sysvinit} | 0 .../auto-serial-console/auto-getty.service | 26 +++++++++++++++++++ .../auto-serial-console_0.1.bb | 13 +++++++--- 4 files changed, 60 insertions(+), 3 deletions(-) create mode 100644 meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console/auto-getty-systemd rename meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console/{auto-getty => auto-getty-sysvinit} (100%) mode change 100755 => 100644 create mode 100644 meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console/auto-getty.service diff --git a/meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console/auto-getty-systemd b/meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console/auto-getty-systemd new file mode 100644 index 000000000..2808bda81 --- /dev/null +++ b/meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console/auto-getty-systemd @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +[ -f "/etc/default/autogetty" ] && . /etc/default/autogetty + +[ "${ENABLED}" != "1" ] && exit + +for arg in $(cat /proc/cmdline); do + case "${arg}" in + console=*) + eval ${arg} + TTY="${console%,*}" + SPEED="${console#*,}" + + # If no speed is given default to 115200 and fall-back + [ "${SPEED}" = "${TTY}" ] && SPEED="115200,57600,38400,19200,9600" + + if [ -n "${TTY}" ] && grep -qs "${TTY}" /etc/securetty; then + setsid /sbin/agetty -8 -L ${TTY} ${SPEED} xterm + fi + ;; + esac +done diff --git a/meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console/auto-getty b/meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console/auto-getty-sysvinit old mode 100755 new mode 100644 similarity index 100% rename from meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console/auto-getty rename to meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console/auto-getty-sysvinit diff --git a/meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console/auto-getty.service b/meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console/auto-getty.service new file mode 100644 index 000000000..ae9562b59 --- /dev/null +++ b/meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console/auto-getty.service @@ -0,0 +1,26 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Serial Auto-Getty +After=systemd-user-sessions.service plymouth-quit-wait.service +After=rc-local.service + +# If additional gettys are spawned during boot then we should make +# sure that this is synchronized before getty.target, even though +# getty.target didn't actually pull it in. +Before=getty.target +IgnoreOnIsolate=yes + +[Service] +ExecStart=/usr/bin/auto-getty +Type=idle +Restart=always +RestartSec=0 + +[Install] +WantedBy=getty.target diff --git a/meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console_0.1.bb b/meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console_0.1.bb index 01a9ec7a9..836862568 100644 --- a/meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console_0.1.bb +++ b/meta-digi-dey/recipes-digi/auto-serial-console/auto-serial-console_0.1.bb @@ -7,18 +7,22 @@ LIC_FILES_CHKSUM = "\ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420 \ " +AUTOGETTY_FILE="${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'auto-getty-systemd', 'auto-getty-sysvinit', d)}" + SRC_URI = "\ file://autogetty \ - file://auto-getty \ + file://${AUTOGETTY_FILE} \ + file://auto-getty.service \ file://auto-serial-console \ " S = "${WORKDIR}" -inherit update-rc.d +inherit systemd update-rc.d INITSCRIPT_NAME = "auto-serial-console" INITSCRIPT_PARAMS = "start 99 5 ." +SYSTEMD_SERVICE_${PN} = "auto-getty.service" do_install () { install -m 0755 -d ${D}${sysconfdir}/default @@ -29,6 +33,9 @@ do_install () { install -m 0755 -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/auto-serial-console ${D}${sysconfdir}/init.d/auto-serial-console + install -d ${D}${systemd_unitdir}/system/ + install -m 0644 ${WORKDIR}/auto-getty.service ${D}${systemd_unitdir}/system/auto-getty.service + install -m 0755 -d ${D}${bindir} - install -m 0755 ${WORKDIR}/auto-getty ${D}${bindir}/auto-getty + install -m 0755 ${WORKDIR}/${AUTOGETTY_FILE} ${D}${bindir}/auto-getty } From 7938ddef8f030db0c0cb73a2b6c6a0659804c533 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 28 Sep 2020 16:55:29 +0200 Subject: [PATCH 30/63] dey-image-recovery-initramfs: remove openssl-bin from initramfs This package was being included as a RRECOMMENDS from libcrypto, but we don't need it in the initramfs at all. Since our recovery image is already pretty big compared with the recovery partition size on ccimx6ul platforms with 256 MB of storage, remove it to make sure the image can fit. https://jira.digi.com/browse/DEL-7253 Signed-off-by: Gabriel Valcazar --- .../recipes-core/images/dey-image-recovery-initramfs.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-digi-dey/recipes-core/images/dey-image-recovery-initramfs.bb b/meta-digi-dey/recipes-core/images/dey-image-recovery-initramfs.bb index 15cc4481e..e53606405 100644 --- a/meta-digi-dey/recipes-core/images/dey-image-recovery-initramfs.bb +++ b/meta-digi-dey/recipes-core/images/dey-image-recovery-initramfs.bb @@ -29,6 +29,7 @@ IMAGE_ROOTFS_SIZE = "8192" # Remove some packages added via recommendations BAD_RECOMMENDATIONS += " \ + openssl-bin \ openssl-conf \ " From 3786647d1c12df7251ff18119bbc35021495cd04 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 29 Sep 2020 18:06:02 +0200 Subject: [PATCH 31/63] ccimx8x/mn: rename dt overlays filenames Follow the syntax: _ov__[_].dts where: _ov_ identifies the file as an overlay. som|board identifies whether the overlay applies to the SOM or to the carrier board. functionality identifies the function of the overlay. hardware identifies the hardware to which the overlay applies. Signed-off-by: Hector Palacios --- meta-digi-arm/conf/machine/ccimx8mn-dvk.conf | 10 +++++----- .../conf/machine/ccimx8x-sbc-express.conf | 6 +++--- .../conf/machine/ccimx8x-sbc-pro.conf | 20 +++++++++---------- .../u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt | 8 ++++---- .../u-boot/u-boot-dey/ccimx8x/boot.txt | 12 +++++------ 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf index 5b45b1424..025e7e817 100644 --- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf @@ -15,12 +15,12 @@ SPL_BINARY = "spl/u-boot-spl.bin" UBOOT_DTB_NAME = "ccimx8mn-dvk.dtb" KERNEL_DEVICETREE ?= " \ - digi/ccimx8mn_ov_bt.dtbo \ - digi/ccimx8mn_ov_quad.dtbo \ - digi/ccimx8mn_ov_v1.dtbo \ - digi/ccimx8mn_ov_wifi.dtbo \ digi/ccimx8mn-dvk.dtb \ - digi/ccimx8mn-dvk_ov_lvds.dtbo \ + digi/_ov_board_lvds_ccimx8mn-dvk.dtbo \ + digi/_ov_som_bt_ccimx8mn.dtbo \ + digi/_ov_som_quad_ccimx8mn.dtbo \ + digi/_ov_som_v1_ccimx8mn.dtbo \ + digi/_ov_som_wifi_ccimx8mn.dtbo \ " SERIAL_CONSOLES ?= "115200;ttymxc0" diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf index e4aa15a34..c2599b41d 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-express.conf @@ -13,9 +13,9 @@ UBOOT_CONFIG[ccimx8x_sbc_express1GB] = "ccimx8x_sbc_express1GB_defconfig,,u-boot KERNEL_DEVICETREE ?= " \ digi/ccimx8x-sbc-express.dtb \ - digi/ccimx8x_ov_bt.dtbo \ - digi/ccimx8x_ov_qxp.dtbo \ - digi/ccimx8x_ov_wifi.dtbo \ + digi/_ov_som_bt_ccimx8x.dtbo \ + digi/_ov_som_quad_ccimx8x.dtbo \ + digi/_ov_som_wifi_ccimx8x.dtbo \ " SERIAL_CONSOLES ?= "115200;ttyLP2" diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf index 9563dcfcd..d69665211 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf @@ -14,16 +14,16 @@ UBOOT_CONFIG[ccimx8x_sbc_pro512MB] = "ccimx8x_sbc_pro512MB_defconfig,,u-boot-dtb KERNEL_DEVICETREE ?= " \ digi/ccimx8x-sbc-pro.dtb \ - digi/ccimx8x_ov_bt.dtbo \ - digi/ccimx8x_ov_qxp.dtbo \ - digi/ccimx8x_ov_wifi.dtbo \ - digi/ccimx8x-sbc-pro_ov_flexcan1.dtbo \ - digi/ccimx8x-sbc-pro_ov_lpuart3.dtbo \ - digi/ccimx8x-sbc-pro_ov_lt9812-hdmi-dsi0.dtbo \ - digi/ccimx8x-sbc-pro_ov_lvds1.dtbo \ - digi/ccimx8x-sbc-pro_ov_parallel-camera.dtbo \ - digi/ccimx8x-sbc-pro_ov_pcie-card.dtbo \ - digi/ccimx8x-sbc-pro_ov_hsd101pfw2_lvds.dtbo \ + digi/_ov_board_flexcan1_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 \ + digi/_ov_board_lvds1_ccimx8x-sbc-pro.dtbo \ + digi/_ov_board_parallel-camera_ccimx8x-sbc-pro.dtbo \ + digi/_ov_board_pcie-card_ccimx8x-sbc-pro.dtbo \ + digi/_ov_som_bt_ccimx8x.dtbo \ + digi/_ov_som_quad_ccimx8x.dtbo \ + digi/_ov_som_wifi_ccimx8x.dtbo \ " SERIAL_CONSOLES ?= "115200;ttyLP2" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt index 0b72f146f..c85d093c1 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt @@ -21,21 +21,21 @@ if test -n "${module_ram}"; then setexpr module_has_bt ${module_has_bt} / 20000 if test "${module_has_bt}" = "1"; then - setenv overlays ccimx8mn_ov_bt.dtbo,${overlays} + setenv overlays _ov_som_bt_ccimx8mn.dtbo,${overlays} fi if test "${module_has_wifi}" = "1"; then - setenv overlays ccimx8mn_ov_wifi.dtbo,${overlays} + setenv overlays _ov_som_wifi_ccimx8mn.dtbo,${overlays} fi if test "${som_hv}" = "1"; then - setenv overlays ccimx8mn_ov_v1.dtbo,${overlays} + setenv overlays _ov_som_v1_ccimx8mn.dtbo,${overlays} fi fi # Apply quad overlay if the SOC type is "imx8mn" if test "${soc_type}" = "imx8mn"; then - setenv overlays ccimx8mn_ov_quad.dtbo,${overlays} + setenv overlays _ov_som_quad_ccimx8mn.dtbo,${overlays} fi # Get the UUID of the configured boot partition. diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt index dd3edbecb..f0fbb1a0e 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt @@ -17,28 +17,28 @@ if test -n "${module_ram}"; then setexpr module_has_bt ${module_has_bt} / 2 if test "${module_has_bt}" = "1"; then - setenv overlays ccimx8x_ov_bt.dtbo,${overlays} + setenv overlays _ov_som_bt_ccimx8x.dtbo,${overlays} fi if test "${module_has_wifi}" = "1"; then - setenv overlays ccimx8x_ov_wifi.dtbo,${overlays} + setenv overlays _ov_som_wifi_ccimx8x.dtbo,${overlays} fi else # # Set overlays depending on the hardware variant # if test "${module_variant}" = "0x01"; then - setenv overlays ccimx8x_ov_bt.dtbo,ccimx8x_ov_wifi.dtbo,${overlays} + setenv overlays _ov_som_bt_ccimx8x.dtbo,_ov_som_wifi_ccimx8x.dtbo,${overlays} elif test "${module_variant}" = "0x02"; then - setenv overlays ccimx8x_ov_bt.dtbo,ccimx8x_ov_wifi.dtbo,${overlays} + setenv overlays _ov_som_bt_ccimx8x.dtbo,_ov_som_wifi_ccimx8x.dtbo,${overlays} elif test "${module_variant}" = "0x04"; then - setenv overlays ccimx8x_ov_bt.dtbo,ccimx8x_ov_wifi.dtbo,${overlays} + setenv overlays _ov_som_bt_ccimx8x.dtbo,_ov_som_wifi_ccimx8x.dtbo,${overlays} fi fi # Apply QXP overlay if the SOC type is "imx8qxp" if test "${soc_type}" = "imx8qxp"; then - setenv overlays ccimx8x_ov_qxp.dtbo,${overlays} + setenv overlays _ov_som_quad_ccimx8x.dtbo,${overlays} fi # Get the UUID of the configured boot partition. From 23b7815c17750d9fac33c9f122b61f13fc9419a0 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Wed, 30 Sep 2020 18:04:08 +0200 Subject: [PATCH 32/63] meta-digi-dey: libdigiapix: Update GPIO rules for digiapix group. This commit updates the GPIO udev rules to change the group owner and permission of the new gpio char driver. This will allow users that belong to the digiapix group to access the char driver. Signed-off-by: Mike Engel https://jira.digi.com/browse/DEL-7255 --- .../recipes-digi/libdigiapix/libdigiapix-git/99-digiapix.rules | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/99-digiapix.rules b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/99-digiapix.rules index 4da39ff7c..fde3880f2 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/99-digiapix.rules +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/99-digiapix.rules @@ -5,6 +5,7 @@ SUBSYSTEM=="iio", GROUP="digiapix", MODE="0660" SUBSYSTEM=="misc", GROUP="digiapix", MODE="0660", ENV{DEVNAME}=="/dev/watchdog" SUBSYSTEM=="spidev", GROUP="digiapix", MODE="0660" SUBSYSTEM=="watchdog",GROUP="digiapix", MODE="0660" +SUBSYSTEM=="gpio", GROUP="digiapix", MODE="0660", ACTION=="add" # # Use two different rules for GPIO's. From 2ade93d8ebcde0b882a7adfe5573f6bc1294c187 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Wed, 30 Sep 2020 18:52:49 +0200 Subject: [PATCH 33/63] u-boot-dey: restore modified env vars in case of error on bootscript The boot script appends values to certain variables such as $extra_bootargs and $overlays. If the final instruction of the boot script (dboot command) fails, these variables contain the new values, plus the original one. Since the user recovers the prompt, he may do a 'saveenv' to save the environment, and the modified variables will be saved, only to be enlarged again on the next boot. This can lead to repeated strings on such variables. Save the original value and restore it in case of failure on the dboot command. Signed-off-by: Hector Palacios --- .../u-boot/u-boot-dey/ccimx6qpsbc/boot.txt | 11 +++++++++++ .../u-boot/u-boot-dey/ccimx6sbc/boot.txt | 11 +++++++++++ .../u-boot/u-boot-dey/ccimx6ulsbc/boot.txt | 11 +++++++++++ .../u-boot/u-boot-dey/ccimx6ulstarter/boot.txt | 11 +++++++++++ .../u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt | 14 ++++++++++++++ .../recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt | 14 ++++++++++++++ 6 files changed, 72 insertions(+) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt index 0af8ee3f9..67f84c604 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt @@ -2,6 +2,9 @@ # U-Boot bootscript for EMMC/SD images created by Yocto. # +# Back up environment variables +setenv ORIG_extra_bootargs ${extra_bootargs} + # # Set device tree filename depending on the board ID (if defined) # @@ -34,3 +37,11 @@ else fi setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs} dboot linux mmc ${mmcbootdev}:${mmcpart} + + + +# We only get here in case of an error on the dboot command. + +# Undo changes to environment variables +setenv extra_bootargs ${ORIG_extra_bootargs} +setenv ORIG_extra_bootargs diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt index 95f55ff61..d68c1bfee 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6sbc/boot.txt @@ -2,6 +2,9 @@ # U-Boot bootscript for EMMC/SD images created by Yocto. # +# Back up environment variables +setenv ORIG_extra_bootargs ${extra_bootargs} + # # Set device tree filename depending on the board ID (if defined) # @@ -64,3 +67,11 @@ else fi setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs} dboot linux mmc ${mmcbootdev}:${mmcpart} + + + +# We only get here in case of an error on the dboot command. + +# Undo changes to environment variables +setenv extra_bootargs ${ORIG_extra_bootargs} +setenv ORIG_extra_bootargs diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt index 09e5b0ec1..00762b19a 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulsbc/boot.txt @@ -2,6 +2,9 @@ # U-Boot bootscript for NAND images created by Yocto. # +# Back up environment variables +setenv ORIG_extra_bootargs ${extra_bootargs} + # # Set device tree filename depending on the board ID (if defined) # @@ -28,3 +31,11 @@ else fi setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs} dboot linux nand ${mtdbootpart} + + + +# We only get here in case of an error on the dboot command. + +# Undo changes to environment variables +setenv extra_bootargs ${ORIG_extra_bootargs} +setenv ORIG_extra_bootargs diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt index 37758ec4f..daf3d707f 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6ulstarter/boot.txt @@ -2,6 +2,9 @@ # U-Boot bootscript for NAND images created by Yocto. # +# Back up environment variables +setenv ORIG_extra_bootargs ${extra_bootargs} + # # Set device tree filename depending on the board ID (if defined) # @@ -28,3 +31,11 @@ else fi setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs} dboot linux nand ${mtdbootpart} + + + +# We only get here in case of an error on the dboot command. + +# Undo changes to environment variables +setenv extra_bootargs ${ORIG_extra_bootargs} +setenv ORIG_extra_bootargs diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt index c85d093c1..b49f6a4df 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt @@ -2,6 +2,10 @@ # U-Boot bootscript for EMMC/SD images created by Yocto. # +# Back up environment variables +setenv ORIG_overlays ${overlays} +setenv ORIG_extra_bootargs ${extra_bootargs} + # Set SOC type to "imx8mn" if not already defined by U-Boot if test ! -n "${soc_type}"; then setenv soc_type "imx8mn" @@ -54,3 +58,13 @@ else fi setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs} dboot linux mmc ${mmcbootdev}:${mmcpart} + + + +# We only get here in case of an error on the dboot command. + +# Undo changes to environment variables +setenv overlays ${ORIG_overlays} +setenv ORIG_overlays +setenv extra_bootargs ${ORIG_extra_bootargs} +setenv ORIG_extra_bootargs diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt index f0fbb1a0e..875d874de 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt @@ -2,6 +2,10 @@ # U-Boot bootscript for EMMC/SD images created by Yocto. # +# Back up environment variables +setenv ORIG_overlays ${overlays} +setenv ORIG_extra_bootargs ${extra_bootargs} + # Set SOC type to "imx8qxp" if not already defined by U-Boot if test ! -n "${soc_type}"; then setenv soc_type "imx8qxp" @@ -57,3 +61,13 @@ else fi setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs} dboot linux mmc ${mmcbootdev}:${mmcpart} + + + +# We only get here in case of an error on the dboot command. + +# Undo changes to environment variables +setenv overlays ${ORIG_overlays} +setenv ORIG_overlays +setenv extra_bootargs ${ORIG_extra_bootargs} +setenv ORIG_extra_bootargs From 58707b40bad1d98f4c755ebcb38b4627b00cbf95 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Fri, 2 Oct 2020 18:03:34 +0200 Subject: [PATCH 34/63] meta-digi-dey: qtbase: update ccimx6 qt5.sh script to reflect xwayland migration This commit adds new environment variables to support QT with wayland and to fix the following error message when executing QT5 applications on the target. qt.qpa.plugin: Could not find the Qt platform plugin "eglfs" in "" This application failed to start because no Qt platform plugin could be initialized. Reinstalling the application may fix this problem. Available platform plugins are: minimal, offscreen, vnc, wayland-egl, wayland, xcb. Aborted. Signed-off-by: Mike Engel --- meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6/qt5.sh | 2 -- meta-digi-dey/recipes-qt/qt5/qtbase/ccimx8x/qt5.sh | 9 --------- .../recipes-qt/qt5/qtbase/{ccimx6ul => fb}/qt5.sh | 0 .../recipes-qt/qt5/qtbase/{ccimx8mn => xwayland}/qt5.sh | 0 meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend | 4 +++- 5 files changed, 3 insertions(+), 12 deletions(-) delete mode 100644 meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6/qt5.sh delete mode 100644 meta-digi-dey/recipes-qt/qt5/qtbase/ccimx8x/qt5.sh rename meta-digi-dey/recipes-qt/qt5/qtbase/{ccimx6ul => fb}/qt5.sh (100%) rename meta-digi-dey/recipes-qt/qt5/qtbase/{ccimx8mn => xwayland}/qt5.sh (100%) diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6/qt5.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6/qt5.sh deleted file mode 100644 index 6ffe8f271..000000000 --- a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6/qt5.sh +++ /dev/null @@ -1,2 +0,0 @@ -# Use EGLFS platform plugin for images without X11 -[ -f "/etc/init.d/xserver-nodm" ] || export QT_QPA_PLATFORM="eglfs" diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx8x/qt5.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx8x/qt5.sh deleted file mode 100644 index 16c8e26d7..000000000 --- a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx8x/qt5.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -export QT_QPA_PLATFORM="wayland" - -[ -f "/etc/profile.d/weston.sh" ] && return - -export QT_QPA_PLATFORM="xcb" - -# Use EGLFS platform plugin for images without XWayland and X11 -[ -f "/etc/xserver-nodm/Xserver" ] || export QT_QPA_PLATFORM="eglfs" diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/qt5.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/fb/qt5.sh similarity index 100% rename from meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/qt5.sh rename to meta-digi-dey/recipes-qt/qt5/qtbase/fb/qt5.sh diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx8mn/qt5.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/xwayland/qt5.sh similarity index 100% rename from meta-digi-dey/recipes-qt/qt5/qtbase/ccimx8mn/qt5.sh rename to meta-digi-dey/recipes-qt/qt5/qtbase/xwayland/qt5.sh diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend index c1ed65746..f7ae3240b 100644 --- a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend +++ b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend @@ -6,9 +6,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +SCRIPT_DIR = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', 'fb', d)}" + # Digi: we use a custom script per platform, not per backend like NXP does SRC_URI_append = " \ - file://qt5.sh \ + file://${SCRIPT_DIR}/qt5.sh \ " SRC_URI_append_imxgpu3d = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', \ From a872c5f4cd414db126d9360dd8a2e4af0b4af755 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 5 Oct 2020 09:57:59 +0200 Subject: [PATCH 35/63] trustfence-tool: update to v2.4 This version includes changes needed to reflect the OTP driver update in the kernel. https://jira.digi.com/browse/DEL-7261 Signed-off-by: Gabriel Valcazar --- .../trustfence/trustfence-tool_2.3.bb | 17 ----------------- .../trustfence/trustfence-tool_2.4.bb | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 meta-digi-dey/recipes-core/trustfence/trustfence-tool_2.3.bb create mode 100644 meta-digi-dey/recipes-core/trustfence/trustfence-tool_2.4.bb diff --git a/meta-digi-dey/recipes-core/trustfence/trustfence-tool_2.3.bb b/meta-digi-dey/recipes-core/trustfence/trustfence-tool_2.3.bb deleted file mode 100644 index fb9d7a042..000000000 --- a/meta-digi-dey/recipes-core/trustfence/trustfence-tool_2.3.bb +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2016-2019 Digi International. - -SUMMARY = "Trustfence command line tool" -SECTION = "console/tools" -LICENSE = "CLOSED" - -SRC_URI_arm = "${DIGI_PKG_SRC}/${BP}-${TUNE_ARCH}.tar.gz;name=arm" - -SRC_URI[arm.md5sum] = "ef253e2c781d76820f38832ceec22ada" -SRC_URI[arm.sha256sum] = "5fc478f76848b438cc28cbdc7f8eabd63f7db4b2998a5a46d75602a80365a596" - -SRC_URI_aarch64 = "${DIGI_PKG_SRC}/${BP}-${TUNE_ARCH}.tar.gz;name=aarch64" - -SRC_URI[aarch64.md5sum] = "a109efb8a2c7b57f2e83136ada24938d" -SRC_URI[aarch64.sha256sum] = "ddb9cb94b4ffa182e479cfbcc0f57774a6c68ac813b4af747aa493c259970c5b" - -inherit bin_package diff --git a/meta-digi-dey/recipes-core/trustfence/trustfence-tool_2.4.bb b/meta-digi-dey/recipes-core/trustfence/trustfence-tool_2.4.bb new file mode 100644 index 000000000..6ab402d4d --- /dev/null +++ b/meta-digi-dey/recipes-core/trustfence/trustfence-tool_2.4.bb @@ -0,0 +1,17 @@ +# Copyright (C) 2016-2020 Digi International. + +SUMMARY = "Trustfence command line tool" +SECTION = "console/tools" +LICENSE = "CLOSED" + +SRC_URI_arm = "${DIGI_PKG_SRC}/${BP}-${TUNE_ARCH}.tar.gz;name=arm" + +SRC_URI[arm.md5sum] = "926c31fecec8e28a6ed30984b19e868f" +SRC_URI[arm.sha256sum] = "1ec9cae98553e9917ff1a88bfce17fce749a4a8af28b8c40e24c8eebb7540faa" + +SRC_URI_aarch64 = "${DIGI_PKG_SRC}/${BP}-${TUNE_ARCH}.tar.gz;name=aarch64" + +SRC_URI[aarch64.md5sum] = "eec9ff6c3b715ec37c8a38997f446581" +SRC_URI[aarch64.sha256sum] = "fa738cce350028d74363c78fdca567263c4863389d3741e9f8761486d97e99a6" + +inherit bin_package From aad9e045cd5076b69257b74a7bd9dafcc1c608ad Mon Sep 17 00:00:00 2001 From: Francisco Gil Martinez Date: Tue, 6 Oct 2020 08:49:58 +0200 Subject: [PATCH 36/63] ccimx8x/mn: add dt overlays for the keypad controller Signed-off-by: Francisco Gil Martinez --- meta-digi-arm/conf/machine/ccimx8mn-dvk.conf | 1 + meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf | 1 + 2 files changed, 2 insertions(+) diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf index 025e7e817..72e73a934 100644 --- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf @@ -18,6 +18,7 @@ KERNEL_DEVICETREE ?= " \ digi/ccimx8mn-dvk.dtb \ digi/_ov_board_lvds_ccimx8mn-dvk.dtbo \ digi/_ov_som_bt_ccimx8mn.dtbo \ + digi/_ov_som_mca-keypad_ccimx8mn.dtbo \ digi/_ov_som_quad_ccimx8mn.dtbo \ digi/_ov_som_v1_ccimx8mn.dtbo \ digi/_ov_som_wifi_ccimx8mn.dtbo \ diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf index d69665211..4b0afd466 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf @@ -22,6 +22,7 @@ KERNEL_DEVICETREE ?= " \ digi/_ov_board_parallel-camera_ccimx8x-sbc-pro.dtbo \ digi/_ov_board_pcie-card_ccimx8x-sbc-pro.dtbo \ digi/_ov_som_bt_ccimx8x.dtbo \ + digi/_ov_som_mca-keypad_ccimx8x.dtbo \ digi/_ov_som_quad_ccimx8x.dtbo \ digi/_ov_som_wifi_ccimx8x.dtbo \ " From 06189293f4942720d98f382672423395d6c07ed2 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 6 Oct 2020 14:04:05 +0200 Subject: [PATCH 37/63] sysinfo: fix error on devices without SOC revision in their device tree Commit cbb38440 ("meta-digi-dey: sysinfo: Add chip revision sysinfo output") introduced a new script variable to determine the SOC revision of the module. However this entry only is available on the CC8X platforms. This commit checks if the entry exist and then tries to read it to avoid unexpected issues with devices without this entry. https://jira.digi.com/browse/DEL-7263 Signed-off-by: Arturo Buzarra --- meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo b/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo index e99f88e50..956d09aee 100755 --- a/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo +++ b/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo @@ -297,7 +297,7 @@ BOARD_VARIANT="$(cat /proc/device-tree/digi,hwid,variant | tr -d '\0')" BOARD_SN="$(cat /proc/device-tree/digi,hwid,sn | tr -d '\0')" BOARD_VERSION="$(cat /proc/device-tree/digi,carrierboard,version | tr -d '\0')" BOARD_ID="$(cat /proc/device-tree/digi,carrierboard,id | tr -d '\0')" -SOC_REV="$(cat /proc/device-tree/cpus/rev | tr -d '\0')" +[ -e "/proc/device-tree/cpus/rev" ] && SOC_REV="$(cat /proc/device-tree/cpus/rev | tr -d '\0')" if grep -qs '\' /proc/device-tree/compatible; then MCA_NODE="/sys/bus/i2c/devices/0-007e" From 77e30407fd3bdcb7e7bc91a274f5ebc7bd48d131 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Tue, 6 Oct 2020 15:22:45 +0200 Subject: [PATCH 38/63] sysinfo: fix security status section for ConnectCore 8M platforms Commit c24d1d96 ("sysinfo: adapt script after removal of deprecated fsl_otp driver") introduced support to determine if a device is closed by checking a new boolean property on the DT for the CC8X platforms, however the CC8M platforms use the same mechanism. This commit modifies the sysinfo script to check also the DT for the CC8M platforms. https://jira.digi.com/browse/DEL-7263 Signed-off-by: Arturo Buzarra --- meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo b/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo index 956d09aee..36151a8ed 100755 --- a/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo +++ b/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo @@ -254,7 +254,7 @@ make_report(){ echo "--------------------------------------" echo "" - if grep -qs '\' /proc/device-tree/compatible; then + if grep -qs '\' /proc/device-tree/compatible; then if [ -f "/proc/device-tree/digi,tf-closed" ]; then echo "Security status: [CLOSED]" elif [ -f "/proc/device-tree/digi,tf-open" ]; then From 2397f700cf78bd2fd0225c874640f17a7a56c5f1 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Tue, 6 Oct 2020 14:13:14 +0200 Subject: [PATCH 39/63] meta-digi-dey: qtbase: fix build path error of qt5.sh script Signed-off-by: Mike Engel --- meta-digi-dey/recipes-qt/qt5/qtbase/{fb => ccimx6ul}/qt5.sh | 0 meta-digi-dey/recipes-qt/qt5/qtbase/{xwayland => }/qt5.sh | 0 meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend | 4 +--- 3 files changed, 1 insertion(+), 3 deletions(-) rename meta-digi-dey/recipes-qt/qt5/qtbase/{fb => ccimx6ul}/qt5.sh (100%) rename meta-digi-dey/recipes-qt/qt5/qtbase/{xwayland => }/qt5.sh (100%) diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/fb/qt5.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/qt5.sh similarity index 100% rename from meta-digi-dey/recipes-qt/qt5/qtbase/fb/qt5.sh rename to meta-digi-dey/recipes-qt/qt5/qtbase/ccimx6ul/qt5.sh diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/xwayland/qt5.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/qt5.sh similarity index 100% rename from meta-digi-dey/recipes-qt/qt5/qtbase/xwayland/qt5.sh rename to meta-digi-dey/recipes-qt/qt5/qtbase/qt5.sh diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend index f7ae3240b..c1ed65746 100644 --- a/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend +++ b/meta-digi-dey/recipes-qt/qt5/qtbase_%.bbappend @@ -6,11 +6,9 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SCRIPT_DIR = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', 'fb', d)}" - # Digi: we use a custom script per platform, not per backend like NXP does SRC_URI_append = " \ - file://${SCRIPT_DIR}/qt5.sh \ + file://qt5.sh \ " SRC_URI_append_imxgpu3d = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', \ From 54643df6770a34756a9840f151a1dbcca3f0f703 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 5 Oct 2020 16:22:09 +0200 Subject: [PATCH 40/63] packagegroup-dey-wireless: make ccimx6/6qp platforms use wireless-regdb-static Back when the ccimx6/6qp used Linux v4.9, we needed to use crda because wireless-regdb-static wasn't supported until v4.15. Now that we use v5.4 on all platforms, this workaround isn't needed anymore. Signed-off-by: Gabriel Valcazar --- .../packagegroups/packagegroup-dey-wireless.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb index c3ec1f8a8..68e43af99 100644 --- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb +++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb @@ -16,5 +16,3 @@ RDEPENDS_${PN} = "\ " RDEPENDS_${PN}_remove_ccimx6sbc = "hostapd" -RDEPENDS_${PN}_remove_ccimx6 = "wireless-regdb-static" -RDEPENDS_${PN}_append_ccimx6 = " crda" From ce11c9a02ec41dcd8c5691c0a1a94f510196c61c Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Mon, 5 Oct 2020 16:25:29 +0200 Subject: [PATCH 41/63] cosmetic: digi-defaults.inc: update Linux/U-Boot version table Add the ccimx6/6qp and update the ccimx8x supported U-Boot version. Even though older versions of U-Boot can be built for the 8X, the dependencies with the SCFW only make it possible to use the latest version of U-Boot to avoid unexpected behaviour. Signed-off-by: Gabriel Valcazar --- meta-digi-arm/conf/machine/include/digi-defaults.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 40a7604bd..6eecb5dd9 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -14,8 +14,10 @@ LINUXLIBCVERSION ?= "5.4%" # # Platform Linux U-Boot # ------------------------------------------------- +# ccimx6 5.4 2017.03 +# ccimx6qp 5.4 2017.03 # ccimx6ul 5.4 2017.03 -# ccimx8x 5.4 2019.04, 2018.03, 2017.03 (all packaged in imx-boot) +# ccimx8x 5.4 2020.04 (packaged in imx-boot) # ccimx8mn 5.4 2018.03 (packaged in imx-boot) # From ee2167a574cf1daf099479516cb191cbbd32a059 Mon Sep 17 00:00:00 2001 From: Gonzalo Ruiz Date: Wed, 7 Oct 2020 10:00:02 +0200 Subject: [PATCH 42/63] firmware_qualcomm: ccimx8mn: update US Board Data File calibration data Update file: - bdwlan30_US.bin (8c8b575fb9a65714df0b7c6cb3399ed6) This file was generated by calibrating several CC8MN SOMs from spin 3 and merging their resulting BDF files into a Golden file. It also encodes the Target output powers. Reference calibration file is obtained from 'qca6574au-le-2-2-2_qca_oem' repo at tag 'r00005.1' under path 'wlanfw/cnss_proc/wlan/fw/target/sdio_dst/qc6174/bdwlan30.bin': - bdwlan30.bin (8a40d95698825e1718bee640b1f7982a) Target output powers respect the maximum EVM for every data rate. Signed-off-by: Gonzalo Ruiz --- .../ccimx8mn/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/ccimx8mn/bdwlan30_US.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/ccimx8mn/bdwlan30_US.bin index b5b763136af0f1482312730a83bf09c8d6c6c04d..486c810ccaf5313d6b4752f9bcdb4eeca7d58319 100644 GIT binary patch literal 8124 zcmeHMeNYtV8Q&9)hL9+Dz}_b{?&Zr{j*mlDGs4pxNYBWN^J zNsVCz&6%KatZAGKNu5rnn|9KPohEHEQ;nVJA9N;Un0)M*)^VIpLg*i4=>4^z<*k_#&<`<{^RzS@ibXnZH;R8c+!dOfctpzOvj^oS%tbTAQ2dYf6cw z#Nzbo3A~_;EZw5G>=5i6k0-l8iRepdfH_!NYW6D2Uw1lL$iGAqQJ$#FQFn`V z`ttPU%hS`>u3ej+UMTaMkFJf4oev|tUA==xhfa+6&t7J^5Vx%*^v50k3BPDB=>wo*RC~+vv<;jVdtgfBsOXr-+LmJvlt=ZF1(aW)*nG z|J-?k=RUt=#4-o*C)qI?SJi1+loK*pERI|W20E)Tw3xQGp z7yw1wIskA~vl_#G{~-Z@HBb^YT+P%^{KLoEJ$anTf3c^_Rf3F#S7vTQ5%0G_BFaT? zXX;Ta-zoHpPfAbACrO6Nql*|fs^J@jHt~QoAU{QJr|RieMnHZ15#guei1dQ|GcuEM z&`yR!)qI`MB6do>@)5F$YNHP@1L!D!To@I{q>J)6nNH=)Swy+%8m1Ao@dtzf@hRyU`7~*xGHI4Uh~u{l^2{MjK zq>~vtVtFKR;&!P)ZX?r_`jw(eekatgUFwz(k*lcH^g1R5W%2n!kytMA@*brhNb5%{ z^rH{@p{LCB8s>47#%~g~h^11MTnGJS=|ZKy4Z>dNZ$I?+5o#rEW+=3tPZM&)EmEoM zAq!w{c$iw$%y$Sr@vt-`kNi+SAKr2A&^Upq7YGkZ8>?eXh5$uH-D;&U`1OfC@EM}l z-+Fp0{@nbQNlHjkNPNi3kdTmXpM^(6Mw`rR-j;&GV%x^F3?`d^-_>U?1gLj##E<7H zAAiH!_3}8T-a#xAm!|)M${^F(a%dfxj+uyzO-c>je!uYQG_utdr21|sm zi`!;Tu|`@nps%Hk!B^4mmrq_U>-j+5nwaOZG_yA~N zz@#~EX@_tltR?_T!PH7CoOdAHp#k3kRAn(*EiIj_+qThaGQv3l=h0u+##UNP7IRA{ za@*4Z$Wfj5*X;wqtN>*I7>!Aq51+tQL4q+Y9jMHn1^}b_==XJU6;_MYQr*E;f)9&P zOK_lWKkES>G1XqS0)SX!xawn|#miP>08EuD&J#7DuAQxz2dq$mexHDFxRKBow><-# zM`!@#;f5kc*MTYUVGcMS1n1?Dhfzr|0}|An}#uql~`p>Uw*ICDanC07JdLF2vd5t)}4CoFSl5-#mVtz&FSGL$BhCS+|`azKrO$ zciYwH!uPw!l$yGF^|>d`oVmNi1LR&SKrW}E={P14*?7CaiiMI}t|6CF%jsw)7A5k@ zLZ;}Dkj%}>CG(jehomx)dx(0Bjsm&0bL1i@6CKYap%gw#$QO&Ha(O4%drYynmfs*` zfITPJi=<-cwaf;T$vXrja#FQi5B44fdof@yC}*JJ;0$U*48Ix9pl+!~Zkm-#P~>tI zdj`s)oK=HzjpP!|UQo_OnkkB2&!nOpev42dR!BSK-5?i6M}pr3o)*%@T&X~Ikug*P zoRKq;gLeupv0AE=Tgb(V963*pq8_KynN4UbUn*3JyQDpGyH=O^d90&0(hRd174dGN zMr@GU|j8eggw zU!@k`!8!d6?w3R=d4W9v>KxbyK{<*_qEnb`l+Tw49ZmoX8tejQpN1oCTTD!}+c#lvkHcK6{59C(RMkXHaMX5rTm@k#U zy(o#Y!G6h8_6x7*KM) zk#~T-6gnH~Qo>gVJH#ewpL~!cD1s&!0>Pj81VSVvLcZ5uClB=hiwYE%Hy=O$>-VnS zjhhTn5#L6kp|`F%vET1u(i*UH50kL4S6*@A+weV37T?3bX)GKoq724Wq+_cS6_q5X zXWFxJutYImdmJt#R|C9s=k61){pzhhmerrU@XO!dxwCM+*uys;AHMv0fR|Q+!s(yC zhUM{nX5o53Kfu4set&j9+|uDW%at2DT-?>Ma2-pk-zrz6U>X>k}V*4D@M$CMG|;d1LaE zTQ?@B{to=J8xx;=HaYPD(3A{Zo_tWz`?~^(7sGYAL@u#jm7na-Bl&rfl{Z{*xKfExH%pkXp_}9|w zFIsdXS;jD>;$Sld{#A*|tZ_WghV{I~ufDI)rSmjl@pgK97hoi!T4qQ|&C!o3$%+{-fLe@n)mSv;8*R^2FMhd1R(n;+!%Fqbn8N5#>XKeU}AxaK!~*5fE^f^0DinunP#Z zwg(UqXon}+n7yXK~Mx#oH~n`@J5{Nw)MlG2cCJF$1hcu8yd>%3=Xb^xip z=3-*J)R#Q_yz~Bk@ALHz%kzdmtVQ)vIwE?&N$6}Z5=6eAAPAF5PY`Q~D46PW@zFV; zzi*_brt5UX&fMJGZ@>A*)RguNK}1DeySDvTQ8C(doE$lGE_CtA8$v^kYKmd&TR^ZAzYuWTnqPX=sfHw;j$o)uo7-$hn!#s02{)ufl(hAjrbT2jShDL zur_oRidl|~_77(7LJ@y#gDj(}7|b@I=W!R`C!7>VrE#)^s$i+6Z*xMrPHK`@-aQ^5E{W}`3d2Q_?Gk= zvWP-V6&KO-BdR^})hL_>Il9}`02&!soW0?Nj4Yz=C}t^83TD83+_ zBKJ`TnHIJa_25B%SP;Ys>59U00kB-Vs7u!Xk@MWS8W3pI5{;*)DSB#ubu9@p=OZ_+n1Nyrie zkq4!X^t4neA_l{qNgMH&=jwMSdhKtB!SKnc5@OhM^1Bngez5#%dcCHpCP+LY>5b{>@?6#_2U3jY1~VxO?48q(>x7%kt69umAQT$VWHt-jwA@&f#&y=5V^)xW38LGdeaN3SYkZ=Hxr?zW4s0 zKK%GPbc8T|D29>VKwC|fCDF1b&{xw`SW2%pFPoj6c#Rkd08nYsTd6>ALo)#J8W04) zY0+EsL%qt5RYpSH(HrRC?3Ok3s-b=bh}VF=Kqu$0Bw14Yy*16&0`p1@2m(-{0R8BY zwb;1axLh^W6Yz1I#Yo5b`?*E{VvI3bRDQ0~k}3nJ&br&UOf%IV@FN$!hEDXJKrPl% z<0|7SWk(?B?LaQ`YC6^1&n*OodI8vL)+<1>b&qj{aYbZ@za3T4NpvzeZ?G24IS+IL z;G~nxao!W$5v$Ei#;chJdc8hWZ8p$p{u5l2wFFG5c>v%qgF%H{w+m1MMJZIo_yKfgS*= z%n5Yz&=3Gw=D0ai{ti@08!VKvV;&gk3;3bBCOU3tkn1t8wlMKuYok0%p&c&v|mRlb;YTM6RZgl=oMRsCH2{J3L!>Th8M zNF!xpXy^r5T*TXjy&{&HNdrYP>sbcn;$3`+P$}+*zHgqV_KX;MMm?3P^oLuaKis4A zhjq|fnxVJMf!?y1cL@8$I^eCI>m&1&K60NV^VTuh>{hf3m+%$Bez9Ki0xy|a$8JP9 zcn7~*aELAmld05C7>3P7`Pjxgg&MIzY9-@=m(FIQEtuttgt7>aQh2hxO2G|0FPX52 zw-@ZCfZr_en}_#+-)ixYbOh`f7ud6lGA}LScNZ=NziuVII4X%Tu^GsMt>D)#Rw?mO zkVmePN2QX7htznRfma|Pk%N9X{ej*bLvP*ze&_8K0Ow&t&p{q?{nR|-s5MF-z6tv9e8C2Nc+DJdXQa-DBoDcQGB9h|4QMmo4)LkHbyOyk z!|p)4v4h_y928q1zLgQ4Z0|u{9xBG=z^hYu^ZkD=^#3JdrR1JFH@SZDdDO$Xt)TP_ z3HO9-tnw;=M?P@A^0~D}-j_^x57hUiT52HIQ`yW`b{8tamHd98Ui3(Qu$KsV$mb!y z2lBZc0v^L`V+)WCJNX)+QEZj?NS!kuI5+cLzGb{iQ0u(-J#a|}7Mxod+^N)aTdCZ4 zHXyam@_olmZlrRUJhm7)@IL;a&@6UH$I0bX0+Y@ccp#4k(JLK=JPdHYs$cay+++r|nPJ%?REAwVhPz=K+zsXU zNR|S7Tfy%huy>H$L~UmZS)|-G8wIa;R0@&=MKAkc>ejE=qYuBI!hVZ-@f zzAf|R`^@5XZNH{}$bNNgh09f4m8@x}yTT14$!4=DdhvR#IygM$%`SD!0Z zYFec`VimgG9Kk_T#Pqyvv@^Q20Yl-=6vV%+x5xqI0-@Ihj zeKvEKxc%8(qTrH6XG(f`g(>MC$oe^15{lOmGXwp4&@ms(=(fY&I9+W1)2jaeRN%TA Ms`7u_|A(mm1N!aS_y7O^ From d34d9de25ad5b6b47bb289539dda0a6c2ea2d3da Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Thu, 8 Oct 2020 13:45:03 +0200 Subject: [PATCH 43/63] u-boot: remove 2019.04 recipe, superseeded by v2020.04 Signed-off-by: Hector Palacios --- .../recipes-bsp/u-boot/u-boot-dey_2019.04.bb | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb deleted file mode 100644 index 2fda3537b..000000000 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2019.04.bb +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (C) 2019,2020 Digi International - -require digi-u-boot.inc -LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" - -DEPENDS += "flex-native bison-native" - -SRCBRANCH = "v2019.04/maint" -SRCREV = "${AUTOREV}" - -COMPATIBLE_MACHINE = "(ccimx8x)" From 453444fd755c3a1af67275abfbefc7f6fb1153d1 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Thu, 8 Oct 2020 09:43:08 +0200 Subject: [PATCH 44/63] README: [cosmetic] use official product names. Signed-off-by: Hector Palacios --- README.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 00ec34e54..3b12afd47 100644 --- a/README.md +++ b/README.md @@ -87,10 +87,11 @@ Documentation is available online at https://www.digi.com/resources/documentatio * Removed support to bluez4 * Updated OpenSSL to v1.1.1d * Package upgrades and security fixes -* Updated kernel version to v5.4 for i.MX8X, i.MX8MN and i.MX6UL platforms -* Updated U-Boot to version 2017.03-r6 for i.MX6UL platform -* Updated U-Boot to version 2018.03-r4 for i.MX8MN platform -* Updated U-Boot to version 2019.04-r2 for i.MX8X platform +* Updated kernel version to v5.4 for ConnectCore 8X, ConnecCore 8M Nano and + ConnectCore 6UL +* Updated U-Boot to version 2017.03-r6 for ConnectCore 6UL +* Updated U-Boot to version 2018.03-r4 for ConnectCore 8 MNano platform +* Updated U-Boot to version 2019.04-r2 for ConnectCore 8X platform * Added support for ConnectCore 8M Nano v2 SOM * Added initial TrustFence support for ConnectCore 8M Nano From 9557b4912879580608b85b73a621f17d79eb372d Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Thu, 8 Oct 2020 09:43:36 +0200 Subject: [PATCH 45/63] README: update changelog and URLs to DEY-3.0-r2 release Signed-off-by: Hector Palacios https://jira.digi.com/browse/DEL-7270 --- README.md | 79 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 69 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 3b12afd47..67197f667 100644 --- a/README.md +++ b/README.md @@ -54,8 +54,31 @@ Software for the following hardware platforms is in production support: * [CC-WMX6UL-KIT](https://www.digi.com/products/models/cc-wmx6ul-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/3.0/cc6ul/yocto-gs_index)) * [CC-SBP-WMX-JN58](https://www.digi.com/products/models/cc-sbp-wmx-jn58) -Previous versions of Digi Embedded Yocto include support for additional Digi -hardware. +## ConnectCore 6 Plus +* ConnectCore 6 Plus System-on-Module (SOM) + * [CC-WMX-KK8D-TN](https://www.digi.com/products/models/cc-wmx-kk8d-tn) +* ConnectCore 6 Plus professional development kit + * [CC-WMX6P-KIT](https://www.digi.com/products/models/cc-wmx6p-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/3.0/cc6plus/yocto-gs_index)) + +## ConnectCore 6 +* ConnectCore 6 System-on-Module (SOM) + * [CC-WMX-J97C-TN](https://www.digi.com/products/models/cc-wmx-j97c-tn) + * [CC-WMX-L96C-TE](https://www.digi.com/products/models/cc-wmx-l96c-te) + * [CC-WMX-L87C-TE](https://www.digi.com/products/models/cc-wmx-l87c-te) + * [CC-MX-L76C-Z1](https://www.digi.com/products/models/cc-mx-l76c-z1) + * [CC-MX-L86C-Z1](https://www.digi.com/products/models/cc-mx-l86c-z1) + * [CC-MX-L96C-Z1](https://www.digi.com/products/models/cc-mx-l96c-z1) + * [CC-WMX-L76C-TE](https://www.digi.com/products/models/cc-wmx-l76c-te) + * CC-WMX-K87C-FJA + * CC-WMX-K77C-TE + * CC-WMX-L97D-TN + * CC-WMX-J98C-FJA + * CC-WMX-J98C-FJA-1 +* ConnectCore 6 Jumpstart Development Kit (SBC with Connectore 6 module) + * [CC-WMX6-KIT](https://www.digi.com/products/models/cc-wmx6-kit) ([Get Started](https://www.digi.com/resources/documentation/digidocs/embedded/dey/3.0/cc6/yocto-gs_index)) + * [CC-SB-WMX-J97C-1](https://www.digi.com/products/models/cc-sb-wmx-j97c-1) + * [CC-SB-WMX-L87C-1](https://www.digi.com/products/models/cc-sb-wmx-l87c-1) + * [CC-SB-WMX-L76C-1](https://www.digi.com/products/models/cc-sb-wmx-l76c-1) # Installation @@ -70,11 +93,23 @@ Documentation is available online at https://www.digi.com/resources/documentatio # Downloads -* Demo images: https://ftp1.digi.com/support/digiembeddedyocto/3.0/r1/images/ -* Software Development Kit (SDK): https://ftp1.digi.com/support/digiembeddedyocto/3.0/r1/sdk/ +* Demo images: https://ftp1.digi.com/support/digiembeddedyocto/3.0/r2/images/ +* Software Development Kit (SDK): https://ftp1.digi.com/support/digiembeddedyocto/3.0/r2/sdk/ # Release Changelog +## 3.0-r2 + +* Updated BSP to NXP release rel_imx_5.4.24_2.1.0. +* Added support to ConnectCore 6 and ConnectCore 6 Plus (kernel v5.4). +* Updated U-Boot to version 2020.04-r1 for ConnectCore 8X. +* TrustFence: added secure console and U-Boot environment encryption support. + to ConnectCore 8X and 8M Nano. +* Added MCA keypad support for ConnectCore 8X and 8M Nano. +* Fix SoftAP on 5GHz on ConnectCore 6UL. +* Other minor fixes. + + ## 3.0-r1 * Release based on [Yocto 3.0 (Zeus)](https://www.yoctoproject.org/software-overview/downloads) including: @@ -117,17 +152,13 @@ updated list can be found on the online documentation. * When working as an access point, DFS-capable channels in the 5GHz band are not supported. * For P2P connections Digi recommends "Negotiated GO" modes. The QCA6564 - devices (ConnectCore 6UL and ConnectCore 8M Nano) fail to join autonomous - groups. -* Trustfence is not yet supported on the ConnectCore 8M Nano. + devices (ConnectCore 6UL, ConnectCore 6 Plus, and ConnectCore 8M Nano) fail + to join autonomous groups. ## ConnectCore 8M Nano * ConnectCore 8M Nano System-on-Module (SOM) * CPU wake-up sources are not yet supported -* ConnectCore 8M Nano DVK - * The maximum bitrate for CAN interface is 125 Kbits/s. This is a software - limitation from the CAN controller. ## ConnectCore 8X @@ -150,6 +181,34 @@ updated list can be found on the online documentation. reducing the maximum throughput of this interface. * The QCA6564 wireless chip does not support Wake On Wireless LAN. +## ConnectCore 6 Plus + +* ConnectCore 6 Plus System-on-Module (SOM) + * NXP i.MX6QP processor has a documented errata (ERR004512) whereby the maximum + performance of the Gigabit FEC is limited to 400Mbps (total for Tx and Rx). +* ConnectCore 6 Plus SBC + * The Micrel PHY KSZ9031 may take between five and six seconds to + auto-negotiate with Gigabit switches. + +## ConnectCore 6 + +* ConnectCore 6 System-on-Module (SOM) + * NXP i.MX6 processor has a documented errata (ERR004512) whereby the maximum + performance of the Gigabit FEC is limited to 400Mbps (total for Tx and Rx). + * When using softAP mode on Band A on the Qualcomm AR6233, channels used for + Dynamic Frequency Selection (DFS) are not supported. + * The Qualcomm AR6233 firmware does not support the following configuration + modes: + * Concurrent modes involving P2P mode, such as P2P + softAP or P2P + STA. + * Bluetooth + softAP + STA concurrent mode. + * A maximum of five clients are supported when using Qualcomm's AR6233 in + softAP mode. + * A maximum of ten connected devices are supported when using Qualcomm's AR6233 + Bluetooth Low Energy mode. +* ConnectCore 6 SBC + * The Micrel PHY KSZ9031 may take between five and six seconds to + auto-negotiate with Gigabit switches. + # Support Contact Information For support questions please contact Digi Technical Support: From 519b924f125146c6462eb297863da48e83d60be6 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Thu, 8 Oct 2020 13:23:11 +0200 Subject: [PATCH 46/63] meta-digi: update revisions for dey-3.0-r2.1 Signed-off-by: Hector Palacios --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_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 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 922d34d2d..8daa0b582 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index 243ff2143..e228653a0 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "72f9d767ff7be11e42eda1b642f87cad0dc9d4e1" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index dd3b5a540..87f235c20 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2018.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "a32edd9b18564d6a2d5a1132d6f5655b717a7a7f" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" 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 ef49e0c04..4c8dcf8fa 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 = "5139edc02ad257a23b0077caf3cd15eaeefef97b" COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index de5c09fad..d10cf1fd4 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 = "5139edc02ad257a23b0077caf3cd15eaeefef97b" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 4437359c9..f6e08314e 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};branch=${SRCBRANCH} \ + ${QCOM_GIT_URI};nobranch=1 \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 0774cb146..b1efada30 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.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "11f53b1cea6e5a06dd2812945387fa983fa9b4af" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${LINUX_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index d5501cdd7..a906fad5d 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "${AUTOREV}" +SRCREV = "35943b2466c9357cdd4e5c165f26149d82ed51f6" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${CC_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index 4e66757e4..abf140a14 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,2020, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "1317384494f56ac3d10e7dee3ac968b944f02468" 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 9d977bb28..2054381ce 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "bce0bfff451c67c5387ebdaa9b5da1bde82750ca" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ + ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From fb3c7d5e3f6a98cfb872b6d428abe013f28ca124 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Thu, 8 Oct 2020 13:23:11 +0200 Subject: [PATCH 47/63] meta-digi: revert revisions to AUTOREV This reverts commit 76ec96632760fd3ee6113a74b8363a688edf99c3. Signed-off-by: Hector Palacios --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_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 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 8daa0b582..922d34d2d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index e228653a0..243ff2143 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "72f9d767ff7be11e42eda1b642f87cad0dc9d4e1" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index 87f235c20..dd3b5a540 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2018.03/maint" -SRCREV = "a32edd9b18564d6a2d5a1132d6f5655b717a7a7f" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" 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 4c8dcf8fa..ef49e0c04 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 = "5139edc02ad257a23b0077caf3cd15eaeefef97b" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index d10cf1fd4..de5c09fad 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 = "5139edc02ad257a23b0077caf3cd15eaeefef97b" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index f6e08314e..4437359c9 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-3.0/maint" -SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" +SRCREV = "${AUTOREV}" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};nobranch=1 \ + ${QCOM_GIT_URI};branch=${SRCBRANCH} \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index b1efada30..0774cb146 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.0/maint" -SRCREV = "11f53b1cea6e5a06dd2812945387fa983fa9b4af" +SRCREV = "${AUTOREV}" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};nobranch=1" +SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index a906fad5d..d5501cdd7 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "35943b2466c9357cdd4e5c165f26149d82ed51f6" +SRCREV = "${AUTOREV}" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};nobranch=1" +SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index abf140a14..4e66757e4 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,2020, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "1317384494f56ac3d10e7dee3ac968b944f02468" +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 2054381ce..9d977bb28 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "bce0bfff451c67c5387ebdaa9b5da1bde82750ca" +SRCREV = "${AUTOREV}" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ + ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From 666c361df2eb12cbfaac01b7779e57db105cadaf Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Fri, 9 Oct 2020 16:49:25 +0200 Subject: [PATCH 48/63] ccimx8x-sbc-pro: add overlay for SBC versions 3 and lower Since this overlay is only used in the SBC Pro bootscript, have a separate bootscript for the SBC Express. https://jira.digi.com/browse/DEL-7276 Signed-off-by: Gabriel Valcazar --- .../conf/machine/ccimx8x-sbc-pro.conf | 1 + .../{ccimx8x => ccimx8x-sbc-express}/boot.txt | 0 .../u-boot-dey/ccimx8x-sbc-pro/boot.txt | 78 +++++++++++++++++++ 3 files changed, 79 insertions(+) rename meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/{ccimx8x => ccimx8x-sbc-express}/boot.txt (100%) create mode 100644 meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf index 4b0afd466..f4a6eeebd 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf @@ -19,6 +19,7 @@ KERNEL_DEVICETREE ?= " \ digi/_ov_board_lpuart3_ccimx8x-sbc-pro.dtbo \ digi/_ov_board_lt9812-hdmi-dsi0_ccimx8x-sbc-pro.dtbo \ digi/_ov_board_lvds1_ccimx8x-sbc-pro.dtbo \ + digi/_ov_board_v1-v3_ccimx8x-sbc-pro.dtbo \ digi/_ov_board_parallel-camera_ccimx8x-sbc-pro.dtbo \ digi/_ov_board_pcie-card_ccimx8x-sbc-pro.dtbo \ digi/_ov_som_bt_ccimx8x.dtbo \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt similarity index 100% rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x/boot.txt rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt new file mode 100644 index 000000000..eb6de7f06 --- /dev/null +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt @@ -0,0 +1,78 @@ +# +# U-Boot bootscript for EMMC/SD images created by Yocto. +# + +# Back up environment variables +setenv ORIG_overlays ${overlays} +setenv ORIG_extra_bootargs ${extra_bootargs} + +# Set SOC type to "imx8qxp" if not already defined by U-Boot +if test ! -n "${soc_type}"; then + setenv soc_type "imx8qxp" +fi + +# +# Determine overlays to apply depending on the hardware capabilities +# described by the HWID, SOM version, and carrier board version. +# +if test -n "${module_ram}"; then + setexpr module_has_wifi ${hwid_3} \& 1 + setexpr module_has_bt ${hwid_3} \& 2 + setexpr module_has_bt ${module_has_bt} / 2 + + if test "${module_has_bt}" = "1"; then + setenv overlays _ov_som_bt_ccimx8x.dtbo,${overlays} + fi + + if test "${module_has_wifi}" = "1"; then + setenv overlays _ov_som_wifi_ccimx8x.dtbo,${overlays} + fi +else + # + # Set overlays depending on the hardware variant + # + if test "${module_variant}" = "0x01"; then + setenv overlays _ov_som_bt_ccimx8x.dtbo,_ov_som_wifi_ccimx8x.dtbo,${overlays} + elif test "${module_variant}" = "0x02"; then + setenv overlays _ov_som_bt_ccimx8x.dtbo,_ov_som_wifi_ccimx8x.dtbo,${overlays} + elif test "${module_variant}" = "0x04"; then + setenv overlays _ov_som_bt_ccimx8x.dtbo,_ov_som_wifi_ccimx8x.dtbo,${overlays} + fi +fi + +# Apply QXP overlay if the SOC type is "imx8qxp" +if test "${soc_type}" = "imx8qxp"; then + setenv overlays _ov_som_quad_ccimx8x.dtbo,${overlays} +fi + +# Apply SBCv3 overlay if the board_version is 3 or lesser +if test "${board_version}" -le "3"; then + setenv overlays _ov_board_v1-v3_ccimx8x-sbc-pro.dtbo,${overlays} +fi + +# Get the UUID of the configured boot partition. +part uuid mmc ${mmcbootdev}:${mmcpart} bootpart +# Check the boot source. +if test "${bootpart}" = "${part1_uuid}"; then + # We are booting from the eMMC using 'linux'. + true +elif test "${bootpart}" = "${part2_uuid}"; then + # We are booting from the eMMC using 'recovery'. + setenv boot_initrd true + setenv initrd_file uramdisk-recovery.img +else + # We are booting from the SD card. + setenv mmcroot /dev/mmcblk${mmcbootdev}p2 +fi +setenv extra_bootargs fbcon=logo-pos:center ${extra_bootargs} +dboot linux mmc ${mmcbootdev}:${mmcpart} + + + +# We only get here in case of an error on the dboot command. + +# Undo changes to environment variables +setenv overlays ${ORIG_overlays} +setenv ORIG_overlays +setenv extra_bootargs ${ORIG_extra_bootargs} +setenv ORIG_extra_bootargs From f6c2cec797696c290cd7bcb7b78a89d2fe5bb9f4 Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Wed, 14 Oct 2020 16:46:20 +0200 Subject: [PATCH 49/63] sysinfo: add 0x prefix to SEC_CONFIG_WORD to fix conditional expression Commit c24d1d96 ("sysinfo: adapt script after removal of deprecated fsl_otp driver") introduced a mistake masking the SEC_CONFIG[1] bit read from the OTP. This commit fix the read command to force it in hex format and finally match with the mask in the script. https://jira.digi.com/browse/DEL-7263 Signed-off-by: Arturo Buzarra --- meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo b/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo index 36151a8ed..cae3a49e5 100755 --- a/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo +++ b/meta-digi-dey/recipes-digi/sysinfo/sysinfo/sysinfo @@ -263,7 +263,7 @@ make_report(){ else if [ -e ${OTP_PATH}/nvmem ]; then # Check SEC_CONFIG on OCOTP_CFG5 (ADDR=6) bit 1. - SEC_CONFIG_WORD=$(dd if=${OTP_PATH}/nvmem of=/dev/stdout bs=4 skip=6 count=1 status=none | hexdump -n 4 -v -e '1/4 "%08x\n"') + SEC_CONFIG_WORD=$(dd if=${OTP_PATH}/nvmem of=/dev/stdout bs=4 skip=6 count=1 status=none | hexdump -n 4 -v -e '1/4 "0x%08x\n"') if [ "$((${SEC_CONFIG_WORD} & 0x2))" != "0" ]; then echo "Security status: [CLOSED]" else From 46687455232013f53b394ba731467c1156abf047 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Wed, 14 Oct 2020 16:04:27 +0200 Subject: [PATCH 50/63] ARM64: dts: ccimx8x: [cosmetic] alphabetize DT files Signed-off-by: Hector Palacios --- meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf index f4a6eeebd..3fb369cdc 100644 --- a/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf +++ b/meta-digi-arm/conf/machine/ccimx8x-sbc-pro.conf @@ -19,9 +19,9 @@ KERNEL_DEVICETREE ?= " \ digi/_ov_board_lpuart3_ccimx8x-sbc-pro.dtbo \ digi/_ov_board_lt9812-hdmi-dsi0_ccimx8x-sbc-pro.dtbo \ digi/_ov_board_lvds1_ccimx8x-sbc-pro.dtbo \ - digi/_ov_board_v1-v3_ccimx8x-sbc-pro.dtbo \ digi/_ov_board_parallel-camera_ccimx8x-sbc-pro.dtbo \ digi/_ov_board_pcie-card_ccimx8x-sbc-pro.dtbo \ + digi/_ov_board_v1-v3_ccimx8x-sbc-pro.dtbo \ digi/_ov_som_bt_ccimx8x.dtbo \ digi/_ov_som_mca-keypad_ccimx8x.dtbo \ digi/_ov_som_quad_ccimx8x.dtbo \ From 0a0f376ea6c8898a220875fa487f0f4d19e17856 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Wed, 14 Oct 2020 16:04:37 +0200 Subject: [PATCH 51/63] ARM64: dts: ccimx8mn: add overlay for DVK version < 3 Signed-off-by: Hector Palacios https://jira.digi.com/browse/DEL-7279 --- meta-digi-arm/conf/machine/ccimx8mn-dvk.conf | 1 + .../recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf index 72e73a934..966cee45a 100644 --- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf @@ -17,6 +17,7 @@ UBOOT_DTB_NAME = "ccimx8mn-dvk.dtb" KERNEL_DEVICETREE ?= " \ digi/ccimx8mn-dvk.dtb \ digi/_ov_board_lvds_ccimx8mn-dvk.dtbo \ + digi/_ov_board_v1-v2_ccimx8mn-dvk.dtbo \ digi/_ov_som_bt_ccimx8mn.dtbo \ digi/_ov_som_mca-keypad_ccimx8mn.dtbo \ digi/_ov_som_quad_ccimx8mn.dtbo \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt index b49f6a4df..413f0e3f5 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8mn-dvk/boot.txt @@ -42,6 +42,11 @@ if test "${soc_type}" = "imx8mn"; then setenv overlays _ov_som_quad_ccimx8mn.dtbo,${overlays} fi +# Apply DVK v1-v2 overlay if the board version is < 3 +if test "${board_version}" -lt "3"; then + setenv overlays _ov_board_v1-v2_ccimx8mn-dvk.dtbo,${overlays} +fi + # Get the UUID of the configured boot partition. part uuid mmc ${mmcbootdev}:${mmcpart} bootpart # Check the boot source. From 6e00349b0d329666260d7148a4bba0d2aa17032b Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Mon, 19 Oct 2020 12:26:07 +0200 Subject: [PATCH 52/63] u-boot: ccimx8x: fix default uboot name for 512MB variants with old-style HWID https://jira.digi.com/browse/DUB-974 Signed-off-by: Arturo Buzarra --- .../u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt index 9aa482a53..f5f4d3365 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/install_linux_fw_sd.txt @@ -51,7 +51,7 @@ else elif test "${module_variant}" = "0x05"; then setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-1GB_16bit.bin; elif test "${module_variant}" = "0x06"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-512GB_16bit.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-pro-${soc_rev}-512MB_16bit.bin; fi fi fi From 3a5d193b0971d397d9ed4f3b1488f197a11a1c4a Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Mon, 19 Oct 2020 13:51:01 +0200 Subject: [PATCH 53/63] u-boot: ccimx8x-sbc-express: sync installation sd card script This commit added support to C0/B0 variants. https://jira.digi.com/browse/DUB-974 Signed-off-by: Arturo Buzarra --- .../install_linux_fw_sd.txt | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt index 56f16d909..602b5f84c 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/install_linux_fw_sd.txt @@ -19,26 +19,37 @@ if test $? -eq 1; then exit; fi +# Since SOMs with the B0 SOC might have an older U-Boot that doesn't export the +# SOC revision to the environment, use B0 by default +if test -z "${soc_rev}"; then + setenv soc_rev B0 +fi + +# In case this script is used to update to a newer release whose imx-boot file +# is not recognized by the SECO fw check, bypass it by default. The script has +# the necessary logic to choose the correct imx-boot file for the target's SOC. +setenv skip-uboot-check "yes" + # Determine U-Boot file to program basing on SOM's RAM size and SOC type (linked to bus width) bus_width="32bit" if test -n "${module_ram}" && test -n "${soc_type}"; then if test "${soc_type}" = "imx8dx"; then bus_width="16bit" fi - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${module_ram}_${bus_width}.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-${module_ram}_${bus_width}.bin; else # Determine U-Boot file to program basing on SOM's variant if test -n "${module_variant}"; then if test "${module_variant}" = "0x01"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1GB_32bit.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-1GB_32bit.bin; elif test "${module_variant}" = "0x02"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-2GB_32bit.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-2GB_32bit.bin; elif test "${module_variant}" = "0x03"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-2GB_32bit.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-2GB_32bit.bin; elif test "${module_variant}" = "0x04"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1GB_16bit.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-1GB_16bit.bin; elif test "${module_variant}" = "0x05"; then - setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1GB_16bit.bin; + setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-1GB_16bit.bin; fi fi fi @@ -53,11 +64,11 @@ else echo ""; echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 8X variant:"; echo " - For a QuadXPlus CPU with 1GB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1GB_32bit.bin"; + echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-1GB_32bit.bin"; echo " - For a QuadXPlus CPU with 2GB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-2GB_32bit.bin"; + echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-2GB_32bit.bin"; echo " - For a DualX CPU with 1GB LPDDR4, run:"; - echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-1GB_16bit.bin"; + echo " => setenv INSTALL_UBOOT_FILENAME imx-boot-ccimx8x-sbc-express-${soc_rev}-1GB_16bit.bin"; echo ""; echo "2. Run the install script again."; echo ""; From 441459b6d264c313dafb9408c8b73e122adab61c Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Fri, 16 Oct 2020 15:53:20 +0200 Subject: [PATCH 54/63] libdigiapix: change default PWM for the ccimx8x-sbc-pro The indexes of the MCA PWM controllers are different in Linux v5.4, so the default value used by libdigiapix results in an error. Reflect this change and, while at it, replace the default PWM with an IO connected to a user LED to make the example more visual. Signed-off-by: Gabriel Valcazar --- .../libdigiapix-git/ccimx8x-sbc-pro/libdigiapix.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-pro/libdigiapix.conf b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-pro/libdigiapix.conf index b5a8f6c4b..c445106bf 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-pro/libdigiapix.conf +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx8x-sbc-pro/libdigiapix.conf @@ -25,8 +25,8 @@ DEFAULT_SPI = 0,0 [PWM] -# MCA PWM2 channel 0 on Expansion connector (MCA_IO7) -DEFAULT_PWM = 7,0 +# MCA PWM0 channel 5 on USER LED0 (MCA_IO18) +DEFAULT_PWM = 0,5 [ADC] From e79e57d1549ed76c3b6a4ea48b61b2b901c5fce5 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Tue, 20 Oct 2020 12:20:02 +0200 Subject: [PATCH 55/63] qtbase: set QT_QPA_EGLFS_INTEGRATION="eglfs_viv" on fb images Otherwise, qt5 applications will fail to launch on the 8X and 6/6QP. https://jira.digi.com/browse/DEL-7281 Signed-off-by: Gabriel Valcazar --- meta-digi-dey/recipes-qt/qt5/qtbase/qt5.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-qt/qt5/qtbase/qt5.sh b/meta-digi-dey/recipes-qt/qt5/qtbase/qt5.sh index 16c8e26d7..42ad08218 100644 --- a/meta-digi-dey/recipes-qt/qt5/qtbase/qt5.sh +++ b/meta-digi-dey/recipes-qt/qt5/qtbase/qt5.sh @@ -6,4 +6,4 @@ export QT_QPA_PLATFORM="wayland" export QT_QPA_PLATFORM="xcb" # Use EGLFS platform plugin for images without XWayland and X11 -[ -f "/etc/xserver-nodm/Xserver" ] || export QT_QPA_PLATFORM="eglfs" +[ -f "/etc/xserver-nodm/Xserver" ] || export QT_QPA_PLATFORM="eglfs" QT_QPA_EGLFS_INTEGRATION="eglfs_viv" From e1129bc8e41e5d37946dfe36a5800b270a7a7b54 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 20 Oct 2020 17:15:59 +0200 Subject: [PATCH 56/63] meta-digi: update revisions for dey-3.0-r2.2 Signed-off-by: Hector Palacios --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_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 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 922d34d2d..8daa0b582 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index 243ff2143..e228653a0 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "72f9d767ff7be11e42eda1b642f87cad0dc9d4e1" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index dd3b5a540..ecc8086cc 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2018.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "edd9ebafae30ad9fd0bc9f26ab21fd1b215d30c6" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" 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 ef49e0c04..8704c0a6d 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 = "f584ba1c464a8578b9cb939a1be56b015daf7607" COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index de5c09fad..0cfffe571 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 = "f584ba1c464a8578b9cb939a1be56b015daf7607" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 4437359c9..f6e08314e 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};branch=${SRCBRANCH} \ + ${QCOM_GIT_URI};nobranch=1 \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 0774cb146..3b509a410 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.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "68dad194801bbcd9487b8177e06e7b8cdcd94c79" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${LINUX_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index d5501cdd7..a906fad5d 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "${AUTOREV}" +SRCREV = "35943b2466c9357cdd4e5c165f26149d82ed51f6" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${CC_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index 4e66757e4..abf140a14 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,2020, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "1317384494f56ac3d10e7dee3ac968b944f02468" 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 9d977bb28..2054381ce 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "bce0bfff451c67c5387ebdaa9b5da1bde82750ca" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ + ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From 5a8b929694d78aab64a840e32c088fb731fd294a Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 20 Oct 2020 17:15:59 +0200 Subject: [PATCH 57/63] meta-digi: revert revisions to AUTOREV This reverts commit e1129bc8e41e5d37946dfe36a5800b270a7a7b54. Signed-off-by: Hector Palacios --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_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 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 8daa0b582..922d34d2d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index e228653a0..243ff2143 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "72f9d767ff7be11e42eda1b642f87cad0dc9d4e1" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index ecc8086cc..dd3b5a540 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2018.03/maint" -SRCREV = "edd9ebafae30ad9fd0bc9f26ab21fd1b215d30c6" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" 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 8704c0a6d..ef49e0c04 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 = "f584ba1c464a8578b9cb939a1be56b015daf7607" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index 0cfffe571..de5c09fad 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 = "f584ba1c464a8578b9cb939a1be56b015daf7607" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index f6e08314e..4437359c9 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-3.0/maint" -SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" +SRCREV = "${AUTOREV}" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};nobranch=1 \ + ${QCOM_GIT_URI};branch=${SRCBRANCH} \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 3b509a410..0774cb146 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.0/maint" -SRCREV = "68dad194801bbcd9487b8177e06e7b8cdcd94c79" +SRCREV = "${AUTOREV}" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};nobranch=1" +SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index a906fad5d..d5501cdd7 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "35943b2466c9357cdd4e5c165f26149d82ed51f6" +SRCREV = "${AUTOREV}" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};nobranch=1" +SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index abf140a14..4e66757e4 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,2020, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "1317384494f56ac3d10e7dee3ac968b944f02468" +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 2054381ce..9d977bb28 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "bce0bfff451c67c5387ebdaa9b5da1bde82750ca" +SRCREV = "${AUTOREV}" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ + ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From d7d8c7aa56373d6db115d419a21761e4b6f7528b Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Wed, 21 Oct 2020 13:55:16 +0200 Subject: [PATCH 58/63] ccimx6qpsbc: add support for variants 0x02 and 0x03 Build the U-Boot for variants with 1GB of memory and make the installation and boot scripts recognize all of the current variants. Signed-off-by: Gabriel Valcazar --- meta-digi-arm/conf/machine/ccimx6qpsbc.conf | 3 ++- .../recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt | 4 ++++ .../u-boot/u-boot-dey/ccimx6qpsbc/install_linux_fw_sd.txt | 7 ++++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf index 8b5fbea57..5895509ae 100644 --- a/meta-digi-arm/conf/machine/ccimx6qpsbc.conf +++ b/meta-digi-arm/conf/machine/ccimx6qpsbc.conf @@ -22,7 +22,8 @@ PREFERRED_PROVIDER_virtual/libg2d_mx6 = "imx-gpu-g2d" # U-Boot configurations # Last one is the default (the one the symlinks point at) -UBOOT_CONFIG ??= "ccimx6qpsbc2GB" +UBOOT_CONFIG ??= "ccimx6qpsbc1GB ccimx6qpsbc2GB" +UBOOT_CONFIG[ccimx6qpsbc1GB] = "ccimx6qpsbc1GB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" UBOOT_CONFIG[ccimx6qpsbc2GB] = "ccimx6qpsbc2GB_defconfig,,u-boot-dtb.${UBOOT_SUFFIX}" KERNEL_DEVICETREE ?= " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt index 67f84c604..2ae28ea4a 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx6qpsbc/boot.txt @@ -16,6 +16,10 @@ else # if test "${module_variant}" = "0x01"; then setenv fdt_file imx6qp-ccimx6qpsbc-wb.dtb + elif test "${module_variant}" = "0x02"; then + setenv fdt_file imx6qp-ccimx6qpsbc-wb.dtb + elif test "${module_variant}" = "0x03"; then + setenv fdt_file imx6qp-ccimx6qpsbc.dtb else setenv fdt_file imx6qp-ccimx6qpsbc-wb.dtb fi 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 918a3715f..daceaa14a 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 @@ -21,8 +21,10 @@ fi # Determine U-Boot file to program basing on module variant if test -n "${module_variant}"; then - if test "${module_variant}" = "0x01"; then + if test "${module_variant}" = "0x01" || test "${module_variant}" = "0x02"; then setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6qpsbc2GB.imx; + elif test "${module_variant}" = "0x03"; then + setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6qpsbc1GB.imx; fi fi # Use 'test -n ...' because 'test -z ...' does not work well on old versions of @@ -36,6 +38,9 @@ else echo "1. Set variable 'INSTALL_UBOOT_FILENAME' depending on your ConnectCore 6 QuadPlus variant:"; echo " - For a QuadPlus CPU with 2GB DDR3, run:"; echo " => setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6qpsbc2GB.imx"; + echo " - For a DualPlus CPU with 1GB DDR3, run:"; + echo " => setenv INSTALL_UBOOT_FILENAME u-boot-ccimx6qpsbc1GB.imx"; + echo ""; echo ""; echo "2. Run the install script again."; echo ""; From 496d8f8eda007ffc3f5ff9cfdb177917c1c9c7ab Mon Sep 17 00:00:00 2001 From: Arturo Buzarra Date: Thu, 22 Oct 2020 13:30:25 +0200 Subject: [PATCH 59/63] dey-image-installer: add release version to readme file in ZIP installer This commit replaces the hardcoded text from the readme file by the environment variables adding from this way the release version to the file content. Signed-off-by: Arturo Buzarra --- meta-digi-dey/classes/dey-image-installer.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-digi-dey/classes/dey-image-installer.bbclass b/meta-digi-dey/classes/dey-image-installer.bbclass index 4c0923362..048b82173 100644 --- a/meta-digi-dey/classes/dey-image-installer.bbclass +++ b/meta-digi-dey/classes/dey-image-installer.bbclass @@ -39,8 +39,8 @@ generate_installer_zip () { # Create README file cat >${IMGDEPLOYDIR}/README.txt <<_EOF_ -Digi Embedded Yocto kit installer ---------------------------------- +${DISTRO_NAME} ${DISTRO_VERSION} kit installer +---------------------------------------- _EOF_ md5sum ${INSTALLER_FILELIST} | sed -e "s,${DEPLOY_DIR_IMAGE}/,,g;s,${IMGDEPLOYDIR}/,,g" >> ${IMGDEPLOYDIR}/README.txt From 3a299682aae95467ab3c78b02c69b5c4e6e17ef4 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Thu, 22 Oct 2020 16:14:30 +0200 Subject: [PATCH 60/63] meta-digi: update revisions for dey-3.0-r2.3 Signed-off-by: Hector Palacios --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_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 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 922d34d2d..8daa0b582 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index 243ff2143..e228653a0 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "72f9d767ff7be11e42eda1b642f87cad0dc9d4e1" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index dd3b5a540..ecc8086cc 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2018.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "edd9ebafae30ad9fd0bc9f26ab21fd1b215d30c6" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" 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 ef49e0c04..8704c0a6d 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 = "f584ba1c464a8578b9cb939a1be56b015daf7607" COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index de5c09fad..0cfffe571 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 = "f584ba1c464a8578b9cb939a1be56b015daf7607" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 4437359c9..f6e08314e 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};branch=${SRCBRANCH} \ + ${QCOM_GIT_URI};nobranch=1 \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 0774cb146..85c5c2373 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.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "967cd126159a8d6934ec2b9c2e625a8f25b52e2f" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${LINUX_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index d5501cdd7..a906fad5d 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "${AUTOREV}" +SRCREV = "35943b2466c9357cdd4e5c165f26149d82ed51f6" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${CC_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index 4e66757e4..abf140a14 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,2020, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "1317384494f56ac3d10e7dee3ac968b944f02468" 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 9d977bb28..2054381ce 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "bce0bfff451c67c5387ebdaa9b5da1bde82750ca" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ + ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From a64005482bc299e4359e4df731c505ca429d20b9 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Thu, 22 Oct 2020 16:14:30 +0200 Subject: [PATCH 61/63] meta-digi: revert revisions to AUTOREV This reverts commit 3a299682aae95467ab3c78b02c69b5c4e6e17ef4. Signed-off-by: Hector Palacios --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_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 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 8daa0b582..922d34d2d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index e228653a0..243ff2143 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "72f9d767ff7be11e42eda1b642f87cad0dc9d4e1" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index ecc8086cc..dd3b5a540 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2018.03/maint" -SRCREV = "edd9ebafae30ad9fd0bc9f26ab21fd1b215d30c6" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" 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 8704c0a6d..ef49e0c04 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 = "f584ba1c464a8578b9cb939a1be56b015daf7607" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index 0cfffe571..de5c09fad 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 = "f584ba1c464a8578b9cb939a1be56b015daf7607" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index f6e08314e..4437359c9 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-3.0/maint" -SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" +SRCREV = "${AUTOREV}" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};nobranch=1 \ + ${QCOM_GIT_URI};branch=${SRCBRANCH} \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 85c5c2373..0774cb146 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.0/maint" -SRCREV = "967cd126159a8d6934ec2b9c2e625a8f25b52e2f" +SRCREV = "${AUTOREV}" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};nobranch=1" +SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index a906fad5d..d5501cdd7 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "35943b2466c9357cdd4e5c165f26149d82ed51f6" +SRCREV = "${AUTOREV}" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};nobranch=1" +SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index abf140a14..4e66757e4 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,2020, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "1317384494f56ac3d10e7dee3ac968b944f02468" +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 2054381ce..9d977bb28 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "bce0bfff451c67c5387ebdaa9b5da1bde82750ca" +SRCREV = "${AUTOREV}" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ + ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From 4dfdf2d435352d927102b96f90ece69c70717c22 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Fri, 23 Oct 2020 13:09:44 +0200 Subject: [PATCH 62/63] meta-digi: update revisions for dey-3.0-r2.4 Signed-off-by: Hector Palacios --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_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 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 922d34d2d..8daa0b582 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index 243ff2143..e228653a0 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "72f9d767ff7be11e42eda1b642f87cad0dc9d4e1" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index dd3b5a540..ecc8086cc 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2018.03/maint" -SRCREV = "${AUTOREV}" +SRCREV = "edd9ebafae30ad9fd0bc9f26ab21fd1b215d30c6" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" 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 ef49e0c04..f009db050 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 = "b84d3443cc3ba5b2fc65b58fbcac9618d3a3704d" COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index de5c09fad..13147909f 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 = "b84d3443cc3ba5b2fc65b58fbcac9618d3a3704d" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index 4437359c9..f6e08314e 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};branch=${SRCBRANCH} \ + ${QCOM_GIT_URI};nobranch=1 \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index 0774cb146..e4b5c8a50 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.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "8086dc5f8e298a5df8fde6f925f3d7afda9f7bef" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${LINUX_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index d5501cdd7..a906fad5d 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "${AUTOREV}" +SRCREV = "35943b2466c9357cdd4e5c165f26149d82ed51f6" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${CC_GIT_URI};nobranch=1" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index 4e66757e4..abf140a14 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,2020, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "1317384494f56ac3d10e7dee3ac968b944f02468" 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 9d977bb28..2054381ce 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "bce0bfff451c67c5387ebdaa9b5da1bde82750ca" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ + ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \ From 51319426f86727b553a196e327dfd9e04b1d1535 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Fri, 23 Oct 2020 13:09:52 +0200 Subject: [PATCH 63/63] meta-digi: revert revisions to AUTOREV This reverts commit 4dfdf2d435352d927102b96f90ece69c70717c22. Signed-off-by: Hector Palacios --- meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb | 2 +- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_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 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc index 8daa0b582..922d34d2d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/digi-u-boot.inc @@ -18,7 +18,7 @@ S = "${WORKDIR}/git" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb index e228653a0..243ff2143 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2017.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2017.03/maint" -SRCREV = "72f9d767ff7be11e42eda1b642f87cad0dc9d4e1" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8x)" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb index ecc8086cc..dd3b5a540 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2018.03.bb @@ -3,6 +3,6 @@ require digi-u-boot.inc SRCBRANCH = "v2018.03/maint" -SRCREV = "edd9ebafae30ad9fd0bc9f26ab21fd1b215d30c6" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x|ccimx8m)" 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 f009db050..ef49e0c04 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 = "b84d3443cc3ba5b2fc65b58fbcac9618d3a3704d" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx8x)" diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_git.bb index 13147909f..de5c09fad 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 = "b84d3443cc3ba5b2fc65b58fbcac9618d3a3704d" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -15,7 +15,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git;protocol=https', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-artifact.sh;name=artifact-sign-script \ file://sign_hab;name=artifact-hab-sign \ file://encrypt_hab;name=artifact-hab-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb index f6e08314e..4437359c9 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb @@ -9,12 +9,12 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca PV = "v4.0.11.213X" SRCBRANCH = "qca65X4/dey-3.0/maint" -SRCREV = "97e83349d3649d8d95dae746700358c2690d9571" +SRCREV = "${AUTOREV}" QCOM_GIT_URI = "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_MTK_GIT}linux/qcacld-2.0.git;protocol=ssh', '${DIGI_GITHUB_GIT}/qcacld-2.0.git;protocol=https', d)}" SRC_URI = " \ - ${QCOM_GIT_URI};nobranch=1 \ + ${QCOM_GIT_URI};branch=${SRCBRANCH} \ " # Selects whether the interface is SDIO or PCI diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey-src.inc index e4b5c8a50..0774cb146 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.0/maint" -SRCREV = "8086dc5f8e298a5df8fde6f925f3d7afda9f7bef" +SRCREV = "${AUTOREV}" # Select internal or Github Linux repo LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git;protocol=https', d)}" -SRC_URI = "${LINUX_GIT_URI};nobranch=1" +SRC_URI = "${LINUX_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index a906fad5d..d5501cdd7 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -8,14 +8,14 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7 DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" -SRCREV = "35943b2466c9357cdd4e5c165f26149d82ed51f6" +SRCREV = "${AUTOREV}" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=https" CC_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" -SRC_URI = "${CC_GIT_URI};nobranch=1" +SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-src.inc index abf140a14..4e66757e4 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,2020, Digi International Inc. SRCBRANCH = "dey-3.0/maint" -SRCREV = "1317384494f56ac3d10e7dee3ac968b944f02468" +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 2054381ce..9d977bb28 100644 --- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb +++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix_git.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/ISC;md5=f3b90e78ea0cffb20bf5cca DEPENDS = "libsoc libsocketcan libgpiod" SRCBRANCH ?= "dey-3.0/maint" -SRCREV = "bce0bfff451c67c5387ebdaa9b5da1bde82750ca" +SRCREV = "${AUTOREV}" LIBDIGIAPIX_URI_STASH = "${DIGI_MTK_GIT}dey/libdigiapix.git;protocol=ssh" LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" @@ -17,7 +17,7 @@ LIBDIGIAPIX_URI_GITHUB = "${DIGI_GITHUB_GIT}/libdigiapix.git;protocol=https" LIBDIGIAPIX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1' , '${LIBDIGIAPIX_URI_STASH}', '${LIBDIGIAPIX_URI_GITHUB}', d)}" SRC_URI = " \ - ${LIBDIGIAPIX_GIT_URI};nobranch=1 \ + ${LIBDIGIAPIX_GIT_URI};branch=${SRCBRANCH} \ file://99-digiapix.rules \ file://libdigiapix.conf \ file://digiapix.sh \