From b4793c1678dbed829d4bd8f8f4884393556b3c89 Mon Sep 17 00:00:00 2001
From: Alexandre Bard <alexandre.bard@netmodule.com>
Date: Wed, 30 Aug 2023 16:43:55 +0200
Subject: [PATCH] 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
---
 .../conf/machine/include/am335x-nrhw16-nrhw24.inc      |  5 +++++
 .../conf/machine/netmodule-hw20.conf                   |  5 +++++
 .../conf/machine/netmodule-hw22.conf                   |  5 +++++
 .../conf/machine/netmodule-hw25.conf                   |  5 +++++
 .../conf/machine/netmodule-hw26.conf                   |  5 +++++
 .../recipes-core/images/nwl-ramdisk-minimal.bb         | 10 ++++++++++
 6 files changed, 35 insertions(+)

diff --git a/layers/meta-netmodule-legacy-bsp/conf/machine/include/am335x-nrhw16-nrhw24.inc b/layers/meta-netmodule-legacy-bsp/conf/machine/include/am335x-nrhw16-nrhw24.inc
index 1c5e8e8..6ef6685 100644
--- a/layers/meta-netmodule-legacy-bsp/conf/machine/include/am335x-nrhw16-nrhw24.inc
+++ b/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 \
+	"
diff --git a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw20.conf b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw20.conf
index f3429de..de2a385 100644
--- a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw20.conf
+++ b/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 \
+	"
diff --git a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw22.conf b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw22.conf
index 0472b70..1c40b09 100644
--- a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw22.conf
+++ b/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 \
+	"
diff --git a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw25.conf b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw25.conf
index 58fa0eb..b30ea7f 100644
--- a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw25.conf
+++ b/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 \
+	"
diff --git a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw26.conf b/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw26.conf
index c98cc67..d315afc 100644
--- a/layers/meta-netmodule-legacy-bsp/conf/machine/netmodule-hw26.conf
+++ b/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 \
+	"
diff --git a/layers/meta-nwl-distro/recipes-core/images/nwl-ramdisk-minimal.bb b/layers/meta-nwl-distro/recipes-core/images/nwl-ramdisk-minimal.bb
index bbc20e6..6bdd337 100644
--- a/layers/meta-nwl-distro/recipes-core/images/nwl-ramdisk-minimal.bb
+++ b/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)} \
 	"