Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Arturo Buzarra 2017-10-04 08:42:29 +02:00
parent f36e8a94a1
commit 8c14ae877f
15 changed files with 69 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-digi-arm/recipes-bsp/firmware-atheros/firmware-atheros.bb
View File

@ -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." SUMMARY = "Firmware files for Digi's platforms, such as Atheros bluetooth."
SECTION = "base" SECTION = "base"
@ -74,4 +74,4 @@ FILES_${PN}-ar3k = "/lib/firmware/ar3k"
FILES_${PN}-ath6kl = "/lib/firmware/ath6k" FILES_${PN}-ath6kl = "/lib/firmware/ath6k"
PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "(ccimx6$)" COMPATIBLE_MACHINE = "(ccimx6sbc)"

4
meta-digi-arm/recipes-bsp/firmware-qualcomm/firmware-qualcomm.bb
View File

@ -1,4 +1,4 @@
# Copyright (C) 2016 Digi International. # Copyright (C) 2016,2017 Digi International.
SUMMARY = "Qualcomm firmware files for Digi's platforms." SUMMARY = "Qualcomm firmware files for Digi's platforms."
SECTION = "base" SECTION = "base"
@ -55,4 +55,4 @@ FILES_${PN}-qca6564-bt = "/lib/firmware/qca"
FILES_${PN}-qca6564-wifi = "/lib/firmware" FILES_${PN}-qca6564-wifi = "/lib/firmware"
PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "(ccimx6ul)" COMPATIBLE_MACHINE = "(ccimx6qpsbc|ccimx6ul)"

2
meta-digi-arm/recipes-bsp/u-boot/u-boot-fw-utils_%.bbappend
View File

@ -88,4 +88,4 @@ pkg_postinst_${PN}() {
fi fi
} }
COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul)" COMPATIBLE_MACHINE = "(ccimx6sbc|ccimx6qpsbc|ccimx6ul)"

2
meta-digi-arm/recipes-kernel/kernel-module-qualcomm/kernel-module-qualcomm.bb
View File

@ -56,4 +56,4 @@ FILES_${PN} += " \
${base_libdir}/firmware/wlan/qcom_cfg.ini \ ${base_libdir}/firmware/wlan/qcom_cfg.ini \
" "
COMPATIBLE_MACHINE = "(ccimx6ul)" COMPATIBLE_MACHINE = "(ccimx6qpsbc|ccimx6ul)"

4
meta-digi-arm/recipes-kernel/linux/linux-dey_3.14.bb
View File

@ -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-dey.inc
require recipes-kernel/linux/linux-dtb.inc require recipes-kernel/linux/linux-dtb.inc
@ -8,4 +8,4 @@ inherit fsl-vivante-kernel-driver-handler
SRCBRANCH = "v3.14/master" SRCBRANCH = "v3.14/master"
SRCREV = "${AUTOREV}" SRCREV = "${AUTOREV}"
COMPATIBLE_MACHINE = "(ccimx6$)" COMPATIBLE_MACHINE = "(ccimx6sbc)"

2
meta-digi-arm/recipes-kernel/linux/linux-dey_4.1.bb
View File

@ -6,4 +6,4 @@ require recipes-kernel/linux/linux-dtb.inc
SRCBRANCH = "v4.1.15/master" SRCBRANCH = "v4.1.15/master"
SRCREV = "${AUTOREV}" SRCREV = "${AUTOREV}"
COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul)" COMPATIBLE_MACHINE = "(ccimx6sbc|ccimx6ul)"

3
meta-digi-dey/recipes-connectivity/packagegroups/packagegroup-dey-wireless.bb
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2012 Digi International. # Copyright (C) 2012-2017 Digi International.
# #
SUMMARY = "Wireless packagegroup for DEY image" SUMMARY = "Wireless packagegroup for DEY image"
@ -16,3 +16,4 @@ RDEPENDS_${PN} = "\
" "
RDEPENDS_${PN}_append_ccimx6ul = " hostapd" RDEPENDS_${PN}_append_ccimx6ul = " hostapd"
RDEPENDS_${PN}_append_ccimx6qpsbc = " hostapd"

