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

ipq807x_v5.4: change RAP630W-312G and RAP63XC vendor name

Browse Source 
Fixes: WIFI-14471
Signed-off-by: Wingate Chi <wingate.chi@cybertan.com.tw>
This commit is contained in:
Wingate Chi
2025-03-14 08:36:07 +00:00
committed by John Crispin
parent 486cc7983a
commit 076bc0712e
14 changed files with 47 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
target: [ 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf189', 'cig_wf196', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'cybertan_rap630w-312g', 'cybertan_rap63xc-211g', 'sonicfi_rap630c-311g', 'sonicfi_rap630w-311g', 'sonicfi_rap630w-211g', 'sonicfi_rap7110c-341x', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap105', 'edgecore_eap111', 'edgecore_eap112', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4x_3', 'hfcl_ion4xi_w', 'hfcl_ion4x_w', 'indio_um-305ax', 'senao_iap4300m', 'senao_jeap6500', 'udaya_a6-id2', 'udaya_a6-od2', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655' ]
target: [ 'cig_wf186h', 'cig_wf186w', 'cig_wf188n', 'cig_wf196', 'cig_wf196', 'cybertan_eww631-a1', 'cybertan_eww631-b1', 'sonicfi_rap630w-312g', 'sonicfi_rap63xc-211g', 'sonicfi_rap630c-311g', 'sonicfi_rap630w-311g', 'sonicfi_rap630w-211g', 'sonicfi_rap7110c-341x', 'edgecore_eap101', 'edgecore_eap102', 'edgecore_eap104', 'edgecore_eap105', 'edgecore_eap111', 'edgecore_eap112', 'edgecore_oap101', 'edgecore_oap101-6e', 'edgecore_oap101e', 'edgecore_oap101e-6e', 'hfcl_ion4xe', 'hfcl_ion4xi', 'hfcl_ion4x', 'hfcl_ion4x_2', 'hfcl_ion4x_3', 'hfcl_ion4xi_w', 'hfcl_ion4x_w', 'indio_um-305ax', 'senao_iap4300m', 'senao_jeap6500', 'udaya_a6-id2', 'udaya_a6-od2', 'yuncore_ax820', 'yuncore_ax840', 'yuncore_fap640', 'yuncore_fap650', 'yuncore_fap655' ]
steps:
- uses: actions/checkout@v3

4
feeds/ipq807x_v5.4/ath11k-wifi/Makefile
View File

@@ -32,7 +32,6 @@ ALLWIFIBOARDS:= \
cybertan-eww622-a1 \
cybertan-eww631-a1 \
cybertan-eww631-b1 \
cybertan-rap630w-312g \
edgecore-eap101 \
gl-ax1800 \
gl-axt1800 \
@@ -52,6 +51,7 @@ ALLWIFIBOARDS:= \
wallys-dr6018-v4 \
sonicfi-rap630c-311g \
sonicfi-rap630w-311g \
sonicfi-rap630w-312g \
tplink-ex227 \
tplink-ex447 \
yuncore-ax840 \
@@ -394,7 +394,6 @@ $(eval $(call generate-ath11k-wifi-package,cig-wf194c4,Cigtech WF194c4))
$(eval $(call generate-ath11k-wifi-package,cybertan-eww622-a1,CyberTan EWW622 A1))
$(eval $(call generate-ath11k-wifi-package,cybertan-eww631-a1,CyberTan EWW631 A1))
$(eval $(call generate-ath11k-wifi-package,cybertan-eww631-b1,CyberTan EWW631 B1))
$(eval $(call generate-ath11k-wifi-package,cybertan-rap630w-312g,CyberTan RAP630W 312G))
$(eval $(call generate-ath11k-wifi-package,sercomm-wallaby,Sercomm Kiwi))
$(eval $(call generate-ath11k-wifi-package,wallys-dr6018,Wallys DR6018))
$(eval $(call generate-ath11k-wifi-package,wallys-dr6018-v4,Wallys DR6018 V4))
@@ -408,6 +407,7 @@ $(eval $(call generate-ath11k-wifi-package,indio-um-510axp-v1,Indio UM-510AXP V1
$(eval $(call generate-ath11k-wifi-package,indio-um-510axm-v1,Indio UM-510AXM V1))
$(eval $(call generate-ath11k-wifi-package,sonicfi-rap630c-311g,Sonicfi RAP630C 311G))
$(eval $(call generate-ath11k-wifi-package,sonicfi-rap630w-311g,Sonicfi RAP630W 311G))
$(eval $(call generate-ath11k-wifi-package,sonicfi-rap630w-312g,Sonicfi RAP630W 312G))
$(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,yuncore-ax840,YunCore AX840))

0
feeds/ipq807x_v5.4/ath11k-wifi/board-cybertan-rap630w-312g.bin.IPQ5018 → feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-312g.bin.IPQ5018
View File

0
feeds/ipq807x_v5.4/ath11k-wifi/board-cybertan-rap630w-312g.bin.QCN6122 → feeds/ipq807x_v5.4/ath11k-wifi/board-sonicfi-rap630w-312g.bin.QCN6122
View File

2
feeds/ipq807x_v5.4/ipq50xx/base-files/etc/board.d/01_leds
View File

@@ -24,7 +24,7 @@ cybertan,eww631-a1|\
cybertan,eww631-b1)
ucidef_set_led_default "power" "POWER" "sys:blue" "on"
;;
cybertan,rap630w-312g)
sonicfi,rap630w-312g)
ucidef_set_led_default "power" "POWER" "red:power" "on"
ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:wifi2" "phy0tpt"
ucidef_set_led_wlan "wlan5g" "WLAN5G" "green:wifi5" "phy1tpt"

