From b67d7e02e9c0fcfdd59fab7f0a63db6009cb9843 Mon Sep 17 00:00:00 2001 From: "Diaz de Grenu, Jose" Date: Thu, 14 Jul 2016 17:16:42 +0200 Subject: [PATCH 01/40] Revert "meta-digi-dey: pulseaudio: add HDMI audio sink on hotplug" When module-alsa-sink is used, the audio is sometimes heard with reverb. We will go back to module-udev-detect, so the functionality introduced in the commit being reverted won't longer work. This reverts commit fca507d316ded1e3126ba6db265b7fe871550fae. https://jira.digi.com/browse/DEL-2587 Signed-off-by: Jose Diaz de Grenu de Pedro --- .../pulseaudio/pulseaudio/hdmi_hotplug.sh | 18 ------------------ .../pulseaudio/pulseaudio_%.bbappend | 14 -------------- 2 files changed, 32 deletions(-) delete mode 100644 meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio/hdmi_hotplug.sh diff --git a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio/hdmi_hotplug.sh b/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio/hdmi_hotplug.sh deleted file mode 100644 index 63ce0772e..000000000 --- a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio/hdmi_hotplug.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh -# -# Called from udev on HDMI plug/unplug event - -# Find HDMI card number -for card in /sys/class/sound/card*; do - if readlink ${card}/device | grep -qs hdmi; then - HDMI_CARD="${card##/sys/class/sound/card}" - fi -done - -# On HDMI plugin event, if the sink has not been loaded yet, load the -# HDMI audio sink from ALSA -if [ "${EVENT}" = "plugin" ]; then - if ! pactl list sinks | grep -qs "imx-hdmi-soc"; then - pactl load-module module-alsa-sink device=hw:${HDMI_CARD} - fi -fi diff --git a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend index 47dc37227..8c02716bc 100644 --- a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend +++ b/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend @@ -1,16 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" - -SRC_URI += "file://hdmi_hotplug.sh" - # Do not include module-udev-detect so that module-detect is used instead RDEPENDS_pulseaudio-server_remove = "pulseaudio-module-udev-detect" - -do_install_append() { - install -d ${D}${sysconfdir}/udev/scripts - install -m 0755 ${WORKDIR}/hdmi_hotplug.sh ${D}${sysconfdir}/udev/scripts - - cat >> ${D}${base_libdir}/udev/rules.d/90-pulseaudio.rules <<-_EOL_ - - SUBSYSTEM=="platform", KERNEL=="*hdmi_video", ACTION=="change", RUN+="/etc/udev/scripts/hdmi_hotplug.sh" - _EOL_ -} From 3d6f705a148db9bed06cef93fb0d7a263eb80b1d Mon Sep 17 00:00:00 2001 From: "Diaz de Grenu, Jose" Date: Thu, 14 Jul 2016 17:18:58 +0200 Subject: [PATCH 02/40] Revert "pulseaudio: remove module-udev-detect" Using module-detect there are some audio reverb problems. Reverting that commit will make pulseaudio use module-udev-detect again instead, which takes longer to initialize but does not have that problem. This reverts commit e021f738ee148c4cf747751fd0051a62e65badf1. https://jira.digi.com/browse/DEL-2587 Signed-off-by: Jose Diaz de Grenu de Pedro --- .../recipes-multimedia/pulseaudio/pulseaudio_%.bbappend | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend diff --git a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend deleted file mode 100644 index 8c02716bc..000000000 --- a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -# Do not include module-udev-detect so that module-detect is used instead -RDEPENDS_pulseaudio-server_remove = "pulseaudio-module-udev-detect" From d042239bc27abb69399cd2c051e0d26dfb00c17c Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Fri, 15 Jul 2016 12:11:47 +0200 Subject: [PATCH 03/40] release_notes, changelog: update for upcoming release. Signed-off-by: Mike Engel --- ChangeLog | 6 ++++++ Release_Notes.txt | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ac6a16f1c..9eeda898e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,12 @@ Version Release date (YYYY-MM-DD) ------------------------------------------------------------------------------- +2.0-r2 2016-07-18 + + * Release based on Yocto 2.0 (Jethro) for ConnectCore 6 SBC including: + - Update support for new PMIC hardware revision + - minor bug fixes + 2.0-r1 2016-02-15 * U-Boot 2015.04 for the ConnectCore 6 System-On-Module and SBC. diff --git a/Release_Notes.txt b/Release_Notes.txt index 9d5f7bba0..da55c6e24 100644 --- a/Release_Notes.txt +++ b/Release_Notes.txt @@ -1,11 +1,11 @@ Digi Embedded Yocto (DEY) 2.0 Release Notes - Build 2.0-r1.2 + Build 2.0-r2.1 (c) 2016, Digi International http://www.digiembedded.com/ - February, 2016 + July, 2016 Introduction From 94328c3769820f5fce4f04372d1b8016435629d3 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Fri, 15 Jul 2016 12:29:55 +0200 Subject: [PATCH 04/40] meta-digi: update revisions for dey-2.0-r2.1 Signed-off-by: Mike Engel --- 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 ++-- 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 +- 5 files changed, 7 insertions(+), 7 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..cdc6d44d1 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 = "dfc9c241d7b8171dddb804bc2c4f7fa431386c23" # 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 816082c23..3d4eb1567 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 @@ -11,13 +11,13 @@ DEPENDS += "dtc-native u-boot-mkimage-native" PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "3f985499b4b8a5f402cc67ea44585015de3728a9" # 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 \ file://boot.txt \ file://install_linux_fw_sd.txt \ " diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index f663f0d8e..a84d8f29f 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -14,7 +14,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 bc82533ed..3a5c3eecd 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 023241b1b..9009cc7df 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 = "9aa2120c4aa05526924f8d977a1cec1c3ecdfbee" COMPATIBLE_MACHINE = "(ccimx6)" From 088a7576070acf24fccf6b1d2b5738e945fa1db2 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Mon, 18 Jul 2016 10:08:14 +0200 Subject: [PATCH 05/40] meta-digi: revert kernel and u-boot revisions to AUTOREV Signed-off-by: Mike Engel --- 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 ++-- 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 +- 5 files changed, 7 insertions(+), 7 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 3d4eb1567..816082c23 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 @@ -11,13 +11,13 @@ DEPENDS += "dtc-native u-boot-mkimage-native" PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "3f985499b4b8a5f402cc67ea44585015de3728a9" +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} \ file://boot.txt \ file://install_linux_fw_sd.txt \ " diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index a84d8f29f..f663f0d8e 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -14,7 +14,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 3a5c3eecd..bc82533ed 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 9009cc7df..023241b1b 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 = "9aa2120c4aa05526924f8d977a1cec1c3ecdfbee" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6)" From b536961dfc8e28d44cc84390dca5c9d112b81235 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Tue, 19 Jul 2016 15:25:26 +0200 Subject: [PATCH 06/40] meta-digi-dey: Update disrtro version to dey-2.0-r2. Signed-off-by: Mike Engel --- meta-digi-dey/conf/distro/dey.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf index d095b350d..f550fb473 100644 --- a/meta-digi-dey/conf/distro/dey.conf +++ b/meta-digi-dey/conf/distro/dey.conf @@ -1,6 +1,6 @@ DISTRO = "dey" DISTRO_NAME = "Digi Embedded Yocto" -DISTRO_VERSION = "2.0-r1" +DISTRO_VERSION = "2.0-r2" DISTRO_CODENAME = "jethro" SDK_VENDOR = "-deysdk" SDK_VERSION := "${@'${DISTRO_VERSION}'}" From 8d4c7544618217f38102c7baf0f3e6809843b66c Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Tue, 19 Jul 2016 15:27:09 +0200 Subject: [PATCH 07/40] changelog: update for upcoming release. Signed-off-by: Mike Engel --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9eeda898e..c605b40a5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,7 +7,7 @@ Version Release date (YYYY-MM-DD) ------------------------------------------------------------------------------- -2.0-r2 2016-07-18 +2.0-r2 2016-07-19 * Release based on Yocto 2.0 (Jethro) for ConnectCore 6 SBC including: - Update support for new PMIC hardware revision From ee65f4af6ddcba8b0f63924f4b95922e38fd5056 Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Tue, 19 Jul 2016 15:35:36 +0200 Subject: [PATCH 08/40] meta-digi: update revisions for dey-2.0-r2.1 Signed-off-by: Mike Engel --- 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 ++-- 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 +- 5 files changed, 7 insertions(+), 7 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..cdc6d44d1 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 = "dfc9c241d7b8171dddb804bc2c4f7fa431386c23" # 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 816082c23..3d4eb1567 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 @@ -11,13 +11,13 @@ DEPENDS += "dtc-native u-boot-mkimage-native" PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "${AUTOREV}" +SRCREV = "3f985499b4b8a5f402cc67ea44585015de3728a9" # 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 \ file://boot.txt \ file://install_linux_fw_sd.txt \ " diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index f663f0d8e..a84d8f29f 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -14,7 +14,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 bc82533ed..3a5c3eecd 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 023241b1b..9009cc7df 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 = "9aa2120c4aa05526924f8d977a1cec1c3ecdfbee" COMPATIBLE_MACHINE = "(ccimx6)" From 729a7198e62385e1996a0526076024d746b481be Mon Sep 17 00:00:00 2001 From: Mike Engel Date: Tue, 19 Jul 2016 15:42:19 +0200 Subject: [PATCH 09/40] meta-digi: revert kernel and u-boot revisions to AUTOREV Signed-off-by: Mike Engel --- 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 ++-- 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 +- 5 files changed, 7 insertions(+), 7 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 3d4eb1567..816082c23 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 @@ -11,13 +11,13 @@ DEPENDS += "dtc-native u-boot-mkimage-native" PROVIDES += "u-boot" SRCBRANCH = "v2015.04/maint" -SRCREV = "3f985499b4b8a5f402cc67ea44585015de3728a9" +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} \ file://boot.txt \ file://install_linux_fw_sd.txt \ " diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index a84d8f29f..f663f0d8e 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -14,7 +14,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 3a5c3eecd..bc82533ed 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 9009cc7df..023241b1b 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 = "9aa2120c4aa05526924f8d977a1cec1c3ecdfbee" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6)" From fdf8978e5797f7a9910b816fd23744ba7f95a8ad Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 22 Jul 2016 10:32:00 +0200 Subject: [PATCH 10/40] linux, u-boot: configure recipes to use maintenance branches Signed-off-by: Javier Viguera --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb | 3 +-- meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb | 2 +- meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) 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 1abe6a6ea..4ddc949d0 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 @@ -11,8 +11,7 @@ DEPENDS += "${@base_conditional('TRUSTFENCE_SIGN', '1', 'trustfence-cst-native', PROVIDES += "u-boot" -SRCBRANCH = "v2015.04/master" -SRCBRANCH_ccimx6ul = "v2015.04/master" +SRCBRANCH = "v2015.04/maint" SRCREV = "${AUTOREV}" # Select internal or Github U-Boot repo 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 7f2aa8fc5..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 @@ -5,7 +5,7 @@ require recipes-kernel/linux/linux-dtb.inc inherit fsl-vivante-kernel-driver-handler -SRCBRANCH = "v3.14/master" +SRCBRANCH = "v3.14/dey-2.0/maint" 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 96399f669..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 @@ -3,7 +3,7 @@ require recipes-kernel/linux/linux-dey.inc require recipes-kernel/linux/linux-dtb.inc -SRCBRANCH = "v4.1.15/master" +SRCBRANCH = "v4.1/dey-2.0/maint" SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6ul)" From 416fb59bcf78b9d822da775d2ee2dbd93ec1dc10 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 22 Jul 2016 10:53:46 +0200 Subject: [PATCH 11/40] meta-digi-dey: bump distro version to 2.0-r3 Signed-off-by: Javier Viguera --- meta-digi-dey/conf/distro/dey.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-digi-dey/conf/distro/dey.conf b/meta-digi-dey/conf/distro/dey.conf index 8e0fbfbe0..83b9a1377 100644 --- a/meta-digi-dey/conf/distro/dey.conf +++ b/meta-digi-dey/conf/distro/dey.conf @@ -1,6 +1,6 @@ DISTRO = "dey" DISTRO_NAME = "Digi Embedded Yocto" -DISTRO_VERSION = "2.0-r2" +DISTRO_VERSION = "2.0-r3" DISTRO_CODENAME = "jethro" SDK_VENDOR = "-deysdk" SDK_VERSION := "${@'${DISTRO_VERSION}'}" From 3957edbb0b3055deff6b97a05d091f7aa96e9ec1 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 22 Jul 2016 11:48:23 +0200 Subject: [PATCH 12/40] meta-digi: update revisions for dey-2.0-r3.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 ++-- 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 +- 6 files changed, 8 insertions(+), 8 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..cdc6d44d1 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 = "dfc9c241d7b8171dddb804bc2c4f7fa431386c23" # 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 4ddc949d0..0eb6bf77d 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 = "503966879d788ee738190abc6a0c07320cd02e76" # 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-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index 19c71f113..c61e1941d 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -15,7 +15,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 bc82533ed..3a5c3eecd 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..6c84cf559 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 = "1d2fe70cd126a1102ae1db0e8b214ac5f064521f" 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..4a25bbcfd 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 = "c3348827dd46c16640c6667c8464a2cfc8e156fa" COMPATIBLE_MACHINE = "(ccimx6ul)" From d7426d57c9e13690914e1b0fc2f5b091b6c08a2e Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 22 Jul 2016 11:57:38 +0200 Subject: [PATCH 13/40] meta-digi: update changelog and release notes for dey-2.0-r3.1 Signed-off-by: Javier Viguera --- ChangeLog | 5 +++++ Release_Notes.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c605b40a5..70ef2285d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,11 @@ Version Release date (YYYY-MM-DD) ------------------------------------------------------------------------------- +2.0-r3 2016-07-22 + + * Support for new platform CC6UL + * Support for Trustfence security enhancements + 2.0-r2 2016-07-19 * Release based on Yocto 2.0 (Jethro) for ConnectCore 6 SBC including: diff --git a/Release_Notes.txt b/Release_Notes.txt index da55c6e24..56476c8f2 100644 --- a/Release_Notes.txt +++ b/Release_Notes.txt @@ -1,7 +1,7 @@ Digi Embedded Yocto (DEY) 2.0 Release Notes - Build 2.0-r2.1 + Build 2.0-r3.1 (c) 2016, Digi International http://www.digiembedded.com/ From 5726d9770278f885d784531d2bd712440407e70a Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 26 Jul 2016 11:57:56 +0200 Subject: [PATCH 14/40] meta-digi: revert kernel and u-boot 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 ++-- 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 +- 6 files changed, 8 insertions(+), 8 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 0eb6bf77d..4ddc949d0 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 = "503966879d788ee738190abc6a0c07320cd02e76" +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-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index c61e1941d..19c71f113 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -15,7 +15,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 3a5c3eecd..bc82533ed 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 6c84cf559..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 = "1d2fe70cd126a1102ae1db0e8b214ac5f064521f" +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 4a25bbcfd..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 = "c3348827dd46c16640c6667c8464a2cfc8e156fa" +SRCREV = "${AUTOREV}" COMPATIBLE_MACHINE = "(ccimx6ul)" From b37cbc26c30e7acb556819da3be8636365194f5b Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 26 Jul 2016 12:23:26 +0200 Subject: [PATCH 15/40] base-files: fix resize-ext4fs script to work with DM devices This is needed so the encrypted rootfs is properly resized to the partition size. https://jira.digi.com/browse/DEL-2765 Signed-off-by: Javier Viguera --- .../recipes-core/base-files/base-files/resize-ext4fs.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-digi-dey/recipes-core/base-files/base-files/resize-ext4fs.sh b/meta-digi-dey/recipes-core/base-files/base-files/resize-ext4fs.sh index 1f726b37a..74ce0a3f3 100755 --- a/meta-digi-dey/recipes-core/base-files/base-files/resize-ext4fs.sh +++ b/meta-digi-dey/recipes-core/base-files/base-files/resize-ext4fs.sh @@ -26,9 +26,12 @@ get_emmc_block_device() { } RESIZE2FS="$(which resize2fs)" +DM_BLOCK_DEVICE="/dev/dm-" EMMC_BLOCK_DEVICE="$(get_emmc_block_device)" if [ -x "${RESIZE2FS}" -a -n "${EMMC_BLOCK_DEVICE}" ]; then PARTITIONS="$(blkid | sed -ne "{s,\(^${EMMC_BLOCK_DEVICE}[^:]\+\):.*TYPE=\"ext4\".*,\1,g;T;p}" | sort -u)" + # Add possible device mapper devices + PARTITIONS="${PARTITIONS} $(blkid | sed -ne "{s,\(^${DM_BLOCK_DEVICE}[^:]\+\):.*TYPE=\"ext4\".*,\1,g;T;p}" | sort -u)" for i in ${PARTITIONS}; do if ! ${RESIZE2FS} ${i} 2>/dev/null; then echo "ERROR: resize2fs ${i}" From a8bec40bea7e7e2a85dd5e935052f9d6af5c3d8e Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 26 Jul 2016 14:17:47 +0200 Subject: [PATCH 16/40] meta-digi-dey: trustfence: implement encrypted rootfs installation https://jira.digi.com/browse/DEL-2700 Signed-off-by: Javier Viguera --- .../trustfence/trustfence-initramfs.bb | 8 +- .../trustfence-initramfs-init | 15 +++- .../trustfence-install.sh | 89 +++++++++++++++++++ 3 files changed, 107 insertions(+), 5 deletions(-) create mode 100644 meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/trustfence-install.sh diff --git a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb index dfe67b5a9..7fb2bdc45 100644 --- a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb +++ b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb @@ -4,13 +4,17 @@ SUMMARY = "Trustfence initramfs required files" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" -SRC_URI = "file://trustfence-initramfs-init" +SRC_URI = " \ + file://trustfence-initramfs-init \ + file://trustfence-install.sh \ +" S = "${WORKDIR}" do_install() { - install -d ${D}${sbindir} + install -d ${D}${base_sbindir} install -m 0755 trustfence-initramfs-init ${D}/init + install -m 0755 trustfence-install.sh ${D}${base_sbindir} } # Do not create debug/devel packages diff --git a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/trustfence-initramfs-init b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/trustfence-initramfs-init index 441635f73..899f5c4e0 100644 --- a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/trustfence-initramfs-init +++ b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/trustfence-initramfs-init @@ -31,10 +31,13 @@ mkdir -p /var/run && rngd for arg in $(cat /proc/cmdline); do case "${arg}" in - init=*|rescue=1|root=*) eval ${arg};; + init=*|rescue=1|root=*|trustfence_install=*) eval ${arg};; esac done +# Translate "PARTUUID=..." to real device +root="$(findfs ${root})" + # Jump to a rescue shell if requested if [ -n "${rescue}" ]; then # Expand console and respawn if exited @@ -44,8 +47,14 @@ if [ -n "${rescue}" ]; then done fi -# Translate "PARTUUID=..." to real device -root="$(findfs ${root})" +# Run install script if "trustfence_install" kernel parameter exists +if [ -n "${trustfence_install}" ]; then + trustfence-install.sh ${trustfence_install} ${root} + sleep 1 + echo ">> Rebooting the system" + sleep 1 + sync && reboot -f +fi # Open LUKS encrypted device if trustfence-tool ${root} cryptroot; then diff --git a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/trustfence-install.sh b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/trustfence-install.sh new file mode 100644 index 000000000..4b83e3caf --- /dev/null +++ b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/trustfence-install.sh @@ -0,0 +1,89 @@ +#!/bin/sh +#=============================================================================== +# +# trustfence-install.sh +# +# Copyright (C) 2016 by Digi International Inc. +# All rights reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License version 2 as published by +# the Free Software Foundation. +# +# +# !Description: Wrapper script for initial deployment of encrypted rootfs +# +# The script gathers the needed information from the 'trustfence_install' +# kernel command line parameter with following syntax: +# +# trustfence_install="source:serverip:filename" +# source -> 'tftp' | +# serverip -> | '' (serverip or empty if local) +# filename -> (path relative to 'source') +# +# For 'tftp' mode the kernel IP autoconfig may be used to bring the network +# interface up, with 'ip' kernel parameter. Examples: +# +# ip=:::::eth0:off +# ip=dhcp +# +# This script is meant for testing purposes. It's NOT a stable API and may +# be subject to change. +# +#=============================================================================== + +set -o pipefail + +TF_INSTALL_INFO="${1}" +TF_ROOTFS_DEV="${2}" + +error() { + [ "${#}" != "0" ] && printf "\n[ERROR]: %s\n\n" "${1}" + exit 1 +} + +# Parse trustfence_install kernel parameter +IFS=":" read SOURCE SERVERIP FILENAME <<_EOF_ +${TF_INSTALL_INFO} +_EOF_ + +# Validate command line arguments +if [ -z "${SOURCE}" ] || [ -z "${FILENAME}" ] || { [ "${SOURCE}" = "tftp" ] && [ -z "${SERVERIP}" ]; }; then + error "wrong 'trustfence_install' parameter: ${TF_INSTALL_INFO}" +elif ! [ -b "${TF_ROOTFS_DEV}" ]; then + error "${TF_ROOTFS_DEV} is not a block device" +fi + +# Generate random key, initialize the partition and open the virtual mapped device +trustfence-tool --format --newkey "${TF_ROOTFS_DEV}" cryptroot +if [ "${?}" != "0" ]; then + error "trustfence-tool: open mapped device" +fi + +# Install image to the encrypted mapped device +if [ "${SOURCE}" = "tftp" ]; then + printf "\nInstalling ${FILENAME} from TFTP\n\n" + tftp -g -l - -r "${FILENAME}" "${SERVERIP}" | pv -tprebW | dd of=/dev/mapper/cryptroot 2>/dev/null + if [ "${?}" != "0" ]; then + error "write ${FILENAME}" + fi +elif [ -b "${SOURCE}" ]; then + printf "\nInstalling ${FILENAME} from local media\n\n" + MOUNTPOINT="/media/$(basename ${SOURCE})" + FSTYPE="$(blkid ${SOURCE} | sed -e 's,.*TYPE="\([^"]\+\)".*,\1,g')" + mkdir -p ${MOUNTPOINT} + mount -r ${FSTYPE:+-t ${FSTYPE}} ${SOURCE} ${MOUNTPOINT} + pv -tprebW ${MOUNTPOINT}/${FILENAME} | dd of=/dev/mapper/cryptroot 2>/dev/null + if [ "${?}" != "0" ]; then + error "write ${FILENAME}" + fi + umount ${SOURCE} +else + error "${SOURCE} is neither a block device nor 'tftp'" +fi + +echo "" +echo "#######################" +echo "# Install completed #" +echo "#######################" +echo "" From ddd5d379a32fe753021d2aaaafe199c48aada21d Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Tue, 26 Jul 2016 12:46:36 +0200 Subject: [PATCH 17/40] recipes-core: busybox: start syslog at a very early state Start syslog earlier (from 20 to 02) so it is running and other init scripts can use it to log into the system like the S03networking script. https://jira.digi.com/browse/DEL-2812 Signed-off-by: Isaac Hermida --- meta-digi-dey/recipes-core/busybox/busybox_1.23.2.bbappend | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-digi-dey/recipes-core/busybox/busybox_1.23.2.bbappend b/meta-digi-dey/recipes-core/busybox/busybox_1.23.2.bbappend index 89ba06284..f7b942600 100644 --- a/meta-digi-dey/recipes-core/busybox/busybox_1.23.2.bbappend +++ b/meta-digi-dey/recipes-core/busybox/busybox_1.23.2.bbappend @@ -38,6 +38,9 @@ FILES_${PN}-acpid = " ${sysconfdir}/init.d/busybox-acpid \ INITSCRIPT_PACKAGES =+ "${PN}-acpid" INITSCRIPT_NAME_${PN}-acpid = "busybox-acpid" +# Start busybox-syslog at a very early state +INITSCRIPT_PARAMS_${PN}-syslog = "defaults 02" + # static-nodes package (create static nodes from /etc/device_table) PACKAGES =+ "${PN}-static-nodes" FILES_${PN}-static-nodes = "${sysconfdir}/init.d/busybox-static-nodes" From 6d846bb7dbbdfb65cff565174d0f5cb035eb8a68 Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Tue, 26 Jul 2016 13:25:12 +0200 Subject: [PATCH 18/40] recipes-kernel: defconfig: sync ccimx6ul defconfig Signed-off-by: Isaac Hermida --- .../linux/linux-dey-4.1/ccimx6ul/defconfig | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig index 78a7376f7..6370e3505 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig @@ -43,7 +43,6 @@ CONFIG_VFP=y CONFIG_NEON=y CONFIG_BINFMT_MISC=m CONFIG_PM_DEBUG=y -CONFIG_PM_TEST_SUSPEND=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y @@ -216,7 +215,6 @@ CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_CODA=y CONFIG_SOC_CAMERA_OV2640=y CONFIG_DRM=y -CONFIG_DRM_VIVANTE=y CONFIG_FB=y CONFIG_FB_MXS=y CONFIG_FB_MXC_SYNC_PANEL=y @@ -308,7 +306,6 @@ CONFIG_MXC_PXP_V2=y CONFIG_MXC_PXP_V3=y CONFIG_IMX_SDMA=y CONFIG_MXS_DMA=y -CONFIG_DMATEST=m CONFIG_STAGING=y CONFIG_STAGING_MEDIA=y # CONFIG_IOMMU_SUPPORT is not set @@ -332,11 +329,6 @@ CONFIG_QUOTA_NETLINK_INTERFACE=y # CONFIG_PRINT_QUOTA_WARNING is not set CONFIG_AUTOFS4_FS=y CONFIG_FUSE_FS=y -CONFIG_ISO9660_FS=m -CONFIG_JOLIET=y -CONFIG_ZISOFS=y -CONFIG_UDF_FS=m -CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=y CONFIG_TMPFS=y CONFIG_JFFS2_FS=y @@ -380,10 +372,10 @@ CONFIG_CRYPTO_TWOFISH=y # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_DEV_FSL_CAAM=y CONFIG_CRYPTO_DEV_FSL_CAAM_SM=y -CONFIG_CRYPTO_DEV_FSL_CAAM_SM_TEST=y CONFIG_CRYPTO_DEV_FSL_CAAM_SECVIO=y CONFIG_CRC_CCITT=m CONFIG_CRC_T10DIF=y +CONFIG_CRC_ITU_T=m CONFIG_CRC7=m CONFIG_LIBCRC32C=m CONFIG_FONTS=y From 8884970e5ae3c3d68fa624ae9c1ee18869d17023 Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Tue, 26 Jul 2016 13:44:02 +0200 Subject: [PATCH 19/40] meta-digi-dey: busybox: adapt acpid.map file for CC6UL https://jira.digi.com/browse/DEL-2838 Signed-off-by: Isaac Hermida --- .../recipes-core/busybox/busybox-1.23.2/ccimx6ul/acpid.map | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 meta-digi-dey/recipes-core/busybox/busybox-1.23.2/ccimx6ul/acpid.map diff --git a/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/ccimx6ul/acpid.map b/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/ccimx6ul/acpid.map new file mode 100644 index 000000000..7755a2a33 --- /dev/null +++ b/meta-digi-dey/recipes-core/busybox/busybox-1.23.2/ccimx6ul/acpid.map @@ -0,0 +1,3 @@ +#s_type n_type(hex) s_code n_code value description +EV_KEY 0x01 KEY_SLEEP 142 1 pswitch-suspend +EV_KEY 0x01 KEY_POWER 116 1 pswitch-poweroff From ba0834ed88405924d152a7285203f14322509095 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 26 Jul 2016 16:45:33 +0200 Subject: [PATCH 20/40] trustfence-tool: update checksums Signed-off-by: Javier Viguera --- meta-digi-dey/recipes-core/trustfence/trustfence-tool_1.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-digi-dey/recipes-core/trustfence/trustfence-tool_1.0.bb b/meta-digi-dey/recipes-core/trustfence/trustfence-tool_1.0.bb index 88eb069b9..d4322c698 100644 --- a/meta-digi-dey/recipes-core/trustfence/trustfence-tool_1.0.bb +++ b/meta-digi-dey/recipes-core/trustfence/trustfence-tool_1.0.bb @@ -6,7 +6,7 @@ LICENSE = "CLOSED" SRC_URI = "${DIGI_PKG_SRC}/${BP}.tar.gz" -SRC_URI[md5sum] = "1140b71d0e619001b677117e8938be48" -SRC_URI[sha256sum] = "13eecca139dfb6470204c75291c5791144dea098653f52d39d847b2aee3fe19b" +SRC_URI[md5sum] = "fb1e9b69862f8ff46d6de988b19cf8f9" +SRC_URI[sha256sum] = "bd36764ff424b72b676d0c5b71456827ed13c55f64c309c81bfd527e7bee2b7f" inherit bin_package From 02c961eb3fd8e5e329189c2a1a455e9913a20226 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 26 Jul 2016 19:45:30 +0200 Subject: [PATCH 21/40] build.sh: add support to build a toolchain for CC6UL The build script was filtering out toolchain builds for all image recipes not starting with 'dey-image-', but for the CC6UL we are building by default 'core-image-base', so update the regular expression to allow building the toolchain for 'core-image-*' image recipes. https://jira.digi.com/browse/DEL-2837 Signed-off-by: Javier Viguera --- sdk/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/build.sh b/sdk/build.sh index c668c50ef..2983e4cb8 100755 --- a/sdk/build.sh +++ b/sdk/build.sh @@ -238,7 +238,7 @@ for platform in ${DY_PLATFORMS}; do printf "\n[INFO] Building the ${target} target.\n" time bitbake ${target} # Build the toolchain for DEY images - if [ "${DY_BUILD_TCHAIN}" = "true" ] && echo "${target}" | grep -qs '^dey-image-[^-]\+$'; then + if [ "${DY_BUILD_TCHAIN}" = "true" ] && echo "${target}" | grep -qs '^\(core\|dey\)-image-[^-]\+$'; then printf "\n[INFO] Building the toolchain for ${target}.\n" time bitbake -c populate_sdk ${target} fi From fc959bd23f1071457a47854124126c84a6b17f3e Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Wed, 27 Jul 2016 13:59:38 +0200 Subject: [PATCH 22/40] kernel-module-qualcomm: do not log any error if dtb regdomain is not set Do not add a log error if there is not defined a device tree entry for the regulatory domain. Signed-off-by: Isaac Hermida --- .../kernel-module-qualcomm/qualcomm-pre-up | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm-pre-up b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm-pre-up index 922b0ce17..60364501f 100644 --- a/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm-pre-up +++ b/meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm/qualcomm-pre-up @@ -58,11 +58,13 @@ JP_CODE="0x2" # Check if the DTB_REGION_CODE is in the list of valid codes, # if not use the OTP programmed value. case "${DTB_REGION_CODE}" in - ${US_CODE}|${WW_CODE}|${JP_CODE}) - REGULATORY_DOMAIN=${DTB_REGION_CODE};; - *) - logger -t qca6564 "[ERROR] Invalid region code in device tree, using OTP value" - REGULATORY_DOMAIN=${OTP_REGION_CODE};; + ${US_CODE}|${WW_CODE}|${JP_CODE}) + REGULATORY_DOMAIN=${DTB_REGION_CODE};; + *) + if [ -n "${DTB_REGION_CODE}" ]; then + logger -t qca6564 "[ERROR] Invalid region code in device tree, using OTP value" + fi + REGULATORY_DOMAIN=${OTP_REGION_CODE};; esac BDATA_LINK="${FIRMWARE_DIR}/bdwlan30.bin" From 5e35a9ca0003f660de161677066472e7fec6507a Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Wed, 27 Jul 2016 09:39:27 +0200 Subject: [PATCH 23/40] recipes-core: suspend: down the bluetooth interface before entering suspend Down the bluetooth interface before entering suspend and up it after resuming if it is present and up. https://jira.digi.com/browse/DEL-2806 Signed-off-by: Isaac Hermida --- .../recipes-core/busybox/busybox-1.23.2/ccimx6ul/suspend | 4 ++++ 1 file changed, 4 insertions(+) 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 d597339b6..a87cdcd65 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 @@ -29,12 +29,16 @@ suspend_interfaces() { if grep -qs '^wlan0' /var/run/ifstate; then ifdown wlan0 && up_wlan_on_resume="1" && sleep 0.5 && rmmod wlan fi + if hcitool -i hci0 dev >/dev/null 2>&1; then + hciconfig hci0 down && up_hci0_on_resume="1" && sleep 0.5 + fi } resume_interfaces() { if ! grep -qs '^wlan0' /var/run/ifstate; then [ -n "${up_wlan_on_resume}" ] && modprobe wlan && sleep 0.5 && ifup wlan0 fi + [ -n "${up_hci0_on_resume}" ] && hciconfig hci0 up } while getopts "h" c; do From adf044ec5ebd7c9e0352bef68a104696d6af3034 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 28 Jul 2016 13:17:53 +0200 Subject: [PATCH 24/40] mkproject.sh: blacklist ccardimx28js 'ccardimx28js' is not supported officially in this release. Signed-off-by: Javier Viguera --- sdk/mkproject.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/mkproject.sh b/sdk/mkproject.sh index 1c70b14e6..946dad902 100755 --- a/sdk/mkproject.sh +++ b/sdk/mkproject.sh @@ -28,7 +28,7 @@ MKP_NONE="\033[0m" MKP_CONFIGPATH="${MKP_SCRIPTPATH}/sources/meta-digi/sdk/config" # Blacklist platforms (not officially supported in a DEY release) -MKP_BLACKLIST_PLATFORMS="" +MKP_BLACKLIST_PLATFORMS="ccardimx28js" MKP_SETUP_ENVIRONMENT='#!/bin/bash From 6203b101b678483624fcc3e4cdfd81e915035d1b Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 29 Jul 2016 10:35:27 +0200 Subject: [PATCH 25/40] trustfence-tool: update checksums Version: 1.0-gd725a21 Signed-off-by: Javier Viguera --- meta-digi-dey/recipes-core/trustfence/trustfence-tool_1.0.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-digi-dey/recipes-core/trustfence/trustfence-tool_1.0.bb b/meta-digi-dey/recipes-core/trustfence/trustfence-tool_1.0.bb index d4322c698..7d42d034e 100644 --- a/meta-digi-dey/recipes-core/trustfence/trustfence-tool_1.0.bb +++ b/meta-digi-dey/recipes-core/trustfence/trustfence-tool_1.0.bb @@ -6,7 +6,7 @@ LICENSE = "CLOSED" SRC_URI = "${DIGI_PKG_SRC}/${BP}.tar.gz" -SRC_URI[md5sum] = "fb1e9b69862f8ff46d6de988b19cf8f9" -SRC_URI[sha256sum] = "bd36764ff424b72b676d0c5b71456827ed13c55f64c309c81bfd527e7bee2b7f" +SRC_URI[md5sum] = "eea4efe8b8e7527a0ffeea16fd238ba3" +SRC_URI[sha256sum] = "aefeb08f2db59c891cf1162488499448bf9d80d64b2778d4fda11343793373e7" inherit bin_package From 3dcc4f8f4903062f46a6c4298b75f0cf678ed99c Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Fri, 29 Jul 2016 18:31:07 +0200 Subject: [PATCH 26/40] build.sh: fix random build failures in the buildserver We have seen lately random build failures in the buildserver due to missing QT5 base libraries that are needed when building some other QT5 packages. Examples: Compiling qtdeclarative: error: cannot open .../tmp/work/cortexa9hf-vfp-neon-mx6qdl-dey-linux-gnueabi/qtbase/5.5.1+gitAUTOINC+5afc431323-r0/build/lib/libQt5Core.so: No such file or directory error: cannot open .../tmp/work/cortexa9hf-vfp-neon-mx6qdl-dey-linux-gnueabi/qtbase/5.5.1+gitAUTOINC+5afc431323-r0/build/lib/libQt5Network.so: No such file or directory error: cannot open .../tmp/work/cortexa9hf-vfp-neon-mx6qdl-dey-linux-gnueabi/qtbase/5.5.1+gitAUTOINC+5afc431323-r0/build/lib/libQt5Widgets.so: No such file or directory The problem here is that 'qtdeclarative' is trying to get the needed libraries from the 'qtbase' temporary work directory. But because in the buildserver we have 'rm_work' enabled to save space, sometimes the rm-work class has removed the 'qtbase' work directory before 'qtdeclarative' has been built, leading to the compilation error. This is probably a bug in 'meta-qt5', because the different packages needing QT5 base libraries should take them at compile time from the sysroot and not from the qtbase work directory. At the moment just workaround this adding an exception to the rm-work class to not remove the 'qtbase' temporary work directory. Signed-off-by: Javier Viguera --- sdk/build-github.sh | 2 +- sdk/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/build-github.sh b/sdk/build-github.sh index 6ec295345..bbe509e71 100755 --- a/sdk/build-github.sh +++ b/sdk/build-github.sh @@ -29,7 +29,7 @@ MANIFEST_URL="https://github.com/digi-embedded/dey-manifest.git" RM_WORK_CFG=" INHERIT += \"rm_work\" # Exclude rm_work for some key packages (for debugging purposes) -RM_WORK_EXCLUDE += \"dey-image-qt linux-dey u-boot-dey\" +RM_WORK_EXCLUDE += \"dey-image-qt linux-dey qtbase u-boot-dey\" " X11_REMOVAL_CFG=" diff --git a/sdk/build.sh b/sdk/build.sh index 2983e4cb8..ba4533982 100755 --- a/sdk/build.sh +++ b/sdk/build.sh @@ -42,7 +42,7 @@ BB_GENERATE_MIRROR_TARBALLS = \"1\" RM_WORK_CFG=" INHERIT += \"rm_work\" # Exclude rm_work for some key packages (for debugging purposes) -RM_WORK_EXCLUDE += \"dey-image-qt linux-dey u-boot-dey\" +RM_WORK_EXCLUDE += \"dey-image-qt linux-dey qtbase u-boot-dey\" " X11_REMOVAL_CFG=" From fb2f7bd3453a9bd687217fcada2baeb07a00cb67 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Mon, 1 Aug 2016 13:42:30 +0200 Subject: [PATCH 27/40] README: Merge Release Notes and Changelog in a single document. The README.md file is rendered by github using github's markdown syntax: https://help.github.com/articles/basic-writing-and-formatting-syntax/ https://jira.digi.com/browse/DEL-2854 Signed-off-by: Alex Gonzalez --- ChangeLog | 30 ----------- README | 7 --- README.md | 125 ++++++++++++++++++++++++++++++++++++++++++++++ Release_Notes.txt | 87 -------------------------------- 4 files changed, 125 insertions(+), 124 deletions(-) delete mode 100644 ChangeLog delete mode 100644 README create mode 100644 README.md delete mode 100644 Release_Notes.txt diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 70ef2285d..000000000 --- a/ChangeLog +++ /dev/null @@ -1,30 +0,0 @@ - Digi Embedded Yocto (DEY) 2.0 - Release Changelog - - (c) 2016, Digi International - http://www.digiembedded.com/ - - -Version Release date (YYYY-MM-DD) -------------------------------------------------------------------------------- -2.0-r3 2016-07-22 - - * Support for new platform CC6UL - * Support for Trustfence security enhancements - -2.0-r2 2016-07-19 - - * Release based on Yocto 2.0 (Jethro) for ConnectCore 6 SBC including: - - Update support for new PMIC hardware revision - - minor bug fixes - -2.0-r1 2016-02-15 - - * U-Boot 2015.04 for the ConnectCore 6 System-On-Module and SBC. - * Linux kernel v3.14.57 for the ConnectCore 6 System-On-Module and SBC. - * Release based on Yocto 2.0 (Jethro) for ConnectCore 6 SBC including: - - Bluez5 - - QT5 (over X11 and Framebuffer graphical systems) - - New toolchain based on GCC-5.2 and GLIBC-2.22 - - Cellular support - - Package upgrades and security fixes diff --git a/README b/README deleted file mode 100644 index d4808feab..000000000 --- a/README +++ /dev/null @@ -1,7 +0,0 @@ -meta-digi -========= - -This is the location for Digi maintained layers. - -Please see the README files contained in the individual layers for -specific information. diff --git a/README.md b/README.md new file mode 100644 index 000000000..cca2e48e6 --- /dev/null +++ b/README.md @@ -0,0 +1,125 @@ +# Digi Embedded Yocto (DEY) 2.0 +## Release 2.0-r3 + +This document provides information about Digi Embedded Yocto, +Digi International's professional embedded Yocto development environment. + +Digi Embedded Yocto 2.0 is based on the 2.0 (Jethro) Yocto release. + +# Supported Platforms + +The current release supports the following hardware platforms: + +* Digi ConnectCore 6 + * [Digi P/N CC-WMX-J97C-TN](http://www.digi.com/products/models/cc-wmx-j97c-tn) + * [Digi P/N CC-WMX-L96C-TE](http://www.digi.com/products/models/cc-wmx-l96c-te) + * [Digi P/N CC-WMX-L87C-TE](http://www.digi.com/products/models/cc-wmx-l87c-te) + * [Digi P/N CC-MX-L76C-Z1](http://www.digi.com/products/models/cc-mx-l76c-z1) + * [Digi P/N CC-MX-L86C-Z1](http://www.digi.com/products/models/cc-mx-l86c-z1) + * [Digi P/N CC-MX-L96C-Z1](http://www.digi.com/products/models/cc-mx-l96c-z1) + * [Digi P/N CC-WMX-L76C-TE](http://www.digi.com/products/models/cc-wmx-l76c-te) + * Digi P/N CC-WMX-K87C-FJA + * Digi P/N CC-WMX-K77C-TE + * Digi P/N CC-WMX-L97D-TN + * Digi P/N CC-WMX-J98C-FJA + * Digi P/N CC-WMX-J98C-FJA-1 + +Software for the following hardware platforms is in beta support: + +* Digi ConnectCore 6UL + * [Digi P/N CC-WMX-JN58-NE](http://www.digi.com/products/models/cc-wmx-jn58-ne) + * [Digi P/N CC-MX-JN58-Z1](http://www.digi.com/products/models/cc-mx-jn58-z1) +* Digi ConnectCore 6UL Starter Kit + * [Digi P/N CC-WMX6UL-START](http://www.digi.com/products/models/cc-wmx6ul-start) ([Get Started](https://www.digi.com/resources/documentation/digidocs/90001514/default.htm#concept/yocto/c_get_started_with_yocto.htm)) + +* Digi ConnectCore 6 Development Kit + * [Digi P/N CC-WMX6-KIT](http://www.digi.com/products/models/cc-wmx6-kit) ([Get Started](http://www.digi.com/resources/documentation/digidocs/90001945-13/default.htm#concept/yocto/c_get_started_with_yocto.htm%3FTocPath%3DDigi%2520Embedded%2520Yocto%7CGet%2520started%7C_____0)) + +* Digi ConnectCore 6 SBC + * [Digi P/N CC-SB-WMX-J97C-1](http://www.digi.com/products/models/cc-sb-wmx-j97c-1) + * Digi P/N CC-SB-WMX-L87C-1 + * Digi P/N CC-SB-WMX-L76C-1 + +Previous versions of Digi Embedded Yocto include support for additional Digi +hardware. + +# Documentation + +Documentation is available online on the Digi documentation site: + +* [Digi ConnectCore 6UL](http://www.digi.com/resources/documentation/Digidocs/90001514/default.htm) +* [Digi ConnectCore 6](http://www.digi.com/resources/documentation/Digidocs/90001945-13/default.htm) + +# Downloads + +* [Demo images](ftp://ftp1.digi.com/support/digiembeddedyocto/2.0/r3/images/) +* [Software Development Kit (SDK)](ftp://ftp1.digi.com/support/digiembeddedyocto/2.0/r3/sdk/) + +# Release Changelog + +## 2.0-r3 + +* Support for the new Digi ConnectCore 6UL System-On-Module and Starter Kit + * U-Boot 2015.04 + * Linux kernel v4.1.28 +* Support for TrustFence security enhancements + * Secure console + * Secure boot + * Secure JTAG + * Encrypted root filesystem + * True Random Number Generator + +## 2.0-r2 + +* Release based on Yocto 2.0 (Jethro) for ConnectCore 6 SBC including: + * Update support for new PMIC hardware revision + * Minor bug fixes + +## 2.0-r1 + +* U-Boot 2015.04 for the Digi ConnectCore 6 System-On-Module and SBC +* Linux kernel v3.14.57 for the Digi ConnectCore 6 System-On-Module and SBC +* Release based on Yocto 2.0 (Jethro) for Digi ConnectCore 6 SBC including: + * Bluez5 + * QT5 (over X11 and Framebuffer graphical systems) + * New toolchain based on GCC-5.2 and GLIBC-2.22 + * Cellular support + * Package upgrades and security fixes + +# Known Issues and Limitations + +## Digi ConnectCore 6UL + +## Digi ConnectCore 6UL Starter Kit + +## Digi ConnectCore 6 + +* 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 +* When using TrustFence encrypted images secure boot support, the CAAM will +hang the processor when trying to authenticate an encrypted kernel image after +a failed attempt. Hence the target needs to be reset after an authentication +failure. + +## Digi 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: + +* [Enterprise Support](https://mydigi.secure.force.com/customers/) +* [Product Technical Support](http://www.digi.com/support/product-support) +* [Support forum](http://www.digi.com/support/forum/) diff --git a/Release_Notes.txt b/Release_Notes.txt deleted file mode 100644 index 56476c8f2..000000000 --- a/Release_Notes.txt +++ /dev/null @@ -1,87 +0,0 @@ - - Digi Embedded Yocto (DEY) 2.0 - Release Notes - Build 2.0-r3.1 - - (c) 2016, Digi International - http://www.digiembedded.com/ - July, 2016 - - -Introduction ---------------------------------------------------------------------------- - This document provides information about Digi Embedded Yocto 2.0 (DEY-2.0), - Digi International's professional embedded Yocto development environment. - - Digi Embedded Yocto 2.0 is based on the 2.0 (Jethro) Yocto release. - - -Contents -------------------------------------------------------------------------- - This document contains the following sections: - - 1. Supported Platforms - 2. Supported System-On-Module variants - 3. Documentation - 4. Known Issues - 5. Support Contact Information - - -1. Supported Platforms -------------------------------------------------------------------------- - - The current Digi Embedded Yocto 2.0 release fully supports the following - hardware platforms: - - * ConnectCore 6 SBC (Digi P/N CC-SB-WMX-J97C) - - The following hardware platform remains in beta software support: - - * ConnectCore 6 SBC (Digi P/N CC-SB-WMX-J97C-1) - - Previous versions of Digi Embedded Yocto include support for additional Digi - hardware. - - The additional hardware supported by DEY-1.6 is the following: - - * ConnectCard for i.MX28 JumpStart Kit (Digi P/N CC-WMX28-LX) - - The additional hardware supported by DEY-1.4 is the following: - - * ConnectCore for MX51 (Digi P/N CC-(W)MX51-LX) - * ConnectCore for MX53 (Digi P/N CC-(W)MX53-LX) - - -2. Supported System-On-Module variants -------------------------------------------------------------------------- - - Digi's system-on-modules can be ordered in different hardware variants, for - example with different memory configurations. For a list of the available - module variants please refer to the Digi embedded products web page. - - -3. Documentation -------------------------------------------------------------------------- - - Digi Embedded Yocto documentation is available from the Digi online - documentation system. - - -4. Known Issues -------------------------------------------------------------------------- - - Refer to the Digi online documentation. - - -5. Support Contact Information -------------------------------------------------------------------------- - For support questions please contact the Digi technical support experts: - - Digi Technical Support - - Web based Support: http://www.digi.com/support/eservice/login.jsp - Support Web site: http://www.digi.com/support/index.jsp - Support forum: http://www.digi.com/support/forum/ - - -Have fun! From a9b8d74041df1229cf15f16e82ecb48593167c70 Mon Sep 17 00:00:00 2001 From: "Diaz de Grenu, Jose" Date: Mon, 8 Aug 2016 11:49:26 +0200 Subject: [PATCH 28/40] Revert "meta-digi-dey: trustfence: disable encryption for the ConnectCore 6UL" Encryption is now supported in the ConnectCore 6UL This reverts commit 454fff56ba42c72697b84c8d297804b0eb886a25. https://jira.digi.com/browse/DEL-2857 Signed-off-by: Diaz de Grenu, Jose --- meta-digi-dey/classes/trustfence.bbclass | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-digi-dey/classes/trustfence.bbclass b/meta-digi-dey/classes/trustfence.bbclass index b174655e3..c933e34ed 100644 --- a/meta-digi-dey/classes/trustfence.bbclass +++ b/meta-digi-dey/classes/trustfence.bbclass @@ -22,7 +22,6 @@ TRUSTFENCE_CONSOLE_DISABLE ?= "0" TRUSTFENCE_SIGN ?= "1" TRUSTFENCE_SIGN_KEYS_PATH ?= "default" TRUSTFENCE_DEK_PATH ?= "default" -TRUSTFENCE_DEK_PATH_ccimx6ul = "0" TRUSTFENCE_ENCRYPT_ENVIRONMENT ?= "1" # Trustfence initramfs image recipe From 674625455848059d11192c07eac897b3ba56cb6c Mon Sep 17 00:00:00 2001 From: "Diaz de Grenu, Jose" Date: Tue, 9 Aug 2016 17:02:31 +0200 Subject: [PATCH 29/40] meta-digi-dey: trustfence: add Yocto macro to unlock key revocation By default, on closed devices you cannot revoke any key. To do so, it is required to compile a U-Boot which instructs the HAB not to set the sticky bit which write protects that field in the OCOTP controller. This patch introduces a Yocto macro which allows to configure U-Boot in that way. In the ConnectCore 6, the value of this settings is ignored, because HAB never sets the sticky bit which write protects that field. https://jira.digi.com/browse/DUB-665 Signed-off-by: Diaz de Grenu, Jose --- README.md | 4 ++++ meta-digi-dey/classes/trustfence.bbclass | 2 ++ 2 files changed, 6 insertions(+) diff --git a/README.md b/README.md index cca2e48e6..515be72d0 100644 --- a/README.md +++ b/README.md @@ -110,6 +110,10 @@ Bluetooth Low Energy mode hang the processor when trying to authenticate an encrypted kernel image after a failed attempt. Hence the target needs to be reset after an authentication failure. +* NXP i.MX6 processor does not set the sticky bit which write protects the +SRK_REVOKE eFuse on closed devices. This means that in the ConnectCore 6, +key revocation is always possible, no matter the value of the Yocto macro +TRUSTFENCE_UNLOCK_KEY_REVOCATION. ## Digi ConnectCore 6 SBC diff --git a/meta-digi-dey/classes/trustfence.bbclass b/meta-digi-dey/classes/trustfence.bbclass index c933e34ed..49aa5459d 100644 --- a/meta-digi-dey/classes/trustfence.bbclass +++ b/meta-digi-dey/classes/trustfence.bbclass @@ -56,6 +56,8 @@ python () { d.appendVar("UBOOT_EXTRA_CONF", "CONFIG_SIGN_IMAGE=y ") if d.getVar("TRUSTFENCE_SIGN_KEYS_PATH", True): d.appendVar("UBOOT_EXTRA_CONF", 'CONFIG_SIGN_KEYS_PATH=\\"%s\\" ' % d.getVar("TRUSTFENCE_SIGN_KEYS_PATH")) + if (d.getVar("TRUSTFENCE_UNLOCK_KEY_REVOCATION", True) == "1"): + d.appendVar("UBOOT_EXTRA_CONF", "CONFIG_UNLOCK_SRK_REVOKE=y ") if d.getVar("TRUSTFENCE_KEY_INDEX", True): d.appendVar("UBOOT_EXTRA_CONF", "CONFIG_KEY_INDEX=%s " % d.getVar("TRUSTFENCE_KEY_INDEX")) if (d.getVar("TRUSTFENCE_DEK_PATH", True) not in [None, "0"]): From b31c09e59f7b4d14eaadcce17be45b48b136b437 Mon Sep 17 00:00:00 2001 From: Stephan Klatt Date: Fri, 17 Jun 2016 12:00:42 +0200 Subject: [PATCH 30/40] init-ifupdown: misc cellular fixes * set cellular user and password * stricter replace to not match set values * only set cellular interface to auto Internal merge of Github's PR: https://github.com/digi-embedded/meta-digi/pull/2 Signed-off-by: Javier Viguera --- .../init-ifupdown/init-ifupdown_1.0.bbappend | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend index ff4378aa5..1cde43cfc 100644 --- a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend +++ b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend @@ -46,37 +46,38 @@ do_install_append() { # Cellular interface if [ -n "${@bb.utils.contains('DISTRO_FEATURES', 'cellular', '1', '', d)}" ] && [ -n "${CELLULAR_INTERFACE}" ]; then cat ${WORKDIR}/interfaces.cellular >> ${D}${sysconfdir}/network/interfaces + [ -n "${CELLULAR_AUTO}" ] && sed -i -e 's/^#auto ##CELLULAR_INTERFACE##/auto ##CELLULAR_INTERFACE##/g' ${D}${sysconfdir}/network/interfaces sed -i -e 's,##CELLULAR_INTERFACE##,${CELLULAR_INTERFACE},g' ${D}${sysconfdir}/network/interfaces - [ -n "${CELLULAR_AUTO}" ] && sed -i -e 's/#auto/auto/g' ${D}${sysconfdir}/network/interfaces + if [ -n "${CELLULAR_APN}" ]; then - sed -i -e 's/apn/apn ${CELLULAR_APN}/g' ${D}${sysconfdir}/network/interfaces + sed -i -e 's/^\(\s*\)apn/\1apn ${CELLULAR_APN}/g' ${D}${sysconfdir}/network/interfaces else - sed -i -e '/apn/d' ${D}${sysconfdir}/network/interfaces + sed -i -e '/^\s*apn/d' ${D}${sysconfdir}/network/interfaces fi if [ -n "${CELLULAR_PIN}" ]; then - sed -i -e 's/pin/pin ${CELLULAR_PIN}/g' ${D}${sysconfdir}/network/interfaces + sed -i -e 's/^\(\s*\)pin/\1pin ${CELLULAR_PIN}/g' ${D}${sysconfdir}/network/interfaces else - sed -i -e '/pin/d' ${D}${sysconfdir}/network/interfaces + sed -i -e '/^\s*pin/d' ${D}${sysconfdir}/network/interfaces fi if [ -n "${CELLULAR_PORT}" ]; then - sed -i -e 's/port/port ${CELLULAR_PORT}/g' ${D}${sysconfdir}/network/interfaces + sed -i -e 's/^\(\s*\)port/\1port ${CELLULAR_PORT}/g' ${D}${sysconfdir}/network/interfaces sed -i -e 's,dhcp,manual,g' ${D}${sysconfdir}/network/interfaces else - sed -i -e '/port/d' ${D}${sysconfdir}/network/interfaces + sed -i -e '/^\s*port/d' ${D}${sysconfdir}/network/interfaces fi if [ -n "${CELLULAR_USER}" ]; then - sed -i -e 's/user/user ${CELLULAR_PORT}/g' ${D}${sysconfdir}/network/interfaces + sed -i -e 's/^\(\s*\)user/\1user ${CELLULAR_USER}/g' ${D}${sysconfdir}/network/interfaces else - sed -i -e '/user/d' ${D}${sysconfdir}/network/interfaces + sed -i -e '/^\s*user/d' ${D}${sysconfdir}/network/interfaces fi if [ -n "${CELLULAR_PASSWORD}" ]; then - sed -i -e 's/password/password ${CELLULAR_PORT}/g' ${D}${sysconfdir}/network/interfaces + sed -i -e 's/^\(\s*\)password/\1password ${CELLULAR_PASSWORD}/g' ${D}${sysconfdir}/network/interfaces else - sed -i -e '/password/d' ${D}${sysconfdir}/network/interfaces + sed -i -e '/^\s*password/d' ${D}${sysconfdir}/network/interfaces fi fi From 7727b4402e40e179c649516d69f294a3ddee1ba9 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Tue, 9 Aug 2016 19:32:00 +0200 Subject: [PATCH 31/40] init-ifupdown: use [[:blank:]] posix expression instead of '\s' shorthand According to 'grep' manual '\s' is a synonym for [[:space:]] which matches spaces, TABs, but also newlines, etc. We want to only match spaces and TABs, so use [[:blank:]] instead. Signed-off-by: Javier Viguera --- .../init-ifupdown/init-ifupdown_1.0.bbappend | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend index 1cde43cfc..35acc7e94 100644 --- a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend +++ b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend @@ -50,34 +50,34 @@ do_install_append() { sed -i -e 's,##CELLULAR_INTERFACE##,${CELLULAR_INTERFACE},g' ${D}${sysconfdir}/network/interfaces if [ -n "${CELLULAR_APN}" ]; then - sed -i -e 's/^\(\s*\)apn/\1apn ${CELLULAR_APN}/g' ${D}${sysconfdir}/network/interfaces + sed -i -e 's/^\([[:blank:]]*\)apn/\1apn ${CELLULAR_APN}/g' ${D}${sysconfdir}/network/interfaces else - sed -i -e '/^\s*apn/d' ${D}${sysconfdir}/network/interfaces + sed -i -e '/^[[:blank:]]*apn/d' ${D}${sysconfdir}/network/interfaces fi if [ -n "${CELLULAR_PIN}" ]; then - sed -i -e 's/^\(\s*\)pin/\1pin ${CELLULAR_PIN}/g' ${D}${sysconfdir}/network/interfaces + sed -i -e 's/^\([[:blank:]]*\)pin/\1pin ${CELLULAR_PIN}/g' ${D}${sysconfdir}/network/interfaces else - sed -i -e '/^\s*pin/d' ${D}${sysconfdir}/network/interfaces + sed -i -e '/^[[:blank:]]*pin/d' ${D}${sysconfdir}/network/interfaces fi if [ -n "${CELLULAR_PORT}" ]; then - sed -i -e 's/^\(\s*\)port/\1port ${CELLULAR_PORT}/g' ${D}${sysconfdir}/network/interfaces + sed -i -e 's/^\([[:blank:]]*\)port/\1port ${CELLULAR_PORT}/g' ${D}${sysconfdir}/network/interfaces sed -i -e 's,dhcp,manual,g' ${D}${sysconfdir}/network/interfaces else - sed -i -e '/^\s*port/d' ${D}${sysconfdir}/network/interfaces + sed -i -e '/^[[:blank:]]*port/d' ${D}${sysconfdir}/network/interfaces fi if [ -n "${CELLULAR_USER}" ]; then - sed -i -e 's/^\(\s*\)user/\1user ${CELLULAR_USER}/g' ${D}${sysconfdir}/network/interfaces + sed -i -e 's/^\([[:blank:]]*\)user/\1user ${CELLULAR_USER}/g' ${D}${sysconfdir}/network/interfaces else - sed -i -e '/^\s*user/d' ${D}${sysconfdir}/network/interfaces + sed -i -e '/^[[:blank:]]*user/d' ${D}${sysconfdir}/network/interfaces fi if [ -n "${CELLULAR_PASSWORD}" ]; then - sed -i -e 's/^\(\s*\)password/\1password ${CELLULAR_PASSWORD}/g' ${D}${sysconfdir}/network/interfaces + sed -i -e 's/^\([[:blank:]]*\)password/\1password ${CELLULAR_PASSWORD}/g' ${D}${sysconfdir}/network/interfaces else - sed -i -e '/^\s*password/d' ${D}${sysconfdir}/network/interfaces + sed -i -e '/^[[:blank:]]*password/d' ${D}${sysconfdir}/network/interfaces fi fi From b8f50680e540fc83c3c162cb81469956209bc408 Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Tue, 9 Aug 2016 13:48:52 +0200 Subject: [PATCH 32/40] meta-digi-arm: Exclude u-boot-fw-utils if U-Boot environment encryption is enabled There is currently no support on fw_printenv/fw_setenv to access an encrypted environment. This commit removes the package if U-Boot environment encryption is enabled to avoid environment corruption on access. It also documents the issue as a known issue. https://jira.digi.com/browse/DEL-2625 Signed-off-by: Alex Gonzalez --- README.md | 3 +++ meta-digi-arm/conf/machine/include/ccimx6.inc | 2 +- meta-digi-arm/conf/machine/include/ccimx6ul.inc | 2 +- .../recipes-core/packagegroups/packagegroup-dey-core.bb | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 515be72d0..2828707e7 100644 --- a/README.md +++ b/README.md @@ -88,6 +88,9 @@ Documentation is available online on the Digi documentation site: # Known Issues and Limitations +* When using the TrustFence (TM) U-Boot environment encryption, access to the +U-Boot environment from the Linux OS is not supported. + ## Digi ConnectCore 6UL ## Digi ConnectCore 6UL Starter Kit diff --git a/meta-digi-arm/conf/machine/include/ccimx6.inc b/meta-digi-arm/conf/machine/include/ccimx6.inc index b0d4e2a7c..2d73b7725 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6.inc @@ -27,7 +27,7 @@ MACHINE_EXTRA_RDEPENDS += " \ e2fsprogs-mke2fs \ e2fsprogs-resize2fs \ parted \ - u-boot-fw-utils \ + ${@base_conditional('TRUSTFENCE_ENCRYPT_ENVIRONMENT', '1', '', 'u-boot-fw-utils', d)} \ " MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE} ${WIRELESS_MODULE}" MACHINE_EXTRA_RRECOMMENDS += "fsl-alsa-plugins cryptodev-module rng-tools" diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc index e8aa9ce89..1b4302fe7 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc @@ -22,7 +22,7 @@ MACHINE_FIRMWARE ?= "" MACHINE_EXTRA_RDEPENDS += " \ imx-kobs \ mtd-utils-ubifs \ - u-boot-fw-utils \ + ${@base_conditional('TRUSTFENCE_ENCRYPT_ENVIRONMENT', '1', '', 'u-boot-fw-utils', d)} \ " MACHINE_EXTRA_RRECOMMENDS += "${MACHINE_FIRMWARE} ${WIRELESS_MODULE}" MACHINE_EXTRA_RRECOMMENDS += "fsl-alsa-plugins cryptodev-module" diff --git a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb index 7b6c6baa7..ecacb5581 100644 --- a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb +++ b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb @@ -55,3 +55,5 @@ RRECOMMENDS_${PN} = "\ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \ ${MACHINE_EXTRA_RRECOMMENDS} \ " + +do_package[vardeps] = "TRUSTFENCE_ENCRYPT_ENVIRONMENT" From 0320e7734e824f26acde9aaa822fea272e50505a Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Tue, 9 Aug 2016 13:49:26 +0200 Subject: [PATCH 33/40] README.md: Update release notes. * Add trademark to TrustFence (TM) for consistency. * Remove CC6UL non-wireless variant from supported products * Added a note to check the online documentation for an updated known issues and limitations list. Signed-off-by: Alex Gonzalez --- README.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2828707e7..c658295ef 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,6 @@ Software for the following hardware platforms is in beta support: * Digi ConnectCore 6UL * [Digi P/N CC-WMX-JN58-NE](http://www.digi.com/products/models/cc-wmx-jn58-ne) - * [Digi P/N CC-MX-JN58-Z1](http://www.digi.com/products/models/cc-mx-jn58-z1) * Digi ConnectCore 6UL Starter Kit * [Digi P/N CC-WMX6UL-START](http://www.digi.com/products/models/cc-wmx6ul-start) ([Get Started](https://www.digi.com/resources/documentation/digidocs/90001514/default.htm#concept/yocto/c_get_started_with_yocto.htm)) @@ -88,6 +87,9 @@ Documentation is available online on the Digi documentation site: # Known Issues and Limitations +This is a list of known issues and limitations at the time of release. An +updated list can be found on the online documentation. + * When using the TrustFence (TM) U-Boot environment encryption, access to the U-Boot environment from the Linux OS is not supported. @@ -109,14 +111,14 @@ modes: softAP mode * A maximum of ten connected devices are supported when using Qualcomm's AR6233 Bluetooth Low Energy mode -* When using TrustFence encrypted images secure boot support, the CAAM will -hang the processor when trying to authenticate an encrypted kernel image after -a failed attempt. Hence the target needs to be reset after an authentication -failure. * NXP i.MX6 processor does not set the sticky bit which write protects the SRK_REVOKE eFuse on closed devices. This means that in the ConnectCore 6, key revocation is always possible, no matter the value of the Yocto macro TRUSTFENCE_UNLOCK_KEY_REVOCATION. +* When using TrustFence (TM) encrypted images secure boot support, the CAAM +will hang the processor when trying to authenticate an encrypted kernel image +after a failed attempt. Hence the target needs to be reset after an +authentication failure. ## Digi ConnectCore 6 SBC From 6d5e1ba8b6d6fe7c4d23c472946824d09bf6cda5 Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Wed, 10 Aug 2016 12:13:57 +0200 Subject: [PATCH 34/40] recipes-kernel: defconfig: sync ccimx6ul defconfig https://jira.digi.com/browse/DEL-2863 Signed-off-by: Isaac Hermida --- .../recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig b/meta-digi-arm/recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig index 6370e3505..ed1c6ddd4 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey-4.1/ccimx6ul/defconfig @@ -187,6 +187,7 @@ CONFIG_CPU_THERMAL=y CONFIG_IMX_THERMAL=y CONFIG_DEVICE_THERMAL=y CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y CONFIG_MCA_CC6UL_WATCHDOG=y CONFIG_IMX2_WDT=y CONFIG_MFD_DA9052_I2C=y From 0d2130625b09f4b070065ea4b0dccc8bf147d639 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 10 Aug 2016 13:11:50 +0200 Subject: [PATCH 35/40] image-types_digi.bbclass: fix u-boot image for SDCARD when TF is enabled When TRUSTFENCE_SIGN is enabled, the u-boot binary for the SDCARD image needs to be the "signed" one. https://jira.digi.com/browse/DEL-2876 Signed-off-by: Javier Viguera --- meta-digi-arm/classes/image_types_digi.bbclass | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta-digi-arm/classes/image_types_digi.bbclass b/meta-digi-arm/classes/image_types_digi.bbclass index 1805de6e7..9588d2d86 100644 --- a/meta-digi-arm/classes/image_types_digi.bbclass +++ b/meta-digi-arm/classes/image_types_digi.bbclass @@ -185,8 +185,14 @@ IMAGE_CMD_sdcard() { parted -s ${SDIMG} -- unit KiB mkpart primary ext2 $(expr ${IMAGE_ROOTFS_ALIGNMENT} \+ ${BOOT_SPACE_ALIGNED}) -1s parted -s ${SDIMG} unit KiB print + # Set u-boot image to flash depending on whether TRUSTFENCE_SIGN is enabled + SDIMG_UBOOT="${DEPLOY_DIR_IMAGE}/${UBOOT_SYMLINK}" + if [ "${TRUSTFENCE_SIGN}" = "1" ]; then + SDIMG_UBOOT="$(readlink -e ${SDIMG_UBOOT} | sed -e 's,u-boot-,u-boot-signed-,g')" + fi + # Burn bootloader, boot and rootfs partitions - dd if=${DEPLOY_DIR_IMAGE}/${UBOOT_SYMLINK} of=${SDIMG} conv=notrunc,fsync seek=2 bs=512 + dd if=${SDIMG_UBOOT} of=${SDIMG} conv=notrunc,fsync seek=2 bs=512 dd if=${SDIMG_BOOTFS} of=${SDIMG} conv=notrunc,fsync seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc,fsync seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024 + ${BOOT_SPACE_ALIGNED} \* 1024) } From 59e805bdebb0af01118da822800277f5cb6de63a Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Wed, 10 Aug 2016 14:13:50 +0200 Subject: [PATCH 36/40] README.md: Update release notes. * Add known issues for CC6UL. * Refer to online documentation for interface and feature list. * Add uSD encrypted image boot limitation. Signed-off-by: Alex Gonzalez --- README.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c658295ef..65dbec0f9 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,9 @@ Digi International's professional embedded Yocto development environment. Digi Embedded Yocto 2.0 is based on the 2.0 (Jethro) Yocto release. +For a full list of supported features and interfaces please refer to the +online documentation. + # Supported Platforms The current release supports the following hardware platforms: @@ -95,7 +98,10 @@ U-Boot environment from the Linux OS is not supported. ## Digi ConnectCore 6UL -## Digi ConnectCore 6UL Starter Kit +* 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. ## Digi ConnectCore 6 @@ -124,6 +130,8 @@ authentication failure. * The Micrel PHY KSZ9031 may take between five and six seconds to auto-negotiate with Gigabit switches +* Secure uSD booting only supports booting signed images. A uSD image is not +generated if TrustFence (TM) image encryption support is enabled. # Support Contact Information From 2e13e194d9b86e709157cf11a9756616d8be1b6a Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 10 Aug 2016 16:12:39 +0200 Subject: [PATCH 37/40] trustfence: disable SDCARD image generation when encryption is enabled Currently we don't support booting encrypted images from an SDCARD, so just disable the generation of such images. https://jira.digi.com/browse/DEL-2876 Signed-off-by: Javier Viguera --- meta-digi-dey/classes/trustfence.bbclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-digi-dey/classes/trustfence.bbclass b/meta-digi-dey/classes/trustfence.bbclass index 49aa5459d..113ca14ff 100644 --- a/meta-digi-dey/classes/trustfence.bbclass +++ b/meta-digi-dey/classes/trustfence.bbclass @@ -65,3 +65,6 @@ python () { if (d.getVar("TRUSTFENCE_ENCRYPT_ENVIRONMENT", True) == "1"): d.appendVar("UBOOT_EXTRA_CONF", 'CONFIG_ENV_AES=y CONFIG_ENV_AES_CAAM_KEY=y') } + +# SDCARD image is not supported when encryption is enabled, so disable it in such cases +IMAGE_FSTYPES_remove = "${@'' if d.getVar('TRUSTFENCE_DEK_PATH', True) == '0' else 'sdcard'}" From 45763aec39f20cf202d8f64d86d5724cc56142f6 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 10 Aug 2016 16:14:00 +0200 Subject: [PATCH 38/40] u-boot-dey: cosmetic, add quotes to warning message So the warning message shows the TF variable setting in the correct syntax that they should be written in the project's local.conf Signed-off-by: Javier Viguera --- meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2015.04.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 280b7b2d4..2e23c8b91 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 @@ -35,7 +35,7 @@ UBOOT_EXTRA_CONF ?= "" python __anonymous() { if (d.getVar("TRUSTFENCE_DEK_PATH", True) not in ["0", None]) and (d.getVar("TRUSTFENCE_SIGN", True) != "1"): - bb.fatal("Only signed U-Boot images can be encrypted. Generate signed images (TRUSTFENCE_SIGN=1) or remove encryption (TRUSTFENCE_DEK_PATH = 0)") + bb.fatal("Only signed U-Boot images can be encrypted. Generate signed images (TRUSTFENCE_SIGN = \"1\") or remove encryption (TRUSTFENCE_DEK_PATH = \"0\")") } do_compile () { From 443092a6b0798c6c2522a9a00b3bd518a9dadb5e Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 11 Aug 2016 16:21:30 +0200 Subject: [PATCH 39/40] README.md: fix FTP links not rendered in GitHub's markdown FTP links are not correctly rendered in GitHub, so just put them as text. Signed-off-by: Javier Viguera --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 65dbec0f9..ac8efaf71 100644 --- a/README.md +++ b/README.md @@ -54,8 +54,8 @@ Documentation is available online on the Digi documentation site: # Downloads -* [Demo images](ftp://ftp1.digi.com/support/digiembeddedyocto/2.0/r3/images/) -* [Software Development Kit (SDK)](ftp://ftp1.digi.com/support/digiembeddedyocto/2.0/r3/sdk/) +* Demo images: ftp://ftp1.digi.com/support/digiembeddedyocto/2.0/r3/images/ +* Software Development Kit (SDK): ftp://ftp1.digi.com/support/digiembeddedyocto/2.0/r3/sdk/ # Release Changelog From c92db49554b9974415caac556f111525d741158a Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Thu, 11 Aug 2016 16:22:02 +0200 Subject: [PATCH 40/40] meta-digi: update revisions for dey-2.0-r3.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 ++-- 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 +- 6 files changed, 8 insertions(+), 8 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..cdc6d44d1 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 = "dfc9c241d7b8171dddb804bc2c4f7fa431386c23" # 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 2e23c8b91..ffaa15e3e 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 = "a7142750a45ec473d1620e2684ab4ca25e2f1001" # 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-kernel/linux/linux-dey.inc b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc index a7717b203..ef1c067a9 100644 --- a/meta-digi-arm/recipes-kernel/linux/linux-dey.inc +++ b/meta-digi-arm/recipes-kernel/linux/linux-dey.inc @@ -15,7 +15,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 bc82533ed..3a5c3eecd 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..85af0ced7 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 = "5542184056ec555f314b4b8fce8f3b0fbb87168a" 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..d17cebf12 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 = "a606129938fd7ce256e25dbe9bb3635490df72eb" COMPATIBLE_MACHINE = "(ccimx6ul)"