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

ucentral: development update

Browse Source 
* fix dhcpsnoop on ipq807x
* update ucentralgw
* add eap620/660 support
* add cigwf610d
* do not deploy a default ratelimit config
* add eap225 support

Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2021-04-13 16:01:36 +02:00
parent 668f79f021
commit aef9711647
16 changed files with 919 additions and 62 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', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_ecs4100-12ph', 'edgecore_ecw5211', 'linksys_e8450', 'linksys_ea8300', 'zyxel_gs1900-10hp']
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']
steps:
- uses: actions/checkout@v2

6
feeds/ucentral/ratelimit/files/etc/config/ratelimit
View File

@@ -1,3 +1,3 @@
config rate uCentral
option egress 10
option ingress 20
#config rate uCentral
# option egress 10
# option ingress 20

3
feeds/ucentral/ucentralgw/Makefile
View File

@@ -6,8 +6,7 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=git@github.com:stephb9959/ucentralgw.git
PKG_SOURCE_DATE:=2021-03-28
PKG_SOURCE_VERSION:=35abd7820581d844b694f2d3dd56ee741f40671b
#PKG_MIRROR_HASH:=3f6569a5e63fdfd032976ac0f79d736d3935101ac1b97fb370514b013c5e6bb6
PKG_SOURCE_VERSION:=48dfabb1ddc91cb9feeaef802f9e48b3b013ef12
CMAKE_INSTALL:=1
PKG_LICENSE:=BSD-3-Clause

2
feeds/ucentral/udhcpsnoop/Makefile
View File

@@ -9,7 +9,7 @@ PKG_MAINTAINER:=John Crispin <john@phrozen.org>
PKG_SOURCE_URL=https://github.com/blogic/udhcpsnoop.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2021-04-12
PKG_SOURCE_VERSION:=7c3831318747a4f0c221292c5eb41f411cf0c3bd
PKG_SOURCE_VERSION:=9d4b428d96513c5b45f80d5d73ae378e074c9a9b
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk

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

@@ -30,8 +30,8 @@ ALLWIFIBOARDS:= \
edgecore-eap101 \
sercomm-wallaby \
edgecore-eap102 \
tplink-ex227 \
tplink-ex447
tplink-eap620 \
tplink-eap660
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-ex227,TP-Link EX227))
$(eval $(call generate-ath11k-wifi-package,tplink-ex447,TP-Link EX447))
$(eval $(call generate-ath11k-wifi-package,tplink-eap620,TP-Link EX227))
$(eval $(call generate-ath11k-wifi-package,tplink-eap660,TP-Link EX447))
$(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))
$(eval $(call BuildPackage,ath11k-wifi-qcom-ipq8074))

BIN
feeds/wifi-ax/ath11k-wifi/board-sercomm-wallaby.bin.IPQ8074
View File

Binary file not shown.

BIN
feeds/wifi-ax/ath11k-wifi/bdwlan_EX227.bin → feeds/wifi-ax/ath11k-wifi/board-tplink-eap620.bin.IPQ8074
View File

Binary file not shown.

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

BIN
feeds/wifi-ax/ath11k-wifi/board-tplink-ex227.bin.IPQ8074
View File

Binary file not shown.

BIN
feeds/wifi-ax/ath11k-wifi/board-tplink-ex447.bin.IPQ8074
View File

Binary file not shown.

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

