From: Josep Orga <jorga@somdevices.com>
Date: Thu, 25 Nov 2021 08:35:47 +0000 (+0100)
Subject: meta-somdevices: Renamed mlan0 to wlan0, and changed wifi_mod_para.conf wifi configur... 
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=1b6f901107c6ee31cfe4da1b61a86dd62fc3440e;p=meta-somdevices.git

meta-somdevices: Renamed mlan0 to wlan0, and changed wifi_mod_para.conf wifi configuration file:
	· Set sta_name as wlan.
	· Disabled p2p0 interface changing drv_mode (from 7 to 3).

Signed-off-by: Josep Orga <jorga@somdevices.com>
---

diff --git a/recipes-connectivity/linux-firmware/linux-firmware_%.bbappend b/recipes-connectivity/linux-firmware/linux-firmware_%.bbappend
new file mode 100644
index 0000000..8ea9ef5
--- /dev/null
+++ b/recipes-connectivity/linux-firmware/linux-firmware_%.bbappend
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+do_install_append () {
+    sed -i '75s/wfd_name=p2p/sta_name=wlan/g' ${D}${nonarch_base_libdir}/firmware/nxp/wifi_mod_para.conf
+    sed -i '78s/drv_mode=7/drv_mode=3/g' ${D}${nonarch_base_libdir}/firmware/nxp/wifi_mod_para.conf
+}
diff --git a/recipes-connectivity/network/network.bb b/recipes-connectivity/network/network.bb
index 3e26e57..2bb6f71 100644
--- a/recipes-connectivity/network/network.bb
+++ b/recipes-connectivity/network/network.bb
@@ -1,5 +1,5 @@
 SUMMARY = "Configure network interfaces"
-DESCRIPTION = "Add necessary files to configure eth0 and mlan0 interfaces"
+DESCRIPTION = "Add necessary files to configure eth0 and wlan0 interfaces"
 PR = "somdevices.0"
 MAINTAINER = "SomDevices <somdevices@somdevices.com>"
 
@@ -25,9 +25,9 @@ do_install () {
 	echo "PoolOffset=100" >> ${D}/etc/systemd/network/30-uap0.network
 	echo "PoolSize=20" >> ${D}/etc/systemd/network/30-uap0.network
 
-	echo "[Match]" > ${D}/etc/systemd/network/31-mlan0.network
-	echo "Name=mlan0" >> ${D}/etc/systemd/network/31-mlan0.network
-	echo "" >> ${D}/etc/systemd/network/31-mlan0.network
-	echo "[Network]" >> ${D}/etc/systemd/network/31-mlan0.network
-	echo "DHCP=yes" >> ${D}/etc/systemd/network/31-mlan0.network
+	echo "[Match]" > ${D}/etc/systemd/network/31-wlan0.network
+	echo "Name=wlan0" >> ${D}/etc/systemd/network/31-wlan0.network
+	echo "" >> ${D}/etc/systemd/network/31-wlan0.network
+	echo "[Network]" >> ${D}/etc/systemd/network/31-wlan0.network
+	echo "DHCP=yes" >> ${D}/etc/systemd/network/31-wlan0.network
 }
diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant-mlan0.conf b/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant-mlan0.conf
deleted file mode 100644
index c93b5bd..0000000
--- a/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant-mlan0.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-ctrl_interface=/var/run/wpa_supplicant
-ctrl_interface_group=0
-update_config=1
-
-network={
-        ssid="ssid0"
-        psk="pass0"
-}
diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant-wlan0.conf b/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant-wlan0.conf
new file mode 100644
index 0000000..c93b5bd
--- /dev/null
+++ b/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant-wlan0.conf
@@ -0,0 +1,8 @@
+ctrl_interface=/var/run/wpa_supplicant
+ctrl_interface_group=0
+update_config=1
+
+network={
+        ssid="ssid0"
+        psk="pass0"
+}
diff --git a/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend b/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend
index 2a23139..97227fc 100644
--- a/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend
+++ b/recipes-connectivity/wpa-supplicant/wpa-supplicant_%.bbappend
@@ -1,19 +1,19 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-SUMMARY = "Add wpa-supplicant-mlan0.conf file"
-DESCRIPTION = "Copy wpa-supplicant-mlan0.conf to use wpa_supplicant@.service"
+SUMMARY = "Add wpa-supplicant-wlan0.conf file"
+DESCRIPTION = "Copy wpa-supplicant-wlan0.conf to use wpa_supplicant@.service"
 PR = "somdevices.0"
 MAINTAINER = "SomDevices <somdevices@somdevices.com>"
 
 LICENSE = "MIT"
 
 SRC_URI += " \
-	file://wpa_supplicant-mlan0.conf \
+	file://wpa_supplicant-wlan0.conf \
 "
 
-CONFFILES_${PN} += " ${D}${sysconfdir}/wpa_supplicant/wpa_supplicant-mlan0.conf"
+CONFFILES_${PN} += " ${D}${sysconfdir}/wpa_supplicant/wpa_supplicant-wlan0.conf"
 
 do_install_append () {
     mkdir -p ${D}${sysconfdir}/wpa_supplicant
-    install -m 600 ${WORKDIR}/wpa_supplicant-mlan0.conf ${D}${sysconfdir}/wpa_supplicant/
+    install -m 600 ${WORKDIR}/wpa_supplicant-wlan0.conf ${D}${sysconfdir}/wpa_supplicant/
 }