4
meta-digi-dey/recipes-core/recovery/recovery-initramfs.bb
View File

@ -53,7 +53,9 @@ PACKAGES = "${PN}"
FILES_${PN} = "/" FILES_${PN} = "/"
RDEPENDS_${PN}_append_ccimx6 = " \ RDEPENDS_${PN}_append_ccimx6sbc = " \
cryptsetup \ cryptsetup \
rng-tools \ rng-tools \
" "
RDEPENDS_${PN}_append_ccimx6qpsbc = " cryptsetup"

4
meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb
View File

@ -27,11 +27,13 @@ RDEPENDS_${PN} = " \
u-boot-fw-utils \ u-boot-fw-utils \
" "
RDEPENDS_${PN}_append_ccimx6 = " \ RDEPENDS_${PN}_append_ccimx6sbc = " \
cryptsetup \ cryptsetup \
rng-tools \ rng-tools \
" "
RDEPENDS_${PN}_append_ccimx6qpsbc = " cryptsetup"
RDEPENDS_${PN}_append_ccimx6ul = " \ RDEPENDS_${PN}_append_ccimx6ul = " \
mtd-utils-ubifs \ mtd-utils-ubifs \
" "

0
meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/ccimx6sbc/trustfence-initramfs-init → meta-digi-dey/recipes-core/trustfence/trustfence-initramfs/ccimx6/trustfence-initramfs-init
View File

2
meta-digi-dey/recipes-digi/dey-examples/dey-examples-cryptochip.bb
View File

@ -24,5 +24,5 @@ do_install() {
} }
PACKAGE_ARCH = "${MACHINE_ARCH}" PACKAGE_ARCH = "${MACHINE_ARCH}"
COMPATIBLE_MACHINE = "(ccimx6ul)" COMPATIBLE_MACHINE = "(ccimx6qpsbc|ccimx6ul)"

43
meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx6qpsbc/board.conf Normal file
View File

@ -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

2
meta-digi-dey/recipes-digi/swu-images/swu.inc
View File

@ -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}')}" 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_TEMPLATE = "scripts: ( { filename = \\"preinstall_swu.sh\\"; type = \\"preinstall\\"; sha256 = \\"@preinstall_swu.sh\\"; \\x7D );"
PREINST_SCRIPT_DESC = "" 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}')}" PREINST_SCRIPT_DESC_ccimx6ul = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_INITRAMFS_IMAGE', True), '', '${PREINST_SCRIPT_TEMPLATE}')}"
python () { python () {

4
meta-digi-dey/recipes-multimedia/packagegroups/packagegroup-dey-audio.bb
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2012 Digi International. # Copyright (C) 2012-2017 Digi International.
# #
SUMMARY = "Audio packagegroup for DEY image" SUMMARY = "Audio packagegroup for DEY image"
@ -21,4 +21,4 @@ RDEPENDS_${PN} = "\
${ALSA_UTILS_PKGS} \ ${ALSA_UTILS_PKGS} \
" "
RDEPENDS_${PN}_append_ccimx6sbc = " card-detect" RDEPENDS_${PN}_append_ccimx6 = " card-detect"

10
meta-digi-dey/recipes-multimedia/pulseaudio/pulseaudio_%.bbappend
View File

@ -3,15 +3,15 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
SRC_URI_append_ccimx6ulsbc = " file://0001-pulseaudio-keep-headphones-volume-in-platforms-witho.patch" 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://hdmi_hotplug.sh \
file://dey-audio-hdmi.conf \ file://dey-audio-hdmi.conf \
file://dey-audio-sgtl5000.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 -d ${D}${sysconfdir}/udev/scripts
install -m 0755 ${WORKDIR}/hdmi_hotplug.sh ${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}" PACKAGE_ARCH = "${MACHINE_ARCH}"
# The card-detect binary is only necessary for the HDMI hotplug to work on the ccimx6sbc # The card-detect binary is only necessary for the HDMI hotplug to work on the ccimx6sbc/ccimx6qpsbc
RDEPENDS_${PN}_append_ccimx6sbc = " card-detect" RDEPENDS_${PN}_append_ccimx6 = " card-detect"