@@ -1,7 +1,7 @@
From ba5eddc42a29b5adb4559f6d96729335b0c5d1d5 Mon Sep 17 00:00:00 2001
From c9e80c840be1932cdfe41cc118d88c1fe68745e1 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/12] ipq807x: add the Qualcomm AX target support
Subject: [PATCH] ipq807x: add the Qualcomm AX target support
Signed-off-by: John Crispin <john@phrozen.org>
---
@@ -13,27 +13,29 @@ Signed-off-by: John Crispin <john@phrozen.org>
target/linux/ipq807x/109-logspam.patch | 24 +
target/linux/ipq807x/Makefile | 22 +
.../ipq807x/base-files/etc/board.d/01_leds | 29 +
.../ipq807x/base-files/etc/board.d/02_network | 76 +
.../etc/hotplug.d/firmware/10-ath11k-caldata | 70 +
.../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 +
.../ipq807x/base-files/etc/init.d/bootcount | 12 +
.../linux/ipq807x/base-files/etc/init.d/wdt | 14 +
...G4_v5.4.B-AQR_CIG_WIFI_ID44715_VER1673.cld | Bin 0 -> 391170 bytes
.../base-files/lib/upgrade/platform.sh | 64 +
.../base-files/lib/upgrade/platform.sh | 62 +
target/linux/ipq807x/config-4.4 | 821 +++++++++
.../arm/boot/dts/qcom-ipq6018-cig-wf188.dts | 18 +
.../arm/boot/dts/qcom-ipq6018-cig-wf188n.dts | 18 +
.../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 +
.../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 +++++
.../boot/dts/qcom/qcom-ipq807x-eap102.dts | 918 ++++++++++
target/linux/ipq807x/image/Makefile | 26 +
target/linux/ipq807x/image/ipq60xx.mk | 47 +
target/linux/ipq807x/image/ipq807x.mk | 46 +
target/linux/ipq807x/ipq60xx/config-default | 142 ++
target/linux/ipq807x/image/ipq807x.mk | 72 +
target/linux/ipq807x/ipq60xx/config-default | 144 ++
.../linux/ipq807x/ipq60xx/profiles/default.mk | 9 +
target/linux/ipq807x/ipq60xx/target.mk | 8 +
target/linux/ipq807x/ipq807x/config-default | 74 +
@@ -49,8 +51,9 @@ Signed-off-by: John Crispin <john@phrozen.org>
target/linux/ipq807x/patches/106-eap101.patch | 975 +++++++++++
.../ipq807x/patches/107-ed2-compile.patch | 12 +
.../linux/ipq807x/patches/108-log-spam.patch | 37 +
target/linux/ipq807x/patches/109-tplink.patch | 1510 +++++++++++++++++
45 files changed, 9156 insertions(+), 3 deletions(-)
target/linux/ipq807x/patches/109-tplink.patch | 1518 +++++++++++++++++
.../ipq807x/patches/110-add-esmt-nand.patch | 37 +
48 files changed, 9307 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
@@ -68,6 +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-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
@@ -92,6 +97,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
create mode 100644 target/linux/ipq807x/patches/107-ed2-compile.patch
create mode 100644 target/linux/ipq807x/patches/108-log-spam.patch
create mode 100644 target/linux/ipq807x/patches/109-tplink.patch
create mode 100644 target/linux/ipq807x/patches/110-add-esmt-nand.patch
diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index f71114b5da..4a85d83118 100644
@@ -306,10 +312,10 @@ index 0000000000..9e03f179c0
+exit 0
diff --git a/target/linux/ipq807x/base-files/etc/board.d/02_network b/target/linux/ipq807x/base-files/etc/board.d/02_network
new file mode 100755
index 0000000000..a8d941ff47
index 0000000000..bea114b0b6
--- /dev/null
+++ b/target/linux/ipq807x/base-files/etc/board.d/02_network
@@ -0,0 +1,76 @@
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+. /lib/functions.sh
@@ -325,9 +331,10 @@ index 0000000000..a8d941ff47
+
+ case $board in
+ cig,wf188|\
+ tplink,ex227|\
+ tplink,ex447)
+ ucidef_set_interface_lan "eth0"
+ tplink,eap620|\
+ tplink,eap660)
+ ucidef_set_interface_wan "eth0"
+ ucidef_set_interface_lan ""
+ ;;
+ qcom,ipq6018-cp01|\
+ qcom,ipq807x-hk01)
@@ -388,10 +395,10 @@ index 0000000000..a8d941ff47
+exit 0
diff --git a/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata b/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
new file mode 100755
index 0000000000..beeda6bbc3
index 0000000000..45b90b2fd2
--- /dev/null
+++ b/target/linux/ipq807x/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
@@ -0,0 +1,70 @@
@@ -0,0 +1,97 @@
+#!/bin/sh
+
+[ -e /lib/firmware/$FIRMWARE ] && exit 0
@@ -399,6 +406,25 @@ index 0000000000..beeda6bbc3
+. /lib/functions.sh
+. /lib/functions/system.sh
+
+macaddr_setup() {
+ local mac=$1
+ local val=$2
+ local oui=${mac%:*:*}
+ local nic=$(echo $mac | cut -d: -f 5)
+
+ nic=$(printf "%02x" $((0x${nic//:/} + $val & 0xff)) | sed 's/^\(.\{2\}\)\(.\{2\}\)\(.\{2\}\)/\1:\2:\3/')
+ echo $oui:$nic:01
+}
+
+ath11k_generate_macs() {
+ touch /lib/firmware/ath11k-macs
+ eth=$(cat /sys/class/net/eth0/address)
+ for a in `seq 1 3`; do
+ m=$(macaddr_setup ${eth} $a)
+ echo -ne \\x${m//:/\\x} >> /lib/firmware/ath11k-macs
+ done
+}
+
+caldata_die() {
+ echo "caldata: " "$*"
+ exit 1
@@ -426,8 +452,8 @@ index 0000000000..beeda6bbc3
+ edgecore,eap102 |\
+ qcom,ipq807x-hk01|\
+ qcom,ipq807x-hk14|\
+ tplink,ex227|\
+ tplink,ex447|\
+ tplink,eap620|\
+ tplink,eap660|\
+ sercomm,wallaby)
+ caldata_extract "0:ART" 0x1000 0x20000
+ ;;
@@ -458,6 +484,14 @@ index 0000000000..beeda6bbc3
+ ;;
+ esac
+ ;;
+ath11k-macs)
+ case "$board" in
+ edgecore,eap102|\
+ cig,wf188n)
+ ath11k_generate_macs
+ ;;
+ esac
+ ;;
+*)
+ exit 1
+ ;;
@@ -4702,10 +4736,10 @@ HcmV?d00001
diff --git a/target/linux/ipq807x/base-files/lib/upgrade/platform.sh b/target/linux/ipq807x/base-files/lib/upgrade/platform.sh
new file mode 100755
index 0000000000..5869e3221a
index 0000000000..e7a62ae72a
--- /dev/null
+++ b/target/linux/ipq807x/base-files/lib/upgrade/platform.sh
@@ -0,0 +1,64 @@
@@ -0,0 +1,62 @@
+. /lib/functions/system.sh
+
+qca_do_upgrade() {
@@ -4733,10 +4767,10 @@ index 0000000000..5869e3221a
+ cig,wf194c|\
+ edgecore,eap101|\
+ edgecore,eap102|\
+ tplink,eap620|\
+ tplink,eap660|\
+ qcom,ipq6018-cp01|\
+ qcom,ipq807x-hk01|\
+ sercomm,wallaby|\
+ xiaomi,ax1800)
+ qcom,ipq807x-hk01)
+ [ "$magic_long" = "73797375" ] && return 0
+ ;;
+ esac
@@ -4750,9 +4784,7 @@ index 0000000000..5869e3221a
+
+ board=$(board_name)
+ case $board in
+ cig,wf188|\
+ tplink,ex227|\
+ tplink,ex447)
+ cig,wf188)
+ qca_do_upgrade $1
+ ;;
+ cig,wf188n|\
@@ -4760,8 +4792,8 @@ index 0000000000..5869e3221a
+ edgecore,eap102|\
+ qcom,ipq6018-cp01|\
+ qcom,ipq807x-hk01|\
+ sercomm,wallaby|\
+ xiaomi,ax1800)
+ tplink,eap660|\
+ tplink,eap620)
+ nand_upgrade_tar "$1"
+ ;;
+ edgecore,eap101)
@@ -4772,7 +4804,7 @@ index 0000000000..5869e3221a
+}
diff --git a/target/linux/ipq807x/config-4.4 b/target/linux/ipq807x/config-4.4
new file mode 100644
index 0000000000..31794089c4
index 0000000000..46e046b060
--- /dev/null
+++ b/target/linux/ipq807x/config-4.4
@@ -0,0 +1,821 @@
@@ -5535,7 +5567,7 @@ index 0000000000..31794089c4
+# CONFIG_SW_SYNC is not set
+# CONFIG_FSL_MC_BUS is not set
+# CONFIG_ALLOC_BUFFERS_IN_4K_CHUNKS is not set
+# CONFIG_ALLOC_SKB_PAGE_FRAG_DISABLE is not set
+CONFIG_ALLOC_SKB_PAGE_FRAG_DISABLE=y
+# CONFIG_MMAP_ALLOW_UNINITIALIZED is not set
+# CONFIG_MAILBOX is not set
+# CONFIG_MAILBOX_TEST is not set
@@ -5587,7 +5619,7 @@ index 0000000000..31794089c4
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_LEDS_GPIO=y
+# CONFIG_ARCH_IPQ256M is not set
+# CONFIG_SKB_FIXED_SIZE_2K is not set
+CONFIG_SKB_FIXED_SIZE_2K=y
+CONFIG_IPQ_MEM_PROFILE=512
+# CONFIG_VIRTIO_NET is not set
+# CONFIG_QCA_85XX_SWITCH is not set
@@ -5725,6 +5757,70 @@ 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
new file mode 100644
index 0000000000..fa9f3c604e
--- /dev/null
+++ b/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-eap620.dts
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2017, The Linux Foundation. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * 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"
+
+/ {
+ soc {
+ pmu {
+ compatible = "arm,cortex-a7-pmu";
+ interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) |
+ IRQ_TYPE_LEVEL_HIGH)>;
+ };
+ };
+};
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
new file mode 100644
index 0000000000..9c50e0fba5
--- /dev/null
+++ b/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-eap660.dts
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2017, The Linux Foundation. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * 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"
+
+/ {
+ soc {
+ pmu {
+ compatible = "arm,cortex-a7-pmu";
+ interrupts = <GIC_PPI 7 (GIC_CPU_MASK_SIMPLE(4) |
+ IRQ_TYPE_LEVEL_HIGH)>;
+ };
+ };
+};
diff --git a/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-sercomm-wallaby.dts b/target/linux/ipq807x/files/arch/arm/boot/dts/qcom-ipq807x-sercomm-wallaby.dts
new file mode 100644
index 0000000000..e756aa5622
@@ -7225,10 +7321,10 @@ index 0000000000..2751391ac7
+TARGET_DEVICES += xiaomi_ax1800
diff --git a/target/linux/ipq807x/image/ipq807x.mk b/target/linux/ipq807x/image/ipq807x.mk
new file mode 100644
index 0000000000..092eca798b
index 0000000000..599346b9ca
--- /dev/null
+++ b/target/linux/ipq807x/image/ipq807x.mk
@@ -0,0 +1,46 @@
@@ -0,0 +1,72 @@
+KERNEL_LOADADDR := 0x41208000
+
+define Device/qcom_hk01
@@ -7275,12 +7371,38 @@ index 0000000000..092eca798b
+ DEVICE_PACKAGES := ath11k-wifi-edgecore-eap102 kmod-usb3 uboot-envtools
+endef
+TARGET_DEVICES += edgecore_eap102
+
+define Device/tplink_eap620
+ DEVICE_TITLE := TP-Link EAP620
+ DEVICE_DTS := qcom-ipq807x-eap620
+ DEVICE_DTS_CONFIG=config@hk07
+ SUPPORTED_DEVICES := tplink,eap620
+ DEVICE_PACKAGES := ath11k-wifi-tplink-eap620
+ 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
+
+define Device/tplink_eap660
+ DEVICE_TITLE := TP-Link EAP660
+ DEVICE_DTS := qcom-ipq807x-eap660
+ DEVICE_DTS_CONFIG=config@hk09
+ SUPPORTED_DEVICES := tplink,eap660
+ DEVICE_PACKAGES := ath11k-wifi-tplink-eap660
+ 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
diff --git a/target/linux/ipq807x/ipq60xx/config-default b/target/linux/ipq807x/ipq60xx/config-default
new file mode 100644
index 0000000000..7d1abafb78
index 0000000000..73c01b4466
--- /dev/null
+++ b/target/linux/ipq807x/ipq60xx/config-default
@@ -0,0 +1,142 @@
@@ -0,0 +1,144 @@
+CONFIG_ALLOC_BUFFERS_IN_4K_CHUNKS=y
+CONFIG_ANDROID=y
+# CONFIG_ANDROID_BINDER_IPC is not set
@@ -7423,6 +7545,8 @@ index 0000000000..7d1abafb78
+CONFIG_VMSPLIT_2G=y
+# CONFIG_VMSPLIT_3G is not set
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_GPIO_WATCHDOG=y
+CONFIG_GPIO_WATCHDOG_ARCH_INITCALL=y
diff --git a/target/linux/ipq807x/ipq60xx/profiles/default.mk b/target/linux/ipq807x/ipq60xx/profiles/default.mk
new file mode 100644
index 0000000000..f47e73acfc
@@ -12208,15 +12332,15 @@ index 0000000000..94b2a3ffd5
+ /* Set OTG VBUS Valid from HSPHY to controller */
diff --git a/target/linux/ipq807x/patches/109-tplink.patch b/target/linux/ipq807x/patches/109-tplink.patch
new file mode 100644
index 0000000000..da3e3ef536
index 0000000000..f12f5bc70d
--- /dev/null
+++ b/target/linux/ipq807x/patches/109-tplink.patch
@@ -0,0 +1,1510 @@
+Index: linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq807x-ex227.dts
@@ -0,0 +1,1518 @@
+Index: linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq807x-eap620.dts
+===================================================================
+--- /dev/null
++++ linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq807x-ex227.dts
+@@ -0,0 +1,750 @@
++++ linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq807x-eap620.dts
+@@ -0,0 +1,754 @@
++/dts-v1/;
++/*
++ * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
@@ -12239,8 +12363,8 @@ index 0000000000..da3e3ef536
++/ {
++ #address-cells = <0x2>;
++ #size-cells = <0x2>;
++ model = "TP-Link EX227";
++ compatible = "tplink,ex227", "qcom,ipq807x";
++ model = "TP-Link EAP620";
++ compatible = "tplink,eap620", "qcom,ipq807x";
++ qcom,msm-id = <0x143 0x0>;
++ interrupt-parent = <&intc>;
++ qcom,board-id = <0x8 0x0>;
@@ -12252,6 +12376,10 @@ index 0000000000..da3e3ef536
++ * to patch MAC addresses
++ */
++ ethernet0 = "/soc/dp1";
++ led-boot = &led_power;
++ led-failsafe = &led_power;
++ led-running = &led_power;
++ led-upgrade = &led_power;
++ };
++
++ chosen {
@@ -12818,8 +12946,8 @@ index 0000000000..da3e3ef536
++ pinctrl-0 = <&led_pins>;
++ pinctrl-names = "default";
++
++ led_power {
++ label = "led_power";
++ led_power: led_power {
++ label = "blue:power";
++ gpio = <&tlmm 42 GPIO_ACTIVE_HIGH>;
++ default-state = "on";
++ };
@@ -12967,11 +13095,11 @@ index 0000000000..da3e3ef536
++ status = "disabled";
++};
++
+Index: linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq807x-ex447.dts
+Index: linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq807x-eap660.dts
+===================================================================
+--- /dev/null
++++ linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq807x-ex447.dts
+@@ -0,0 +1,750 @@
++++ linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/arch/arm64/boot/dts/qcom/qcom-ipq807x-eap660.dts
+@@ -0,0 +1,754 @@
++/dts-v1/;
++/*
++ * Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
@@ -12994,8 +13122,8 @@ index 0000000000..da3e3ef536
++/ {
++ #address-cells = <0x2>;
++ #size-cells = <0x2>;
++ model = "TP-Link EX447";
++ compatible = "tplink,ex447", "qcom,ipq807x";
++ model = "TP-Link EAP660";
++ compatible = "tplink,eap660", "qcom,ipq807x";
++ qcom,msm-id = <0x143 0x0>;
++ interrupt-parent = <&intc>;
++ qcom,board-id = <0x8 0x0>;
@@ -13013,6 +13141,10 @@ index 0000000000..da3e3ef536
++ bootargs = "console=ttyMSM0,115200,n8 root=/dev/ram0 rw \
++ init=/init";
++ bootargs-append = " swiotlb=1";
++ led-boot = &led_power;
++ led-failsafe = &led_power;
++ led-running = &led_power;
++ led-upgrade = &led_power;
++ };
++};
++
@@ -13573,8 +13705,8 @@ index 0000000000..da3e3ef536
++ pinctrl-0 = <&led_pins>;
++ pinctrl-names = "default";
++
++ led_power {
++ label = "led_power";
++ led_power: led_power {
++ label = "power:blue";
++ gpio = <&tlmm 42 GPIO_ACTIVE_HIGH>;
++ default-state = "on";
++ };
@@ -13722,6 +13854,49 @@ index 0000000000..da3e3ef536
++ status = "disabled";
++};
++
diff --git a/target/linux/ipq807x/patches/110-add-esmt-nand.patch b/target/linux/ipq807x/patches/110-add-esmt-nand.patch
new file mode 100644
index 0000000000..d47a4d0d16
--- /dev/null
+++ b/target/linux/ipq807x/patches/110-add-esmt-nand.patch
@@ -0,0 +1,37 @@
+Index: linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/drivers/mtd/nand/nand_ids.c
+===================================================================
+--- linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce.orig/drivers/mtd/nand/nand_ids.c
++++ linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/drivers/mtd/nand/nand_ids.c
+@@ -62,6 +62,12 @@ struct nand_flash_dev nand_flash_ids[] =
+ {"TH58NYG3S0H 8G 1.8V 8-bit",
+ { .id = {0x98, 0xa3, 0x91, 0x26} },
+ SZ_4K, SZ_1K, SZ_256K, 0, 4, 256, NAND_ECC_INFO(8, SZ_512) },
++
++ {"F59D2G81KA 2G 1.8V 8-bit",
++ { .id = {0xc8, 0x5a, 0x90, 0x04} },
++ SZ_2K, SZ_256, SZ_128K, 0, 4, 128, NAND_ECC_INFO(8, SZ_512) },
++
++
+ LEGACY_ID_NAND("NAND 4MiB 5V 8-bit", 0x6B, 4, SZ_8K, SP_OPTIONS),
+ LEGACY_ID_NAND("NAND 4MiB 3,3V 8-bit", 0xE3, 4, SZ_8K, SP_OPTIONS),
+ LEGACY_ID_NAND("NAND 4MiB 3,3V 8-bit", 0xE5, 4, SZ_8K, SP_OPTIONS),
+@@ -190,6 +196,7 @@ struct nand_manufacturers nand_manuf_ids
+ {NAND_MFR_SANDISK, "SanDisk"},
+ {NAND_MFR_INTEL, "Intel"},
+ {NAND_MFR_ATO, "ATO"},
++ {NAND_MFR_ESMT, "ESMT"},
+ {NAND_MFR_GIGA, "GigaDevice"},
+ {NAND_MFR_ATO, "ATO"},
+ {NAND_MFR_WINBOND, "Winbond"},
+Index: linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/include/linux/mtd/nand.h
+===================================================================
+--- linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce.orig/include/linux/mtd/nand.h
++++ linux-4.4.60-qsdk-10fd7d14853b7020b804acae690c8acec5d954ce/include/linux/mtd/nand.h
+@@ -778,6 +778,7 @@ static inline struct mtd_info *nand_to_m
+ #define NAND_MFR_ATO 0x9b
+ #define NAND_MFR_WINBOND 0xef
+ #define NAND_MFR_FIDELIX 0xe5
++#define NAND_MFR_ESMT 0xc8
+
+ /* The maximum expected count of bytes in the NAND ID sequence */
+ #define NAND_MAX_ID_LEN 8
--
2.25.1

639
patches/0029-ipq4019-add-CIG-wf610d.patch Normal file
View File

@@ -0,0 +1,639 @@
From 859bdaad5959f972babb268eff24901b116703c8 Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org>
Date: Tue, 13 Apr 2021 16:59:32 +0200
Subject: [PATCH] ipq4019: add CIG wf610d
Signed-off-by: John Crispin <john@phrozen.org>
---
package/firmware/ipq-wifi/Makefile | 4 +-
.../ipq-wifi/board-cig_wf610d.qca4019 | Bin 0 -> 24316 bytes
.../ipq40xx/base-files/etc/board.d/01_leds | 3 +
.../ipq40xx/base-files/etc/board.d/02_network | 1 +
.../etc/hotplug.d/firmware/11-ath10k-caldata | 8 +
.../lib/preinit/05_set_iface_mac_ipq40xx.sh | 4 +
.../boot/dts/qcom-ipq4029-ap-cig-wf610d.dts | 409 ++++++++++++++++++
target/linux/ipq40xx/image/generic.mk | 14 +
.../901-arm-boot-add-dts-files.patch | 3 +-
9 files changed, 444 insertions(+), 2 deletions(-)
create mode 100644 package/firmware/ipq-wifi/board-cig_wf610d.qca4019
create mode 100755 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-cig-wf610d.dts
diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
index e5f10a1f98..513ad4ea67 100644
--- a/package/firmware/ipq-wifi/Makefile
+++ b/package/firmware/ipq-wifi/Makefile
@@ -47,7 +47,8 @@ ALLWIFIBOARDS:= \
nec_wg2600hp3 \
plasmacloud_pa1200 \
plasmacloud_pa2200 \
- qxwlan_e2600ac
+ qxwlan_e2600ac \
+ cig_wf610d
ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
@@ -131,5 +132,6 @@ $(eval $(call generate-ipq-wifi-package,nec_wg2600hp3,NEC Platforms WG2600HP3))
$(eval $(call generate-ipq-wifi-package,plasmacloud_pa1200,Plasma Cloud PA1200))
$(eval $(call generate-ipq-wifi-package,plasmacloud_pa2200,Plasma Cloud PA2200))
$(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
+$(eval $(call generate-ipq-wifi-package,cig_wf610d,CIG WF_610D))
$(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))
diff --git a/package/firmware/ipq-wifi/board-cig_wf610d.qca4019 b/package/firmware/ipq-wifi/board-cig_wf610d.qca4019
new file mode 100644
index 0000000000000000000000000000000000000000..3ba97ff0b9dc46519dc3767cac3931872a8cc5f1
GIT binary patch
literal 24316
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
literal 0
HcmV?d00001
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
index 3e0f3ab258..f9674126ba 100755
--- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
@@ -30,6 +30,7 @@ edgecore,oap100)
ucidef_set_led_wlan "wlan2g" "WLAN2G" "blue:wlan2g" "phy0tpt"
ucidef_set_led_wlan "wlan5g" "WLAN5G" "blue:wlan5g" "phy1tpt"
;;
+
engenius,eap1300)
ucidef_set_led_netdev "lan" "LAN" "blue:lan" "eth0"
ucidef_set_led_wlan "wlan2g" "WLAN2G" "blue:wlan2g" "phy0tpt"
@@ -61,6 +62,8 @@ qxwlan,e2600ac-c2)
ucidef_set_led_wlan "wlan2g" "WLAN0" "green:wlan0" "phy0tpt"
ucidef_set_led_wlan "wlan5g" "WLAN1" "green:wlan1" "phy1tpt"
;;
+edgecore,ecw5211 |\
+cig,wf610d |\
zyxel,nbg6617 |\
zyxel,wre6606)
ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wlan2g" "phy0tpt"
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
index 8b7364ff33..dcdb790c84 100755
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -41,6 +41,7 @@ ipq40xx_setup_interfaces()
;;
asus,map-ac2200|\
cilab,meshpoint-one|\
+ cig,wf610d|\
edgecore,ecw5211|\
edgecore,oap100|\
openmesh,a42|\
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 6670d310db..5eae9c6e80 100644
--- 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
@@ -93,6 +93,10 @@ case "$FIRMWARE" in
caldata_extract "ART" 0x1000 0x2f20
ath10k_patch_mac $(mtd_get_mac_binary ORGDATA 0x26)
;;
+ cig,wf610d)
+ caldata_extract "0:ART" 0x1000 0x2f20
+ ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii 0:APPSBLENV ethaddr) +2)
+ ;;
cellc,rtl30vw |\
compex,wpj419 |\
compex,wpj428 |\
@@ -197,6 +201,10 @@ case "$FIRMWARE" in
caldata_extract "ART" 0x5000 0x2f20
ath10k_patch_mac $(mtd_get_mac_binary ORGDATA 0x2c)
;;
+ cig,wf610d)
+ caldata_extract "0:ART" 0x5000 0x2f20
+ ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_ascii 0:APPSBLENV ethaddr) +3)
+ ;;
cellc,rtl30vw |\
compex,wpj419 |\
compex,wpj428 |\
diff --git a/target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh b/target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh
index 0d606c75b5..4d3b1df219 100644
--- a/target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh
+++ b/target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh
@@ -7,6 +7,10 @@ preinit_set_mac_address() {
ip link set dev eth0 address $(macaddr_add "$base_mac" +1)
ip link set dev eth1 address $(macaddr_add "$base_mac" +3)
;;
+ cig,wf610d)
+ base_mac=$(mtd_get_mac_ascii 0:APPSBLENV ethaddr)
+ ip link set eth0 address "${base_mac}"
+ ;;
ezviz,cs-w3-wd1200g-eup)
ip link set dev eth0 address $(mtd_get_mac_binary "ART" 0x6)
ip link set dev eth1 address $(mtd_get_mac_binary "ART" 0x0)
diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-cig-wf610d.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-cig-wf610d.dts
new file mode 100755
index 0000000000..e75e35e8ef
--- /dev/null
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4029-ap-cig-wf610d.dts
@@ -0,0 +1,409 @@
+/* Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+#include "qcom-ipq4019.dtsi"
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/soc/qcom,tcsr.h>
+
+/ {
+ model = "Cambridge Industries Group, Ltd. WF-610D";
+ compatible = "cig,wf610d", "qcom,ipq4019";
+ qcom,board-id = <8 0>;
+ qcom,msm-id = <0x111 0>;
+ qcom,pmic-id = <0 0 0 0>;
+
+ memory {
+ device_type = "memory";
+ reg = <0x80000000 0x10000000>; /* 256MB */
+ };
+
+ chosen {
+ bootargs-append = " clk_ignore_unused";
+ };
+
+ soc {
+ pinctrl@1000000 {
+ serial_0_pins: serial0_pinmux {
+ mux {
+ pins = "gpio16", "gpio17";
+ function = "blsp_uart0";
+ bias-disable;
+ };
+ };
+
+ serial_1_pins: serial1_pinmux {
+ mux {
+ pins = "gpio8", "gpio9";
+ function = "blsp_uart1";
+ bias-disable;
+ };
+ };
+
+ nand_pins: nand_pins {
+
+ pullups {
+ pins = "gpio53", "gpio58",
+ "gpio59";
+ function = "qpic";
+ bias-pull-up;
+ };
+
+ pulldowns {
+ pins = "gpio54", "gpio55", "gpio56",
+ "gpio57", "gpio60", "gpio61",
+ "gpio62", "gpio63", "gpio64",
+ "gpio65", "gpio66", "gpio67",
+ "gpio68", "gpio69";
+ function = "qpic";
+ bias-pull-down;
+ };
+ };
+ led_0_pins: led0_pinmux {
+ mux {
+ pins = "gpio52", "gpio42", "gpio43", "gpio45", "gpio46", "gpio47", "gpio48", "gpio40", "gpio39", "gpio49";
+ function = "gpio";
+ drive-strength = <16>;
+ bias-pull-down;
+ output-low;
+ };
+ };
+
+ spi_0_pins: spi_0_pinmux {
+ pinmux {
+ function = "blsp_spi0";
+ pins = "gpio13", "gpio14", "gpio15";
+ };
+ pinmux_cs {
+ function = "gpio";
+ pins = "gpio12";
+ };
+ pinconf {
+ pins = "gpio13", "gpio14", "gpio15";
+ drive-strength = <12>;
+ bias-disable;
+ };
+ pinconf_cs {
+ pins = "gpio12";
+ drive-strength = <2>;
+ bias-disable;
+ output-high;
+ };
+ };
+
+ i2c_0_pins: i2c_0_pinmux {
+ pinmux {
+ function = "blsp_i2c0";
+ pins = "gpio10", "gpio11";
+ };
+ pinconf {
+ pins = "gpio10", "gpio11";
+ drive-strength = <16>;
+ bias-disable;
+ };
+ };
+ mdio_pins: mdio_pinmux {
+ mux_1 {
+ pins = "gpio6";
+ function = "mdio";
+ bias-pull-up;
+ };
+ mux_2 {
+ pins = "gpio7";
+ function = "mdc";
+ bias-pull-up;
+ };
+ };
+
+ };
+
+ serial@78af000 {
+ pinctrl-0 = <&serial_0_pins>;
+ pinctrl-names = "default";
+ status = "okay";
+ };
+
+ serial@78b0000 {
+ pinctrl-0 = <&serial_1_pins>;
+ pinctrl-names = "default";
+ status = "okay";
+ };
+
+ blsp_dma: dma@7884000 {
+ status = "okay";
+ };
+
+ spi_0: spi@78b5000 {
+ pinctrl-0 = <&spi_0_pins>;
+ pinctrl-names = "default";
+ status = "okay";
+ cs-gpios = <&tlmm 12 GPIO_ACTIVE_HIGH>;
+
+ m25p80@0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ reg = <0>;
+ compatible = "jedec,spi-nor";
+ linux,modalias = "m25p80", "n25q128a11";
+ spi-max-frequency = <24000000>;
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ SBL1@0 {
+ label = "0:SBL1";
+ reg = <0x0 0x40000>;
+ read-only;
+ };
+
+ MIBIB@40000 {
+ label = "0:MIBIB";
+ reg = <0x40000 0x20000>;
+ read-only;
+ };
+
+ QSEE@60000 {
+ label = "0:QSEE";
+ reg = <0x60000 0x60000>;
+ read-only;
+ };
+
+ CDT@c0000 {
+ label = "0:CDT";
+ reg = <0xc0000 0x10000>;
+ read-only;
+ };
+
+ DDRPARAMS@d0000 {
+ label = "0:DDRPARAMS";
+ reg = <0xd0000 0x10000>;
+ read-only;
+ };
+
+ APPSBLENV@e0000 {
+ label = "0:APPSBLENV";
+ reg = <0xe0000 0x10000>;
+ read-only;
+ };
+
+ APPSBL@f0000 {
+ label = "0:APPSBL";
+ reg = <0xf0000 0x80000>;
+ read-only;
+ };
+
+ ART@170000 {
+ label = "0:ART";
+ reg = <0x170000 0x10000>;
+ read-only;
+ };
+
+ firmware@180000 {
+ compatible = "denx,fit";
+ label = "firmware";
+ reg = <0x180000 0x1e80000>;
+ };
+ };
+ };
+ };
+
+ i2c_0: i2c@78b7000 { /* BLSP1 QUP2 */
+ pinctrl-0 = <&i2c_0_pins>;
+ pinctrl-1 = <&i2c_0_pins>;
+ pinctrl-names = "i2c_active", "i2c_sleep";
+ status = "okay";
+
+ qca_codec: qca_codec@12 {
+ compatible = "qca,ipq40xx-codec";
+ reg = <0x12>;
+ status = "disabled";
+ };
+
+ lcd_ts: lcd_ts@40 {
+ compatible = "qca,gsl1680_ts";
+ reg = <0x40>;
+ status = "disabled";
+ };
+ };
+
+
+
+ cryptobam: dma@8e04000 {
+ status = "okay";
+ };
+
+ crypto@8e3a000 {
+ status = "okay";
+ };
+
+ gpio_keys {
+ compatible = "gpio-keys";
+
+ reset {
+ label = "reset";
+ linux,code = <KEY_RESTART>;
+ gpios = <&tlmm 50 GPIO_ACTIVE_LOW>;
+ linux,input-type = <1>;
+ };
+ };
+
+ gpio-leds {
+ compatible = "gpio-leds";
+ pinctrl-0 = <&led_0_pins>;
+
+ wf6203_green_power {
+ gpios = <&tlmm 52 0>;
+ label = "wf6203:green:power";
+ default-state = "off";
+ };
+ wf6203_yellow_eth0 {
+ gpios = <&tlmm 42 0>;
+ label = "wf6203:yellow:eth0";
+ default-state = "off";
+ };
+ wf6203_green_eth0 {
+ gpios = <&tlmm 43 GPIO_ACTIVE_LOW>;
+ label = "wf6203:green:eth0";
+ default-state = "off";
+ };
+ wf6203_yellow_eth1 {
+ gpios = <&tlmm 45 0>;
+ label = "wf6203:yellow:eth1";
+ default-state = "off";
+ };
+ wf6203_green_eth1 {
+ gpios = <&tlmm 46 GPIO_ACTIVE_LOW>;
+ label = "wf6203:green:eth1";
+ default-state = "off";
+ };
+ wf6203_yellow_eth2 {
+ gpios = <&tlmm 47 0>;
+ label = "wf6203:yellow:eth2";
+ default-state = "off";
+ };
+ wf6203_green_eth2 {
+ gpios = <&tlmm 48 GPIO_ACTIVE_LOW>;
+ label = "wf6203:green:eth2";
+ default-state = "off";
+ };
+ wf6203_green_wifi2g {
+ gpios = <&tlmm 40 0>;
+ label = "wf6203:green:wifi2g";
+ default-state = "off";
+ };
+ wf6203_green_wifi5g {
+ gpios = <&tlmm 39 0>;
+ label = "wf6203:green:wifi5g";
+ default-state = "off";
+ };
+ wf6203_green_status {
+ gpios = <&tlmm 49 0>;
+ label = "wf6203:green:status";
+ default-state = "off";
+ };
+ };
+
+
+ watchdog@b017000 {
+ timeout-sec = <60>;
+ status = "okay";
+ };
+
+ qpic_bam: dma@7984000 {
+ status = "okay";
+ };
+
+ nand: qpic-nand@79b0000 {
+ pinctrl-0 = <&nand_pins>;
+ pinctrl-names = "default";
+ status = "okay";
+ };
+
+ mdio@90000 {
+ pinctrl-0 = <&mdio_pins>;
+ pinctrl-names = "default";
+ phy-reset-gpio = <&tlmm 18 0>;
+ status = "okay";
+ bias-disable;
+ };
+
+ ess-switch@c000000 {
+ switch_cpu_bmp = <0x1>; /* cpu port bitmap */
+ switch_lan_bmp = <0x3e>; /* lan port bitmap */
+ switch_wan_bmp = <0>; /* wan port bitmap */
+ status = "okay";
+ };
+
+ ess-psgmii@98000 {
+ status = "okay";
+ };
+
+ edma@c080000 {
+ status = "okay";
+ };
+
+ usb3_ss_phy: ssphy@9a000 {
+ status = "okay";
+ };
+
+ usb3_hs_phy: hsphy@a6000 {
+ status = "okay";
+ };
+
+ usb3: usb3@8af8800 {
+ status = "okay";
+ };
+
+ usb2_hs_phy: hsphy@a8000 {
+ status = "okay";
+ };
+
+ usb2: usb2@60f8800 {
+ status = "okay";
+ };
+
+ ext_wtd {
+ compatible = "linux,wdt-gpio";
+ gpios = <&tlmm 41 GPIO_ACTIVE_LOW>;
+ hw_algo = "toggle";
+ hw_margin_ms = <1000>;
+ always-running;
+ };
+
+ tcsr@1949000 {
+ compatible = "qcom,tcsr";
+ reg = <0x1949000 0x100>;
+ qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
+ };
+
+ tcsr@1957000 {
+ compatible = "qcom,tcsr";
+ reg = <0x1957000 0x100>;
+ qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
+ };
+
+ wifi0: wifi@a000000 {
+ qcom,ath10k-calibration-variant = "CIG WF_610D";
+ status = "okay";
+ };
+
+ wifi1: wifi@a800000 {
+ qcom,ath10k-calibration-variant = "CIG WF_610D";
+ status = "okay";
+ };
+ };
+
+};
diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk
index 4e40b8be50..1de17dd15a 100644
--- a/target/linux/ipq40xx/image/generic.mk
+++ b/target/linux/ipq40xx/image/generic.mk
@@ -273,6 +273,20 @@ define Device/cilab_meshpoint-one
endef
TARGET_DEVICES += cilab_meshpoint-one
+define Device/cig_wf610d
+ $(call Device/FitImage)
+ DEVICE_TITLE := CIG WF_610D
+ DEVICE_DTS := qcom-ipq4029-ap-cig-wf610d
+ KERNEL_INSTALL := 1
+ KERNEL_SIZE := 4048k
+ BLOCKSIZE := 128k
+ PAGESIZE := 2048
+ DEVICE_PACKAGES := ipq-wifi-cig_wf610d
+ IMAGES = sysupgrade.bin
+ IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata
+endef
+TARGET_DEVICES += cig_wf610d
+
define Device/compex_wpj419
$(call Device/FitImage)
$(call Device/UbiFit)
diff --git a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
index a3d3341587..aec0d01ed6 100644
--- a/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
+++ b/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
-@@ -837,11 +837,58 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+@@ -837,11 +837,59 @@ dtb-$(CONFIG_ARCH_QCOM) += \
qcom-apq8074-dragonboard.dtb \
qcom-apq8084-ifc6540.dtb \
qcom-apq8084-mtp.dtb \
@@ -43,6 +43,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
qcom-ipq4019-ap.dk07.1-c1.dtb \
qcom-ipq4019-ap.dk07.1-c2.dtb \
+ qcom-ipq4019-a62.dtb \
++ qcom-ipq4029-ap-cig-wf610d.dtb \
+ qcom-ipq4019-cm520-79f.dtb \
+ qcom-ipq4019-ea8300.dtb \
+ qcom-ipq4019-eap2200.dtb \
--
2.25.1

