From 8c14ae877ff01ac6c899a6b142f381e8754b8932 Mon Sep 17 00:00:00 2001
From: Arturo Buzarra <arturo.buzarra@digi.com>
Date: Wed, 4 Oct 2017 08:42:29 +0200
Subject: [PATCH] meta-digi recipes: adjust machine overrides for new platform

This commit modifies different recipes to support the new platform
ccimx6qpsbc and adapt it to maintain the support to ccimx6sbc.

https://jira.digi.com/browse/DEL-5082

Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
---
 .../firmware-atheros/firmware-atheros.bb      |  4 +-
 .../firmware-qualcomm/firmware-qualcomm.bb    |  4 +-
 .../u-boot/u-boot-fw-utils_%.bbappend         |  2 +-
 .../kernel-module-qualcomm.bb                 |  2 +-
 .../recipes-kernel/linux/linux-dey_3.14.bb    |  4 +-
 .../recipes-kernel/linux/linux-dey_4.1.bb     |  2 +-
 .../packagegroup-dey-wireless.bb              |  3 +-
 .../recovery/recovery-initramfs.bb            |  4 +-
 .../trustfence/trustfence-initramfs.bb        |  4 +-
 .../trustfence-initramfs-init                 |  0
 .../dey-examples/dey-examples-cryptochip.bb   |  2 +-
 .../libdigiapix-git/ccimx6qpsbc/board.conf    | 43 +++++++++++++++++++
 meta-digi-dey/recipes-digi/swu-images/swu.inc |  2 +-
 .../packagegroups/packagegroup-dey-audio.bb   |  4 +-
 .../pulseaudio/pulseaudio_%.bbappend          | 10 ++---
 15 files changed, 69 insertions(+), 21 deletions(-)
 rename meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/{ccimx6sbc => ccimx6}/trustfence-initramfs-init (100%)
 create mode 100644 meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6qpsbc/board.conf

diff --git a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb
index 8c03f9df7..aba5c07cd 100644
--- a/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb
+++ b/meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2013 Digi International.
+# Copyright (C) 2013-2017 Digi International.
 
 SUMMARY = "Firmware files for Digi's platforms, such as Atheros bluetooth."
 SECTION = "base"
@@ -74,4 +74,4 @@ FILES_${PN}-ar3k = "/lib/firmware/ar3k"
 FILES_${PN}-ath6kl = "/lib/firmware/ath6k"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ccimx6$)"
+COMPATIBLE_MACHINE = "(ccimx6sbc)"
diff --git a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
index b12bc2b14..049f3f41b 100644
--- a/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
+++ b/meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2016 Digi International.
+# Copyright (C) 2016,2017 Digi International.
 
 SUMMARY = "Qualcomm firmware files for Digi's platforms."
 SECTION = "base"
@@ -55,4 +55,4 @@ FILES_${PN}-qca6564-bt = "/lib/firmware/qca"
 FILES_${PN}-qca6564-wifi = "/lib/firmware"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ccimx6ul)"
+COMPATIBLE_MACHINE = "(ccimx6qpsbc|ccimx6ul)"
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend b/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend
index 547138192..5dc685e89 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend
@@ -88,4 +88,4 @@ pkg_postinst_${PN}() {
 	fi
 }
 
-COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul)"
+COMPATIBLE_MACHINE = "(ccimx6sbc|ccimx6qpsbc|ccimx6ul)"
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 e65ff29f5..37c80419d 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
@@ -56,4 +56,4 @@ FILES_${PN} += " \
     ${base_libdir}/firmware/wlan/qcom_cfg.ini \
 "
 
-COMPATIBLE_MACHINE = "(ccimx6ul)"
+COMPATIBLE_MACHINE = "(ccimx6qpsbc|ccimx6ul)"
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..1692577bc 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
@@ -1,4 +1,4 @@
-# Copyright (C) 2015 Digi International
+# Copyright (C) 2015-2017 Digi International
 
 require recipes-kernel/linux/linux-dey.inc
 require recipes-kernel/linux/linux-dtb.inc
