firmware-nxp-wifi: Use FILES += and keep order.FILES notes per oelint

The firmware is split into per-chip sub-packages, and each block keeps
its FILES assignment beside the matching RDEPENDS/RPROVIDES/RREPLACES/
RCONFLICTS so a package's definition reads as a unit. oelint flags this
two ways:

- oelint.var.filesoverride on every FILES:${PN}-<pkg> = assignment.
  Switch these to += (the vars are never otherwise set, so this is
  behaviourally identical) and the override check no longer fires.
- oelint.var.order.FILES, because interleaving each package's FILES with
  its own R* vars means a later FILES lands after an earlier RDEPENDS/
  RCONFLICTS. Clearing it would mean scattering all FILES to the top and
  breaking the per-package grouping, so keep an inline # nooelint:
  oelint.var.order.FILES per block instead.

No functional change.

Signed-off-by: Luciano Dittgen <luciano.dittgen@ossystems.com.br>

1 files changed, 19 insertions, 8 deletions

diff --git a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
index ffe86d15c..20b56421d 100644
--- a/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
+++ b/recipes-bsp/firmware-imx/firmware-nxp-wifi_1.1.bb
@@ -74,12 +74,15 @@ RDEPENDS:${PN}-all-usb = "\
     ${PN}-nxpiw610-usb \
 "
 
-FILES:${PN}-nxp-common = "\
+# The firmware is split into per-chip sub-packages; each block keeps its FILES
+# beside the matching R* vars for readability.
+# nooelint: oelint.var.order.FILES
+FILES:${PN}-nxp-common += "\
     ${nonarch_base_libdir}/firmware/nxp/wifi_mod_para.conf \
     ${nonarch_base_libdir}/firmware/nxp/helper_uart_3000000.bin \
 "
 
-FILES:${PN}-nxp8987-sdio = "\
+FILES:${PN}-nxp8987-sdio += "\
     ${nonarch_base_libdir}/firmware/nxp/*8987* \
 "
 RDEPENDS:${PN}-nxp8987-sdio += "${PN}-nxp-common"
@@ -87,11 +90,12 @@ RPROVIDES:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio"
 RREPLACES:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio"
 RCONFLICTS:${PN}-nxp8987-sdio = "linux-firmware-nxp8987-sdio"
 
-FILES:${PN}-nxp8997-sdio = "\
+# nooelint: oelint.var.order.FILES
+FILES:${PN}-nxp8997-sdio += "\
     ${nonarch_base_libdir}/firmware/mrvl/sdiouart8997_combo_v4.bin \
 "
 
-FILES:${PN}-nxp9098-common = "\
+FILES:${PN}-nxp9098-common += "\
     ${nonarch_base_libdir}/firmware/nxp/ed_mac_ctrl_V3_909x.conf \
     ${nonarch_base_libdir}/firmware/nxp/txpwrlimit_cfg_9098.conf \
     ${nonarch_base_libdir}/firmware/nxp/uart9098_bt_v1.bin \
@@ -101,7 +105,8 @@ RPROVIDES:${PN}-nxp9098-common = "linux-firmware-nxp9098-common"
 RREPLACES:${PN}-nxp9098-common = "linux-firmware-nxp9098-common"
 RCONFLICTS:${PN}-nxp9098-common = "linux-firmware-nxp9098-common"
 
-FILES:${PN}-nxp9098-pcie = "\
+# nooelint: oelint.var.order.FILES
+FILES:${PN}-nxp9098-pcie += "\
     ${nonarch_base_libdir}/firmware/nxp/pcie*9098* \
 "
 RDEPENDS:${PN}-nxp9098-pcie += "${PN}-nxp9098-common"
@@ -109,7 +114,8 @@ RPROVIDES:${PN}-nxp9098-pcie = "linux-firmware-nxp9098-pcie"
 RREPLACES:${PN}-nxp9098-pcie = "linux-firmware-nxp9098-pcie"
 RCONFLICTS:${PN}-nxp9098-pcie = "linux-firmware-nxp9098-pcie"
 
-FILES:${PN}-nxp9098-sdio = "\
+# nooelint: oelint.var.order.FILES
+FILES:${PN}-nxp9098-sdio += "\
     ${nonarch_base_libdir}/firmware/nxp/sd*9098* \
 "
 RDEPENDS:${PN}-nxp9098-sdio += "${PN}-nxp9098-common"
@@ -117,13 +123,15 @@ RPROVIDES:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio"
 RREPLACES:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio"
 RCONFLICTS:${PN}-nxp9098-sdio = "linux-firmware-nxp9098-sdio"
 
+# nooelint: oelint.var.order.FILES
 FILES:${PN}-nxpaw693-pcie += "\
     ${nonarch_base_libdir}/firmware/nxp/pcie*aw693* \
     ${nonarch_base_libdir}/firmware/nxp/uart*aw693* \
 "
 RDEPENDS:${PN}-nxpaw693-pcie += "${PN}-nxp-common"
 
-FILES:${PN}-nxpiw416-sdio = "\
+# nooelint: oelint.var.order.FILES
+FILES:${PN}-nxpiw416-sdio += "\
     ${nonarch_base_libdir}/firmware/mrvl/sdiouartiw416_combo_v0.bin \
     ${nonarch_base_libdir}/firmware/nxp/*iw416* \
 "
@@ -132,6 +140,7 @@ RPROVIDES:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio"
 RREPLACES:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio"
 RCONFLICTS:${PN}-nxpiw416-sdio = "linux-firmware-nxpiw416-sdio"
 
+# nooelint: oelint.var.order.FILES
 FILES:${PN}-nxpiw610-sdio += "\
     ${nonarch_base_libdir}/firmware/nxp/sd_iw610.bin.se \
     ${nonarch_base_libdir}/firmware/nxp/sduart_iw610.bin.se \
@@ -144,12 +153,14 @@ RPROVIDES:${PN}-nxpiw610-sdio = "linux-firmware-nxpiw610-sdio"
 RREPLACES:${PN}-nxpiw610-sdio = "linux-firmware-nxpiw610-sdio"
 RCONFLICTS:${PN}-nxpiw610-sdio = "linux-firmware-nxpiw610-sdio"
 
+# nooelint: oelint.var.order.FILES
 FILES:${PN}-nxpiw610-usb += "\
     ${nonarch_base_libdir}/firmware/nxp/usb*_iw610.bin.se \
 "
 RDEPENDS:${PN}-nxpiw610-usb += "${PN}-nxp-common"
 
-FILES:${PN}-nxpiw612-sdio = "\
+# nooelint: oelint.var.order.FILES
+FILES:${PN}-nxpiw612-sdio += "\
     ${nonarch_base_libdir}/firmware/nxp/sd_w61x_v1.bin.se \
     ${nonarch_base_libdir}/firmware/nxp/sduart_nw61x_*.bin.se \
     ${nonarch_base_libdir}/firmware/nxp/uartspi_n61x_*.bin.se \