scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-11-01 19:07:47 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

ucentral: development update

Browse Source 
* more mac80211/hapd script improvements
* more led blink/off commands
* update ucentral-schema
* further improvement on maverick
* various ipq807x led improvements

Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2021-06-25 09:18:09 +02:00
parent 0825cb93c5
commit 42251224b3
10 changed files with 397 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
patches/0017-ipq807x-add-the-Qualcomm-AX-target-support.patch
View File

@@ -1,7 +1,7 @@
From 7890393e2bb05b5d9e9cf351642b99585b068a13 Mon Sep 17 00:00:00 2001
From a524aed3cf42831f98fdd88ef31e3eb491372d0e Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Sat, 18 Jul 2020 08:53:44 +0200
Subject: [PATCH 01/14] ipq807x: add the Qualcomm AX target support
Subject: [PATCH 21/36] ipq807x: add the Qualcomm AX target support
Signed-off-by: John Crispin <john@phrozen.org>
---
@@ -12,7 +12,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
.../etc/hotplug.d/firmware/11-ath10k-caldata | 5 +
target/linux/ipq807x/109-logspam.patch | 24 +
target/linux/ipq807x/Makefile | 22 +
.../ipq807x/base-files/etc/board.d/01_leds | 35 +
.../ipq807x/base-files/etc/board.d/01_leds | 36 +
.../ipq807x/base-files/etc/board.d/02_network | 77 +
.../etc/hotplug.d/firmware/10-ath11k-caldata | 97 ++
.../ipq807x/base-files/etc/init.d/aq_phy | 15 +
@@ -53,7 +53,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
.../linux/ipq807x/patches/108-log-spam.patch | 37 +
target/linux/ipq807x/patches/109-tplink.patch | 1518 +++++++++++++++++
.../ipq807x/patches/110-add-esmt-nand.patch | 37 +
48 files changed, 9338 insertions(+), 3 deletions(-)
48 files changed, 9339 insertions(+), 3 deletions(-)
create mode 100644 package/boot/uboot-envtools/files/ipq807x
create mode 100644 target/linux/ipq807x/109-logspam.patch
create mode 100644 target/linux/ipq807x/Makefile
@@ -186,6 +186,21 @@ index 0000000000..6c429f1852
+config_foreach ubootenv_add_app_config ubootenv
+
+exit 0
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index 7d035a299b..986c74dc4d 100644
--- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh
@@ -365,8 +365,8 @@ hostapd_set_vlan_file() {
local ifname="$1"
local vlan="$2"
json_get_vars name vid
- echo "${vid} ${ifname}-${name}" >> /var/run/hostapd-${ifname}.vlan
- wireless_add_vlan "${vlan}" "${ifname}-${name}"
+ echo "${vid} ${ifname}.${name}" >> /var/run/hostapd-${ifname}.vlan
+ wireless_add_vlan "${vlan}" "${ifname}.${name}"
}
hostapd_set_vlan() {
diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index c4d9dd78e3..6670d310db 100644
--- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -262,10 +277,10 @@ index 0000000000..66031ace35
+$(eval $(call BuildTarget))
diff --git a/target/linux/ipq807x/base-files/etc/board.d/01_leds b/target/linux/ipq807x/base-files/etc/board.d/01_leds
new file mode 100755
index 0000000000..60a3ccdc52
index 0000000000..35b4d9b529
--- /dev/null
+++ b/target/linux/ipq807x/base-files/etc/board.d/01_leds
@@ -0,0 +1,35 @@
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+. /lib/functions/uci-defaults.sh
@@ -278,13 +293,13 @@ index 0000000000..60a3ccdc52
+sercomm,wallaby|\
+cig,wf188n|\
+cig,wf194c)
+ ucidef_set_led_netdev "wan" "WAN" "green:wan" "br-wan" "tx rx link"
+ ucidef_set_led_netdev "lan" "LAN" "green:lan" "br-lan" "tx rx link"
+ ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0" "tx rx link"
+ ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wifi5" "phy0tx"
+ ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wifi2" "phy1tx"
+ ;;
+esac
+
+case "$board" in
+cig,wf188n|\
+edgecore,eap101)
+ ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wifi5" "phy0tx"
+ ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wifi2" "phy1tx"
@@ -293,6 +308,7 @@ index 0000000000..60a3ccdc52
+ ucidef_set_led_netdev "poe" "poe" "green:wan" "eth0"
+ ;;
+edgecore,eap102)
+ ucidef_set_led_netdev "poe" "poe" "green:wan" "eth0"
+ ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wifi5" "phy0tx"
+ ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wifi2" "phy1tx"
+ ;;
@@ -6306,7 +6322,7 @@ index 0000000000..ba4a5ef3ca
+};
diff --git a/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq807x-eap102.dts b/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq807x-eap102.dts
new file mode 100755
index 0000000000..fdb0d03a30
index 0000000000..d04cb1020c
--- /dev/null
+++ b/target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq807x-eap102.dts
@@ -0,0 +1,918 @@
@@ -6982,10 +6998,10 @@ index 0000000000..fdb0d03a30
+ pinctrl-0 = <&led_pins>;
+ pinctrl-names = "default";
+
+ led_power: led_pwr {
+ label = "green:power";
+ led_pwr {
+ label = "green:wan";
+ gpios = <&tlmm 46 GPIO_ACTIVE_HIGH>;
+ default-state = "on";
+ default-state = "off";
+ linux,default-trigger = "led_pwr";
+ };
+
@@ -7001,10 +7017,10 @@ index 0000000000..fdb0d03a30
+ default-state = "off";
+ };
+
+ led_bt {
+ led_power: led_bt {
+ gpios = <&tlmm 50 GPIO_ACTIVE_HIGH>;
+ label = "green:bt";
+ default-state = "off";
+ label = "green:power";
+ default-state = "on";
+ linux,default-trigger = "led_bt";
+ };
+ };
@@ -8752,7 +8768,7 @@ index 0000000000..5744a2a5bf
+ struct comp_opts {
diff --git a/target/linux/ipq807x/patches/102-cig-wf188.patch b/target/linux/ipq807x/patches/102-cig-wf188.patch
new file mode 100644
index 0000000000..225ea45d08
index 0000000000..a9d3015b79
--- /dev/null
+++ b/target/linux/ipq807x/patches/102-cig-wf188.patch
@@ -0,0 +1,869 @@
@@ -9085,25 +9101,25 @@ index 0000000000..225ea45d08
++ pinctrl-names = "default";
++
++ led@25 {
++ label = "led_5g";
++ label = "green:wifi5";
++ gpios = <&tlmm 25 GPIO_ACTIVE_HIGH>;
++ linux,default-trigger = "wf188:green:5g";
++ default-state = "off";
++ };
++ led@24 {
++ label = "led_2g";
++ label = "green:wifi2";
++ gpios = <&tlmm 24 GPIO_ACTIVE_HIGH>;
++ linux,default-trigger = "wf188:green:2g";
++ default-state = "off";
++ };
++ led@18 {
++ label = "led_eth";
++ label = "green:wan";
++ gpios = <&tlmm 18 GPIO_ACTIVE_HIGH>;
++ linux,default-trigger = "wf188:green:eth";
++ default-state = "off";
++ };
++ led_power: led@16 {
++ label = "led_pwr";
++ label = "green:power";
++ gpios = <&tlmm 16 GPIO_ACTIVE_HIGH>;
++ linux,default-trigger = "wf188:green:power";
++ default-state = "off";
@@ -9513,28 +9529,28 @@ index 0000000000..225ea45d08
++ pinctrl-names = "default";
++
++ led@25 {
++ label = "led_5g";
++ label = "green:wifi5";
++ gpios = <&tlmm 25 GPIO_ACTIVE_HIGH>;
++ linux,default-trigger = "wf188:green:5g";
++ default-state = "off";
++ };
++ led@24 {
++ label = "led_2g";
++ label = "green:wifi2";
++ gpios = <&tlmm 24 GPIO_ACTIVE_HIGH>;
++ linux,default-trigger = "wf188:green:2g";
++ default-state = "off";
++ };
++ led@18 {
++ label = "led_eth";
++ label = "green:wan";
++ gpios = <&tlmm 18 GPIO_ACTIVE_HIGH>;
++ linux,default-trigger = "wf188:green:eth";
++ default-state = "off";
++ };
++ led_power: led@16 {
++ label = "led_pwr";
++ label = "green:power";
++ gpios = <&tlmm 16 GPIO_ACTIVE_HIGH>;
++ linux,default-trigger = "wf188:green:power";
++ default-state = "off";
++ default-state = "on";
++ };
++ };
++
@@ -11288,7 +11304,7 @@ index 0000000000..f91601ec59
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
diff --git a/target/linux/ipq807x/patches/106-eap101.patch b/target/linux/ipq807x/patches/106-eap101.patch
new file mode 100644
index 0000000000..228dadb611
index 0000000000..188870b8dc
--- /dev/null
+++ b/target/linux/ipq807x/patches/106-eap101.patch
@@ -0,0 +1,993 @@
@@ -12184,13 +12200,13 @@ index 0000000000..228dadb611
++
++ led@25 {
++ label = "green:wifi5";
++ gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
++ gpios = <&tlmm 35 GPIO_ACTIVE_HIGH>;
++ linux,default-trigger = "wf188:green:5g";
++ default-state = "off";
++ };
++ led@24 {
++ label = "green:wifi2";
++ gpios = <&tlmm 37 GPIO_ACTIVE_LOW>;
++ gpios = <&tlmm 37 GPIO_ACTIVE_HIGH>;
++ linux,default-trigger = "wf188:green:2g";
++ default-state = "off";
++ };

24
patches/0030-base-files-add-a-turnoff-command-to-the-led-script.patch
View File

@@ -1,27 +1,28 @@
From 43f1072a42dd19a0718c44c58daf3f9e5a3c9421 Mon Sep 17 00:00:00 2001
From d459f53ff9608c47fbf0b634fa4380bce1099d49 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Mon, 19 Apr 2021 13:49:20 +0200
Subject: [PATCH] base-files: add a turnoff command to the led script
Subject: [PATCH 31/36] base-files: add a turnoff command to the led script
Signed-off-by: John Crispin <john@phrozen.org>
---
package/base-files/files/etc/init.d/led | 15 +++++++++++++++
1 file changed, 15 insertions(+)
package/base-files/files/etc/init.d/led | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/package/base-files/files/etc/init.d/led b/package/base-files/files/etc/init.d/led
index 8d97515d52..9f7930feed 100755
index 8d97515d52..3221c8c44c 100755
--- a/package/base-files/files/etc/init.d/led
+++ b/package/base-files/files/etc/init.d/led
@@ -3,6 +3,8 @@
@@ -3,6 +3,9 @@
START=96
+extra_command "turnoff" "Turn all leds off"
+extra_command "blink" "Blink all leds"
+
load_led() {
local name
local sysfs
@@ -122,7 +124,18 @@ load_led() {
@@ -122,7 +125,25 @@ load_led() {
}
}
@@ -31,6 +32,13 @@ index 8d97515d52..9f7930feed 100755
+ echo 0 > /sys/class/leds/$led/brightness
+ done
+}
+
+blink() {
+ for led in `ls /sys/class/leds/`; do
+ echo 0 > /sys/class/leds/$led/brightness
+ echo timer > /sys/class/leds/$led/trigger
+ done
+}
+
start() {
+ [ "$(uci get system.@system[-1].leds_off)" -eq 1 ] && {
@@ -40,7 +48,7 @@ index 8d97515d52..9f7930feed 100755
[ -e /sys/class/leds/ ] && {
[ -s /var/run/led.state ] && {
local led trigger brightness
@@ -138,5 +151,7 @@ start() {
@@ -138,5 +159,7 @@ start() {
config_load system
config_foreach load_led led