@@ -8,4 +8,4 @@ inherit fsl-vivante-kernel-driver-handler
 SRCBRANCH = "v3.14/master"
 SRCREV = "${AUTOREV}"
 
-COMPATIBLE_MACHINE = "(ccimx6$)"
+COMPATIBLE_MACHINE = "(ccimx6sbc)"
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 8f891fed8..b7a681d46 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
@@ -6,4 +6,4 @@ require recipes-kernel/linux/linux-dtb.inc
 SRCBRANCH = "v4.1.15/master"
 SRCREV = "${AUTOREV}"
 
-COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul)"
+COMPATIBLE_MACHINE = "(ccimx6sbc|ccimx6ul)"
diff --git a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb
index e4f27eb3e..f2d6bf9a7 100644
--- a/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb
+++ b/meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012 Digi International.
+# Copyright (C) 2012-2017 Digi International.
 #
 SUMMARY = "Wireless packagegroup for DEY image"
 
@@ -16,3 +16,4 @@ RDEPENDS_${PN} = "\
 "
 
 RDEPENDS_${PN}_append_ccimx6ul = " hostapd"
+RDEPENDS_${PN}_append_ccimx6qpsbc = " hostapd"
diff --git a/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb b/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb
index fb88dba95..16103d2af 100644
--- a/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb
+++ b/meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb
@@ -53,7 +53,9 @@ PACKAGES = "${PN}"
 
 FILES_${PN} = "/"
 
-RDEPENDS_${PN}_append_ccimx6 = " \
+RDEPENDS_${PN}_append_ccimx6sbc = " \
     cryptsetup \
     rng-tools \
 "
+
+RDEPENDS_${PN}_append_ccimx6qpsbc = " cryptsetup"
diff --git a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb
index 0d6d77ef4..5f9cb418c 100644
--- a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb
+++ b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb
@@ -27,11 +27,13 @@ RDEPENDS_${PN} = " \
     u-boot-fw-utils \
 "
 
-RDEPENDS_${PN}_append_ccimx6 = " \
+RDEPENDS_${PN}_append_ccimx6sbc = " \
     cryptsetup \
     rng-tools \
 "
 
+RDEPENDS_${PN}_append_ccimx6qpsbc = " cryptsetup"
+
 RDEPENDS_${PN}_append_ccimx6ul = " \
     mtd-utils-ubifs \
 "
diff --git a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/ccimx6sbc/trustfence-initramfs-init b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/ccimx6/trustfence-initramfs-init
similarity index 100%
rename from meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/ccimx6sbc/trustfence-initramfs-init
rename to meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/ccimx6/trustfence-initramfs-init
diff --git a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb
index e1700995b..0f71a4f42 100644
--- a/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb
+++ b/meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb
@@ -24,5 +24,5 @@ do_install() {
 }
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ccimx6ul)"
+COMPATIBLE_MACHINE = "(ccimx6qpsbc|ccimx6ul)"
 
diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6qpsbc/board.conf b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6qpsbc/board.conf
new file mode 100644
index 000000000..1e88b544e
--- /dev/null
+++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6qpsbc/board.conf
@@ -0,0 +1,43 @@
+[board]
+model = Digi International ConnectCore 6 QuadPlus Single Board Computer.
+
+[GPIO]
+
+# USER LED (RED) - GPIO02_IO02
+USER_LED = 34
+
+# USER LED (ORANGE) - GPIO02_IO03
+USER_LED_2 = 35
+
+# USER LED (GREEN) - GPIO02_IO04
+USER_LED_3 = 36
+
+# USER BUTTON - GPIO02_IO05
+USER_BUTTON = 37
+
+[I2C]
+
+# I2C-3 on I2C board connector.
+DEFAULT_I2C_BUS = 2
+
+[SPI]
+
+# SPI-1 on SPI board connector.
+DEFAULT_SPI = 0,0
+
+[PWM]
+
+# PWM1 on LCD board connector (pin 10).
+DEFAULT_PWM = 0,0
+
+[ADC]
+
+# HWMON Driver
+DEFAULT_ADC_DRIVER = 1
+
+# IIO Device 0
+DEFAULT_DEVICE_INDEX = 0
+
+# PMIC_ADCIN1 on GPIO board connector (Pin 1)
+DEFAULT_ADC_LINE = 1
+
diff --git a/meta-digi-dey/recipes-digi/swu-images/swu.inc b/meta-digi-dey/recipes-digi/swu-images/swu.inc
index d88e78df2..e4024216f 100644
--- a/meta-digi-dey/recipes-digi/swu-images/swu.inc
+++ b/meta-digi-dey/recipes-digi/swu-images/swu.inc
@@ -32,7 +32,7 @@ ROOTFS_ENC_DEV_ccimx6ul = "${ROOTFS_DEV_NAME}"
 ROOTFS_DEV_NAME_FINAL = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_INITRAMFS_IMAGE', True), '${ROOTFS_ENC_DEV}', '${ROOTFS_DEV_NAME}')}"
 PREINST_SCRIPT_TEMPLATE = "scripts: ( { filename = \\"preinstall_swu.sh\\"; type = \\"preinstall\\"; sha256 = \\"@preinstall_swu.sh\\"; \\x7D );"
 PREINST_SCRIPT_DESC = ""
-PREINST_SCRIPT_DESC_ccimx6sbc = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_INITRAMFS_IMAGE', True), '${PREINST_SCRIPT_TEMPLATE}', '')}"
+PREINST_SCRIPT_DESC_ccimx6 = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_INITRAMFS_IMAGE', True), '${PREINST_SCRIPT_TEMPLATE}', '')}"
 PREINST_SCRIPT_DESC_ccimx6ul = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_INITRAMFS_IMAGE', True), '', '${PREINST_SCRIPT_TEMPLATE}')}"
 
 python () {
diff --git a/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-audio.bb b/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-audio.bb
index 1f5ece5d1..9ea584779 100644
--- a/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-audio.bb
+++ b/meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-audio.bb
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012 Digi International.
+# Copyright (C) 2012-2017 Digi International.
 #
 SUMMARY = "Audio packagegroup for DEY image"
 
@@ -21,4 +21,4 @@ RDEPENDS_${PN} = "\
     ${ALSA_UTILS_PKGS} \
 "
 
-RDEPENDS_${PN}_append_ccimx6sbc = " card-detect"
+RDEPENDS_${PN}_append_ccimx6 = " card-detect"
diff --git a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend b/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
index 1889c09a0..0b6d1ad0b 100644
--- a/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
+++ b/meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
@@ -3,15 +3,15 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
 SRC_URI_append_ccimx6ulsbc = " file://0001-pulseaudio-keep-headphones-volume-in-platforms-witho.patch"
-SRC_URI_append_ccimx6sbc = " \
+SRC_URI_append_ccimx6 = " \
     file://hdmi_hotplug.sh \
     file://dey-audio-hdmi.conf \
     file://dey-audio-sgtl5000.conf \
 "
 
-EXTRA_OECONF_append_ccimx6sbc = " --disable-memfd"
+EXTRA_OECONF_append_ccimx6 = " --disable-memfd"
 
-do_install_append_ccimx6sbc() {
+do_install_append_ccimx6() {
 	install -d ${D}${sysconfdir}/udev/scripts
 	install -m 0755 ${WORKDIR}/hdmi_hotplug.sh ${D}${sysconfdir}/udev/scripts
 
@@ -34,5 +34,5 @@ do_install_append_ccimx6sbc() {
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-# The card-detect binary is only necessary for the HDMI hotplug to work on the ccimx6sbc
-RDEPENDS_${PN}_append_ccimx6sbc = " card-detect"
+# The card-detect binary is only necessary for the HDMI hotplug to work on the ccimx6sbc/ccimx6qpsbc
+RDEPENDS_${PN}_append_ccimx6 = " card-detect"