Skip to contentSkip to conversation

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

PATCH Superseded Marek Vasut 3 participants 4 messages Nov 1, 2022

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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 .

---
Cc: Alexander Kanavin <[email protected]>
Cc: Alexandre Belloni <[email protected]>
Cc: Richard Purdie <[email protected]>
---
V2: Replace hard-coded /lib with ${nonarch_base_libdir}

---
 meta/recipes-connectivity/bluez5/bluez5.inc | 2 ++
 1 file changed, 2 insertions(+)
meta/recipes-connectivity/bluez5/bluez5.inc +2 -0
index f07e318897..a2aa7b86c4 100644
@@ -68,6 +68,8 @@ EXTRA_OECONF = "\
   --without-zsh-completion-dir \
 "
 
+CFLAGS:append = " -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 ??= ""
Signature · 1 line
2.35.1
#1 lore raw
Quoted 21 lines · Marek Vasut

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 .

---
Cc: Alexander Kanavin <[email protected]>
Cc: Alexandre Belloni <[email protected]>
Cc: Richard Purdie <[email protected]>
---
V2: Replace hard-coded /lib with ${nonarch_base_libdir}

---
  meta/recipes-connectivity/bluez5/bluez5.inc | 2 ++
  1 file changed, 2 insertions(+)
meta/recipes-connectivity/bluez5/bluez5.inc +0 -0
index f07e318897..a2aa7b86c4 100644

meta/recipes-connectivity/bluez5/bluez5.inc EXTRA_OECONF = "\ · line 71

Quoted 4 lines
meta/recipes-connectivity/bluez5/bluez5.inc +1 -0
@@ -68,6 +68,8 @@ EXTRA_OECONF = "\
    --without-zsh-completion-dir \
  "
 
+CFLAGS:append = " -DFIRMWARE_DIR=\\"${nonarch_base_libdir}/firmware\\""

why do we use append and not += here ?

Quoted 15 lines
meta/recipes-connectivity/bluez5/bluez5.inc +1 -1
+
  # 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 ??= ""
 
 
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#172359): https://lists.openembedded.org/g/openembedded-core/message/172359
Mute This Topic: https://lists.openembedded.org/mt/94707064/1997914
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#2 lore raw
Quoted 17 lines · Khem Raj
Quoted 16 lines · Marek Vasut

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 .

---
Cc: Alexander Kanavin <[email protected]>
Cc: Alexandre Belloni <[email protected]>
Cc: Richard Purdie <[email protected]>
---
V2: Replace hard-coded /lib with ${nonarch_base_libdir}
---
  meta/recipes-connectivity/bluez5/bluez5.inc | 2 ++

  1 file changed, 2 insertions(+)
Quoted 10 lines
Quoted 8 lines
meta/recipes-connectivity/bluez5/bluez5.inc +0 -0
index f07e318897..a2aa7b86c4 100644
@@ -68,6 +68,8 @@ EXTRA_OECONF = "\
     --without-zsh-completion-dir \

  "
+CFLAGS:append = " -DFIRMWARE_DIR=\\"${nonarch_base_libdir}/firmware\\""

why do we use append and not += here ?

Isn't the override syntax preferred now ?

#3 lore raw
Quoted 4 lines · Marek Vasut via lists.openembedded.org
Quoted 2 lines
Quoted 1 line

+CFLAGS:append = " -DFIRMWARE_DIR=\\"${nonarch_base_libdir}/firmware\\""

why do we use append and not += here ?

Isn't the override syntax preferred now ?

Different behaviour for different purposes. += would be idiomatic here.

Ross