2
feeds/ipq807x_v5.4/ipq50xx/base-files/etc/board.d/02_network
View File

@@ -59,7 +59,7 @@ qcom_setup_interfaces()
ucidef_set_interface_wan "eth0"
ucidef_set_interface_lan "eth1"
;;
cybertan,rap630w-312g|\
sonicfi,rap630w-312g|\
yuncore,fap655)
ucidef_add_switch "switch1" \
"6@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan"

6
feeds/ipq807x_v5.4/ipq50xx/base-files/etc/hotplug.d/firmware/10-ath11k-caldata
View File

@@ -121,9 +121,9 @@ ath11k/IPQ5018/hw1.0/caldata.bin)
cig,wf186h|\
sonicfi,rap630c-311g|\
sonicfi,rap630w-311g|\
sonicfi,rap630w-312g|\
cybertan,eww631-a1|\
cybertan,eww631-b1|\
cybertan,rap630w-312g|\
edgecore,eap104|\
edgecore,oap101|\
edgecore,oap101-6e|\
@@ -150,9 +150,9 @@ ath11k/qcn6122/hw1.0/caldata_1.bin)
cig,wf186h|\
sonicfi,rap630c-311g|\
sonicfi,rap630w-311g|\
sonicfi,rap630w-312g|\
cybertan,eww631-a1|\
cybertan,eww631-b1|\
cybertan,rap630w-312g|\
edgecore,oap101|\
edgecore,oap101-6e|\
edgecore,oap101e|\
@@ -219,7 +219,7 @@ ath11k-macs)
optimcloud,d60-5g|\
optimcloud,d50|\
optimcloud,d50-5g|\
cybertan,rap630w-312g|\
sonicfi,rap630w-312g|\
yuncore,fap655)
ath11k_generate_macs
;;

8
feeds/ipq807x_v5.4/ipq50xx/base-files/lib/upgrade/platform.sh
View File

@@ -72,9 +72,9 @@ platform_check_image() {
cig,wf186h|\
sonicfi,rap630c-311g|\
sonicfi,rap630w-311g|\
sonicfi,rap630w-312g|\
cybertan,eww631-a1|\
cybertan,eww631-b1|\
cybertan,rap630w-312g|\
edgecore,eap104|\
wallys,dr5018|\
hfcl,ion4x_w|\
@@ -143,11 +143,11 @@ platform_do_upgrade() {
}
nand_upgrade_tar "$1"
;;
sonicfi,rap630c-311g|\
sonicfi,rap630w-311g|\
cybertan,eww631-a1|\
cybertan,eww631-b1|\
cybertan,rap630w-312g)
sonicfi,rap630c-311g|\
sonicfi,rap630w-311g|\
sonicfi,rap630w-312g)
boot_part=$(fw_printenv bootfrom | cut -d = -f2)
echo "Current bootfrom is $boot_part"
if [[ $boot_part == 1 ]]; then

4
feeds/ipq807x_v5.4/ipq50xx/files/arch/arm64/boot/dts/qcom/qcom-ipq5018-rap630w-312g.dts
View File

