aboutsummaryrefslogtreecommitdiffstats
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 14:28:16 +0000
commit2bedc9120bc9cd4a9b06fddffa33216870d9a8f9 (patch)
tree8f89927ddd3fcaca1801c225a9e32399f8ed01c8
parent3258649b0452f69c666d1f2f6aff04eb03abf7d0 (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: I85aff38424cd00781bb1e3c0ccbb28117fe0aa9e 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.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.bb b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
index 9ba99fafd..47fb4e371 100644
--- a/recipes-platform/packagegroups/packagegroup-agl-demo.bb
+++ b/recipes-platform/packagegroups/packagegroup-agl-demo.bb
@@ -36,11 +36,11 @@ UNICENS ?= " \
"
# 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)}"
SMARTDEVICELINK = "${@bb.utils.contains('DISTRO_FEATURES', 'agl-sdl', \
'packagegroup-agl-smartdevicelink', '', d)}"