scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-10-29 17:42:41 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

ucentral: development update

Browse Source 
* rename eap6x0 to exxx7
* update schema
* update client
* update gateway
* update usteer
* implement all missing ucentral commands
* patch the led script to allow turning of all leds

Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2021-04-19 09:43:03 +02:00
parent aef9711647
commit 7a40e97658
13 changed files with 109 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-dev.yml vendored
View File

@@ -10,7 +10,7 @@ jobs:
strategy:
fail-fast: false
matrix:
target: ['cig_wf188', 'cig_wf194c', 'cig_wf160d.yml', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_ecs4100-12ph', 'edgecore_ecw5211', 'linksys_e8450', 'tplink_cpe210_v3', 'linksys_ea8300', 'tplink_eap620', 'tplink_eap660', 'zyxel_gs1900-10hp']
target: ['cig_wf188', 'cig_wf194c', 'cig_wf160d.yml', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_ecs4100-12ph', 'edgecore_ecw5211', 'linksys_e8450', 'linksys_ea8300', 'tplink_cpe210_v3', 'tplink_ex227', 'tplink_ex447', 'zyxel_gs1900-10hp']
steps:
- uses: actions/checkout@v2

2
feeds/ucentral/ucentral-client/Makefile
View File

@@ -6,7 +6,7 @@ PKG_RELEASE:=1
PKG_SOURCE_URL=https://github.com/blogic/ucentral-client.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2021-02-15
PKG_SOURCE_VERSION:=6c2c4bc1e176414568e73c96976461b3a1daf2eb
PKG_SOURCE_VERSION:=e2ed426412628155b670f5d5dafffc3e3beb4c11
PKG_LICENSE:=BSD-3-Clause
PKG_MAINTAINER:=John Crispin <john@phrozen.org>

2
feeds/ucentral/ucentral-schema/Makefile
View File

@@ -6,7 +6,7 @@ PKG_RELEASE:=1
PKG_SOURCE_URL=https://github.com/blogic/ucentral-schema.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2021-02-15
PKG_SOURCE_VERSION:=a2ec97a768b8d4eee63abe538b4b0de1bba0a169
PKG_SOURCE_VERSION:=a9d0d049d41138f9f7a93396cfda4fa0f61fc01d
PKG_MAINTAINER:=John Crispin <john@phrozen.org>
PKG_LICENSE:=BSD-3-Clause

4
feeds/ucentral/ucentralgw/Makefile
View File

@@ -4,9 +4,9 @@ PKG_NAME:=ucentralgw
PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=git@github.com:stephb9959/ucentralgw.git
PKG_SOURCE_URL=git@github.com:Telecominfraproject/wlan-cloud-ucentralgw.git
PKG_SOURCE_DATE:=2021-03-28
PKG_SOURCE_VERSION:=48dfabb1ddc91cb9feeaef802f9e48b3b013ef12
PKG_SOURCE_VERSION:=6ed4167f1a2cd0bc0b4ebd34d488fcae4ac9e47
CMAKE_INSTALL:=1
PKG_LICENSE:=BSD-3-Clause

6
feeds/ucentral/usteer/Makefile
View File

@@ -3,10 +3,10 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=usteer
PKG_RELEASE:=1
PKG_SOURCE_URL=https://github.com/blogic/usteer.git
PKG_SOURCE_URL=https://git.openwrt.org/project/usteer.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2022-11-19
PKG_SOURCE_VERSION:=d10731f8060d3937ef562858f5a52ca7f910da31
PKG_SOURCE_DATE:=2021-04-19
PKG_SOURCE_VERSION:=2b1c740ce33509b314c248eb191d21ba504160ba
PKG_BUILD_PARALLEL:=1

1
feeds/ucentral/usteer/files/etc/init.d/usteer
View File

@@ -53,6 +53,7 @@ uci_usteer() {
uci_option_to_json_bool "$cfg" syslog
uci_option_to_json_bool "$cfg" load_kick_enabled
uci_option_to_json_bool "$cfg" assoc_steering
uci_option_to_json_string "$cfg" node_up_script
for opt in \

8
feeds/wifi-ax/ath11k-wifi/Makefile
View File

@@ -30,8 +30,8 @@ ALLWIFIBOARDS:= \
edgecore-eap101 \
sercomm-wallaby \
edgecore-eap102 \
tplink-eap620 \
tplink-eap660
tplink-ex227 \
tplink-ex447
ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ath11k-wifi-$(BOARD))
@@ -112,8 +112,8 @@ $(eval $(call generate-ath11k-wifi-package,cig-wf194c,Cigtech WF194c))
$(eval $(call generate-ath11k-wifi-package,sercomm-wallaby,Sercomm Kiwi))
$(eval $(call generate-ath11k-wifi-package,edgecore-eap101,EdgeCore EAP101))
$(eval $(call generate-ath11k-wifi-package,edgecore-eap102,Edgecore EAP102))
$(eval $(call generate-ath11k-wifi-package,tplink-eap620,TP-Link EX227))
$(eval $(call generate-ath11k-wifi-package,tplink-eap660,TP-Link EX447))
$(eval $(call generate-ath11k-wifi-package,tplink-ex227,TP-Link EX227))
$(eval $(call generate-ath11k-wifi-package,tplink-ex447,TP-Link EX447))
$(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))
$(eval $(call BuildPackage,ath11k-wifi-qcom-ipq8074))

0
feeds/wifi-ax/ath11k-wifi/board-tplink-eap620.bin.IPQ8074 → feeds/wifi-ax/ath11k-wifi/board-tplink-ex227.bin.IPQ8074
View File

0
feeds/wifi-ax/ath11k-wifi/board-tplink-eap660.bin.IPQ8074 → feeds/wifi-ax/ath11k-wifi/board-tplink-ex447.bin.IPQ8074
View File

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

@@ -26,8 +26,8 @@ Signed-off-by: John Crispin <john@phrozen.org>
.../boot/dts/qcom-ipq6018-edgecore-eap101.dts | 18 +
.../boot/dts/qcom-ipq6018-miwifi-ax1800.dts | 18 +
.../arch/arm/boot/dts/qcom-ipq807x-eap102.dts | 26 +
.../arch/arm/boot/dts/qcom-ipq807x-eap620.dts | 26 +
.../arch/arm/boot/dts/qcom-ipq807x-eap660.dts | 26 +
.../arch/arm/boot/dts/qcom-ipq807x-ex227.dts | 26 +
.../arch/arm/boot/dts/qcom-ipq807x-ex447.dts | 26 +
.../boot/dts/qcom-ipq807x-sercomm-wallaby.dts | 26 +
.../arch/arm/boot/dts/qcom-ipq807x-wf194c.dts | 26 +
.../dts/qcom/qcom-ipq6018-miwifi-ax1800.dts | 419 +++++
@@ -71,8 +71,8 @@ Signed-off-by: John Crispin <john@phrozen.org>
create mode 100644 target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq6018-edgecore-eap101.dts
create mode 100644 target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq6018-miwifi-ax1800.dts
create mode 100644 target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-eap102.dts
create mode 100644 target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-eap620.dts
create mode 100644 target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-eap660.dts
create mode 100644 target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-ex227.dts
create mode 100644 target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-ex447.dts
create mode 100644 target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-sercomm-wallaby.dts
create mode 100644 target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-wf194c.dts
create mode 100755 target/linux/ipq807x/files/arch/arm64/boot/dts/qcom/qcom-ipq6018-miwifi-ax1800.dts
@@ -300,7 +300,7 @@ index 0000000000..9e03f179c0
+
+case "$board" in
+cig,wf188n|\
+edgecore,eap101\
+edgecore,eap101|\
+edgecore,eap102)
+ ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wifi5" "phy0tx"
+ ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wifi2" "phy1tx"
@@ -331,8 +331,8 @@ index 0000000000..bea114b0b6
+
+ case $board in
+ cig,wf188|\
+ tplink,eap620|\
+ tplink,eap660)
+ tplink,ex227|\
+ tplink,ex447)
+ ucidef_set_interface_wan "eth0"
+ ucidef_set_interface_lan ""
+ ;;
@@ -452,8 +452,8 @@ index 0000000000..45b90b2fd2
+ edgecore,eap102 |\
+ qcom,ipq807x-hk01|\
+ qcom,ipq807x-hk14|\
+ tplink,eap620|\
+ tplink,eap660|\
+ tplink,ex227|\
+ tplink,ex447|\
+ sercomm,wallaby)
+ caldata_extract "0:ART" 0x1000 0x20000
+ ;;
@@ -4767,8 +4767,8 @@ index 0000000000..e7a62ae72a
+ cig,wf194c|\
+ edgecore,eap101|\
+ edgecore,eap102|\
+ tplink,eap620|\
+ tplink,eap660|\
+ tplink,ex227|\
+ tplink,ex447|\
+ qcom,ipq6018-cp01|\
+ qcom,ipq807x-hk01)
+ [ "$magic_long" = "73797375" ] && return 0
@@ -4792,8 +4792,8 @@ index 0000000000..e7a62ae72a
+ edgecore,eap102|\
+ qcom,ipq6018-cp01|\
+ qcom,ipq807x-hk01|\
+ tplink,eap660|\
+ tplink,eap620)
+ tplink,ex447|\
+ tplink,ex227)
+ nand_upgrade_tar "$1"
+ ;;
+ edgecore,eap101)
@@ -5757,11 +5757,11 @@ index 0000000000..d1d3f3755e
+ };
+ };
+};
diff --git a/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-eap620.dts b/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-eap620.dts
diff --git a/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-ex227.dts b/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-ex227.dts
new file mode 100644
index 0000000000..fa9f3c604e
--- /dev/null
+++ b/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-eap620.dts
+++ b/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-ex227.dts
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2017, The Linux Foundation. All rights reserved.
@@ -5778,7 +5778,7 @@ index 0000000000..fa9f3c604e
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#include "../../../arm64/boot/dts/qcom/qcom-ipq807x-eap620.dts"
+#include "../../../arm64/boot/dts/qcom/qcom-ipq807x-ex227.dts"
+
+/ {
+ soc {
@@ -5789,11 +5789,11 @@ index 0000000000..fa9f3c604e
+ };
+ };
+};
diff --git a/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-eap660.dts b/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-eap660.dts
diff --git a/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-ex447.dts b/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-ex447.dts
new file mode 100644
index 0000000000..9c50e0fba5
--- /dev/null
+++ b/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-eap660.dts
+++ b/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-ex447.dts
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2017, The Linux Foundation. All rights reserved.
@@ -5810,7 +5810,7 @@ index 0000000000..9c50e0fba5
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#include "../../../arm64/boot/dts/qcom/qcom-ipq807x-eap660.dts"
+#include "../../../arm64/boot/dts/qcom/qcom-ipq807x-ex447.dts"
+
+/ {
+ soc {
@@ -7372,31 +7372,31 @@ index 0000000000..599346b9ca
+endef
+TARGET_DEVICES += edgecore_eap102
+
+define Device/tplink_eap620
+ DEVICE_TITLE := TP-Link EAP620
+ DEVICE_DTS := qcom-ipq807x-eap620
+define Device/tplink_ex227
+ DEVICE_TITLE := TP-Link EX227
+ DEVICE_DTS := qcom-ipq807x-ex227
+ DEVICE_DTS_CONFIG=config@hk07
+ SUPPORTED_DEVICES := tplink,eap620
+ DEVICE_PACKAGES := ath11k-wifi-tplink-eap620
+ SUPPORTED_DEVICES := tplink,ex227
+ DEVICE_PACKAGES := ath11k-wifi-tplink-ex227
+ IMAGES := sysupgrade.tar nand-factory.bin nand-factory.ubi
+ IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+ IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
+ IMAGE/nand-factory.ubi := append-ubi
+endef
+TARGET_DEVICES += tplink_eap620
+TARGET_DEVICES += tplink_ex227
+
+define Device/tplink_eap660
+ DEVICE_TITLE := TP-Link EAP660
+ DEVICE_DTS := qcom-ipq807x-eap660
+define Device/tplink_ex447
+ DEVICE_TITLE := TP-Link EX447
+ DEVICE_DTS := qcom-ipq807x-ex447
+ DEVICE_DTS_CONFIG=config@hk09
+ SUPPORTED_DEVICES := tplink,eap660
+ DEVICE_PACKAGES := ath11k-wifi-tplink-eap660
+ SUPPORTED_DEVICES := tplink,ex447
+ DEVICE_PACKAGES := ath11k-wifi-tplink-ex447
+ IMAGES := sysupgrade.tar nand-factory.bin nand-factory.ubi
+ IMAGE/sysupgrade.tar := sysupgrade-tar | append-metadata
+ IMAGE/nand-factory.bin := append-ubi | qsdk-ipq-factory-nand
+ IMAGE/nand-factory.ubi := append-ubi
+endef
+TARGET_DEVICES += tplink_eap660
+TARGET_DEVICES += tplink_ex447
diff --git a/target/linux/ipq807x/ipq60xx/config-default b/target/linux/ipq807x/ipq60xx/config-default
new file mode 100644
index 0000000000..73c01b4466
@@ -12336,10 +12336,10 @@ index 0000000000..f12f5bc70d
--- /dev/null
+++ b/target/linux/ipq807x/patches/109-tplink.patch
@@ -0,0 +1,1518 @@
+Index: linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq807x-eap620.dts
+Index: linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq807x-ex227.dts
+===================================================================
+--- /dev/null
++++ linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq807x-eap620.dts
++++ linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq807x-ex227.dts
+@@ -0,0 +1,754 @@
++/dts-v1/;
++/*
@@ -12363,8 +12363,8 @@ index 0000000000..f12f5bc70d
++/ {
++ #address-cells = <0x2>;
++ #size-cells = <0x2>;
++ model = "TP-Link EAP620";
++ compatible = "tplink,eap620", "qcom,ipq807x";
++ model = "TP-Link EX227";
++ compatible = "tplink,ex227", "qcom,ipq807x";
++ qcom,msm-id = <0x143 0x0>;
++ interrupt-parent = <&intc>;
++ qcom,board-id = <0x8 0x0>;
@@ -13095,10 +13095,10 @@ index 0000000000..f12f5bc70d
++ status = "disabled";
++};
++
+Index: linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq807x-eap660.dts
+Index: linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq807x-ex447.dts
+===================================================================
+--- /dev/null
++++ linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq807x-eap660.dts
++++ linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq807x-ex447.dts
+@@ -0,0 +1,754 @@
++/dts-v1/;
++/*
@@ -13122,8 +13122,8 @@ index 0000000000..f12f5bc70d
++/ {
++ #address-cells = <0x2>;
++ #size-cells = <0x2>;
++ model = "TP-Link EAP660";
++ compatible = "tplink,eap660", "qcom,ipq807x";
++ model = "TP-Link EX447";
++ compatible = "tplink,ex447", "qcom,ipq807x";
++ qcom,msm-id = <0x143 0x0>;
++ interrupt-parent = <&intc>;
++ qcom,board-id = <0x8 0x0>;

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

@@ -0,0 +1,53 @@
From 43f1072a42dd19a0718c44c58daf3f9e5a3c9421 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
Signed-off-by: John Crispin <john@phrozen.org>
---
package/base-files/files/etc/init.d/led | 15 +++++++++++++++
1 file changed, 15 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
--- a/package/base-files/files/etc/init.d/led
+++ b/package/base-files/files/etc/init.d/led
@@ -3,6 +3,8 @@
START=96
+extra_command "turnoff" "Turn all leds off"
+
load_led() {
local name
local sysfs
@@ -122,7 +124,18 @@ load_led() {
}
}
+turnoff() {
+ for led in `ls /sys/class/leds/`; do
+ echo none > /sys/class/leds/$led/trigger
+ echo 0 > /sys/class/leds/$led/brightness
+ done
+}
+
start() {
+ [ "$(uci get system.@system[-1].leds_off)" -eq 1 ] && {
+ turnoff
+ exit 0
+ }
[ -e /sys/class/leds/ ] && {
[ -s /var/run/led.state ] && {
local led trigger brightness
@@ -138,5 +151,7 @@ start() {
config_load system
config_foreach load_led led
+ . /etc/diag.sh
+ set_state done
}
}
--
2.25.1

4
profiles/tplink_eap620.yml → profiles/tplink_ex227.yml
View File

@@ -1,8 +1,8 @@
---
profile: tplink_eap620
profile: tplink_ex227
target: ipq807x
subtarget: ipq807x
description: Build image for the TP-Link EAP620
description: Build image for the TP-Link EX227
feeds:
- name: ipq807x
path: ../../feeds/ipq807x

4
profiles/tplink_eap660.yml → profiles/tplink_ex447.yml
View File

@@ -1,8 +1,8 @@
---
profile: tplink_eap660
profile: tplink_ex447
target: ipq807x
subtarget: ipq807x
description: Build image for the TP-Link EAP660
description: Build image for the TP-Link EX447
feeds:
- name: ipq807x
path: ../../feeds/ipq807x