diff options
| author |   Scott Murray <scott.murray@konsulko.com> | 2024-09-05 15:25:20 -0400 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-09-09 08:15:50 +0000 |
| commit | 0f13b08e09b9fbb99e52d446504e4d2681ca437f (patch) | |
| tree | 437cb205df3b31906e985667eef2bcd16fff106e | |
| parent | 8d51c4656b72d801354b9970e0f95530f1ce43bb (diff) | |
Remove Kingfisher btwilink disabling
Remove DEMO_ENABLE_BTWILINK hook and associated conf file recipe used
to make using the btwilink driver an explicit opt-in, as the driver
has been removed from the meta-rcar Kingfisher BSP layer in its new
scarthgap-v5.9.4 branch in favor of the mainline kernel driver.
Since the Kingfisher is not a primary demo platform at this point,
leaving it to default to its onboard Bluetooth support seems
reasonable versus trying to update this scheme.
Bug-AGL: SPEC-5191, SPEC-5214
Change-Id: I08e05f3dd3b2091ffb2e20cc5e3065abd5cec043
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl-demo/+/30261
Tested-by: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
ci-image-build: Jenkins Job builder account
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
3 files changed, 0 insertions, 23 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 deleted file mode 100644 index 0b49a0278..000000000 --- a/recipes-connectivity/btwilink-disable-conf/btwilink-disable-conf_1.0.bb +++ /dev/null @@ -1,14 +0,0 @@ -SUMMARY = "btwilink module disabling modprobe configuration" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -SRC_URI = "file://btwilink-disable.conf" - -COMPATIBLE_MACHINE = "m3ulcb|h3ulcb" - -do_compile[noexec] = "1" - -do_install() { - install -d ${D}${sysconfdir}/modprobe.d - install -m 0644 ${WORKDIR}/btwilink-disable.conf ${D}${sysconfdir}/modprobe.d -} diff --git a/recipes-connectivity/btwilink-disable-conf/files/btwilink-disable.conf b/recipes-connectivity/btwilink-disable-conf/files/btwilink-disable.conf deleted file mode 100644 index 8d28f629e..000000000 --- a/recipes-connectivity/btwilink-disable-conf/files/btwilink-disable.conf +++ /dev/null @@ -1 +0,0 @@ -install btwilink /bin/false diff --git a/recipes-platform/packagegroups/packagegroup-agl-demo.bb b/recipes-platform/packagegroups/packagegroup-agl-demo.bb index 90283e065..8fdd2ea9f 100644 --- a/recipes-platform/packagegroups/packagegroup-agl-demo.bb +++ b/recipes-platform/packagegroups/packagegroup-agl-demo.bb @@ -9,13 +9,6 @@ PACKAGES = "\ packagegroup-agl-demo \ " -# Hook for demo platform configuration -# 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:ulcb = "${@bb.utils.contains("DEMO_ENABLE_BTWILINK", "true", "", " btwilink-disable-conf", d)}" - # fonts TTF_FONTS = " \ ttf-bitstream-vera \ @@ -34,6 +27,5 @@ RDEPENDS:${PN} += " \ linux-firmware-ath9k \ linux-firmware-ralink \ iproute2 \ - ${DEMO_PLATFORM_CONF} \ ${TTF_FONTS} \ " |