From a0b7db0c1e7ae817da68a0f157dbf843b2afbaba Mon Sep 17 00:00:00 2001
From: Romuald JEANNE <romuald.jeanne@st.com>
Date: Thu, 18 Jun 2020 14:51:31 +0200
Subject: [PATCH] LINUX-FIRMWARE: manage specific RRECOMMENDS for wifi and bt
 suspend service

Change-Id: Iaadd03f1ed30442f9f4c29bc07a8bba6f080a972
---
 .../linux-firmware-bluetooth-bcm4343.bb       | 20 +++++++++++--------
 .../linux-firmware/linux-firmware_%.bbappend  |  2 ++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/recipes-kernel/linux-firmware/linux-firmware-bluetooth-bcm4343.bb b/recipes-kernel/linux-firmware/linux-firmware-bluetooth-bcm4343.bb
index b3ebec9..9f2f37f 100644
--- a/recipes-kernel/linux-firmware/linux-firmware-bluetooth-bcm4343.bb
+++ b/recipes-kernel/linux-firmware/linux-firmware-bluetooth-bcm4343.bb
@@ -1,16 +1,20 @@
 # Copyright (C) 2018, STMicroelectronics - All Rights Reserved
 
-DESCRIPTION = "Bluetooth firmware for BCM4343"
+SUMMARY = "Bluetooth firmware for BCM4343"
 HOMEPAGE = "https://github.com/murata-wireless/cyw-bt-patch"
 LICENSE = "Firmware-cypress-bcm4343"
 LIC_FILES_CHKSUM = "file://LICENCE.cypress;md5=cbc5f665d04f741f1e006d2096236ba7"
 
+NO_GENERIC_LICENSE[Firmware-cypress-bcm4343] = "LICENCE.cypress"
+
+inherit allarch
+
 SRC_URI = "git://github.com/murata-wireless/cyw-bt-patch;protocol=https"
 SRCREV = "f819145223f1f99d3fc81a62c2ea2789d797d7b0"
 
 S = "${WORKDIR}/git"
 
-inherit allarch
+PACKAGES =+ "${PN}-cypress-license"
 
 do_install() {
     install -d ${D}${nonarch_base_libdir}/firmware/brcm/
@@ -19,15 +23,15 @@ do_install() {
     install -m 644 ${S}/LICENCE.cypress ${D}${nonarch_base_libdir}/firmware/LICENCE.cypress_bcm4343
 }
 
-PACKAGES =+ "${PN}-cypress-license"
-FILES_${PN} = " ${nonarch_base_libdir}/firmware/ "
-
-NO_GENERIC_LICENSE[Firmware-cypress-bcm4343] = "LICENCE.cypress"
 LICENSE_${PN} = "Firmware-cypress-bcm4343"
+LICENSE_${PN}-cypress-license = "Firmware-cypress-bcm4343"
+
+FILES_${PN}-cypress-license = "${nonarch_base_libdir}/firmware/LICENCE.cypress_bcm4343"
+FILES_${PN} = "${nonarch_base_libdir}/firmware/"
+
 RDEPENDS_${PN} += "${PN}-cypress-license"
 
-LICENSE_${PN}-cypress-license = "Firmware-cypress-bcm4343"
-FILES_${PN}-cypress-license = "${nonarch_base_libdir}/firmware/LICENCE.cypress_bcm4343"
+RRECOMMENDS_${PN}_append_stm32mpcommon += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'bluetooth-suspend', '', d)}"
 
 # Firmware files are generally not ran on the CPU, so they can be
 # allarch despite being architecture specific
diff --git a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
index 1083b60..551aaae 100644
--- a/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
+++ b/recipes-kernel/linux-firmware/linux-firmware_%.bbappend
@@ -23,3 +23,5 @@ FILES_${PN}-bcm43430_append_stm32mpcommon = " \
   ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.clm_blob \
 "
 RDEPENDS_${PN}-bcm43430_remove_stm32mpcommon = " ${PN}-cypress-license "
+
+RRECOMMENDS_${PN}-bcm43430_append_stm32mpcommon += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'wifi-suspend', '', d)}"