@@ -22,8 +22,8 @@
/ {
#address-cells = <0x2>;
#size-cells = <0x2>;
model = "Cybertan RAP630W-312G";
compatible = "cybertan,rap630w-312g", "qcom,ipq5018-mp03.3", "qcom,ipq5018";
model = "Sonicfi RAP630W-312G";
compatible = "sonicfi,rap630w-312g", "qcom,ipq5018-mp03.3", "qcom,ipq5018";
interrupt-parent = <&intc>;
aliases {

10
feeds/ipq807x_v5.4/ipq50xx/image/ipq50xx.mk
View File

@@ -40,16 +40,16 @@ define Device/cybertan_eww631_b1
endef
TARGET_DEVICES += cybertan_eww631_b1
define Device/cybertan_rap630w_312g
DEVICE_TITLE := CyberTan RAP630W-312G
define Device/sonicfi_rap630w_312g
DEVICE_TITLE := Sonicfi RAP630W-312G
DEVICE_DTS := qcom-ipq5018-rap630w-312g
SUPPORTED_DEVICES := cybertan,rap630w-312g
DEVICE_PACKAGES := ath11k-wifi-cybertan-rap630w-312g ath11k-firmware-ipq50xx-map-spruce \
SUPPORTED_DEVICES := sonicfi,rap630w-312g
DEVICE_PACKAGES := ath11k-wifi-sonicfi-rap630w-312g ath11k-firmware-ipq50xx-map-spruce \
-kmod-usb-dwc3-of-simple kmod-usb-dwc3-qcom kmod-usb3 \
kmod-usb-uas kmod-fs-msdos kmod-fs-ntfs
DEVICE_DTS_CONFIG := config@mp03.3
endef
TARGET_DEVICES += cybertan_rap630w_312g
TARGET_DEVICES += sonicfi_rap630w_312g
define Device/sonicfi_rap630c_311g
DEVICE_TITLE := Sonicfi RAP630C-311G

34
patches/0080-rampis-add-mt7621-cybertan-rap63xc-211g-support.patch → patches/0080-rampis-add-mt7621-sonicfi-rap63xc-211g-support.patch
View File

@@ -1,19 +1,19 @@
From ba018e2a24d85b7eabe0ed5a43d2c0a5ffccac7c Mon Sep 17 00:00:00 2001
From: "wingate.chi" <wingate.chi@cybertan.com.tw>
From: "wingate.chi" <wingate.chi@sonicfi.com.tw>
Date: Mon, 9 Dec 2024 03:06:26 +0000
Subject: [PATCH] rampis: add mt7621 cybertan rap63xc-211g support
Subject: [PATCH] rampis: add mt7621 sonicfi rap63xc-211g support
Signed-off-by: wingate.chi <wingate.chi@cybertan.com.tw>
Signed-off-by: wingate.chi <wingate.chi@sonicfi.com.tw>
---
package/boot/uboot-envtools/files/ramips | 1 +
.../dts/mt7621_cybertan_rap63xc-211g.dts | 204 ++++++++++++++++++
.../dts/mt7621_sonicfi_rap63xc-211g.dts | 204 ++++++++++++++++++
target/linux/ramips/image/mt7621.mk | 9 +
.../mt7621/base-files/etc/board.d/01_leds | 6 +
.../mt7621/base-files/etc/board.d/02_network | 6 +
.../etc/hotplug.d/ieee80211/10_fix_wifi_mac | 5 +
6 files changed, 231 insertions(+)
mode change 100644 => 100755 package/boot/uboot-envtools/files/ramips
create mode 100755 target/linux/ramips/dts/mt7621_cybertan_rap63xc-211g.dts
create mode 100755 target/linux/ramips/dts/mt7621_sonicfi_rap63xc-211g.dts
mode change 100644 => 100755 target/linux/ramips/image/mt7621.mk
mode change 100644 => 100755 target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
mode change 100644 => 100755 target/linux/ramips/mt7621/base-files/etc/board.d/02_network
@@ -29,15 +29,15 @@ index 8c7ce71c49..522bf03254
allnet,all0256n-4m|\
allnet,all0256n-8m|\
allnet,all5002|\
+cybertan,rap63xc-211g|\
+sonicfi,rap63xc-211g|\
yuncore,ax820)
ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x10000" "0x10000"
;;
diff --git a/target/linux/ramips/dts/mt7621_cybertan_rap63xc-211g.dts b/target/linux/ramips/dts/mt7621_cybertan_rap63xc-211g.dts
diff --git a/target/linux/ramips/dts/mt7621_sonicfi_rap63xc-211g.dts b/target/linux/ramips/dts/mt7621_sonicfi_rap63xc-211g.dts
new file mode 100755
index 0000000000..149277a825
--- /dev/null
+++ b/target/linux/ramips/dts/mt7621_cybertan_rap63xc-211g.dts
+++ b/target/linux/ramips/dts/mt7621_sonicfi_rap63xc-211g.dts
@@ -0,0 +1,204 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
@@ -48,8 +48,8 @@ index 0000000000..149277a825
+#include <dt-bindings/leds/common.h>
+
+/ {
+ compatible = "cybertan,rap63xc-211g", "mediatek,mt7621-soc";
+ model = "CyberTan RAP63XC-211G";
+ compatible = "sonicfi,rap63xc-211g", "mediatek,mt7621-soc";
+ model = "sonicfi RAP63XC-211G";
+
+ aliases {
+ led-boot = &led_system;
@@ -253,14 +253,14 @@ index 8790a2fa50..1a1959bdc4
endef
TARGET_DEVICES += cudy_x6-v2
+define Device/cybertan_rap63xc-211g
+define Device/sonicfi_rap63xc-211g
+ $(Device/dsa-migration)
+ IMAGE_SIZE := 15808k
+ DEVICE_VENDOR := CyberTan
+ DEVICE_VENDOR := sonicfi
+ DEVICE_MODEL := RAP63XC-211G
+ DEVICE_PACKAGES := kmod-mt7915-firmware uboot-envtools
+endef
+TARGET_DEVICES += cybertan_rap63xc-211g
+TARGET_DEVICES += sonicfi_rap63xc-211g
+
define Device/dlink_dap-1620-b1
DEVICE_VENDOR := D-Link
@@ -275,7 +275,7 @@ index 3ceac60434..84cc404019
ucidef_set_led_netdev "lan4" "lan4" "green:lan4" "lan4"
ucidef_set_led_netdev "wan" "wan" "green:wan" "wan"
;;
+cybertan,rap63xc-211g)
+sonicfi,rap63xc-211g)
+ ucidef_set_led_netdev "wifi2g" "Wifi2G" "wlan2g" "wlan0" "link"
+ ucidef_set_led_netdev "wifi5g" "Wifi5G" "wlan5g" "wlan1" "link"
+ ucidef_set_led_netdev "lan" "LAN" "green:lan" "lan"
@@ -294,7 +294,7 @@ index 0f6b7fd526..d3944a47c4
uci add_list firewall.@zone[1].network='eth_om'
;;
cudy,m1800|\
+ cybertan,rap63xc-211g|\
+ sonicfi,rap63xc-211g|\
yuncore,ax820|\
zyxel,nt7101)
ucidef_set_interfaces_lan_wan "lan" "wan"
@@ -302,7 +302,7 @@ index 0f6b7fd526..d3944a47c4
lan_mac=$wan_mac
label_mac=$wan_mac
;;
+ cybertan,rap63xc-211g)
+ sonicfi,rap63xc-211g)
+ wan_mac=$(mtd_get_mac_binary Factory 0x4)
+ lan_mac=$(macaddr_add "$wan_mac" 1)
+ label_mac=$wan_mac
@@ -320,7 +320,7 @@ index d5bd50fdf7..7ead3274b0
[ "$PHYNBR" = "1" ] && \
macaddr_setbit_la "$(macaddr_add $hw_mac_addr 0x100000)" > /sys${DEVPATH}/macaddress
;;
+ cybertan,rap63xc-211g)
+ sonicfi,rap63xc-211g)
+ hw_mac_addr="$(mtd_get_mac_binary Factory 0x4)"
+ [ "$PHYNBR" = "0" ] && macaddr_add $hw_mac_addr 2 > /sys${DEVPATH}/macaddress
+ [ "$PHYNBR" = "1" ] && macaddr_add $hw_mac_addr 3 > /sys${DEVPATH}/macaddress

