From 2514406b4caa07b148080f95d19197a8235fc4a9 Mon Sep 17 00:00:00 2001 From: Isaac Hermida Date: Thu, 30 Jan 2025 16:44:07 +0100 Subject: [PATCH] bluez5-init: unify CCMP2 bluetooth init script bluez5-init is a Digi custom recipe to collect the init script needed to bring up the specific platform bluetooth hardware. CCMP1s do not require any bluetooth init extra action. Signed-off-by: Isaac Hermida --- meta-digi-arm/conf/machine/ccmp25-dvk.conf | 3 --- .../firmware-murata-infineon.bb | 13 ------------- .../recipes-connectivity/bluez/bluez5-init.bb | 3 ++- .../bluez/bluez5-init/stm32mpcommon/bluetooth-init | 0 .../stm32mpcommon/bluetooth-init.service | 4 ++-- 5 files changed, 4 insertions(+), 19 deletions(-) rename meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon/cyw55512-bluetooth => meta-digi-dey/recipes-connectivity/bluez/bluez5-init/stm32mpcommon/bluetooth-init (100%) rename meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon/cyw55512-bluetooth.service => meta-digi-dey/recipes-connectivity/bluez/bluez5-init/stm32mpcommon/bluetooth-init.service (73%) diff --git a/meta-digi-arm/conf/machine/ccmp25-dvk.conf b/meta-digi-arm/conf/machine/ccmp25-dvk.conf index 2e3107cae..599aa3220 100644 --- a/meta-digi-arm/conf/machine/ccmp25-dvk.conf +++ b/meta-digi-arm/conf/machine/ccmp25-dvk.conf @@ -122,9 +122,6 @@ WKS_FILES += " \ # Wireless external module HAS_WIFI_VIRTWLANS = "true" -# Remove additional bluetooth packages -MACHINE_BLUETOOTH_EXTRA_INSTALL = "" - # For populate_sdk, gcc-arm-none-eabi_11 has a libpython3 dependency, so we remove it. ST_TOOLS_FOR_SDK:remove = "nativesdk-gcc-arm-none-eabi" diff --git a/meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon.bb b/meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon.bb index 9a526d2fe..aa0096110 100644 --- a/meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon.bb +++ b/meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon.bb @@ -15,8 +15,6 @@ SRC_URI = " \ file://cyfmac4373-sdio_World.clm_blob \ file://cyw4373-autocountry \ file://cyw4373-autocountry.service \ - file://cyw55512-bluetooth \ - file://cyw55512-bluetooth.service \ file://mbt \ " @@ -42,7 +40,6 @@ do_install () { # Install systemd unit files install -d ${D}${systemd_unitdir}/system/ install -m 0644 ${WORKDIR}/cyw4373-autocountry.service ${D}${systemd_unitdir}/system/cyw4373-autocountry.service - install -m 0644 ${WORKDIR}/cyw55512-bluetooth.service ${D}${systemd_unitdir}/system/cyw55512-bluetooth.service fi install -d ${D}${sysconfdir}/init.d/ @@ -51,10 +48,6 @@ do_install () { install -m 0755 ${WORKDIR}/cyw4373-autocountry ${D}${sysconfdir}/cyw4373-autocountry ln -sf /etc/cyw4373-autocountry ${D}${sysconfdir}/init.d/cyw4373-autocountry - # Install bluetooth init service - install -m 0755 ${WORKDIR}/cyw55512-bluetooth ${D}${sysconfdir}/cyw55512-bluetooth - ln -sf /etc/cyw55512-bluetooth ${D}${sysconfdir}/init.d/cyw55512-bluetooth - # Install WLAN client utility binary based on 32-bit/64-bit arch if [ ${TARGET_ARCH} = "aarch64" ]; then install -m 755 ${S}/cyw-fmac-utils-imx64/wl ${D}${sbindir} @@ -109,12 +102,9 @@ inherit update-rc.d systemd INITSCRIPT_PACKAGES += "${PN}-autocountry ${PN}-bluetooth" INITSCRIPT_NAME:${PN}-autocountry = "cyw4373-autocountry" INITSCRIPT_PARAMS:${PN}-autocountry = "start 19 2 3 4 5 . stop 21 0 1 6 ." -INITSCRIPT_NAME:${PN}-bluetooth = "cyw55512-bluetooth" -INITSCRIPT_PARAMS:${PN}-bluetooth = "start 19 2 3 4 5 . stop 21 0 1 6 ." SYSTEMD_PACKAGES = "${PN}-autocountry ${PN}-bluetooth" SYSTEMD_SERVICE:${PN}-autocountry = "cyw4373-autocountry.service" -SYSTEMD_SERVICE:${PN}-bluetooth = "cyw55512-bluetooth.service" PACKAGES =+ " \ ${PN}-mfgtest \ @@ -137,9 +127,6 @@ FILES:${PN}-autocountry = " \ " FILES:${PN}-bluetooth = " \ - ${sysconfdir}/cyw55512-bluetooth \ - ${sysconfdir}/init.d/cyw55512-bluetooth \ - ${systemd_unitdir}/system/cyw55512-bluetooth.service \ ${sbindir}/mbt \ " diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb index 01e54aaeb..fe596bbab 100644 --- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb @@ -60,6 +60,7 @@ RDEPENDS:${PN} = "initscripts-functions" # IW61x Bluetooth support requires the WiFi FW support RDEPENDS:${PN}:append:ccimx9 = " firmware-nxp-wifi-nxpiw612-sdio" +RDEPENDS:${PN}:append:ccmp25 = " firmware-murata-infineon" PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8m|ccimx8x|ccimx9)" +COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8m|ccimx8x|ccimx9|ccmp25)" diff --git a/meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon/cyw55512-bluetooth b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/stm32mpcommon/bluetooth-init similarity index 100% rename from meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon/cyw55512-bluetooth rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-init/stm32mpcommon/bluetooth-init diff --git a/meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon/cyw55512-bluetooth.service b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/stm32mpcommon/bluetooth-init.service similarity index 73% rename from meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon/cyw55512-bluetooth.service rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-init/stm32mpcommon/bluetooth-init.service index 167450918..9b79a78e5 100644 --- a/meta-digi-arm/recipes-bsp/firmware-murata-infineon/firmware-murata-infineon/cyw55512-bluetooth.service +++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/stm32mpcommon/bluetooth-init.service @@ -4,9 +4,9 @@ After=network.target suspend.target ConditionPathIsDirectory=/proc/device-tree/bluetooth [Service] +ExecStart=/etc/bluetooth-init start +ExecStop=/etc/bluetooth-init stop Type=forking -ExecStart=/etc/cyw55512-bluetooth start -ExecStop=/etc/cyw55512-bluetooth stop [Install] WantedBy=multi-user.target suspend.target