summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2019-12-11 19:40:00 +0000
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2019-12-12 16:53:42 +0000
commitbd98391667189c7cc989e90161910bb766c4ca37 (patch)
treea509a3de23d1575fd01de4342508bd435b221de8
parentd1c0f32a43fbe5e1bdbab2a8ebdfd7631dec179e (diff)
Disable Kingfisher onboard Bluetooth when using h3ulcb
Extend the current default disabling of the Kingfisher onboard Bluetooth when using m3ulcb to include h3ulcb as well. Bug-AGL: SPEC-3043 Change-Id: Ie1d5d39fcd23ad690dac8d2481152fb17ee79da5 Signed-off-by: Scott Murray <scott.murray@konsulko.com>
-rw-r--r--recipes-connectivity/btwilink-disable-conf/btwilink-disable-conf_1.0.bb2
-rw-r--r--recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb4
2 files changed, 3 insertions, 3 deletions
diff --git a/recipes-connectivity/btwilink-disable-conf/btwilink-disable-conf_1.0.bb b/recipes-connectivity/btwilink-disable-conf/btwilink-disable-conf_1.0.bb
index 9170a84e6..0b49a0278 100644
--- a/recipes-connectivity/btwilink-disable-conf/btwilink-disable-conf_1.0.bb
+++ b/recipes-connectivity/btwilink-disable-conf/btwilink-disable-conf_1.0.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
SRC_URI = "file://btwilink-disable.conf"
-COMPATIBLE_MACHINE = "m3ulcb"
+COMPATIBLE_MACHINE = "m3ulcb|h3ulcb"
do_compile[noexec] = "1"
diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
index 7917af951..2f2804bc2 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo-platform.bb
@@ -75,11 +75,11 @@ DEMO_PRELOAD_MAPS = "${@bb.utils.contains("PREFERRED_RPROVIDER_virtual/navigatio
DEMO_PRELOAD = "${@bb.utils.contains("DISTRO_FEATURES", "agl-demo-preload", " ${DEMO_PRELOAD_MAPS} poiapp-api-key", "",d)}"
# Hook for demo platform configuration
-# ATM, only used to disable btwilink module on M3ULCB + Kingfisher by default,
+# ATM, only used to disable btwilink module on [MH]3ULCB + Kingfisher by default,
# setting DEMO_ENABLE_BTWILINK to "true" in local.conf / site.conf re-enables.
DEMO_ENABLE_BTWILINK ?= ""
DEMO_PLATFORM_CONF = ""
-DEMO_PLATFORM_CONF_append_m3ulcb = "${@bb.utils.contains("DEMO_ENABLE_BTWILINK", "true", "", " btwilink-disable-conf", d)}"
+DEMO_PLATFORM_CONF_append_ulcb = "${@bb.utils.contains("DEMO_ENABLE_BTWILINK", "true", "", " btwilink-disable-conf", d)}"
RDEPENDS_${PN}_append = " \
qtquickcontrols2-agl \