ramdisk-image: Add wifi firmwares for TI chips

And make it dependent on MACHINE_FEATURES.

These firmwares are required for the chip to function properly.

id:425378

.gitmodules

@@ -2,3 +2,7 @@
 	path = coreos
 	url = ssh://git@bitbucket.gad.local:7999/ico/coreos.git
 	branch = master
+[submodule "layers/meta-netmodule-wlan"]
+	path = layers/meta-netmodule-wlan
+	url = gitea@git.netmodule.intranet:nrsw-oe/meta-netmodule-wlan.git
+	branch = kirkstone

layers/meta-netmodule-legacy-bsp/conf/machine/include/am335x-nrhw16-nrhw24.inc

@@ -12,3 +12,8 @@ KERNEL_DEVICETREE = "\
 DEBUG_SERIAL_CONSOLE ?= "115200;ttyS1"
 COMIO_SERIAL_CONSOLE ?= "115200;ttyS0"
 SERIAL_CONSOLES = "${DEBUG_SERIAL_CONSOLE} ${COMIO_SERIAL_CONSOLE}"
+
+MACHINE_FEATURES += " \
+	wifi \
+	ti-wifi \
+	"

layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw20.conf

@@ -15,3 +15,8 @@ KERNEL_DEVICETREE = "\
 EXT_SERIAL_CONSOLE ?= "115200;ttyS1"
 COMIO_SERIAL_CONSOLE ?= "115200;ttyS0"
 SERIAL_CONSOLES = "${EXT_SERIAL_CONSOLE} ${COMIO_SERIAL_CONSOLE}"
+
+MACHINE_FEATURES += " \
+	wifi \
+	ti-wifi \
+	"

layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw22.conf

@@ -14,3 +14,8 @@ KERNEL_DEVICETREE = "\
 
 DEBUG_SERIAL_CONSOLE ?= "115200;ttyS0"
 SERIAL_CONSOLES = "${DEBUG_SERIAL_CONSOLE}"
+
+MACHINE_FEATURES += " \
+	wifi \
+	ti-wifi \
+	"

layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw25.conf

@@ -16,3 +16,8 @@ KERNEL_DEVICETREE = "\
 EXT_SERIAL_CONSOLE ?= "115200;ttyS5"
 DEBUG_SERIAL_CONSOLE ?= "115200;ttyS0"
 SERIAL_CONSOLES = "${EXT_SERIAL_CONSOLE} ${DEBUG_SERIAL_CONSOLE}"
+
+MACHINE_FEATURES += " \
+	wifi \
+	ti-wifi \
+	"

layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw26.conf

@@ -14,3 +14,8 @@ KERNEL_DEVICETREE = "\
 
 EXT_SERIAL_CONSOLE ?= "115200;ttyS2"
 SERIAL_CONSOLES = "${EXT_SERIAL_CONSOLE}"
+
+MACHINE_FEATURES += " \
+	wifi \
+	ti-wifi \
+	"

layers/meta-netmodule-wlan

@@ -0,0 +1 @@
+Subproject commit e14df2a2ec15acca43b3bd14f2b9df75c7933904

layers/meta-nwl-distro/conf/distro/nwl.conf

@@ -41,3 +41,8 @@ PACKAGECONFIG:pn-bluez5 = "systemd udev"
 
 # Wit busybox "less" the output of "nmcli c" does not show up properly
 RDEPENDS:networkmanager-nmcli += "less"
+
+
+# Dependency to meta-netmodule-wlan
+# Reduce priority as we want only what we explicitly take from this layer
+BBFILE_PRIORITY_netmodule-wlan = "1"

layers/meta-nwl-distro/conf/layer.conf

@@ -9,7 +9,8 @@ BBFILE_COLLECTIONS += "meta-nwl-distro"
 BBFILE_PATTERN_meta-nwl-distro = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-nwl-distro = "6"
 
-LAYERDEPENDS_meta-nwl-distro = "core"
+LAYERDEPENDS_meta-nwl-distro = "core netmodule-wlan"
+
 LAYERSERIES_COMPAT_meta-nwl-distro = "kirkstone"
 
 # Set a variable to get to the top of the metadata location

layers/meta-nwl-distro/recipes-core/images/nwl-ramdisk-minimal.bb

@@ -12,6 +12,14 @@ COREOS_IMAGE_GENERATE_INSTALLER = "0"
 COREOS_IMAGE_GENERATE_UKI = "0"
 COREOS_IMAGE_GENERATE_SWU = "0"
 
+TI_WIFI_PACKAGES = " \
+	firmware-ti-wl18xx \
+	"
+
+WIFI_PACKAGES = " \
+	${@bb.utils.contains("MACHINE_FEATURES", "ti-wifi", "${TI_WIFI_PACKAGES}", "", d)} \
+	"
+
 IMAGE_INSTALL:append = " \
 	coreutils \
 	ncurses-terminfo-base \
@@ -19,4 +27,6 @@ IMAGE_INSTALL:append = " \
 	networkmanager-nmcli \
 	systemd-conf \
 	nwl-tests-kernel \
+	\
+	${@bb.utils.contains("MACHINE_FEATURES", "wifi", "${WIFI_PACKAGES}", "", d)} \
 	"

templates/bblayers.conf.sample

@@ -20,5 +20,6 @@ BBLAYERS ?= " \
   ##COREOS_EXTLAYERSDIR##/meta-swupdate \
   ##NWL_LAYERSDIR##/meta-nwl-distro \
   ##NWL_LAYERSDIR##/meta-netmodule-legacy-bsp \
+  ##NWL_LAYERSDIR##/meta-netmodule-wlan \
   "