From: Marek Vasut <marex@denx.de>
Date: Tue, 1 Nov 2022 21:34:46 +0000 (+0100)
Subject: bluez5: Point hciattach bcm43xx firmware search path to /lib/firmware
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~2655
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=72b3b79ad8b980e8dd9470d16b72c2c70072bbc0;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

bluez5: Point hciattach bcm43xx firmware search path to /lib/firmware

Currently the hciattach bcm43xx firmware loader looks up the firmware
blob in /etc/firmware . Change this to /lib/firmware instead, so that
the path is consistent with Linux kernel which also looks up firmware
for the WiFi part in /lib/firmware .

Signed-off-by: Marek Vasut <marex@denx.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---

diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc
index f07e318897d..a8eaba1dd6a 100644
--- a/meta/recipes-connectivity/bluez5/bluez5.inc
+++ b/meta/recipes-connectivity/bluez5/bluez5.inc
@@ -68,6 +68,8 @@ EXTRA_OECONF = "\
   --without-zsh-completion-dir \
 "
 
+CFLAGS += "-DFIRMWARE_DIR=\\"${nonarch_base_libdir}/firmware\\""
+
 # bluez5 builds a large number of useful utilities but does not
 # install them.  Specify which ones we want put into ${PN}-noinst-tools.
 NOINST_TOOLS_READLINE ??= ""