From ede7b9b6c06340b52123e729d89c15338e99193c Mon Sep 17 00:00:00 2001 From: "Diaz de Grenu, Jose" Date: Wed, 23 Nov 2016 16:53:05 +0100 Subject: [PATCH 01/28] meta-digi: revert revisions to AUTOREV Signed-off-by: Javier Viguera --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc | 4 ++-- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb | 4 ++-- .../recipes-digi/trustfence/trustfence-sign-tools_1.0.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc index cdc6d44d1..709bbd97a 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc @@ -1,11 +1,11 @@ # Copyright (C) 2013 Digi International SRCBRANCH = "v2013.01/dub-2.0/maint" -SRCREV = "dfc9c241d7b8171dddb804bc2c4f7fa431386c23" +SRCREV = "${AUTOREV}" # Select internal or Github U-Boot repo UBOOT_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" -SRC_URI = "${UBOOT_GIT_URI};nobranch=1" +SRC_URI = "${UBOOT_GIT_URI};branch=${SRCBRANCH}" UBOOT_NVRAM_LIBPATH = "git/board/digi/common/cmd_nvram/lib" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb index 42f310ec9..bf1909201 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb @@ -12,13 +12,13 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-cst-native', PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "dbf81842c12245fbb8db6d61064d1a9b51a92816" +SRCREV = "${AUTOREV}" # Select internal or Github U-Boot repo UBOOT_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb index 784fb1fde..9c84eb4fb 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb @@ -3,7 +3,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2015.04/maint" -SRCREV = "dbf81842c12245fbb8db6d61064d1a9b51a92816" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -11,7 +11,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-kernel.sh;name=kernel-script \ file://sign_uimage;name=kernel-sign \ file://encrypt_uimage;name=kernel-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index 7761c6ecc..fc77b74c0 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -16,7 +16,7 @@ LOCALVERSION = "-dey" LINUX_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git', d)}" SRC_URI = " \ - ${LINUX_GIT_URI};nobranch=1 \ + ${LINUX_GIT_URI};branch=${SRCBRANCH} \ file://defconfig \ " diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb index 5725bf913..6d7e0ec69 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb @@ -4,7 +4,7 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v3.10/dey-1.4/maint" -SRCREV = "aa1701793ab27ccfe4931bbc55b46f6b9cb442e7" +SRCREV = "${AUTOREV}" config_dts() { for DTB in ${KERNEL_DEVICETREE}; do diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb index 9a712f868..6819a65b9 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb @@ -6,6 +6,6 @@ require recipes-kernel/linux/linux-dtb.inc inherit fsl-vivante-kernel-driver-handler SRCBRANCH = "v3.14/dey-2.0/maint" -SRCREV = "e4774bf569b2878839570c9cce71d5165269c1f1" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6$)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb index 5ac1f1d66..6a5ceeccc 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb @@ -4,6 +4,6 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v4.1/dey-2.0/maint" -SRCREV = "8dca338beac57160f7eb2706199565624257a514" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6ul)" From f53cb09e239583562fea3c0a848259ccd6503667 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 27 Jan 2017 11:47:42 +0100 Subject: [PATCH 02/28] meta-digi: update README.md for release dey-2.0-r5 Signed-off-by: Javier Viguera --- README.md | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 54ab606b4..cd00df870 100644 --- a/README.md +++ b/README.md @@ -59,14 +59,31 @@ Documentation is available online on the Digi documentation site: # Downloads -* Demo images: ftp://ftp1.digi.com/support/digiembeddedyocto/2.0/r4/images/ -* Software Development Kit (SDK): ftp://ftp1.digi.com/support/digiembeddedyocto/2.0/r4/sdk/ +* Demo images: ftp://ftp1.digi.com/support/digiembeddedyocto/2.0/r5/images/ +* Software Development Kit (SDK): ftp://ftp1.digi.com/support/digiembeddedyocto/2.0/r5/sdk/ # Release Changelog ## 2.0-r5 -* TBC +* Digi Embedded Yocto + * Support firmware update through the new recovery mode + * Initial support to connect to Device Cloud with the CloudConnector + * Updated U-Boot to version 'dub-2015.04-r7' for Digi ConnectCore 6 and 6UL +* Digi ConnectCore 6UL + * Added support to audio codec MAX98089 + * Added support to camera Omnivision OV5642 + * Optimized kernel configuration (smaller kernel) + * Added support for EDO mode on NAND Flash + * Added PMIC NVRAM support through sysfs + * Added suspend support for PMIC regulators + * Added support for i.MX6UL ADC channels + * Added voltage scaling support for MCA ADC + * Added full-system reset support to MCA watchdog + * Added MCA 32KHz output control through sysfs + * Added VRef output control through sysfs + * Added support to PWM1 on Starter Board expansion header + * Kernel v4.1.38 ## 2.0-r4 @@ -133,10 +150,6 @@ properly. To work around this problem the UART is configured without hardware flow control at 115200 bps, reducing the maximum throughput of this interface. This problem will be corrected in newer revisions of the hardware. -* U-Boot version dub-2015.04-r4.5 may report running on Starter Board version 1 -even when your Starter Board is version 2. In that case Ethernet does not work -in U-Boot. More recent versions of U-Boot fix this issue. - ## Digi ConnectCore 6 * NXP i.MX6 processor has a documented errata (ERR004512) whereby the maximum From 615350dd2627de4ef530b69eee7783ac9ce4b52f Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 27 Jan 2017 11:58:29 +0100 Subject: [PATCH 03/28] meta-digi: update revisions for dey-2.0-r5.1 Signed-off-by: Javier Viguera --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc | 4 ++-- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb | 4 ++-- .../recipes-digi/trustfence/trustfence-sign-tools_1.0.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc index 709bbd97a..1f336cabc 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc @@ -1,11 +1,11 @@ # Copyright (C) 2013 Digi International SRCBRANCH = "v2013.01/dub-2.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "f5e96d720736218f8b81e4cf3ec1a2cb55f86401" # Select internal or Github U-Boot repo UBOOT_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" -SRC_URI = "${UBOOT_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${UBOOT_GIT_URI};nobranch=1" UBOOT_NVRAM_LIBPATH = "git/board/digi/common/cmd_nvram/lib" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb index b28ac2344..740ab3a0f 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb @@ -12,13 +12,13 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-cst-native', PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "d5a67e1890b147b3f965c8fb822dd0d043e9fa07" # Select internal or Github U-Boot repo UBOOT_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb index 9c84eb4fb..eac90ac88 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb @@ -3,7 +3,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "d5a67e1890b147b3f965c8fb822dd0d043e9fa07" S = "${WORKDIR}" @@ -11,7 +11,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-kernel.sh;name=kernel-script \ file://sign_uimage;name=kernel-sign \ file://encrypt_uimage;name=kernel-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index 45990474e..9267f3e0e 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -16,7 +16,7 @@ LOCALVERSION = "-dey" LINUX_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git', d)}" SRC_URI = " \ - ${LINUX_GIT_URI};branch=${SRCBRANCH} \ + ${LINUX_GIT_URI};nobranch=1 \ file://defconfig \ " diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb index 6d7e0ec69..5725bf913 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb @@ -4,7 +4,7 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v3.10/dey-1.4/maint" -SRCREV = "${AUTOREV}" +SRCREV = "aa1701793ab27ccfe4931bbc55b46f6b9cb442e7" config_dts() { for DTB in ${KERNEL_DEVICETREE}; do diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb index 6819a65b9..813d228a0 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb @@ -6,6 +6,6 @@ require recipes-kernel/linux/linux-dtb.inc inherit fsl-vivante-kernel-driver-handler SRCBRANCH = "v3.14/dey-2.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "c4cef439604bdfa65d5aeb0b90ef429506a8ec9d" COMPATIBLE_MACHINE = "(ccimx6$)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb index 6a5ceeccc..e74a379ac 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb @@ -4,6 +4,6 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v4.1/dey-2.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "a8f5b5ee0e1477df641fadd8e9485aeedf2c7bb9" COMPATIBLE_MACHINE = "(ccimx6ul)" From 1b387bbe5da6f84227aea752106334ffab7df5f0 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 27 Jan 2017 12:01:15 +0100 Subject: [PATCH 04/28] meta-digi: revert revisions to AUTOREV Signed-off-by: Javier Viguera --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc | 4 ++-- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb | 4 ++-- .../recipes-digi/trustfence/trustfence-sign-tools_1.0.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc index 1f336cabc..709bbd97a 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc @@ -1,11 +1,11 @@ # Copyright (C) 2013 Digi International SRCBRANCH = "v2013.01/dub-2.0/maint" -SRCREV = "f5e96d720736218f8b81e4cf3ec1a2cb55f86401" +SRCREV = "${AUTOREV}" # Select internal or Github U-Boot repo UBOOT_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" -SRC_URI = "${UBOOT_GIT_URI};nobranch=1" +SRC_URI = "${UBOOT_GIT_URI};branch=${SRCBRANCH}" UBOOT_NVRAM_LIBPATH = "git/board/digi/common/cmd_nvram/lib" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb index 740ab3a0f..b28ac2344 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb @@ -12,13 +12,13 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-cst-native', PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "d5a67e1890b147b3f965c8fb822dd0d043e9fa07" +SRCREV = "${AUTOREV}" # Select internal or Github U-Boot repo UBOOT_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb index eac90ac88..9c84eb4fb 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb @@ -3,7 +3,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2015.04/maint" -SRCREV = "d5a67e1890b147b3f965c8fb822dd0d043e9fa07" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -11,7 +11,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-kernel.sh;name=kernel-script \ file://sign_uimage;name=kernel-sign \ file://encrypt_uimage;name=kernel-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index 9267f3e0e..45990474e 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -16,7 +16,7 @@ LOCALVERSION = "-dey" LINUX_GIT_URI = "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git', d)}" SRC_URI = " \ - ${LINUX_GIT_URI};nobranch=1 \ + ${LINUX_GIT_URI};branch=${SRCBRANCH} \ file://defconfig \ " diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb index 5725bf913..6d7e0ec69 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb @@ -4,7 +4,7 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v3.10/dey-1.4/maint" -SRCREV = "aa1701793ab27ccfe4931bbc55b46f6b9cb442e7" +SRCREV = "${AUTOREV}" config_dts() { for DTB in ${KERNEL_DEVICETREE}; do diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb index 813d228a0..6819a65b9 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb @@ -6,6 +6,6 @@ require recipes-kernel/linux/linux-dtb.inc inherit fsl-vivante-kernel-driver-handler SRCBRANCH = "v3.14/dey-2.0/maint" -SRCREV = "c4cef439604bdfa65d5aeb0b90ef429506a8ec9d" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6$)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb index e74a379ac..6a5ceeccc 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb @@ -4,6 +4,6 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v4.1/dey-2.0/maint" -SRCREV = "a8f5b5ee0e1477df641fadd8e9485aeedf2c7bb9" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6ul)" From b2259f7a83d9c3012bbbd5ce2b3a9fd900d3b907 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Tue, 31 Jan 2017 10:02:23 +0100 Subject: [PATCH 05/28] ccimx6sbc: pulseaudio: Make pulseaudio load the sgtl5000 sink The profiles created for the sgtl5000 sound card didn't have any priorities assigned, making pulseaudio map a different profile than before and causing the sink to remain unloaded. This commit fixes this by assigning a priority to each profile. The values were taken directly from the default profile to assure that pulseaudio's behavior is the same using one profile or the other. https://jira.digi.com/browse/DEL-3602 Signed-off-by: Gabriel Valcazar --- .../pulseaudio/pulseaudio/dey-audio-sgtl5000.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio/dey-audio-sgtl5000.conf b/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio/dey-audio-sgtl5000.conf index 7c219776e..ffd115c07 100644 --- a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio/dey-audio-sgtl5000.conf +++ b/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio/dey-audio-sgtl5000.conf @@ -30,40 +30,48 @@ auto-profiles = no description = Analog Mono device-strings = hw:%f channel-map = mono +priority = 2 [Mapping analog-stereo] description = Analog Stereo device-strings = hw:%f channel-map = left,right +priority = 60 [Profile input:analog-mono] description = Analog Mono Input input-mappings = analog-mono skip-probe = yes +priority = 2 [Profile input:analog-stereo] description = Analog Stereo Input input-mappings = analog-stereo skip-probe = yes +priority = 60 [Profile output:analog-mono] description = Analog Mono Output output-mappings = analog-mono skip-probe = yes +priority = 200 [Profile output:analog-mono+input:analog-mono] description = Analog Mono Duplex output-mappings = analog-mono input-mappings = analog-mono skip-probe = yes +priority = 202 [Profile output:analog-stereo] description = Analog Stereo Output output-mappings = analog-stereo skip-probe = yes +priority = 6000 [Profile output:analog-stereo+input:analog-stereo] description = Analog Stereo Duplex output-mappings = analog-stereo input-mappings = analog-stereo skip-probe = yes +priority = 6060 From 50dc84d9497ce3febe9c824465586a21614d51b4 Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Tue, 31 Jan 2017 10:31:45 +0100 Subject: [PATCH 06/28] uboot: install_script: add missing semicolons Signed-off-by: Hector Palacios https://jira.digi.com/browse/DEL-3603 --- .../u-boot-dey-2015.04/ccimx6/install_linux_fw_sd.txt | 4 ++-- .../ccimx6ulsbc/install_linux_fw_sd.txt | 10 +++++----- .../ccimx6ulstarter/install_linux_fw_sd.txt | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6/install_linux_fw_sd.txt index 828a4fff6..0dc005071 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6/install_linux_fw_sd.txt @@ -162,8 +162,8 @@ setenv bootcmd " exit; fi; echo \"\"; - setenv boot_recovery yes - setenv recovery_command wipe_update + setenv boot_recovery yes; + setenv recovery_command wipe_update; saveenv; echo \">> Firmware installation complete. Booting into recovery for final deployment.\"; sleep 1; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulsbc/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulsbc/install_linux_fw_sd.txt index dd58604c7..5c1c46c05 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulsbc/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulsbc/install_linux_fw_sd.txt @@ -74,7 +74,7 @@ setenv bootcmd " echo \">> Installing Linux kernel and device tree files\"; echo \"\"; echo \"\"; - nand erase.part linux + nand erase.part linux; update linux mmc ${INSTALL_MMCDEV} fat ${INSTALL_LINUX_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update linux partition!\"; @@ -87,7 +87,7 @@ setenv bootcmd " echo \">> Installing recovery\"; echo \"\"; echo \"\"; - nand erase.part recovery + nand erase.part recovery; update recovery mmc ${INSTALL_MMCDEV} fat ${INSTALL_RECOVERY_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update recovery partition!\"; @@ -100,7 +100,7 @@ setenv bootcmd " echo \">> Installing Linux root file system\"; echo \"\"; echo \"\"; - nand erase.part rootfs + nand erase.part rootfs; update rootfs mmc ${INSTALL_MMCDEV} fat ${INSTALL_ROOTFS_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update rootfs partition!\"; @@ -109,8 +109,8 @@ setenv bootcmd " exit; fi; echo \"\"; - setenv boot_recovery yes - setenv recovery_command wipe_update + setenv boot_recovery yes; + setenv recovery_command wipe_update; saveenv; echo \">> Firmware installation complete. Booting into recovery for final deployment.\"; sleep 1; diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/install_linux_fw_sd.txt index e6865bd11..ced13db9a 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/install_linux_fw_sd.txt @@ -74,7 +74,7 @@ setenv bootcmd " echo \">> Installing Linux kernel and device tree files\"; echo \"\"; echo \"\"; - nand erase.part linux + nand erase.part linux; update linux mmc ${INSTALL_MMCDEV} fat ${INSTALL_LINUX_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update linux partition!\"; @@ -87,7 +87,7 @@ setenv bootcmd " echo \">> Installing recovery\"; echo \"\"; echo \"\"; - nand erase.part recovery + nand erase.part recovery; update recovery mmc ${INSTALL_MMCDEV} fat ${INSTALL_RECOVERY_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update recovery partition!\"; @@ -100,7 +100,7 @@ setenv bootcmd " echo \">> Installing Linux root file system\"; echo \"\"; echo \"\"; - nand erase.part rootfs + nand erase.part rootfs; update rootfs mmc ${INSTALL_MMCDEV} fat ${INSTALL_ROOTFS_FILENAME}; if test \$? -eq 1; then echo \"[ERROR] Failed to update rootfs partition!\"; @@ -109,8 +109,8 @@ setenv bootcmd " exit; fi; echo \"\"; - setenv boot_recovery yes - setenv recovery_command wipe_update + setenv boot_recovery yes; + setenv recovery_command wipe_update; saveenv; echo \">> Firmware installation complete. Booting into recovery for final deployment.\"; sleep 1; From 4dfaab9dc63d2f0906828866a3a00b2507fb619d Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Mon, 30 Jan 2017 14:16:09 +0100 Subject: [PATCH 07/28] meta-digi-dey: fix layer name Also update LAYERDEPENDS to add 'swupdate' https://jira.digi.com/browse/DEL-3478 Signed-off-by: Javier Viguera --- meta-digi-dey/conf/layer.conf | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta-digi-dey/conf/layer.conf b/meta-digi-dey/conf/layer.conf index a8b03895f..f0737ec43 100644 --- a/meta-digi-dey/conf/layer.conf +++ b/meta-digi-dey/conf/layer.conf @@ -10,12 +10,12 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILES += "${@' '.join('${LAYERDIR}/other-layers/%s/recipes*/*/*.bbappend' % layer \ for layer in BBFILE_COLLECTIONS.split())}" -BBFILE_COLLECTIONS += "dey" -BBFILE_PATTERN_dey := "^${LAYERDIR}/" -BBFILE_PRIORITY_dey = "6" +BBFILE_COLLECTIONS += "digi-dey" +BBFILE_PATTERN_digi-dey := "^${LAYERDIR}/" +BBFILE_PRIORITY_digi-dey = "6" -LAYERDEPENDS_dey = "core digi-arm" -LAYERDEPENDS_dey += "openembedded-layer networking-layer webserver qt5-layer" +LAYERDEPENDS_digi-dey = "core digi-arm" +LAYERDEPENDS_digi-dey += "openembedded-layer networking-layer webserver qt5-layer swupdate" # Digi's General and Open Source license agreements DIGI_EULA_FILE = "${LAYERDIR}/DIGI_EULA" From e0c4aa21fa2afe0fb7a1576bfa2516270fd54ba1 Mon Sep 17 00:00:00 2001 From: Pedro Perez de Heredia Date: Mon, 30 Jan 2017 11:09:23 +0100 Subject: [PATCH 08/28] meta-digi-dey: suspend: add critical section Add critical section in suspend script to avoid that more than one instance can be executed concurrently. This happens, for instance, when the power button key is pressed while the system is resumming, causing issues on the wifi interface. https://jira.digi.com/browse/DEL-3431 Signed-off-by: Pedro Perez de Heredia --- .../busybox/busybox-1.23.2/ccimx6ul/suspend | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/ccimx6ul/suspend b/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/ccimx6ul/suspend index c89ed5ec1..a8122d0b0 100755 --- a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/ccimx6ul/suspend +++ b/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/ccimx6ul/suspend @@ -3,7 +3,7 @@ # # suspend # -# Copyright (C) 2016 by Digi International Inc. +# Copyright (C) 2016, 2017 by Digi International Inc. # All rights reserved. # # This program is free software; you can redistribute it and/or modify it @@ -17,6 +17,8 @@ scriptname="$(basename ${0})" syspower="/sys/power/state" +lockfile="/var/lock/${scriptname}.lock" +lockfd="9" usage() { printf "\nSuspend system to RAM memory\n" @@ -40,6 +42,21 @@ resume_interfaces() { fi } +enter_critical_section() { + # Create lock file + eval "exec ${lockfd}>${lockfile}" + + # Acquire the lock in non blocking mode. Otherwise, additional calls + # to the script will be queued and the system will endlessly go in + # and out of suspend to ram + flock -n "${lockfd}" || exit 0 +} + +exit_critical_section() { + # Release the lock + flock -u "${lockfd}" +} + while getopts "h" c; do case "${c}" in h) usage; exit;; @@ -47,6 +64,9 @@ while getopts "h" c; do done if [ -f "${syspower}" ]; then + # Avoid running multiple instances of this script in parallel + enter_critical_section + # Pre-suspend actions suspend_interfaces @@ -56,6 +76,8 @@ if [ -f "${syspower}" ]; then # Post-resume actions resume_interfaces + + exit_critical_section else printf "\n[ERROR] File ${syspower} not found\n\n" fi From b869ecde82ec7d4328b5f67e1baf8c59db4e6ac9 Mon Sep 17 00:00:00 2001 From: Pedro Perez de Heredia Date: Mon, 30 Jan 2017 11:14:36 +0100 Subject: [PATCH 09/28] meta-digi-dey: suspend: remove unnecesary delay Signed-off-by: Pedro Perez de Heredia --- .../recipes-core/busybox/busybox-1.23.2/ccimx6ul/suspend | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/ccimx6ul/suspend b/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/ccimx6ul/suspend index a8122d0b0..cc460bee2 100755 --- a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/ccimx6ul/suspend +++ b/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/ccimx6ul/suspend @@ -72,7 +72,6 @@ if [ -f "${syspower}" ]; then # Suspend the device printf "mem" > ${syspower} - sleep .5 # Post-resume actions resume_interfaces From 161117caf023ae48f5193f1bc283415ed19fca4d Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 1 Feb 2017 19:09:41 +0100 Subject: [PATCH 10/28] install_linux: fix failure to boot into recovery On a CC6, the 'env default -a' command deletes the 'soc_family' variable that is used on the U-Boot boot scripts to configure the name of the device tree file to load. Then if we try to boot into recovery directly (without a reset) because the variable is not available, it fails to compose the correct name for the fdt, and gives the error: reading uImage--ccimx6sbc-id129.dtb ** Unable to read file uImage--ccimx6sbc-id129.dtb ** Force a reset, so the 'soc_family' variable is available again and the correct fdt_file is loaded. While on it, add some blank lines to the 'recovery reboot' message, so it's easier to read. Signed-off-by: Javier Viguera --- .../u-boot-dey-2015.04/ccimx6/install_linux_fw_sd.txt | 8 ++++++-- .../ccimx6ulsbc/install_linux_fw_sd.txt | 8 ++++++-- .../ccimx6ulstarter/install_linux_fw_sd.txt | 8 ++++++-- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6/install_linux_fw_sd.txt index 0dc005071..e30726d19 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6/install_linux_fw_sd.txt @@ -165,9 +165,13 @@ setenv bootcmd " setenv boot_recovery yes; setenv recovery_command wipe_update; saveenv; - echo \">> Firmware installation complete. Booting into recovery for final deployment.\"; + echo \"\"; + echo \"\"; + echo \">> Firmware installation complete. Rebooting into recovery mode for final deployment.\"; + echo \"\"; + echo \"\"; sleep 1; - run recoverycmd; + reset; " saveenv diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulsbc/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulsbc/install_linux_fw_sd.txt index 5c1c46c05..2240940a9 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulsbc/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulsbc/install_linux_fw_sd.txt @@ -112,9 +112,13 @@ setenv bootcmd " setenv boot_recovery yes; setenv recovery_command wipe_update; saveenv; - echo \">> Firmware installation complete. Booting into recovery for final deployment.\"; + echo \"\"; + echo \"\"; + echo \">> Firmware installation complete. Rebooting into recovery mode for final deployment.\"; + echo \"\"; + echo \"\"; sleep 1; - run recoverycmd; + reset; " saveenv diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/install_linux_fw_sd.txt index ced13db9a..24ba14447 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/install_linux_fw_sd.txt +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-2015.04/ccimx6ulstarter/install_linux_fw_sd.txt @@ -112,9 +112,13 @@ setenv bootcmd " setenv boot_recovery yes; setenv recovery_command wipe_update; saveenv; - echo \">> Firmware installation complete. Booting into recovery for final deployment.\"; + echo \"\"; + echo \"\"; + echo \">> Firmware installation complete. Rebooting into recovery mode for final deployment.\"; + echo \"\"; + echo \"\"; sleep 1; - run recoverycmd; + reset; " saveenv From aaf2524a08bd813e5cac38017ba03a694dd4917a Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 1 Feb 2017 20:04:12 +0100 Subject: [PATCH 11/28] meta-digi-dey: implement class to generate installer zip package It's not enabled by default. It's controlled by DEY_IMAGE_INSTALLER variable in the project's local.conf. https://jira.digi.com/browse/DEL-3591 Signed-off-by: Javier Viguera --- .../classes/dey-image-installer.bbclass | 52 +++++++++++++++++++ meta-digi-dey/classes/dey-image.bbclass | 6 +++ 2 files changed, 58 insertions(+) create mode 100644 meta-digi-dey/classes/dey-image-installer.bbclass diff --git a/meta-digi-dey/classes/dey-image-installer.bbclass b/meta-digi-dey/classes/dey-image-installer.bbclass new file mode 100644 index 000000000..9c29b4c65 --- /dev/null +++ b/meta-digi-dey/classes/dey-image-installer.bbclass @@ -0,0 +1,52 @@ +# +# Generate DEY installer ZIP package +# +# Copyright 2017, Digi International Inc. +# + +DEPENDS += "zip-native" + +# +# Filesystem types allowed in the installer ZIP +# +FSTYPES_WHITELIST = " \ + boot.ubifs \ + boot.vfat \ + ext4 \ + recovery.ubifs \ + recovery.vfat \ + ubifs \ +" + +generate_installer_zip () { + # Get list of files to pack + INSTALLER_FILELIST="${DEPLOY_DIR_IMAGE}/install_linux_fw_sd.scr" + for ext in ${FSTYPES_WHITELIST}; do + if readlink -e "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${ext}" >/dev/null; then + INSTALLER_FILELIST="${INSTALLER_FILELIST} ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${ext}" + fi + done + for ubconf in ${UBOOT_CONFIG}; do + if readlink -e "${DEPLOY_DIR_IMAGE}/u-boot-${ubconf}.${UBOOT_SUFFIX}" >/dev/null; then + INSTALLER_FILELIST="${INSTALLER_FILELIST} ${DEPLOY_DIR_IMAGE}/u-boot-${ubconf}.${UBOOT_SUFFIX}" + fi + done + + # Create README file + cat >README.txt <<_EOF_ +Digi Embedded Yocto kit installer +--------------------------------- + +_EOF_ + md5sum ${INSTALLER_FILELIST} | sed -e "s,${DEPLOY_DIR_IMAGE}/,,g" >> README.txt + + # Pack the files + zip -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.installer.zip ${INSTALLER_FILELIST} README.txt + + # Create the symlink + if [ -n "${IMAGE_LINK_NAME}" ] && [ -e "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.installer.zip" ]; then + ln -sf ${IMAGE_NAME}.installer.zip ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.installer.zip + fi +} + +IMAGE_POSTPROCESS_COMMAND += "generate_installer_zip; " diff --git a/meta-digi-dey/classes/dey-image.bbclass b/meta-digi-dey/classes/dey-image.bbclass index 78e12f53a..8d19292dd 100644 --- a/meta-digi-dey/classes/dey-image.bbclass +++ b/meta-digi-dey/classes/dey-image.bbclass @@ -26,3 +26,9 @@ EXTRA_USERS_PARAMS += "\ # Create QT5 capable toolchain/SDK if 'dey-qt' image feature is enabled # inherit ${@bb.utils.contains("IMAGE_FEATURES", "dey-qt", "populate_sdk_qt5", "",d)} + +# +# Generate ZIP installer if configured in the project's local.conf +# +DEY_IMAGE_INSTALLER ?= "0" +inherit ${@base_conditional("DEY_IMAGE_INSTALLER", "1", "dey-image-installer", "", d)} From 1c61048b956e9b1c88c08ea831e464e8a5efe4e1 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 1 Feb 2017 20:07:12 +0100 Subject: [PATCH 12/28] build.sh: enable zip installer generation by default For automated builds in the buildserver we want the installer ZIP file to be generated. Signed-off-by: Javier Viguera --- sdk/build-github.sh | 5 +++++ sdk/build.sh | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/sdk/build-github.sh b/sdk/build-github.sh index d2f16f66e..f84156d02 100755 --- a/sdk/build-github.sh +++ b/sdk/build-github.sh @@ -32,6 +32,10 @@ INHERIT += \"rm_work\" RM_WORK_EXCLUDE += \"dey-image-qt linux-dey qtbase u-boot-dey\" " +ZIP_INSTALLER_CFG=" +DEY_IMAGE_INSTALLER = \"1\" +" + X11_REMOVAL_CFG=" DISTRO_FEATURES_remove = \"x11\" " @@ -169,6 +173,7 @@ for platform in ${DY_PLATFORMS}; do -e "/^#SSTATE_DIR ?=/cSSTATE_DIR ?= \"${YOCTO_PROJ_DIR}/sstate-cache\"" \ conf/local.conf printf "${RM_WORK_CFG}" >> conf/local.conf + printf "${ZIP_INSTALLER_CFG}" >> conf/local.conf # Remove 'x11' distro feature if building framebuffer images if [ "${DY_FB_IMAGE}" = "true" ]; then printf "${X11_REMOVAL_CFG}" >> conf/local.conf diff --git a/sdk/build.sh b/sdk/build.sh index 178f8b78a..b2f69147f 100755 --- a/sdk/build.sh +++ b/sdk/build.sh @@ -45,6 +45,10 @@ INHERIT += \"rm_work\" RM_WORK_EXCLUDE += \"dey-image-qt linux-dey qtbase u-boot-dey\" " +ZIP_INSTALLER_CFG=" +DEY_IMAGE_INSTALLER = \"1\" +" + X11_REMOVAL_CFG=" DISTRO_FEATURES_remove = \"x11\" " @@ -243,6 +247,7 @@ for platform in ${DY_PLATFORMS}; do if [ "${DY_RM_WORK}" = "true" ]; then printf "${RM_WORK_CFG}" >> conf/local.conf fi + printf "${ZIP_INSTALLER_CFG}" >> conf/local.conf # Remove 'x11' distro feature if building framebuffer images if [ "${DY_FB_IMAGE}" = "true" ]; then printf "${X11_REMOVAL_CFG}" >> conf/local.conf From 731edf319b04139cfe2ca545662d8cdf6eea7f47 Mon Sep 17 00:00:00 2001 From: Alejandro Navarro Date: Thu, 2 Feb 2017 16:39:51 +0100 Subject: [PATCH 13/28] mca_tool: update checksums for version 1.3 Signed-off-by: Alejandro Navarro --- .../recipes-digi/mca/{mca-tool_1.2.bb => mca-tool_1.3.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta-digi-arm/recipes-digi/mca/{mca-tool_1.2.bb => mca-tool_1.3.bb} (67%) diff --git a/meta-digi-arm/recipes-digi/mca/mca-tool_1.2.bb b/meta-digi-arm/recipes-digi/mca/mca-tool_1.3.bb similarity index 67% rename from meta-digi-arm/recipes-digi/mca/mca-tool_1.2.bb rename to meta-digi-arm/recipes-digi/mca/mca-tool_1.3.bb index 803d231b7..fb130b91e 100644 --- a/meta-digi-arm/recipes-digi/mca/mca-tool_1.2.bb +++ b/meta-digi-arm/recipes-digi/mca/mca-tool_1.3.bb @@ -7,8 +7,8 @@ LICENSE = "CLOSED" PKGNAME = "mca_tool" SRC_URI = "${DIGI_PKG_SRC}/${PKGNAME}-${PV}.tar.gz" -SRC_URI[md5sum] = "eb36b9e98c3ac30372343567c29f385d" -SRC_URI[sha256sum] = "864fdf42ce313e1a55caa654d53d9b9efa0073034914eb7b2e1ecc95f1a4fbf2" +SRC_URI[md5sum] = "d54692090bf0820e6116364822f6433f" +SRC_URI[sha256sum] = "e8267e66ba496a1e77b2dec70d6555bdeb8e06b267e776c86b9d4b01e9d13eb5" S = "${WORKDIR}/${PKGNAME}-${PV}" From aebaedd365a69b296e6f1bdd27f5c41f1a783e06 Mon Sep 17 00:00:00 2001 From: Pedro Perez de Heredia Date: Thu, 2 Feb 2017 13:48:01 +0100 Subject: [PATCH 14/28] meta-digi-arm: firmware-qualcomm: qcom_cfg.ini: disable MCS8-9 for Tx mode https://jira.digi.com/browse/DEL-3563 Signed-off-by: Pedro Perez de Heredia --- .../firmware-qualcomm/firmware-qualcomm/wlan/qcom_cfg.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/wlan/qcom_cfg.ini b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/wlan/qcom_cfg.ini index 1aaa184f7..fd1a774a1 100644 --- a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/wlan/qcom_cfg.ini +++ b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/wlan/qcom_cfg.ini @@ -240,7 +240,7 @@ gDataInactivityTimeout=200 # Valid values are 0,1,2. If commented out, the default value is 0. # 0=MCS0-7, 1=MCS0-8, 2=MCS0-9 gVhtRxMCS=2 -gVhtTxMCS=2 +gVhtTxMCS=0 # VHT Tx/Rx MCS values for 2x2 # Valid values are 0,1,2. If commented out, the default value is 0. From a077822c3d5a2bb089891f7199eec75e997473c9 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 2 Feb 2017 19:53:20 +0100 Subject: [PATCH 15/28] README.md: add known issues and limitations https://jira.digi.com/browse/DEL-3557 Signed-off-by: Javier Viguera --- README.md | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index cd00df870..6febb74f8 100644 --- a/README.md +++ b/README.md @@ -142,13 +142,24 @@ after a failed attempt. Hence the target needs to be reset after an authentication failure. * If TrustFence (TM) image encryption support is enabled, the uSD image will boot a signed U-Boot only. +* Firmware update + * Updating from a microSD card is not supported, only from local partitions + (e.g. the 'update' partition) or from external USB memory devices. + * The software update package must be located in the root level of the + update media (subfolders are not yet supported). +* Cloud Connector + * Remote file system management fails with long file names and paths + (over 255 characters). + * Data points are always sent to the server although data service is + disabled. ## Digi ConnectCore 6UL -* In the Bluetooth interface, the UART hardware flow control doesn’t work -properly. To work around this problem the UART is configured without hardware -flow control at 115200 bps, reducing the maximum throughput of this interface. -This problem will be corrected in newer revisions of the hardware. +* The UART connected to the Bluetooth chip on early versions of the ConnectCore + 6UL system-on-module (hardware version < 4) cannot properly execute flow + control. To work around this issue, UART1 of these SOM versions has been + configured to operate at 115200 bps and without hardware flow control, + reducing the maximum throughput of this interface. ## Digi ConnectCore 6 From 8ae033e89ccec91f7782bcc3e0d59aed6da6530e Mon Sep 17 00:00:00 2001 From: David Escalona Date: Fri, 3 Feb 2017 11:20:05 +0100 Subject: [PATCH 16/28] Revert "meta-digi-dey: cloudconnector: Build from source tarball." This reverts commit e0890e8866851d86944c4ec2bb662f9a8356f999. --- .../cloudconnector/cloudconnector_1.0.bb | 29 ------------------- .../cloudconnector/cloudconnector_git.bb | 2 -- 2 files changed, 31 deletions(-) delete mode 100644 meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_1.0.bb diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_1.0.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_1.0.bb deleted file mode 100644 index 0a777f821..000000000 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_1.0.bb +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (C) 2017, Digi International Inc. - -SUMMARY = "Digi's device cloud connector" -SECTION = "libs" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MPL-2.0;md5=815ca599c9df247a0c7f619bab123dad" - -DEPENDS = "confuse openssl recovery-utils zlib" - -SRC_URI = "${DIGI_PKG_SRC}/${BP}.tar.gz" - -SRC_URI[md5sum] = "db366b0358c1b47f6380080ce75d91e4" -SRC_URI[sha256sum] = "5ecd4b1830fea7746e005465b6eef30f118302147861eb4074cf717fffbdf9d5" - -S = "${WORKDIR}/${PN}-${PV}" - -inherit pkgconfig - -do_install() { - oe_runmake DESTDIR=${D} install -} - -PACKAGES =+ "${PN}-cert" - -FILES_${PN}-cert = "${sysconfdir}/ssl/certs/Digi_Int-ca-cert-public.crt" - -CONFFILES_${PN} += "${sysconfdir}/cc.conf" - -RDEPENDS_${PN} = "${PN}-cert" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index 32afcc5f4..034aadf57 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -27,5 +27,3 @@ FILES_${PN}-cert = "${sysconfdir}/ssl/certs/Digi_Int-ca-cert-public.crt" CONFFILES_${PN} += "${sysconfdir}/cc.conf" RDEPENDS_${PN} = "${PN}-cert" - -DEFAULT_PREFERENCE = "-1" From 561532490c8bbcb942bec627b8231d9057628ad7 Mon Sep 17 00:00:00 2001 From: David Escalona Date: Fri, 3 Feb 2017 11:22:51 +0100 Subject: [PATCH 17/28] cloudconnector: compile cloudconnector from github by default Signed-off-by: David Escalona --- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index 034aadf57..df5c2d21f 100644 --- a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb +++ b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb @@ -10,7 +10,12 @@ DEPENDS = "confuse openssl recovery-utils zlib" SRCBRANCH = "master" SRCREV = "${AUTOREV}" -SRC_URI = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh;branch=${SRCBRANCH}" +CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" +CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=git" + +CC_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${CC_STASH}', '${CC_GITHUB}', d)}" + +SRC_URI = "${CC_GIT_URI};branch=${SRCBRANCH}" S = "${WORKDIR}/git" From c4643eaf0f79a080f554f496bd113b9493c47e08 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 3 Feb 2017 16:58:40 +0100 Subject: [PATCH 18/28] meta-digi: update revisions for dey-2.0-r5.2 Signed-off-by: Javier Viguera --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc | 4 ++-- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb | 4 ++-- .../recipes-digi/trustfence/trustfence-sign-tools_1.0.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb | 2 +- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc index 03d459756..67263505d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc @@ -1,11 +1,11 @@ # Copyright (C) 2013 Digi International SRCBRANCH = "v2013.01/dub-2.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "f5e96d720736218f8b81e4cf3ec1a2cb55f86401" # Select internal or Github U-Boot repo UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" -SRC_URI = "${UBOOT_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${UBOOT_GIT_URI};nobranch=1" UBOOT_NVRAM_LIBPATH = "git/board/digi/common/cmd_nvram/lib" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb index 99223b914..6a370013c 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb @@ -12,13 +12,13 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-cst-native', PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "d5a67e1890b147b3f965c8fb822dd0d043e9fa07" # Select internal or Github U-Boot repo UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb index f70e0e122..885f4e6cd 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb @@ -3,7 +3,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "d5a67e1890b147b3f965c8fb822dd0d043e9fa07" S = "${WORKDIR}" @@ -11,7 +11,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-kernel.sh;name=kernel-script \ file://sign_uimage;name=kernel-sign \ file://encrypt_uimage;name=kernel-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index 04584d422..b0a6710df 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -16,7 +16,7 @@ LOCALVERSION = "-dey" LINUX_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git', d)}" SRC_URI = " \ - ${LINUX_GIT_URI};branch=${SRCBRANCH} \ + ${LINUX_GIT_URI};nobranch=1 \ file://defconfig \ " diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb index 6d7e0ec69..5725bf913 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb @@ -4,7 +4,7 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v3.10/dey-1.4/maint" -SRCREV = "${AUTOREV}" +SRCREV = "aa1701793ab27ccfe4931bbc55b46f6b9cb442e7" config_dts() { for DTB in ${KERNEL_DEVICETREE}; do diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb index 6819a65b9..813d228a0 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb @@ -6,6 +6,6 @@ require recipes-kernel/linux/linux-dtb.inc inherit fsl-vivante-kernel-driver-handler SRCBRANCH = "v3.14/dey-2.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "c4cef439604bdfa65d5aeb0b90ef429506a8ec9d" COMPATIBLE_MACHINE = "(ccimx6$)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb index 6a5ceeccc..a25df939c 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb @@ -4,6 +4,6 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v4.1/dey-2.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "a2d9a775dbfbbfc8ca3047861b27cfdc9d714aa1" COMPATIBLE_MACHINE = "(ccimx6ul)" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index df5c2d21f..9d05c8a87 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 = "0766a4692de70c13a467cf75176d12b966d78578" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=git" CC_GIT_URI ?= "${@base_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" From 2e003d8385695fd06aaded34c5bdf778837508f6 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 3 Feb 2017 17:00:35 +0100 Subject: [PATCH 19/28] meta-digi: revert revisions to AUTOREV Signed-off-by: Javier Viguera --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc | 4 ++-- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb | 4 ++-- .../recipes-digi/trustfence/trustfence-sign-tools_1.0.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb | 2 +- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc index 67263505d..03d459756 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc @@ -1,11 +1,11 @@ # Copyright (C) 2013 Digi International SRCBRANCH = "v2013.01/dub-2.0/maint" -SRCREV = "f5e96d720736218f8b81e4cf3ec1a2cb55f86401" +SRCREV = "${AUTOREV}" # Select internal or Github U-Boot repo UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" -SRC_URI = "${UBOOT_GIT_URI};nobranch=1" +SRC_URI = "${UBOOT_GIT_URI};branch=${SRCBRANCH}" UBOOT_NVRAM_LIBPATH = "git/board/digi/common/cmd_nvram/lib" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb index 6a370013c..99223b914 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb @@ -12,13 +12,13 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-cst-native', PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "d5a67e1890b147b3f965c8fb822dd0d043e9fa07" +SRCREV = "${AUTOREV}" # Select internal or Github U-Boot repo UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb index 885f4e6cd..f70e0e122 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb @@ -3,7 +3,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2015.04/maint" -SRCREV = "d5a67e1890b147b3f965c8fb822dd0d043e9fa07" +SRCREV = "${AUTOREV}" S = "${WORKDIR}" @@ -11,7 +11,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};nobranch=1 \ + ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ file://trustfence-sign-kernel.sh;name=kernel-script \ file://sign_uimage;name=kernel-sign \ file://encrypt_uimage;name=kernel-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index b0a6710df..04584d422 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -16,7 +16,7 @@ LOCALVERSION = "-dey" LINUX_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git', d)}" SRC_URI = " \ - ${LINUX_GIT_URI};nobranch=1 \ + ${LINUX_GIT_URI};branch=${SRCBRANCH} \ file://defconfig \ " diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb index 5725bf913..6d7e0ec69 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb @@ -4,7 +4,7 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v3.10/dey-1.4/maint" -SRCREV = "aa1701793ab27ccfe4931bbc55b46f6b9cb442e7" +SRCREV = "${AUTOREV}" config_dts() { for DTB in ${KERNEL_DEVICETREE}; do diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb index 813d228a0..6819a65b9 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb @@ -6,6 +6,6 @@ require recipes-kernel/linux/linux-dtb.inc inherit fsl-vivante-kernel-driver-handler SRCBRANCH = "v3.14/dey-2.0/maint" -SRCREV = "c4cef439604bdfa65d5aeb0b90ef429506a8ec9d" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6$)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb index a25df939c..6a5ceeccc 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb @@ -4,6 +4,6 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v4.1/dey-2.0/maint" -SRCREV = "a2d9a775dbfbbfc8ca3047861b27cfdc9d714aa1" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6ul)" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index 9d05c8a87..df5c2d21f 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 = "0766a4692de70c13a467cf75176d12b966d78578" +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=git" CC_GIT_URI ?= "${@base_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" From 30ccd116f5092d2a4604ab815d5ce46aef33ca5a Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Thu, 9 Feb 2017 16:59:59 +0100 Subject: [PATCH 20/28] initscripts: add script to enable CAAM JS0 wakeup According to NXP i.MX Linux Reference Manual: The full CAAM function is exclusive with the Mega/Fast mix off feature in DSM. If CAAM is enabled, the Mega/Fast mix off feature needs to be disabled, and the user should "echo enabled > /sys/bus/platform/devices/2100000.aips-bus/2100000.caam/2101000.jr0/power/wakeup" after the kernel boots up, and then Mega/Fast mix will keep the power on in DSM. Signed-off-by: Hector Palacios https://jira.digi.com/browse/DEL-3636 --- .../initscripts/initscripts-1.0/caam_jr0_wakeup.sh | 10 ++++++++++ .../recipes-core/initscripts/initscripts_1.0.bbappend | 11 ++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 meta-digi-dey/recipes-core/initscripts/initscripts-1.0/caam_jr0_wakeup.sh diff --git a/meta-digi-dey/recipes-core/initscripts/initscripts-1.0/caam_jr0_wakeup.sh b/meta-digi-dey/recipes-core/initscripts/initscripts-1.0/caam_jr0_wakeup.sh new file mode 100644 index 000000000..380a98e66 --- /dev/null +++ b/meta-digi-dey/recipes-core/initscripts/initscripts-1.0/caam_jr0_wakeup.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +# The full CAAM function is exclusive with the Mega/Fast mix off feature in DSM. +# If CAAM is enabled, the Mega/Fast mix off feature needs to be disabled, and +# the user should enable CAAM jr0 as a wakeup source after the kernel boots up, +# and then Mega/Fast mix will keep the power on in DSM. +JR0_WAKEUP="/sys/bus/platform/devices/2100000.aips-bus/2140000.caam/2141000.jr0/power/wakeup" +if [ -f "${JR0_WAKEUP}" ]; then + echo "enabled" > "${JR0_WAKEUP}" +fi diff --git a/meta-digi-dey/recipes-core/initscripts/initscripts_1.0.bbappend b/meta-digi-dey/recipes-core/initscripts/initscripts_1.0.bbappend index 91197617c..d803b5e8e 100644 --- a/meta-digi-dey/recipes-core/initscripts/initscripts_1.0.bbappend +++ b/meta-digi-dey/recipes-core/initscripts/initscripts_1.0.bbappend @@ -1,12 +1,21 @@ -# Copyright (C) 2013 Digi International. +# Copyright (C) 2013-2017 Digi International. FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:" SRC_URI += "file://device_table.txt \ file://devtmpfs.sh" +SRC_URI_append_ccimx6ul = " file://caam_jr0_wakeup.sh" + do_install_append() { install -m 755 ${WORKDIR}/devtmpfs.sh ${D}${sysconfdir}/init.d/devtmpfs.sh update-rc.d -r ${D} devtmpfs.sh start 03 S . install -m 0755 ${WORKDIR}/device_table.txt ${D}${sysconfdir}/device_table } + +do_install_append_ccimx6ul() { + install -m 0755 ${WORKDIR}/caam_jr0_wakeup.sh ${D}${sysconfdir}/init.d/caam_jr0_wakeup.sh + update-rc.d -r ${D} caam_jr0_wakeup.sh start 20 S . +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" From 1949581c5437ef0c6a7a3d5e285f31646a05cf67 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 9 Feb 2017 19:30:43 +0100 Subject: [PATCH 21/28] mesa: make sure GLES3 headers are installed Ship libgles3-mesa-dev package along with libgles2-mesa-dev because otherwise GLES3 headers are missing from the toolchain and we have build failures for example compiling QT applications. Exactly the same workaround is done for the vivante implementation in meta-fsl-arm layer. Original patch (not merged into oe-core): https://patchwork.openembedded.org/patch/134244/ Signed-off-by: Javier Viguera https://jira.digi.com/browse/DEL-3088 --- meta-digi-dey/recipes-graphics/mesa/mesa_%.bbappend | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 meta-digi-dey/recipes-graphics/mesa/mesa_%.bbappend diff --git a/meta-digi-dey/recipes-graphics/mesa/mesa_%.bbappend b/meta-digi-dey/recipes-graphics/mesa/mesa_%.bbappend new file mode 100644 index 000000000..d9020a0e6 --- /dev/null +++ b/meta-digi-dey/recipes-graphics/mesa/mesa_%.bbappend @@ -0,0 +1,6 @@ +# Copyright (C) 2017 Digi International + +# +# Add runtime dependency so that GLES3 headers don't need to be added manually +# +RDEPENDS_libgles2-mesa-dev += "libgles3-mesa-dev" From e367ba8cc437c49a40fc5c8a7f1c140d3cd20570 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 10 Feb 2017 10:39:42 +0100 Subject: [PATCH 22/28] meta-digi: update README.md file * Device Cloud has been renamed to Remote Manager. * Removed "Data points" known issue (fixed in CloudConnector) Signed-off-by: Javier Viguera --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 6febb74f8..ca7b10607 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ Documentation is available online on the Digi documentation site: * Digi Embedded Yocto * Support firmware update through the new recovery mode - * Initial support to connect to Device Cloud with the CloudConnector + * Initial support to connect to Remote Manager with the CloudConnector * Updated U-Boot to version 'dub-2015.04-r7' for Digi ConnectCore 6 and 6UL * Digi ConnectCore 6UL * Added support to audio codec MAX98089 @@ -150,8 +150,6 @@ boot a signed U-Boot only. * Cloud Connector * Remote file system management fails with long file names and paths (over 255 characters). - * Data points are always sent to the server although data service is - disabled. ## Digi ConnectCore 6UL From 44ae297ea83e843ec638778cfe55c0a7ee87260e Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Thu, 9 Feb 2017 12:35:50 +0100 Subject: [PATCH 23/28] meta-digi-arm: firmware-qualcomm: Update board data files. Use bdf with a -2db gain. Signed-off-by: Alex Gonzalez --- .../firmware-qualcomm/bdwlan30_US.bin | Bin 8124 -> 8124 bytes .../firmware-qualcomm/bdwlan30_World.bin | Bin 8124 -> 8124 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/bdwlan30_US.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/bdwlan30_US.bin index fd6ffaeb37f8ea00d8dde905dfe9de70b13ef3ce..c639f16d682688bb8e46496c0897829bc75fe0b4 100644 GIT binary patch delta 294 zcmdmEzsH_skGymBMwS)q79LEiGM0#my<3CI5D{U305P#MU2aSr87*jx%}?0V`09Ch gKpN9j5-4PFaY4-?jS-5Wje`Sf5Cx3Qa^mwi0NHI{;s5{u delta 294 zcmdmEzsH_skGymFMwS)q7F}+uGM0#my<3CI5D{U305P#MT^(*687*jx%}?0V`051& jR%N&`rKu!P$l&9HnnM~R6hj*i57ZzE7@Ot9=Wzf4pR-od diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/bdwlan30_World.bin b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm/bdwlan30_World.bin index e3a4b047477f42ac36f1d169f4019a89e33ace5f..48c54ee1aae14672a7400480d7dc189696268bfa 100644 GIT binary patch delta 294 zcmdmEzsH_sk9_uzjVvqJEj*Z3Wh@aBd$$IaAtJ&60b*ijy4;vLGFs3Wo1d_!@zwM2 hfHbD5Bv8oU;)0q(8Y2`#8wUr}APN|p<;3T4005EtV21zz delta 294 zcmdmEzsH_sk9_u*jVvqJExO!RWh@aBd$$IaAtJ&60b*ijx;orCGFs3Wo1d_!@zo0m jtjcg>N>fRokio|XHHS1tD26s39;iVSFgDAH&*K09SU^{I From bbc03c59358e01450156b354f31fe96964f8a462 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 10 Feb 2017 12:53:16 +0100 Subject: [PATCH 24/28] trustfence-cst: refresh patches with git Refresh the patches with GIT so they apply cleanly using "git am". Otherwise they fail with: Applying: openssl_helper: use /dev/urandom as seed source error: corrupt patch at line 16 Patch failed at 0003 openssl_helper: use /dev/urandom as seed source Applying: hab4_pki_tree.sh: usa a random password for the default PKI generation warning: keys/hab4_pki_tree.sh has type 100755, expected 100644 Notice that they were not failing in Yocto, as it does not use "git am" to apply patches, but it's better to have the patches correctly done. Signed-off-by: Javier Viguera --- .../0003-openssl_helper-use-dev-urandom-as-seed-source.patch | 2 ++ ...-hab4_pki_tree.sh-usa-a-random-password-for-the-defau.patch | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-2.3.2/0003-openssl_helper-use-dev-urandom-as-seed-source.patch b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-2.3.2/0003-openssl_helper-use-dev-urandom-as-seed-source.patch index 24dcbd229..d8a80eac2 100644 --- a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-2.3.2/0003-openssl_helper-use-dev-urandom-as-seed-source.patch +++ b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-2.3.2/0003-openssl_helper-use-dev-urandom-as-seed-source.patch @@ -20,3 +20,5 @@ index 3c9c779092c5..f0cd4e06f0dd 100644 - return RAND_load_file("/dev/random", bytes); + return RAND_load_file("/dev/urandom", bytes); } + + diff --git a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-2.3.2/0004-hab4_pki_tree.sh-usa-a-random-password-for-the-defau.patch b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-2.3.2/0004-hab4_pki_tree.sh-usa-a-random-password-for-the-defau.patch index 6b668d7c3..ed165689a 100644 --- a/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-2.3.2/0004-hab4_pki_tree.sh-usa-a-random-password-for-the-defau.patch +++ b/meta-digi-arm/recipes-bsp/trustfence-cst/trustfence-cst-2.3.2/0004-hab4_pki_tree.sh-usa-a-random-password-for-the-defau.patch @@ -9,7 +9,7 @@ Signed-off-by: Diaz de Grenu, Jose 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/keys/hab4_pki_tree.sh b/keys/hab4_pki_tree.sh -index b2c6b71b604e..93347521cea1 100644 +index b2c6b71b604e..93347521cea1 100755 --- a/keys/hab4_pki_tree.sh +++ b/keys/hab4_pki_tree.sh @@ -95,9 +95,10 @@ fi @@ -26,4 +26,3 @@ index b2c6b71b604e..93347521cea1 100644 fi # The following is required otherwise OpenSSL complains - From e9c1cd4632faa4c4871465940b1837f5b8fbe350 Mon Sep 17 00:00:00 2001 From: Sebastian Pastor Date: Fri, 10 Feb 2017 21:59:10 +0100 Subject: [PATCH 25/28] sdk: build: Add ccimx6ulrftest platform. This is the manufacturing test harness used for the CC6UL module during manufacturing RF test. Signed-off-by: Sebastian Pastor --- sdk/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/sdk/build.sh b/sdk/build.sh index b2f69147f..e7c5c1eae 100755 --- a/sdk/build.sh +++ b/sdk/build.sh @@ -174,6 +174,7 @@ done<<-_EOF_ ccimx6ulsbc DONTBUILDVARIANTS dey-image-qt ccimx6ulstarter DONTBUILDVARIANTS core-image-base ccimx6ulsom DONTBUILDVARIANTS dey-image-mft-module-min + ccimx6ulrftest DONTBUILDVARIANTS dey-image-mft-module-rf _EOF_ YOCTO_IMGS_DIR="${WORKSPACE}/images" From 8d716dd0e0750b8f5c3bf1f20ea7a934316cab82 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Fri, 10 Feb 2017 14:46:25 +0100 Subject: [PATCH 26/28] meta-digi-dey: wpa-supplicant: Add commented out sched_scan_interval. This parameter allows to set the time interval for scheduled scans in seconds. This is usually managed by the wpa-supplicant dynamically, but for example with DFS channels and non broadcasting SSIDs re-associations take too long if the periodic scans time interval is not reduced. https://jira.digi.com/browse/CC6UL-594 Signed-off-by: Alex Gonzalez --- .../wpa-supplicant/ccimx6ul/wpa_supplicant.conf-sane | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccimx6ul/wpa_supplicant.conf-sane b/meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccimx6ul/wpa_supplicant.conf-sane index a180d27d8..c58546a06 100644 --- a/meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccimx6ul/wpa_supplicant.conf-sane +++ b/meta-digi-dey/recipes-connectivity/wpa-supplicant/wpa-supplicant/ccimx6ul/wpa_supplicant.conf-sane @@ -4,6 +4,13 @@ fast_reauth=1 update_config=1 ap_scan=1 + +# Static scheduled scan interval time in seconds +# +# The wpa-supplicant dynamically adjusts the scheduled scan time interval. On +# occassions, fixing the interval time is helpful, for example on DFS channels. +#sched_scan_interval=2 + network={ scan_ssid=1 ssid="" From e7f590350c01c23febd4aac6dd2129d493e24754 Mon Sep 17 00:00:00 2001 From: Pedro Perez de Heredia Date: Mon, 13 Feb 2017 10:57:07 +0100 Subject: [PATCH 27/28] kernel-module-qualcomm: fix issue with _scan_callback at module unload Protect the invocation of the _scan_done() callback function with the global lock to avoid that it is called while the module is being unloaded and the data structures have been freed. Additionally, the commit also adds a patch to reduce the log level of the driver that is logging some annoying messages. https://jira.digi.com/browse/DEL-3607 https://jira.digi.com/browse/DEL-3393 Signed-off-by: Pedro Perez de Heredia --- .../kernel-module-qualcomm.bb | 2 + .../0021-cosmetic-change-log-level.patch | 53 +++++++++ .../0022-fix-issue-with-_scan_callback.patch | 102 ++++++++++++++++++ 3 files changed, 157 insertions(+) create mode 100644 meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/0021-cosmetic-change-log-level.patch create mode 100644 meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/0022-fix-issue-with-_scan_callback.patch 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 1ef977f14..afe55d0dc 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 @@ -34,6 +34,8 @@ SRC_URI = " \ file://0018-qcacld-Indicate-disconnect-event-to-upper-layers.patch \ file://0019-wdd_hdd_main-Print-con_mode-to-clearly-see-if-in-FTM.patch \ file://0020-Makefile-Pass-BUILD_DEBUG_VERSION-to-kbuild-system.patch \ + file://0021-cosmetic-change-log-level.patch \ + file://0022-fix-issue-with-_scan_callback.patch \ " S = "${WORKDIR}/${PV}" diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/0021-cosmetic-change-log-level.patch b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/0021-cosmetic-change-log-level.patch new file mode 100644 index 000000000..2b2c6c8fb --- /dev/null +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/0021-cosmetic-change-log-level.patch @@ -0,0 +1,53 @@ +From: Pedro Perez de Heredia +Date: Mon, 13 Feb 2017 09:43:50 +0100 +Subject: [PATCH] kernel-module-qualcomm: cosmetic change log level for anoying + driver messages + +Signed-off-by: Pedro Perez de Heredia +--- + CORE/SERVICES/HIF/sdio/linux/native_sdio/src/hif.c | 4 ++-- + CORE/SVC/src/logging/wlan_logging_sock_svc.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/CORE/SERVICES/HIF/sdio/linux/native_sdio/src/hif.c b/CORE/SERVICES/HIF/sdio/linux/native_sdio/src/hif.c +index 1a1e51e..ee2af05 100644 +--- a/CORE/SERVICES/HIF/sdio/linux/native_sdio/src/hif.c ++++ b/CORE/SERVICES/HIF/sdio/linux/native_sdio/src/hif.c +@@ -1202,7 +1202,7 @@ TODO: MMC SDIO3.0 Setting should also be modified in ReInit() function when Powe + clock = device->host->f_max; + } + +- printk(KERN_ERR "%s: Dumping clocks (%d,%d)\n", __func__, func->card->cis.max_dtr, device->host->f_max); ++ pr_info("%s: Dumping clocks (%d,%d)\n", __func__, func->card->cis.max_dtr, device->host->f_max); + + /* + // We don't need to set the clock explicitly on 8064/ADP platforms. +@@ -1513,7 +1513,7 @@ static A_STATUS hifEnableFunc(HIF_DEVICE *device, struct sdio_func *func) + sdio_release_host(func); + return A_ERROR; + } +- printk(KERN_ERR"AR6000: Set async interrupt delay clock as %d.\n", asyncintdelay); ++ pr_info("AR6000: Set async interrupt delay clock as %d.\n", asyncintdelay); + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27) +diff --git a/CORE/SVC/src/logging/wlan_logging_sock_svc.c b/CORE/SVC/src/logging/wlan_logging_sock_svc.c +index 0253215..379d878 100644 +--- a/CORE/SVC/src/logging/wlan_logging_sock_svc.c ++++ b/CORE/SVC/src/logging/wlan_logging_sock_svc.c +@@ -431,13 +431,13 @@ static int wlan_logging_thread(void *Arg) + || gwlan_logging.exit)); + + if (ret_wait_status == -ERESTARTSYS) { +- pr_err("%s: wait_event_interruptible returned -ERESTARTSYS", ++ pr_info("%s: wait_event_interruptible returned -ERESTARTSYS", + __func__); + break; + } + + if (gwlan_logging.exit) { +- pr_err("%s: Exiting the thread\n", __func__); ++ pr_info("%s: Exiting the thread\n", __func__); + break; + } + diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/0022-fix-issue-with-_scan_callback.patch b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/0022-fix-issue-with-_scan_callback.patch new file mode 100644 index 000000000..6f1f6fb51 --- /dev/null +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/0022-fix-issue-with-_scan_callback.patch @@ -0,0 +1,102 @@ +From: Pedro Perez de Heredia +Date: Mon, 13 Feb 2017 10:28:35 +0100 +Subject: [PATCH] kernel-module-qualcomm: fix issue with _scan_callback at + module unload + +Protect the invocation of the _scan_done() callback function with the +global lock to avoid that it is called while the module is being unloaded +and the data structures have been freed. + +https://jira.digi.com/browse/DEL-3607 +https://jira.digi.com/browse/DEL-3393 + +Signed-off-by: Pedro Perez de Heredia +--- + CORE/SME/src/csr/csrApiScan.c | 43 +++++++++++++++++++++++++++++-------------- + 1 file changed, 29 insertions(+), 14 deletions(-) + +diff --git a/CORE/SME/src/csr/csrApiScan.c b/CORE/SME/src/csr/csrApiScan.c +index 83a74cb..2f90cce 100644 +--- a/CORE/SME/src/csr/csrApiScan.c ++++ b/CORE/SME/src/csr/csrApiScan.c +@@ -6420,13 +6420,20 @@ eHalStatus csrScanFreeRequest(tpAniSirGlobal pMac, tCsrScanRequest *pReq) + + void csrScanCallCallback(tpAniSirGlobal pMac, tSmeCmd *pCommand, eCsrScanStatus scanStatus) + { +- if(pCommand->u.scanCmd.callback) ++ eHalStatus status; ++ ++ status = sme_AcquireGlobalLock( &pMac->sme ); ++ if ( HAL_STATUS_SUCCESS( status ) ) + { +- pCommand->u.scanCmd.callback(pMac, pCommand->u.scanCmd.pContext, +- pCommand->sessionId, +- pCommand->u.scanCmd.scanID, scanStatus); +- } else { +- smsLog( pMac, LOG2, "%s:%d - Callback NULL!!!", __func__, __LINE__); ++ if(pCommand->u.scanCmd.callback) ++ { ++ pCommand->u.scanCmd.callback(pMac, pCommand->u.scanCmd.pContext, ++ pCommand->sessionId, ++ pCommand->u.scanCmd.scanID, scanStatus); ++ } else { ++ smsLog( pMac, LOG2, "%s:%d - Callback NULL!!!", __func__, __LINE__); ++ } ++ sme_ReleaseGlobalLock( &pMac->sme ); + } + } + +@@ -7126,6 +7133,7 @@ tANI_BOOLEAN csrScanRemoveFreshScanCommand(tpAniSirGlobal pMac, tANI_U8 sessionI + tSmeCmd *pCommand; + tDblLinkList localList; + tDblLinkList *pCmdList; ++ eHalStatus status; + + vos_mem_zero(&localList, sizeof(tDblLinkList)); + if(!HAL_STATUS_SUCCESS(csrLLOpen(pMac->hHdd, &localList))) +@@ -7178,15 +7186,21 @@ tANI_BOOLEAN csrScanRemoveFreshScanCommand(tpAniSirGlobal pMac, tANI_U8 sessionI + while( (pEntry = csrLLRemoveHead(&localList, LL_ACCESS_NOLOCK)) ) + { + pCommand = GET_BASE_ADDR(pEntry, tSmeCmd, Link); +- if (pCommand->u.scanCmd.callback) ++ ++ status = sme_AcquireGlobalLock( &pMac->sme ); ++ if ( HAL_STATUS_SUCCESS( status ) ) + { +- /* User scan request is pending, ++ if (pCommand->u.scanCmd.callback) ++ { ++ /* User scan request is pending, + * send response with status eCSR_SCAN_ABORT*/ +- pCommand->u.scanCmd.callback(pMac, +- pCommand->u.scanCmd.pContext, +- sessionId, +- pCommand->u.scanCmd.scanID, +- eCSR_SCAN_ABORT); ++ pCommand->u.scanCmd.callback(pMac, ++ pCommand->u.scanCmd.pContext, ++ sessionId, ++ pCommand->u.scanCmd.scanID, ++ eCSR_SCAN_ABORT); ++ } ++ sme_ReleaseGlobalLock( &pMac->sme ); + } + csrReleaseCommandScan( pMac, pCommand ); + } +@@ -8015,7 +8029,6 @@ eHalStatus csrProcessSetBGScanParam(tpAniSirGlobal pMac, tSmeCmd *pCommand) + return (status); + } + +- + eHalStatus csrScanAbortMacScan(tpAniSirGlobal pMac, tANI_U8 sessionId, + eCsrAbortReason reason) + { +@@ -8035,6 +8048,8 @@ eHalStatus csrScanAbortMacScan(tpAniSirGlobal pMac, tANI_U8 sessionId, + { + + pCommand = GET_BASE_ADDR( pEntry, tSmeCmd, Link ); ++ pCommand->u.scanCmd.callback = NULL; ++ pCommand->u.scanCmd.pContext = NULL; + csrAbortCommand( pMac, pCommand, eANI_BOOLEAN_FALSE); + } + csrLLUnlock(&pMac->scan.scanCmdPendingList); From 99afac66f435aaf73496223d3e68fd3b070106e3 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Mon, 13 Feb 2017 12:05:13 +0100 Subject: [PATCH 28/28] meta-digi: update revisions for dey-2.0-r5.3 Signed-off-by: Javier Viguera --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc | 4 ++-- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb | 4 ++-- .../recipes-digi/trustfence/trustfence-sign-tools_1.0.bb | 4 ++-- meta-digi-arm/recipes-kernel/linux/linux-dey.inc | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb | 2 +- .../recipes-digi/cloudconnector/cloudconnector_git.bb | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc index 03d459756..67263505d 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey-rev_2013.01.inc @@ -1,11 +1,11 @@ # Copyright (C) 2013 Digi International SRCBRANCH = "v2013.01/dub-2.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "f5e96d720736218f8b81e4cf3ec1a2cb55f86401" # Select internal or Github U-Boot repo UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" -SRC_URI = "${UBOOT_GIT_URI};branch=${SRCBRANCH}" +SRC_URI = "${UBOOT_GIT_URI};nobranch=1" UBOOT_NVRAM_LIBPATH = "git/board/digi/common/cmd_nvram/lib" diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb index 99223b914..6a370013c 100644 --- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb +++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb @@ -12,13 +12,13 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-cst-native', PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "d5a67e1890b147b3f965c8fb822dd0d043e9fa07" # Select internal or Github U-Boot repo UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ " SRC_URI_append = " \ diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb index f70e0e122..885f4e6cd 100644 --- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb +++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools_1.0.bb @@ -3,7 +3,7 @@ LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "d5a67e1890b147b3f965c8fb822dd0d043e9fa07" S = "${WORKDIR}" @@ -11,7 +11,7 @@ S = "${WORKDIR}" UBOOT_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}u-boot-denx.git', '${DIGI_GITHUB_GIT}/u-boot.git', d)}" SRC_URI = " \ - ${UBOOT_GIT_URI};branch=${SRCBRANCH} \ + ${UBOOT_GIT_URI};nobranch=1 \ file://trustfence-sign-kernel.sh;name=kernel-script \ file://sign_uimage;name=kernel-sign \ file://encrypt_uimage;name=kernel-encrypt \ diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index 04584d422..b0a6710df 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -16,7 +16,7 @@ LOCALVERSION = "-dey" LINUX_GIT_URI ?= "${@base_conditional('DIGI_INTERNAL_GIT', '1' , '${DIGI_GIT}linux-2.6.git', '${DIGI_GITHUB_GIT}/linux.git', d)}" SRC_URI = " \ - ${LINUX_GIT_URI};branch=${SRCBRANCH} \ + ${LINUX_GIT_URI};nobranch=1 \ file://defconfig \ " diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb index 6d7e0ec69..5725bf913 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.10.bb @@ -4,7 +4,7 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v3.10/dey-1.4/maint" -SRCREV = "${AUTOREV}" +SRCREV = "aa1701793ab27ccfe4931bbc55b46f6b9cb442e7" config_dts() { for DTB in ${KERNEL_DEVICETREE}; do diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb index 6819a65b9..813d228a0 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb @@ -6,6 +6,6 @@ require recipes-kernel/linux/linux-dtb.inc inherit fsl-vivante-kernel-driver-handler SRCBRANCH = "v3.14/dey-2.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "c4cef439604bdfa65d5aeb0b90ef429506a8ec9d" COMPATIBLE_MACHINE = "(ccimx6$)" diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb index 6a5ceeccc..da34f388d 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb @@ -4,6 +4,6 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc SRCBRANCH = "v4.1/dey-2.0/maint" -SRCREV = "${AUTOREV}" +SRCREV = "ce2459053b5c5bb71291f7a596c26de0e56c746b" COMPATIBLE_MACHINE = "(ccimx6ul)" diff --git a/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb b/meta-digi-dey/recipes-digi/cloudconnector/cloudconnector_git.bb index df5c2d21f..bd73fb971 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 = "4ab08c79a4fae8b701277dc27097c6e52be7dcf3" CC_STASH = "gitsm://git@stash.digi.com/cc/cc_dey.git;protocol=ssh" CC_GITHUB = "gitsm://github.com/digi-embedded/cc_dey.git;protocol=git" CC_GIT_URI ?= "${@base_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"