[OE-core] [RFC 3/3] linux-firmware: MACHINEOVERRIDES for BCM43430 NVRAM

[Ryan Harkin]

This is curious!

On 22 August 2018 at 17:56, Martin Jansa <martin.jansa at gmail.com> wrote:

> cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf
> brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt
>
> is the same as
>
> ln -sf brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/fir
> mware/brcm/brcmfmac43430-sdio.txt
>

On my system, this is what happens when I'm in the root of the
linux-firmware repo:

$ ls -al brcm/*.txt
-rw-rw-r-- 1 ryan ryan 875 Aug 22 18:08 brcm/brcmfmac43430-sdio.AP6212.txt
-rw-rw-r-- 1 ryan ryan 831 Aug 21 14:48 brcm/brcmfmac43430-sdio.MUR1DX.txt

$ ln -sf brcm/brcmfmac43430-sdio.AP6212.txt brcm/brcmfmac43430-sdio.txt

$ ls -al brcm/*.txt
-rw-rw-r-- 1 ryan ryan 875 Aug 22 18:08 brcm/brcmfmac43430-sdio.AP6212.txt
-rw-rw-r-- 1 ryan ryan 831 Aug 21 14:48 brcm/brcmfmac43430-sdio.MUR1DX.txt
lrwxrwxrwx 1 ryan ryan  34 Aug 22 18:08 brcm/brcmfmac43430-sdio.txt ->
brcm/brcmfmac43430-sdio.AP6212.txt

And the file is not valid.

$ cat brcm/brcmfmac43430-sdio.txt
cat: brcm/brcmfmac43430-sdio.txt: No such file or directory

So perhaps I'm doing something wrong. I tried your suggestion originally
and it didn't work for me. Maybe I made a typo or something?



> On Wed, Aug 22, 2018 at 6:47 PM Ryan Harkin <ryan.harkin at linaro.org>
> wrote:
>
>>
>>
>> On 22 August 2018 at 17:41, Martin Jansa <martin.jansa at gmail.com> wrote:
>>
>>> The "cd ${D}${nonarch_base_libdir}/firmware/brcm/" doesn't seem to be
>>> needed, just include the path in 2nd ln parameter.
>>>
>>
>> I don't think that works, or at least, it doesn't work for me, so I may
>> be doing something wrong. I'm also copying the example used in the
>> do_install() a few lines up as I figured that would be the preferred style
>> for this recipe.
>>
>>
>>> On Wed, Aug 22, 2018 at 6:30 PM Ryan Harkin <ryan.harkin at linaro.org>
>>> wrote:
>>>
>>>> The Linux kernel currently expects a single NVRAM file for BCM43430
>>>> named brcmfmac43430-sdio.txt.
>>>>
>>>> Allow the machine to specify an override to link its module specific
>>>> NVRAM to the filename expected by the kernel.
>>>>
>>>> Signed-off-by: Ryan Harkin <ryan.harkin at linaro.org>
>>>> ---
>>>>  meta/recipes-kernel/linux-firmware/linux-firmware_git.bb | 12
>>>> ++++++++++++
>>>>  1 file changed, 12 insertions(+)
>>>>
>>>> diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
>>>> b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
>>>> index 8c54f28..b647abc 100644
>>>> --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
>>>> +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
>>>> @@ -226,6 +226,18 @@ do_install() {
>>>>         ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf
>>>> ti-connectivity/* . )
>>>>  }
>>>>
>>>> +# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will create a
>>>> +# softlink for the module specific NVRAM file to the filename expected
>>>> +# by the Linux kernel
>>>> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-mur1dx = "
>>>> ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt"
>>>> +do_install_append_bcm43430-nvram-mur1dx() {
>>>> +       ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf
>>>> brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt)
>>>> +}
>>>> +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-ap6212 =
>>>> "${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt"
>>>> +do_install_append_bcm43430-nvram-ap6212() {
>>>> +       ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf
>>>> brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt)
>>>> +}
>>>> +
>>>>
>>>>  PACKAGES =+ "${PN}-ralink-license ${PN}-ralink \
>>>>               ${PN}-mt7601u-license ${PN}-mt7601u \
>>>> --
>>>> 2.7.4
>>>>
>>>>
>>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20180822/396f38c7/attachment-0002.html>