Wrong nvram config path for firmware-samsung-gtelwifi-wifi

Describe your issue

What's the expected behaviour?

The nvram config for the bcm4343 module to be installed at the same path configured in the kernel (currently, /lib/firmware/postmarketos/bcm4343/nvram_4343.txt)

What's the current behaviour?

The configuration is installed in /lib/firmware/postmarketos/bcm4343/nvram_mfg.txt, while, the kernel 3.10.17 is configured with /lib/firmware/postmarketos/bcm4343/nvram_4343.txt

How to reproduce your issue?

What device are you using?

samsung-gtelwifi

On what postmarketOS version did you encounter the issue?

• edge (master branch)
• v21.12
• v21.06 (supported until 2022-01-29)

On what environment did you encounter the issue?

Phone environments

• Phosh
• Plasma Mobile
• Sxmo (Wayland/Sway)

Other

• No environment
• GNOME
• KDE Plasma
• Kodi
• MATE
• Shelli
• Sway
• Weston
• Xfce4
• fbkeyboard
• i3wm
• Sxmo (Xorg/Dwm)

How did you get postmarketOS image?

• from https://images.postmarketos.org
• I built it using pmbootstrap
• It was preinstalled on my device

What's the build date of the image? (in yyyy-mm-dd format)

Additional information

This is the log right after a clean installation:

# dmesg | grep -i dhd
               Compiled in drivers/net/wireless/bcmdhd on Sep  6 2021 at 13:31:47
[   69.990936] [c0] DHD: dongle ram size is set to 524288(orig 524288) at 0x0
[   69.991485] [c0] dhdsdio_download_firmware: firmware path=/lib/firmware/postmarketos/bcm4343/bcmdhd_mfg.bin, nvram path=/lib/firmware/postmarketos/bcm4343/nvram_4343.txt
[   70.053924] [c0] _dhdsdio_download_firmware: dongle nvram file download failed
[   70.054016] [c0] dhd_net_bus_devreset: dhd_bus_devreset: -35
[   70.054138] [c0] dhd_open : wl_android_wifi_on failed (-35)
[   70.054168] [c0] dhd_prot_ioctl : bus is down. we have nothing to do
[   70.054199] [c0] dhd_wl_ioctl: WLC_IOCTL: cmd: 3, ret = -1
[   70.054199] [c0] dhd_net_bus_devreset: dhd_bus_devreset: -35

As a workaround, just rename the current file and reboot:

$ cd /lib/firmware/postmarketos/bcm4343
$ sudo mv nvram_mfg.txt nvram_4343.txt

Note that the file is from http://pkgs.postmarketos.org/package/master/postmarketos/armv7/firmware-samsung-gtelwifi-wifi