From 0f13b08e09b9fbb99e52d446504e4d2681ca437f Mon Sep 17 00:00:00 2001 From: Scott Murray Date: Thu, 5 Sep 2024 15:25:20 -0400 Subject: 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 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 --- recipes-platform/packagegroups/packagegroup-agl-demo.bb | 8 -------- 1 file changed, 8 deletions(-) (limited to 'recipes-platform/packagegroups') 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} \ " -- cgit 1.2.3-korg