| Message ID | 20221101115445.18282-1-marex@denx.de |
|---|---|
| State | Accepted, archived |
| Commit | 72b3b79ad8b980e8dd9470d16b72c2c70072bbc0 |
| Headers | show |
| Series | [v2] bluez5: Point hciattach bcm43xx firmware search path to /lib/firmware | expand |
On 11/1/22 4:54 AM, Marek Vasut wrote: > 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> > --- > Cc: Alexander Kanavin <alex@linutronix.de> > Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> > Cc: Richard Purdie <richard.purdie@linuxfoundation.org> > --- > V2: Replace hard-coded /lib with ${nonarch_base_libdir} > --- > meta/recipes-connectivity/bluez5/bluez5.inc | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc > index f07e318897..a2aa7b86c4 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:append = " -DFIRMWARE_DIR=\\"${nonarch_base_libdir}/firmware\\"" why do we use append and not += here ? > + > # 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: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [raj.khem@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On 11/1/22 21:41, Khem Raj wrote: > On 11/1/22 4:54 AM, Marek Vasut wrote: >> 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> >> --- >> Cc: Alexander Kanavin <alex@linutronix.de> >> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> >> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> >> --- >> V2: Replace hard-coded /lib with ${nonarch_base_libdir} >> --- >> meta/recipes-connectivity/bluez5/bluez5.inc | 2 ++ >> 1 file changed, 2 insertions(+) >> >> diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc >> b/meta/recipes-connectivity/bluez5/bluez5.inc >> index f07e318897..a2aa7b86c4 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:append = " -DFIRMWARE_DIR=\\"${nonarch_base_libdir}/firmware\\"" > > why do we use append and not += here ? Isn't the override syntax preferred now ?
On 1 Nov 2022, at 21:02, Marek Vasut via lists.openembedded.org <marex=denx.de@lists.openembedded.org> wrote: >>> +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
diff --git a/meta/recipes-connectivity/bluez5/bluez5.inc b/meta/recipes-connectivity/bluez5/bluez5.inc index f07e318897..a2aa7b86c4 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: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 ??= ""
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> --- Cc: Alexander Kanavin <alex@linutronix.de> Cc: Alexandre Belloni <alexandre.belloni@bootlin.com> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> --- V2: Replace hard-coded /lib with ${nonarch_base_libdir} --- meta/recipes-connectivity/bluez5/bluez5.inc | 2 ++ 1 file changed, 2 insertions(+)