mirror of
				https://github.com/Telecominfraproject/wlan-ap.git
				synced 2025-10-31 18:38:10 +00:00 
			
		
		
		
	23.05: rebase on 23.05-rc4
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
		| @@ -1,6 +1,6 @@ | ||||
| repo:  https://github.com/openwrt/openwrt.git | ||||
| branch: openwrt-23.05 | ||||
| revision: 8b385a45a65cb4721e6bb2fbb24ce080417e331f | ||||
| revision: e92cf0c46ffe3ac7fca936c18577bfb19eb4ce9e | ||||
| output_dir: ./output | ||||
|  | ||||
| patch_folders: | ||||
|   | ||||
| @@ -1,171 +0,0 @@ | ||||
| From d79526cea79b1d38eaa2ea151835096bb6791856 Mon Sep 17 00:00:00 2001 | ||||
| From: John Crispin <john@phrozen.org> | ||||
| Date: Thu, 25 Mar 2021 08:03:48 +0100 | ||||
| Subject: [PATCH 27/43] ipq40xx: add ath10k-ct fw.cfg stubs | ||||
|  | ||||
| Signed-off-by: John Crispin <john@phrozen.org> | ||||
| --- | ||||
|  .../etc/hotplug.d/firmware/40-ct-fw-cfg       | 32 +++++++++++++++++++ | ||||
|  .../lib/firmware/ath10k/fwcfg-ipq4019.txt     | 15 +++++++++ | ||||
|  .../lib/firmware/ath10k/fwcfg-qca9888.txt     | 16 ++++++++++ | ||||
|  .../lib/firmware/ath10k/fwcfg-qca9984.txt     | 16 ++++++++++ | ||||
|  .../lib/firmware/ath10k/fwcfg-qca9888.txt     | 16 ++++++++++ | ||||
|  .../lib/firmware/ath10k/fwcfg-qca9984.txt     | 16 ++++++++++ | ||||
|  6 files changed, 111 insertions(+) | ||||
|  create mode 100644 target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/40-ct-fw-cfg | ||||
|  create mode 100644 target/linux/ipq40xx/base-files/lib/firmware/ath10k/fwcfg-ipq4019.txt | ||||
|  create mode 100644 target/linux/ipq40xx/base-files/lib/firmware/ath10k/fwcfg-qca9888.txt | ||||
|  create mode 100644 target/linux/ipq40xx/base-files/lib/firmware/ath10k/fwcfg-qca9984.txt | ||||
|  create mode 100644 target/linux/ipq806x/base-files/lib/firmware/ath10k/fwcfg-qca9888.txt | ||||
|  create mode 100644 target/linux/ipq806x/base-files/lib/firmware/ath10k/fwcfg-qca9984.txt | ||||
|  | ||||
| diff --git a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/40-ct-fw-cfg b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/40-ct-fw-cfg | ||||
| new file mode 100644 | ||||
| index 0000000000..7e22cbd4f5 | ||||
| --- /dev/null | ||||
| +++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/40-ct-fw-cfg | ||||
| @@ -0,0 +1,32 @@ | ||||
| +#!/bin/sh | ||||
| + | ||||
| +[ -e /lib/firmware/$FIRMWARE ] && exit 0 | ||||
| + | ||||
| + | ||||
| +fwcfg_symlink() { | ||||
| +	local chip=$1 | ||||
| +	local path=$2 | ||||
| + | ||||
| +	ln -s /lib/firmware/ath10k/fwcfg-${chip}.txt /lib/firmware/${FIRMWARE} | ||||
| +} | ||||
| + | ||||
| +case "$FIRMWARE" in                                                          | ||||
| +ath10k/fwcfg-ahb-a000000.wifi.txt|\ | ||||
| +ath10k/fwcfg-ahb-a800000.wifi.txt) | ||||
| +	fwcfg_symlink ipq4019 | ||||
| +	 | ||||
| +	;; | ||||
| +ath10k/fwcfg-pci-0000:01:00.0.txt) | ||||
| +        case "$(board_name)" in | ||||
| +        linksys,ea8300) | ||||
| +                fwcfg_symlink qca9888 | ||||
| +                ;; | ||||
| +	tp-link,ap2220|\ | ||||
| +	tp-link,ec420-g1) | ||||
| +		fwcfg_symlink qca9984 | ||||
| +		;; | ||||
| +	esac | ||||
| +	;; | ||||
| +esac | ||||
| + | ||||
| +exit 0 | ||||
| diff --git a/target/linux/ipq40xx/base-files/lib/firmware/ath10k/fwcfg-ipq4019.txt b/target/linux/ipq40xx/base-files/lib/firmware/ath10k/fwcfg-ipq4019.txt | ||||
| new file mode 100644 | ||||
| index 0000000000..7943173e51 | ||||
| --- /dev/null | ||||
| +++ b/target/linux/ipq40xx/base-files/lib/firmware/ath10k/fwcfg-ipq4019.txt | ||||
| @@ -0,0 +1,15 @@ | ||||
| +vdevs = 8 | ||||
| +peers = 147 | ||||
| +active_peers = 147 | ||||
| +stations = 147 | ||||
| +rate_ctrl_objs = 7 | ||||
| +#regdom = 840 | ||||
| +#fwname = firmware-5-htt-mgt-b.bin | ||||
| +#fwver = 5 | ||||
| +nohwcrypt = 0 | ||||
| +ct_sta_mode = 0 | ||||
| +tx_desc = 2000 | ||||
| +#max_nss = 3 | ||||
| +tids = 450 | ||||
| +skid_limit = 360 | ||||
| +max_amsdus = 3  | ||||
| diff --git a/target/linux/ipq40xx/base-files/lib/firmware/ath10k/fwcfg-qca9888.txt b/target/linux/ipq40xx/base-files/lib/firmware/ath10k/fwcfg-qca9888.txt | ||||
| new file mode 100644 | ||||
| index 0000000000..560c8103d7 | ||||
| --- /dev/null | ||||
| +++ b/target/linux/ipq40xx/base-files/lib/firmware/ath10k/fwcfg-qca9888.txt | ||||
| @@ -0,0 +1,16 @@ | ||||
| +# 9888 chip | ||||
| +vdevs = 8 | ||||
| +peers = 202 | ||||
| +active_peers = 202 | ||||
| +stations = 202 | ||||
| +rate_ctrl_objs = 7 | ||||
| +#regdom = 840 | ||||
| +#fwname = firmware-5-htt-mgt-b.bin | ||||
| +#fwver = 5 | ||||
| +nohwcrypt = 0 | ||||
| +ct_sta_mode = 0 | ||||
| +tx_desc = 2200 | ||||
| +#max_nss = 3 | ||||
| +tids = 450 | ||||
| +skid_limit = 360 | ||||
| +max_amsdus = 3  | ||||
| diff --git a/target/linux/ipq40xx/base-files/lib/firmware/ath10k/fwcfg-qca9984.txt b/target/linux/ipq40xx/base-files/lib/firmware/ath10k/fwcfg-qca9984.txt | ||||
| new file mode 100644 | ||||
| index 0000000000..924a689000 | ||||
| --- /dev/null | ||||
| +++ b/target/linux/ipq40xx/base-files/lib/firmware/ath10k/fwcfg-qca9984.txt | ||||
| @@ -0,0 +1,16 @@ | ||||
| +# 9984 | ||||
| +vdevs = 8 | ||||
| +peers = 180 | ||||
| +active_peers = 180 | ||||
| +stations = 180 | ||||
| +rate_ctrl_objs = 7 | ||||
| +#regdom = 840 | ||||
| +#fwname = firmware-5-htt-mgt-b.bin | ||||
| +#fwver = 5 | ||||
| +nohwcrypt = 0 | ||||
| +ct_sta_mode = 0 | ||||
| +tx_desc = 2400 | ||||
| +#max_nss = 3 | ||||
| +tids = 450 | ||||
| +skid_limit = 360 | ||||
| +max_amsdus = 3  | ||||
| diff --git a/target/linux/ipq806x/base-files/lib/firmware/ath10k/fwcfg-qca9888.txt b/target/linux/ipq806x/base-files/lib/firmware/ath10k/fwcfg-qca9888.txt | ||||
| new file mode 100644 | ||||
| index 0000000000..560c8103d7 | ||||
| --- /dev/null | ||||
| +++ b/target/linux/ipq806x/base-files/lib/firmware/ath10k/fwcfg-qca9888.txt | ||||
| @@ -0,0 +1,16 @@ | ||||
| +# 9888 chip | ||||
| +vdevs = 8 | ||||
| +peers = 202 | ||||
| +active_peers = 202 | ||||
| +stations = 202 | ||||
| +rate_ctrl_objs = 7 | ||||
| +#regdom = 840 | ||||
| +#fwname = firmware-5-htt-mgt-b.bin | ||||
| +#fwver = 5 | ||||
| +nohwcrypt = 0 | ||||
| +ct_sta_mode = 0 | ||||
| +tx_desc = 2200 | ||||
| +#max_nss = 3 | ||||
| +tids = 450 | ||||
| +skid_limit = 360 | ||||
| +max_amsdus = 3  | ||||
| diff --git a/target/linux/ipq806x/base-files/lib/firmware/ath10k/fwcfg-qca9984.txt b/target/linux/ipq806x/base-files/lib/firmware/ath10k/fwcfg-qca9984.txt | ||||
| new file mode 100644 | ||||
| index 0000000000..924a689000 | ||||
| --- /dev/null | ||||
| +++ b/target/linux/ipq806x/base-files/lib/firmware/ath10k/fwcfg-qca9984.txt | ||||
| @@ -0,0 +1,16 @@ | ||||
| +# 9984 | ||||
| +vdevs = 8 | ||||
| +peers = 180 | ||||
| +active_peers = 180 | ||||
| +stations = 180 | ||||
| +rate_ctrl_objs = 7 | ||||
| +#regdom = 840 | ||||
| +#fwname = firmware-5-htt-mgt-b.bin | ||||
| +#fwver = 5 | ||||
| +nohwcrypt = 0 | ||||
| +ct_sta_mode = 0 | ||||
| +tx_desc = 2400 | ||||
| +#max_nss = 3 | ||||
| +tids = 450 | ||||
| +skid_limit = 360 | ||||
| +max_amsdus = 3  | ||||
| --  | ||||
| 2.34.1 | ||||
|  | ||||
| @@ -1,37 +0,0 @@ | ||||
| From 951b9e4887b17cfab12402e941e3f732284028f3 Mon Sep 17 00:00:00 2001 | ||||
| From: John Crispin <john@phrozen.org> | ||||
| Date: Sat, 15 Jul 2023 11:46:58 +0200 | ||||
| Subject: [PATCH 28/43] ipq40xx: enable pstore support | ||||
|  | ||||
| Signed-off-by: John Crispin <john@phrozen.org> | ||||
| --- | ||||
|  .../linux/ipq40xx/patches-5.15/900-pstore.patch | 17 +++++++++++++++++ | ||||
|  1 file changed, 17 insertions(+) | ||||
|  create mode 100644 target/linux/ipq40xx/patches-5.15/900-pstore.patch | ||||
|  | ||||
| diff --git a/target/linux/ipq40xx/patches-5.15/900-pstore.patch b/target/linux/ipq40xx/patches-5.15/900-pstore.patch | ||||
| new file mode 100644 | ||||
| index 0000000000..940ee02020 | ||||
| --- /dev/null | ||||
| +++ b/target/linux/ipq40xx/patches-5.15/900-pstore.patch | ||||
| @@ -0,0 +1,17 @@ | ||||
| +Index: linux-5.15.120/arch/arm/boot/dts/qcom-ipq4019.dtsi | ||||
| +=================================================================== | ||||
| +--- linux-5.15.120.orig/arch/arm/boot/dts/qcom-ipq4019.dtsi | ||||
| ++++ linux-5.15.120/arch/arm/boot/dts/qcom-ipq4019.dtsi | ||||
| +@@ -32,6 +32,12 @@ | ||||
| + 			reg = <0x87e80000 0x180000>; | ||||
| + 			no-map; | ||||
| + 		}; | ||||
| ++ | ||||
| ++		ramoops@87f00000 { | ||||
| ++			compatible = "ramoops"; | ||||
| ++			reg = <0x87df0000 0x10000>; | ||||
| ++			record-size = <0x1000>; | ||||
| ++		}; | ||||
| + 	}; | ||||
| +  | ||||
| + 	aliases { | ||||
| --  | ||||
| 2.34.1 | ||||
|  | ||||
| @@ -1,95 +0,0 @@ | ||||
| From 97f0b48681010e9b6c4b224da5e28101dd9dd5a5 Mon Sep 17 00:00:00 2001 | ||||
| From: John Crispin <john@phrozen.org> | ||||
| Date: Sat, 15 Jul 2023 11:59:02 +0200 | ||||
| Subject: [PATCH] ipq40xx: enable dualboot on ecw5211 | ||||
|  | ||||
| Signed-off-by: John Crispin <john@phrozen.org> | ||||
| --- | ||||
|  .../ipq40xx/base-files/etc/init.d/bootcount   | 11 +++++++++++ | ||||
|  .../base-files/lib/upgrade/platform.sh        | 19 ++++++++++++++++++- | ||||
|  .../arm/boot/dts/qcom-ipq4018-ecw5211.dts     | 10 ++++++++++ | ||||
|  3 files changed, 39 insertions(+), 1 deletion(-) | ||||
|  | ||||
| diff --git a/target/linux/ipq40xx/base-files/etc/init.d/bootcount b/target/linux/ipq40xx/base-files/etc/init.d/bootcount | ||||
| index df656c9b85..f6921089bd 100755 | ||||
| --- a/target/linux/ipq40xx/base-files/etc/init.d/bootcount | ||||
| +++ b/target/linux/ipq40xx/base-files/etc/init.d/bootcount | ||||
| @@ -8,6 +8,17 @@ boot() { | ||||
|  		[ -n "$(fw_printenv bootcount changed 2>/dev/null)" ] &&\ | ||||
|  			echo -e "bootcount\nchanged\n" | /usr/sbin/fw_setenv -s - | ||||
|  		;; | ||||
| +	edgecore,ecw5211) | ||||
| +		part="$(awk -F 'ubi.mtd=' '{printf $2}' /proc/cmdline | cut -d " " -f1)" | ||||
| +		case "$part" in | ||||
| +		rootfs1|\ | ||||
| +		rootfs2) | ||||
| +			avail=$(fw_printenv -n upgrade_available) | ||||
| +			[ ${avail} -ne 1 ] && fw_setenv upgrade_available 1 | ||||
| +			fw_setenv bootcount 0 | ||||
| +			;; | ||||
| +		esac | ||||
| +		;; | ||||
|  	linksys,ea6350v3|\ | ||||
|  	linksys,ea8300|\ | ||||
|  	linksys,mr8300|\ | ||||
| diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh | ||||
| index e6e99b9d21..651ddb8177 100644 | ||||
| --- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh | ||||
| +++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh | ||||
| @@ -110,7 +110,6 @@ platform_do_upgrade() { | ||||
|  	avm,fritzrepeater-3000 |\ | ||||
|  	buffalo,wtr-m2133hp |\ | ||||
|  	cilab,meshpoint-one |\ | ||||
| -	edgecore,ecw5211 |\ | ||||
|  	edgecore,oap100 |\ | ||||
|  	engenius,eap2200 |\ | ||||
|  	glinet,gl-a1300 |\ | ||||
| @@ -157,6 +156,24 @@ platform_do_upgrade() { | ||||
|  	compex,wpj419) | ||||
|  		nand_do_upgrade "$1" | ||||
|  		;; | ||||
| +	edgecore,ecw5211) | ||||
| +		mkdir -p /var/lock/ | ||||
| +		part="$(awk -F 'ubi.mtd=' '{printf $2}' /proc/cmdline | cut -d " " -f 1)" | ||||
| +		case "$part" in | ||||
| +		rootfs1) | ||||
| +			fw_setenv active 2 || exit 1 | ||||
| +			CI_UBIPART="rootfs2" | ||||
| +			;; | ||||
| +		rootfs2) | ||||
| +			fw_setenv active 1 || exit 1 | ||||
| +			CI_UBIPART="rootfs1" | ||||
| +			;; | ||||
| +		*) | ||||
| +			# legacy bootloader | ||||
| +			;; | ||||
| +		esac | ||||
| +		nand_do_upgrade "$1" | ||||
| +		;; | ||||
|  	google,wifi) | ||||
|  		export_bootdevice | ||||
|  		export_partdevice CI_ROOTDEV 0 | ||||
| diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts | ||||
| index 3060b7bd1c..e3e1785e1f 100644 | ||||
| --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts | ||||
| +++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts | ||||
| @@ -255,6 +255,16 @@ | ||||
|  				label = "rootfs"; | ||||
|  				reg = <0x00000000 0x04000000>; | ||||
|  			}; | ||||
| + | ||||
| +			partition@1 { | ||||
| +				label = "rootfs1"; | ||||
| +				reg = <0x00000000 0x04000000>; | ||||
| +			}; | ||||
| + | ||||
| +			partition@4000000 { | ||||
| +				label = "rootfs2"; | ||||
| +				reg = <0x04000000 0x04000000>; | ||||
| +			}; | ||||
|  		}; | ||||
|  	}; | ||||
|  }; | ||||
| --  | ||||
| 2.34.1 | ||||
|  | ||||
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
		Reference in New Issue
	
	Block a user
	 John Crispin
					John Crispin