mirror of
https://github.com/Telecominfraproject/wlan-ap.git
synced 2025-12-16 17:01:37 +00:00
157 lines
5.2 KiB
Diff
157 lines
5.2 KiB
Diff
From 4a5ac0aa04a5e6cf9316ce7c16843f0f4a4128ce Mon Sep 17 00:00:00 2001
|
|
From: John Crispin <john@phrozen.org>
|
|
Date: Wed, 12 May 2021 07:00:18 +0200
|
|
Subject: [PATCH] ipq807x: fix edgecore eap102
|
|
|
|
* import the fixes for the update hardware revision
|
|
|
|
Signed-off-by: John Crispin <john@phrozen.org>
|
|
---
|
|
target/linux/ipq807x/base-files/etc/board.d/02_network | 5 +----
|
|
target/linux/ipq807x/base-files/etc/init.d/bootcount | 3 ++-
|
|
target/linux/ipq807x/base-files/lib/upgrade/platform.sh | 4 ++--
|
|
.../arch/arm64/boot/dts/qcom/qcom-ipq807x-eap102.dts | 8 ++++----
|
|
target/linux/ipq807x/image/ipq60xx.mk | 6 +++---
|
|
target/linux/ipq807x/image/ipq807x.mk | 2 +-
|
|
6 files changed, 13 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/target/linux/ipq807x/base-files/etc/board.d/02_network b/target/linux/ipq807x/base-files/etc/board.d/02_network
|
|
index f23a9f3eac..e90a73f7bf 100755
|
|
--- a/target/linux/ipq807x/base-files/etc/board.d/02_network
|
|
+++ b/target/linux/ipq807x/base-files/etc/board.d/02_network
|
|
@@ -28,6 +28,7 @@ qcom_setup_interfaces()
|
|
ucidef_set_interface_wan "eth0"
|
|
;;
|
|
cig,wf194c|\
|
|
+ edgecore,eap102|\
|
|
sercomm,wallaby)
|
|
ucidef_set_interface_lan "eth0"
|
|
ucidef_set_interface_wan "eth1"
|
|
@@ -36,10 +37,6 @@ qcom_setup_interfaces()
|
|
ucidef_set_interface_lan "eth1 eth2"
|
|
ucidef_set_interface_wan "eth0"
|
|
;;
|
|
- edgecore,eap102)
|
|
- ucidef_set_interface_lan "eth1"
|
|
- ucidef_set_interface_wan "eth0"
|
|
- ;;
|
|
esac
|
|
}
|
|
|
|
diff --git a/target/linux/ipq807x/base-files/etc/init.d/bootcount b/target/linux/ipq807x/base-files/etc/init.d/bootcount
|
|
index ac345d6d4a..a24f27353e 100755
|
|
--- a/target/linux/ipq807x/base-files/etc/init.d/bootcount
|
|
+++ b/target/linux/ipq807x/base-files/etc/init.d/bootcount
|
|
@@ -4,7 +4,8 @@ START=99
|
|
|
|
boot() {
|
|
case "$(board_name)" in
|
|
- edgecore,eap101)
|
|
+ edgecore,eap101|\
|
|
+ edgecore,eap102)
|
|
fw_setenv bootcount 0
|
|
;;
|
|
esac
|
|
diff --git a/target/linux/ipq807x/base-files/lib/upgrade/platform.sh b/target/linux/ipq807x/base-files/lib/upgrade/platform.sh
|
|
index 59d1578925..a520df40d7 100755
|
|
--- a/target/linux/ipq807x/base-files/lib/upgrade/platform.sh
|
|
+++ b/target/linux/ipq807x/base-files/lib/upgrade/platform.sh
|
|
@@ -48,7 +48,6 @@ platform_do_upgrade() {
|
|
;;
|
|
cig,wf188n|\
|
|
cig,wf194c|\
|
|
- edgecore,eap102|\
|
|
qcom,ipq6018-cp01|\
|
|
qcom,ipq807x-hk01|\
|
|
sercomm,wallaby|\
|
|
@@ -56,7 +55,8 @@ platform_do_upgrade() {
|
|
tplink,ex227)
|
|
nand_upgrade_tar "$1"
|
|
;;
|
|
- edgecore,eap101)
|
|
+ edgecore,eap101|\
|
|
+ edgecore,eap102)
|
|
CI_UBIPART="rootfs1"
|
|
nand_upgrade_tar "$1"
|
|
;;
|
|
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
|
|
index e8157f5514..cf822c246e 100755
|
|
--- 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
|
|
@@ -32,8 +32,8 @@
|
|
* Aliases as required by u-boot
|
|
* to patch MAC addresses
|
|
*/
|
|
- ethernet0 = "/soc/dp5";
|
|
- ethernet1 = "/soc/dp6";
|
|
+ ethernet0 = "/soc/dp6";
|
|
+ ethernet1 = "/soc/dp5";
|
|
|
|
led-boot = &led_power;
|
|
led-failsafe = &led_power;
|
|
@@ -593,7 +593,7 @@
|
|
};
|
|
};
|
|
|
|
- dp1 {
|
|
+/* dp1 {
|
|
device_type = "network";
|
|
compatible = "qcom,nss-dp";
|
|
qcom,id = <1>;
|
|
@@ -639,7 +639,7 @@
|
|
qcom,link-poll = <1>;
|
|
qcom,phy-mdio-addr = <3>;
|
|
phy-mode = "sgmii";
|
|
- };
|
|
+ };*/
|
|
|
|
dp5 {
|
|
device_type = "network";
|
|
diff --git a/target/linux/ipq807x/image/ipq60xx.mk b/target/linux/ipq807x/image/ipq60xx.mk
|
|
index c536a174f8..201885a760 100644
|
|
--- a/target/linux/ipq807x/image/ipq60xx.mk
|
|
+++ b/target/linux/ipq807x/image/ipq60xx.mk
|
|
@@ -7,7 +7,7 @@ define Device/cig_wf188
|
|
SUPPORTED_DEVICES := cig,wf188
|
|
IMAGES := sysupgrade.tar
|
|
IMAGE/sysupgrade.tar/squashfs := append-rootfs | pad-rootfs | sysupgrade-tar rootfs=$$$$@ | append-metadata
|
|
- DEVICE_PACKAGES := ath11k-wifi-cig-wf188 uboot-env
|
|
+ DEVICE_PACKAGES := ath11k-wifi-cig-wf188 uboot-envtools
|
|
endef
|
|
TARGET_DEVICES += cig_wf188
|
|
|
|
@@ -16,7 +16,7 @@ define Device/cig_wf188n
|
|
DEVICE_DTS := qcom-ipq6018-cig-wf188n
|
|
DEVICE_DTS_CONFIG := config@cp03-c1
|
|
SUPPORTED_DEVICES := cig,wf188n
|
|
- DEVICE_PACKAGES := ath11k-wifi-cig-wf188n uboot-env
|
|
+ DEVICE_PACKAGES := ath11k-wifi-cig-wf188n uboot-envtools
|
|
endef
|
|
TARGET_DEVICES += cig_wf188n
|
|
|
|
@@ -25,7 +25,7 @@ define Device/edgecore_eap101
|
|
DEVICE_DTS := qcom-ipq6018-edgecore-eap101
|
|
DEVICE_DTS_CONFIG := config@cp01-c1
|
|
SUPPORTED_DEVICES := edgecore,eap101
|
|
- DEVICE_PACKAGES := ath11k-wifi-edgecore-eap101 uboot-env
|
|
+ DEVICE_PACKAGES := ath11k-wifi-edgecore-eap101 uboot-envtools
|
|
endef
|
|
TARGET_DEVICES += edgecore_eap101
|
|
|
|
diff --git a/target/linux/ipq807x/image/ipq807x.mk b/target/linux/ipq807x/image/ipq807x.mk
|
|
index 7081769407..000d2793c9 100644
|
|
--- a/target/linux/ipq807x/image/ipq807x.mk
|
|
+++ b/target/linux/ipq807x/image/ipq807x.mk
|
|
@@ -41,7 +41,7 @@ define Device/edgecore_eap102
|
|
DEVICE_DTS := qcom-ipq807x-eap102
|
|
DEVICE_DTS_CONFIG=config@ac02
|
|
SUPPORTED_DEVICES := edgecore,eap102
|
|
- DEVICE_PACKAGES := ath11k-wifi-edgecore-eap102 kmod-usb3 kmod-usb2
|
|
+ DEVICE_PACKAGES := ath11k-wifi-edgecore-eap102 kmod-usb2 uboot-envtools
|
|
endef
|
|
TARGET_DEVICES += edgecore_eap102
|
|
define Device/tplink_ex227
|
|
--
|
|
2.25.1
|
|
|