15
profiles/cig_wf160d.yml Normal file
View File

@@ -0,0 +1,15 @@
---
profile: cig_wf610d
target: ipq40xx
subtarget: generic
description: Build image for the CIG WF160D
include:
- ucentral-ap
packages:
- ath10k-firmware-qca4019-ct-htt
- ath10k-firmware-qca9888-ct-htt
- ath10k-firmware-qca9984-ct-htt
diffconfig: |
# CONFIG_PACKAGE_ath10k-firmware-qca4019-ct is not set
# CONFIG_PACKAGE_ath10k-firmware-qca9888-ct is not set
# CONFIG_PACKAGE_ath10k-firmware-qca9984-ct is not set

7
profiles/tplink_eap225_outdoor_v1.yml Normal file
View File

@@ -0,0 +1,7 @@
---
profile: tplink_eap225-outdoor-v1
target: ath79
subtarget: generic
description: Build image for the TPLink EAP225 outdoor v1
include:
- ucentral-ap-light

11
profiles/tplink_eap620.yml Normal file
View File

@@ -0,0 +1,11 @@
---
profile: tplink_eap620
target: ipq807x
subtarget: ipq807x
description: Build image for the TP-Link EAP620
feeds:
- name: ipq807x
path: ../../feeds/ipq807x
include:
- wifi-ax
- ucentral-ap

11
profiles/tplink_eap660.yml Normal file
View File

@@ -0,0 +1,11 @@
---
profile: tplink_eap660
target: ipq807x
subtarget: ipq807x
description: Build image for the TP-Link EAP660
feeds:
- name: ipq807x
path: ../../feeds/ipq807x
include:
- wifi-ax
- ucentral-ap