summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2023-01-13 09:16:38 +0000
committerSamuli Piippo <samuli.piippo@qt.io>2023-01-13 14:40:26 +0000
commit1d34aa94e64e7af4129ecf4ee02c80aa8165401e (patch)
treee2daf240842cc211aa8b3831ae4d27268315f52b
parent67db3915b96542308462258039128edc5b2efd17 (diff)
Add support for Yocto 4.2 Mickledore
Add LAYERSERIES_COMPAT for ST's meta layer, since they don't yet provide compatible version. The layer is otherwise compatible, but the libdrm bbappend has wrong version. Change-Id: I5c031c115b9802276b69ad8dfb2f6044f349582a Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r--conf/distro/include/b2qt.inc2
-rw-r--r--conf/layer.conf4
-rw-r--r--recipes-graphics/drm/libdrm_%.bbappend2
3 files changed, 7 insertions, 1 deletions
diff --git a/conf/distro/include/b2qt.inc b/conf/distro/include/b2qt.inc
index 6b5d44e..384ca04 100644
--- a/conf/distro/include/b2qt.inc
+++ b/conf/distro/include/b2qt.inc
@@ -68,3 +68,5 @@ LINUX_A7_EXAMPLES_DT += "stm32mp157c-ev1-a7-examples"
CUBE_M4_EXAMPLES_DT += "stm32mp157c-ev1-m4-examples"
TRUSTED_WIC_FILE = "${@bb.utils.contains('ST_VENDORFS','1','sdcard-stm32mp157c-ev1-trusted-vendorfs-1GB.wks.in','sdcard-stm32mp157c-ev1-trusted-1GB.wks.in',d)}"
WKS_FILE += "${TRUSTED_WIC_FILE}"
+
+BBMASK += "meta-st-stm32mp/recipes-graphics/drm/"
diff --git a/conf/layer.conf b/conf/layer.conf
index c4473b2..919b53b 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -39,4 +39,6 @@ BBFILE_COLLECTIONS += "b2qt_st"
BBFILE_PATTERN_b2qt_st := "^${LAYERDIR}/"
BBFILE_PRIORITY_b2qt_st = "20"
-LAYERSERIES_COMPAT_b2qt_st = "langdale kirkstone"
+LAYERSERIES_COMPAT_b2qt_st = "kirkstone langdale mickledore"
+
+LAYERSERIES_COMPAT_stm-st-stm32mp += "mickledore"
diff --git a/recipes-graphics/drm/libdrm_%.bbappend b/recipes-graphics/drm/libdrm_%.bbappend
new file mode 100644
index 0000000..06c60ad
--- /dev/null
+++ b/recipes-graphics/drm/libdrm_%.bbappend
@@ -0,0 +1,2 @@
+# We don't want etnaviv drm package
+PACKAGECONFIG:stm32mpcommon = ""