<div dir="ltr"><br><br>On 22 August 2018 at 17:41, Martin Jansa &lt;<a href="mailto:martin.jansa@gmail.com">martin.jansa@gmail.com</a>&gt; wrote:<br>&gt;<br>&gt; The &quot;cd ${D}${nonarch_base_libdir}/firmware/brcm/&quot; doesn&#39;t seem to be needed, just include the path in 2nd ln parameter.<br><br>Thanks Martin, and sorry for being so dumb. I&#39;ll send another series at some point, but for now, the patch looks like this:<br><br>diff --git a/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb">linux-firmware_git.bb</a> b/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb">linux-firmware_git.bb</a><br>index 8c54f28..70d4f6a 100644<br>--- a/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb">linux-firmware_git.bb</a><br>+++ b/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb">linux-firmware_git.bb</a><br>@@ -226,6 +226,18 @@ do_install() {<br>        ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . )<br> }<br> <br>+# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will create a<br>+# softlink for the module specific NVRAM file to the filename expected<br>+# by the Linux kernel<br>+FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-mur1dx = &quot; ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt&quot;<br>+do_install_append_bcm43430-nvram-mur1dx() {<br>+       ln -sf brcmfmac43430-sdio.MUR1DX.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt<br>+}<br>+FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-ap6212 = &quot;${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt&quot;<br>+do_install_append_bcm43430-nvram-ap6212() {<br>+       ln -sf brcmfmac43430-sdio.AP6212.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt<br>+}<br>+<br><br>So now the ln issue is resolved, I&#39;m not convinced my MACHINEOVERRIDES is the correct approach. Does anyone have any feedback on how I can improve that?<br><br>As per my cover letter, I originally wanted to be able to provide a MACHINE_EXTRA_RRECOMMENDS, or similar, but I&#39;m not familiar with how to get an _append to apply based on that variable, unless I tested it incorrectly (again).<div><br></div><div>If I add, say, &quot;linux-firmware-bcm43430-nvram-mur1dx&quot; to <span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">MACHINE_EXTRA_RRECOMMENDS, should this work:</span></div><div><br></div><div><span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">+FILES_${PN}-bcm43430-nvram_append_${PN}-bcm43430-nvram-mur1dx = &quot; ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt&quot;</span><br style="font-size:small;text-decoration-style:initial;text-decoration-color:initial"><span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">+do_install_append_${PN}-bcm43430-nvram-mur1dx() {</span><br style="font-size:small;text-decoration-style:initial;text-decoration-color:initial"><span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">+       ln -sf brcmfmac43430-sdio.MUR1DX.txt ${D}${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt</span><br style="font-size:small;text-decoration-style:initial;text-decoration-color:initial"><span style="font-size:small;background-color:rgb(255,255,255);text-decoration-style:initial;text-decoration-color:initial;float:none;display:inline">+}</span><br> </div><div>Or is there a better way of achieving this?</div><div><br></div><div><br>&gt;<br>&gt;<br>&gt; On Wed, Aug 22, 2018 at 6:30 PM Ryan Harkin &lt;<a href="mailto:ryan.harkin@linaro.org">ryan.harkin@linaro.org</a>&gt; wrote:<br>&gt;&gt;<br>&gt;&gt; The Linux kernel currently expects a single NVRAM file for BCM43430<br>&gt;&gt; named brcmfmac43430-sdio.txt.<br>&gt;&gt;<br>&gt;&gt; Allow the machine to specify an override to link its module specific<br>&gt;&gt; NVRAM to the filename expected by the kernel.<br>&gt;&gt;<br>&gt;&gt; Signed-off-by: Ryan Harkin &lt;<a href="mailto:ryan.harkin@linaro.org">ryan.harkin@linaro.org</a>&gt;<br>&gt;&gt; ---<br>&gt;&gt;  meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb">linux-firmware_git.bb</a> | 12 ++++++++++++<br>&gt;&gt;  1 file changed, 12 insertions(+)<br>&gt;&gt;<br>&gt;&gt; diff --git a/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb">linux-firmware_git.bb</a> b/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb">linux-firmware_git.bb</a><br>&gt;&gt; index 8c54f28..b647abc 100644<br>&gt;&gt; --- a/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb">linux-firmware_git.bb</a><br>&gt;&gt; +++ b/meta/recipes-kernel/linux-firmware/<a href="http://linux-firmware_git.bb">linux-firmware_git.bb</a><br>&gt;&gt; @@ -226,6 +226,18 @@ do_install() {<br>&gt;&gt;         ( cd ${D}${nonarch_base_libdir}/firmware ; ln -sf ti-connectivity/* . )<br>&gt;&gt;  }<br>&gt;&gt;<br>&gt;&gt; +# Adding bcm43430-nvram-{module type} to MACHINEOVERRIDES will create a<br>&gt;&gt; +# softlink for the module specific NVRAM file to the filename expected<br>&gt;&gt; +# by the Linux kernel<br>&gt;&gt; +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-mur1dx = &quot; ${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt&quot;<br>&gt;&gt; +do_install_append_bcm43430-nvram-mur1dx() {<br>&gt;&gt; +       ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.MUR1DX.txt brcmfmac43430-sdio.txt)<br>&gt;&gt; +}<br>&gt;&gt; +FILES_${PN}-bcm43430-nvram_append_bcm43430-nvram-ap6212 = &quot;${nonarch_base_libdir}/firmware/brcm/brcmfmac43430-sdio.txt&quot;<br>&gt;&gt; +do_install_append_bcm43430-nvram-ap6212() {<br>&gt;&gt; +       ( cd ${D}${nonarch_base_libdir}/firmware/brcm/ ; ln -sf brcmfmac43430-sdio.AP6212.txt brcmfmac43430-sdio.txt)<br>&gt;&gt; +}<br>&gt;&gt; +<br>&gt;&gt;<br>&gt;&gt;  PACKAGES =+ &quot;${PN}-ralink-license ${PN}-ralink \<br>&gt;&gt;               ${PN}-mt7601u-license ${PN}-mt7601u \<br>&gt;&gt; --<br>&gt;&gt; 2.7.4<br>&gt;&gt;<br></div></div>