meta-digi: integrate ConnectCore MP25 DVK platform on common recipes

Add initial support on common DEY recipes for ConnectCore MP25 DVK platform. https://onedigi.atlassian.net/browse/DEL-8995 Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
2024-07-04 16:48:37 +02:00 · 2024-07-04 16:48:37 +02:00 · 1d29e40d23
parent cbc949447d
commit 1d29e40d23
13 changed files with 1226 additions and 5 deletions
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend
+++ b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend
@ -15,6 +15,7 @@ SRC_URI:append:ccimx8x = " file://asound.state"
 SRC_URI:append:ccimx8m = " file://asound.state"
 SRC_URI:append:ccimx9 = " file://asound.state"
 SRC_URI:append:ccmp1 = " file://asound.state"
+SRC_URI:append:ccmp2 = " file://asound.state"

 do_install:append:ccimx6() {
 	ln -sf asound.micro_play.state ${D}${localstatedir}/lib/alsa/asound.state
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccmp2/asound.conf
+++ b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccmp2/asound.conf
@ -0,0 +1,9 @@
+pcm.stm32max98088 {
+    type hw
+    card 0
+}
+ctl.stm32max98088 {
+    type hw
+    card 0
+}
+ctl.!default stm32max98088
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccmp2/asound.state
+++ b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccmp2/asound.state
--- a/meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon.bb
+++ b/meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon.bb
@ -103,4 +103,4 @@ INSANE_SKIP:${PN} += "build-deps"
 INSANE_SKIP:${PN} += "file-rdeps"

 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ccmp1)"
+COMPATIBLE_MACHINE = "(ccmp1|ccmp2)"
--- a/meta-digi-dey/dynamic-layers/qt5-layer/recipes-qt/packagegroups/packagegroup-qt5-demos.bb
+++ b/meta-digi-dey/dynamic-layers/qt5-layer/recipes-qt/packagegroups/packagegroup-qt5-demos.bb
@ -33,3 +33,9 @@ RDEPENDS:${PN}:append:ccmp15 = " \
    cinematicexperience-rhi \
    cinematicexperience-rhi-tools \
 "
+
+RDEPENDS:${PN}:append:ccmp2 = " \
+    qt5everywheredemo \
+    cinematicexperience-rhi \
+    cinematicexperience-rhi-tools \
+"
--- a/meta-digi-dey/dynamic-layers/qt5-layer/recipes-qt/packagegroups/packagegroup-qt5-dey.bb
+++ b/meta-digi-dey/dynamic-layers/qt5-layer/recipes-qt/packagegroups/packagegroup-qt5-dey.bb
@ -54,6 +54,10 @@ QT5_RDEPENDS:ccmp15 = " \
    ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', '${QT5_RDEPENDS_eglfs}', d)} \
 "

+QT5_RDEPENDS:ccmp2 = " \
+    ${QT5_RDEPENDS_common} \
+"
+
 # Add packagegroup-qt5-webengine to QT5_RDEPENDS and comment out the line below to install qtwebengine to the rootfs.
 QT5_RDEPENDS:remove = " packagegroup-qt5-webengine"

--- a/meta-digi-dey/dynamic-layers/webkit/recipes-core/images/dey-image-webkit.bb
+++ b/meta-digi-dey/dynamic-layers/webkit/recipes-core/images/dey-image-webkit.bb
@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2022, Digi International Inc.
+# Copyright (C) 2020-2024, Digi International Inc.
 #
 require recipes-core/images/dey-image-graphical.inc

@ -7,4 +7,4 @@ DESCRIPTION = "DEY image with WebKit browser engine support"

 GRAPHICAL_CORE = "webkit"

-COMPATIBLE_MACHINE = "(ccimx6$|ccimx8m|ccimx8x|ccimx93|ccmp15)"
+COMPATIBLE_MACHINE = "(ccimx6$|ccimx8m|ccimx8x|ccimx93|ccmp15|ccmp2)"
--- a/meta-digi-dey/dynamic-layers/webkit/recipes-digi/connectcore-demo-example-webkit/connectcore-demo-example-webkit.bb
+++ b/meta-digi-dey/dynamic-layers/webkit/recipes-digi/connectcore-demo-example-webkit/connectcore-demo-example-webkit.bb
@ -4,9 +4,11 @@ require recipes-digi/dey-examples/connectcore-demo-example.inc

 WESTON_SERVICE ?= "weston.service"
 WESTON_SERVICE:ccmp15 ?= "weston-launch.service"
+WESTON_SERVICE:ccmp25 ?= "weston-launch.service"

 CC_DEMO_DISPLAY ?= "wayland-0"
 CC_DEMO_DISPLAY:ccmp15 ?= "wayland-1"
+CC_DEMO_DISPLAY:ccmp25 ?= "wayland-1"
 CC_DEMO_DISPLAY:ccimx93 ?= "wayland-1"
 CC_DEMO_ENV ?= "DISPLAY=:0.0 XDG_RUNTIME_DIR=/run/user/0 WAYLAND_DISPLAY=\$\{DEMO_DISPLAY\}"
 CC_DEMO_ENV:ccimx6ul ?= ""
--- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccmp25/80-mm-net-device-blacklist.rules
+++ b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccmp25/80-mm-net-device-blacklist.rules
@ -0,0 +1,15 @@
+ACTION!="add|change|move|bind", GOTO="mm_net_device_blacklist_end"
+
+# ModemManager documentation states that the best practice is to use the DEVPATH
+# this way rather than other rules such as KERNEL, so be careful when modifying
+
+# Remove Ethernet interfaces from ModemManager probing
+SUBSYSTEM=="net", DEVPATH=="/devices/platform/soc/482c0000.ethernet*", ENV{ID_MM_CANDIDATE}="0", ENV{ID_MM_DEVICE_IGNORE}="1"
+SUBSYSTEM=="net", DEVPATH=="/devices/platform/soc/482d0000.ethernet*", ENV{ID_MM_CANDIDATE}="0", ENV{ID_MM_DEVICE_IGNORE}="1"
+
+# Remove MMC interfaces from ModemManager probing
+SUBSYSTEM=="net", DEVPATH=="/devices/platform/soc/48220000.sdmmc/mmc_host*", ENV{ID_MM_CANDIDATE}="0", ENV{ID_MM_DEVICE_IGNORE}="1"
+SUBSYSTEM=="net", DEVPATH=="/devices/platform/soc/48230000.sdmmc/mmc_host*", ENV{ID_MM_CANDIDATE}="0", ENV{ID_MM_DEVICE_IGNORE}="1"
+SUBSYSTEM=="net", DEVPATH=="/devices/platform/soc/48240000.sdmmc/mmc_host*", ENV{ID_MM_CANDIDATE}="0", ENV{ID_MM_DEVICE_IGNORE}="1"
+
+LABEL="mm_net_device_blacklist_end"
--- a/meta-digi-dey/recipes-connectivity/xbee/xbee.bb
+++ b/meta-digi-dey/recipes-connectivity/xbee/xbee.bb
@ -42,4 +42,4 @@ SYSTEMD_PACKAGES = "${PN}-init"
 SYSTEMD_SERVICE:${PN}-init = "xbee-init.service"

 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ccimx8m|ccimx8x|ccimx9)"
+COMPATIBLE_MACHINE = "(ccimx8m|ccimx8x|ccimx9|ccmp2)"
--- a/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb
+++ b/meta-digi-dey/recipes-core/packagegroups/packagegroup-dey-core.bb
@ -74,6 +74,10 @@ RDEPENDS:${PN}:append:ccmp15 = " \
    v4l-utils \
 "

+RDEPENDS:${PN}:append:ccmp2 = " \
+    v4l-utils \
+"
+
 # The rootfs in the CC6UL is not big enough for graphic images (QT) and the
 # connectcore demo, so we restrict the demo only for the 'core-image-base'
 RDEPENDS:${PN}:remove:ccimx6ul = "connectcore-demo-example"
--- a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccmp25-dvk/libdigiapix.conf
+++ b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccmp25-dvk/libdigiapix.conf
@ -0,0 +1,30 @@
+[board]
+model = Digi International ConnectCore MP25 DVK.
+
+[GPIO]
+
+# USER LED (ULED)
+USER_LED = GPIOF,5
+
+# USER BUTTON (USER_1)
+USER_BUTTON = GPIOF,10
+
+[I2C]
+
+# I2C-1 on MikroBus connector J39.
+DEFAULT_I2C_BUS = 1
+
+[SPI]
+
+# SPI-3 on MikroBus connector J38.
+DEFAULT_SPI = 0,0
+
+[PWM]
+
+# PWM2 on MikroBus connector J39 (pin 1).
+DEFAULT_PWM = 2,0
+
+[ADC]
+
+# ANA0 on GPIO board connector J37 (pin 16)
+DEFAULT_ADC = 2,0
--- a/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb
+++ b/meta-digi-dey/recipes-graphics/lvgl/lvgl-demo_8.3.0.bb
@ -64,9 +64,11 @@ do_configure:prepend() {

 WESTON_SERVICE ?= "weston.service"
 WESTON_SERVICE:ccmp15 ?= "weston-launch.service"
+WESTON_SERVICE:ccmp2 ?= "weston-launch.service"

 LVGL_DEMO_DISPLAY ?= "wayland-0"
 LVGL_DEMO_DISPLAY:ccmp15 ?= "wayland-1"
+LVGL_DEMO_DISPLAY:ccmp2 ?= "wayland-1"
 LVGL_DEMO_DISPLAY:ccimx93 ?= "wayland-1"
 LVGL_DEMO_ENV ?= "DISPLAY=:0.0 XDG_RUNTIME_DIR=/run/user/0 WAYLAND_DISPLAY=\$\{DEMO_DISPLAY\}"
 LVGL_DEMO_ENV:ccimx6ul ?= ""
@ -107,4 +109,4 @@ INITSCRIPT_PARAMS:${PN}-init = "start 99 3 5 . stop 20 0 1 2 6 ."
 SYSTEMD_PACKAGES = "${PN}-init"
 SYSTEMD_SERVICE:${PN}-init = "lvgl-demo-init.service"

-COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8m|ccimx8x|ccimx93|ccmp15)"
+COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8m|ccimx8x|ccimx93|ccmp15|ccmp2)"