package/linux-firmware: add missing nvs file for the wl18xx firmware

The wl18xx shares the same wlcore as the wl1271 and needs the
wl1271-nvs.bin file.  Also, refactor some comments and list items.

Signed-off-by: Marc-Andre Chenier <mac@vrvana.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Tested-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk
index 25a942a10ac87dd70c4e1b3ca4074ce16bfc5085..87804d82af825e7a7a1e22be9e9a4e72cd27d734 100644 (file)
--- a/package/linux-firmware/linux-firmware.mk
+++ b/package/linux-firmware/linux-firmware.mk
@@ -151,6 +151,7 @@ endif
 
 # wl128x
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X),y)
+# wl1271-nvs.bin and wl12xx-nvs.bin are symlinks to wl127x-nvs.bin
 LINUX_FIRMWARE_FILES += \
        ti-connectivity/wl128x-fw-3.bin                         \
        ti-connectivity/wl128x-fw-ap.bin                        \
@@ -159,6 +160,7 @@ LINUX_FIRMWARE_FILES += \
        ti-connectivity/wl1271-nvs.bin                          \
        ti-connectivity/wl128x-nvs.bin                          \
        ti-connectivity/wl12xx-nvs.bin                          \
+       ti-connectivity/wl127x-nvs.bin                          \
        ti-connectivity/wl128x-fw-4-mr.bin                      \
        ti-connectivity/wl128x-fw-4-plt.bin                     \
        ti-connectivity/wl128x-fw-4-sr.bin                      \
@@ -166,18 +168,19 @@ LINUX_FIRMWARE_FILES += \
        ti-connectivity/wl128x-fw-5-plt.bin                     \
        ti-connectivity/wl128x-fw-5-sr.bin                      \
        ti-connectivity/TIInit_7.2.31.bts
-# wl12xx-nvs.bin (above) is a symlink to:
-LINUX_FIRMWARE_FILES += ti-connectivity/wl127x-nvs.bin
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity
 endif
 
 # wl18xx
 ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX),y)
+# wl1271-nvs.bin is a symlink to wl127x-nvs.bin
 LINUX_FIRMWARE_FILES += \
        ti-connectivity/wl18xx-fw.bin \
        ti-connectivity/wl18xx-fw-2.bin \
        ti-connectivity/wl18xx-fw-3.bin \
        ti-connectivity/wl18xx-fw-4.bin \
+       ti-connectivity/wl1271-nvs.bin \
+       ti-connectivity/wl127x-nvs.bin \
        ti-connectivity/TIInit_7.2.31.bts
 LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity
 endif