8
profiles/cybertan_rap63xc-211g.yml
View File

@@ -1,8 +0,0 @@
---
profile: cybertan_rap63xc-211g
target: ramips
subtarget: mt7621
description: Build image for the Cybertan EAP RAP63XC-211G
image: bin/targets/ramips/mt7621/openwrt-ramips-mt7621-cybertan_rap63xc-211g-squashfs-sysupgrade.bin
include:
- ucentral-ap

6
profiles/cybertan_rap630w-312g.yml → profiles/sonicfi_rap630w-312g.yml
View File

@@ -1,9 +1,9 @@
---
profile: cybertan_rap630w_312g
profile: sonicfi_rap630w_312g
target: ipq50xx
subtarget: generic
description: Build image for the Cybertan Wallmount EAP RAP630W-312G
image: bin/targets/ipq50xx/generic/openwrt-ipq50xx-cybertan_rap630w_312g-squashfs-sysupgrade.tar
description: Build image for the Sonicfi Wallmount EAP RAP630W-312G
image: bin/targets/ipq50xx/generic/openwrt-ipq50xx-sonicfi_rap630w_312g-squashfs-sysupgrade.tar
feeds:
- name: ipq807x
path: ../../feeds/ipq807x_v5.4

8
profiles/sonicfi_rap63xc-211g.yml Executable file
View File

@@ -0,0 +1,8 @@
---
profile: sonicfi_rap63xc-211g
target: ramips
subtarget: mt7621
description: Build image for the Sonicfi EAP RAP63XC-211G
image: bin/targets/ramips/mt7621/openwrt-ramips-mt7621-sonicfi_rap63xc-211g-squashfs-sysupgrade.bin
include:
- ucentral-ap