From dba8d27d190cc083c7f11b8713eb7eb41f3d2598 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 3 Oct 2023 07:22:31 +0200 Subject: [PATCH] 23.05: rebase on 23.05-rc4 Signed-off-by: John Crispin --- config.yml | 2 +- ...7-ipq40xx-add-ath10k-ct-fw.cfg-stubs.patch | 171 ---- .../0028-ipq40xx-enable-pstore-support.patch | 37 - ...9-ipq40xx-enable-dualboot-on-ecw5211.patch | 95 -- ...x-remove-23.05-version-of-the-target.patch | 903 ++++++++++-------- 5 files changed, 492 insertions(+), 716 deletions(-) delete mode 100644 patches/0027-ipq40xx-add-ath10k-ct-fw.cfg-stubs.patch delete mode 100644 patches/0028-ipq40xx-enable-pstore-support.patch delete mode 100644 patches/0029-ipq40xx-enable-dualboot-on-ecw5211.patch diff --git a/config.yml b/config.yml index 841e96241..9919fc58a 100644 --- a/config.yml +++ b/config.yml @@ -1,6 +1,6 @@ repo: https://github.com/openwrt/openwrt.git branch: openwrt-23.05 -revision: 8b385a45a65cb4721e6bb2fbb24ce080417e331f +revision: e92cf0c46ffe3ac7fca936c18577bfb19eb4ce9e output_dir: ./output patch_folders: diff --git a/patches/0027-ipq40xx-add-ath10k-ct-fw.cfg-stubs.patch b/patches/0027-ipq40xx-add-ath10k-ct-fw.cfg-stubs.patch deleted file mode 100644 index 8bc3ed776..000000000 --- a/patches/0027-ipq40xx-add-ath10k-ct-fw.cfg-stubs.patch +++ /dev/null @@ -1,171 +0,0 @@ -From d79526cea79b1d38eaa2ea151835096bb6791856 Mon Sep 17 00:00:00 2001 -From: John Crispin -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 ---- - .../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 - diff --git a/patches/0028-ipq40xx-enable-pstore-support.patch b/patches/0028-ipq40xx-enable-pstore-support.patch deleted file mode 100644 index be81d6497..000000000 --- a/patches/0028-ipq40xx-enable-pstore-support.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 951b9e4887b17cfab12402e941e3f732284028f3 Mon Sep 17 00:00:00 2001 -From: John Crispin -Date: Sat, 15 Jul 2023 11:46:58 +0200 -Subject: [PATCH 28/43] ipq40xx: enable pstore support - -Signed-off-by: John Crispin ---- - .../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 - diff --git a/patches/0029-ipq40xx-enable-dualboot-on-ecw5211.patch b/patches/0029-ipq40xx-enable-dualboot-on-ecw5211.patch deleted file mode 100644 index 74dc5aa41..000000000 --- a/patches/0029-ipq40xx-enable-dualboot-on-ecw5211.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 97f0b48681010e9b6c4b224da5e28101dd9dd5a5 Mon Sep 17 00:00:00 2001 -From: John Crispin -Date: Sat, 15 Jul 2023 11:59:02 +0200 -Subject: [PATCH] ipq40xx: enable dualboot on ecw5211 - -Signed-off-by: John Crispin ---- - .../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 - diff --git a/patches/0056-ipq40xx-remove-23.05-version-of-the-target.patch b/patches/0056-ipq40xx-remove-23.05-version-of-the-target.patch index 38f60ff64..960b195ab 100644 --- a/patches/0056-ipq40xx-remove-23.05-version-of-the-target.patch +++ b/patches/0056-ipq40xx-remove-23.05-version-of-the-target.patch @@ -1,29 +1,25 @@ -From a467e92b85d4a1f11614af82a4bd9078fcfa84bc Mon Sep 17 00:00:00 2001 +From 27708df2e1adb8c23ed756e99ac5dd2baff08b36 Mon Sep 17 00:00:00 2001 From: John Crispin -Date: Tue, 19 Sep 2023 06:47:20 +0200 +Date: Tue, 3 Oct 2023 07:08:28 +0200 Subject: [PATCH] ipq40xx: drop upstream target Signed-off-by: John Crispin --- target/linux/ipq40xx/Makefile | 23 - .../ipq40xx/base-files/etc/board.d/01_leds | 123 -- - .../ipq40xx/base-files/etc/board.d/02_network | 237 --- + .../ipq40xx/base-files/etc/board.d/02_network | 238 --- .../base-files/etc/board.d/03_gpio_switches | 47 - .../base-files/etc/board.d/05_compat-version | 18 - .../etc/hotplug.d/firmware/11-ath10k-caldata | 280 --- - .../etc/hotplug.d/firmware/40-ct-fw-cfg | 32 - - .../ipq40xx/base-files/etc/init.d/bootcount | 33 - + .../ipq40xx/base-files/etc/init.d/bootcount | 22 - target/linux/ipq40xx/base-files/etc/inittab | 5 - .../etc/uci-defaults/04_led_migration | 25 - .../etc/uci-defaults/05_fix-compat-version | 13 - - .../lib/firmware/ath10k/fwcfg-ipq4019.txt | 15 - - .../lib/firmware/ath10k/fwcfg-qca9888.txt | 16 - - .../lib/firmware/ath10k/fwcfg-qca9984.txt | 16 - .../lib/preinit/05_set_iface_mac_ipq40xx.sh | 47 - .../lib/upgrade/dualboot_datachk.sh | 108 -- .../ipq40xx/base-files/lib/upgrade/linksys.sh | 125 -- .../ipq40xx/base-files/lib/upgrade/netgear.sh | 76 - - .../base-files/lib/upgrade/platform.sh | 254 --- + .../base-files/lib/upgrade/platform.sh | 239 --- .../ipq40xx/base-files/lib/upgrade/sony.sh | 91 - target/linux/ipq40xx/chromium/config-default | 10 - target/linux/ipq40xx/chromium/target.mk | 3 - @@ -35,7 +31,7 @@ Signed-off-by: John Crispin .../arm/boot/dts/qcom-ipq4018-dap-2610.dts | 232 --- .../arm/boot/dts/qcom-ipq4018-ea6350v3.dts | 307 --- .../arm/boot/dts/qcom-ipq4018-eap1300.dts | 230 --- - .../arm/boot/dts/qcom-ipq4018-ecw5211.dts | 339 ---- + .../arm/boot/dts/qcom-ipq4018-ecw5211.dts | 329 ---- .../arch/arm/boot/dts/qcom-ipq4018-emd1.dts | 210 --- .../arm/boot/dts/qcom-ipq4018-emr3500.dts | 215 --- .../arm/boot/dts/qcom-ipq4018-ens620ext.dts | 249 --- @@ -50,9 +46,10 @@ Signed-off-by: John Crispin .../arm/boot/dts/qcom-ipq4018-jalapeno.dtsi | 276 --- .../dts/qcom-ipq4018-magic-2-wifi-next.dts | 233 --- .../boot/dts/qcom-ipq4018-meshpoint-one.dts | 81 - - .../arch/arm/boot/dts/qcom-ipq4018-mf287.dtsi | 183 -- - .../arm/boot/dts/qcom-ipq4018-mf287plus.dts | 218 --- - .../arm/boot/dts/qcom-ipq4018-mf287pro.dts | 265 --- + .../arch/arm/boot/dts/qcom-ipq4018-mf287.dts | 221 --- + .../boot/dts/qcom-ipq4018-mf287_common.dtsi | 191 -- + .../arm/boot/dts/qcom-ipq4018-mf287plus.dts | 221 --- + .../arm/boot/dts/qcom-ipq4018-mf287pro.dts | 268 --- .../arm/boot/dts/qcom-ipq4018-nbg6617.dts | 361 ---- .../arch/arm/boot/dts/qcom-ipq4018-pa1200.dts | 225 --- .../arm/boot/dts/qcom-ipq4018-rt-ac58u.dts | 316 ---- @@ -133,7 +130,7 @@ Signed-off-by: John Crispin target/linux/ipq40xx/generic/target.mk | 3 - target/linux/ipq40xx/image/Makefile | 19 - target/linux/ipq40xx/image/chromium.mk | 40 - - target/linux/ipq40xx/image/generic.mk | 1234 ------------ + target/linux/ipq40xx/image/generic.mk | 1241 ------------ target/linux/ipq40xx/image/mikrotik.mk | 100 - target/linux/ipq40xx/mikrotik/config-default | 5 - target/linux/ipq40xx/mikrotik/target.mk | 4 - @@ -158,26 +155,21 @@ Signed-off-by: John Crispin ...9-arm-dts-ipq4019-QCA807x-properties.patch | 61 - .../850-soc-add-qualcomm-syscon.patch | 180 -- .../900-dts-ipq4019-ap-dk01.1.patch | 164 -- - .../ipq40xx/patches-5.15/900-pstore.patch | 17 - .../902-dts-ipq4019-ap-dk04.1.patch | 164 -- ...qcom_scm-Clear-download-bit-during-r.patch | 27 - .../patches-5.15/998-lantiq-atm-hacks.patch | 43 - .../999-atm-mpoa-intel-dsl-phy-support.patch | 137 -- - 158 files changed, 34568 deletions(-) + 154 files changed, 34679 deletions(-) delete mode 100644 target/linux/ipq40xx/Makefile delete mode 100644 target/linux/ipq40xx/base-files/etc/board.d/01_leds delete mode 100644 target/linux/ipq40xx/base-files/etc/board.d/02_network delete mode 100644 target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches delete mode 100644 target/linux/ipq40xx/base-files/etc/board.d/05_compat-version delete mode 100644 target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata - delete mode 100644 target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/40-ct-fw-cfg delete mode 100755 target/linux/ipq40xx/base-files/etc/init.d/bootcount delete mode 100644 target/linux/ipq40xx/base-files/etc/inittab delete mode 100644 target/linux/ipq40xx/base-files/etc/uci-defaults/04_led_migration delete mode 100644 target/linux/ipq40xx/base-files/etc/uci-defaults/05_fix-compat-version - delete mode 100644 target/linux/ipq40xx/base-files/lib/firmware/ath10k/fwcfg-ipq4019.txt - delete mode 100644 target/linux/ipq40xx/base-files/lib/firmware/ath10k/fwcfg-qca9888.txt - delete mode 100644 target/linux/ipq40xx/base-files/lib/firmware/ath10k/fwcfg-qca9984.txt delete mode 100644 target/linux/ipq40xx/base-files/lib/preinit/05_set_iface_mac_ipq40xx.sh delete mode 100644 target/linux/ipq40xx/base-files/lib/upgrade/dualboot_datachk.sh delete mode 100644 target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh @@ -209,7 +201,8 @@ Signed-off-by: John Crispin delete mode 100644 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-jalapeno.dtsi delete mode 100644 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-magic-2-wifi-next.dts delete mode 100644 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-meshpoint-one.dts - delete mode 100644 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287.dtsi + delete mode 100644 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287.dts + delete mode 100644 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287_common.dtsi delete mode 100644 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287plus.dts delete mode 100644 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287pro.dts delete mode 100644 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts @@ -317,7 +310,6 @@ Signed-off-by: John Crispin delete mode 100644 target/linux/ipq40xx/patches-5.15/709-arm-dts-ipq4019-QCA807x-properties.patch delete mode 100644 target/linux/ipq40xx/patches-5.15/850-soc-add-qualcomm-syscon.patch delete mode 100644 target/linux/ipq40xx/patches-5.15/900-dts-ipq4019-ap-dk01.1.patch - delete mode 100644 target/linux/ipq40xx/patches-5.15/900-pstore.patch delete mode 100644 target/linux/ipq40xx/patches-5.15/902-dts-ipq4019-ap-dk04.1.patch delete mode 100644 target/linux/ipq40xx/patches-5.15/910-Revert-firmware-qcom_scm-Clear-download-bit-during-r.patch delete mode 100644 target/linux/ipq40xx/patches-5.15/998-lantiq-atm-hacks.patch @@ -483,10 +475,10 @@ index 1ba5d2b1a7..0000000000 -exit 0 diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network deleted file mode 100644 -index 77dc892d07..0000000000 +index 5de62f1d7d..0000000000 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network +++ /dev/null -@@ -1,237 +0,0 @@ +@@ -1,238 +0,0 @@ -# -# Copyright (c) 2015 The Linux Foundation. All rights reserved. -# Copyright (c) 2011-2015 OpenWrt.org @@ -597,6 +589,7 @@ index 77dc892d07..0000000000 - zte,mf286d) - ucidef_set_interfaces_lan_wan "lan2 lan3 lan4" "wan" - ;; +- zte,mf287|\ - zte,mf287plus|\ - zte,mf287pro) - ucidef_set_interface_lan "lan1 lan2 lan3 lan4" @@ -1087,50 +1080,12 @@ index c8cf297e81..0000000000 - exit 1 - ;; -esac -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 -deleted file mode 100644 -index 7e22cbd4f5..0000000000 ---- a/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/40-ct-fw-cfg -+++ /dev/null -@@ -1,32 +0,0 @@ --#!/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/etc/init.d/bootcount b/target/linux/ipq40xx/base-files/etc/init.d/bootcount deleted file mode 100755 -index f6921089bd..0000000000 +index df656c9b85..0000000000 --- a/target/linux/ipq40xx/base-files/etc/init.d/bootcount +++ /dev/null -@@ -1,33 +0,0 @@ +@@ -1,22 +0,0 @@ -#!/bin/sh /etc/rc.common - -START=99 @@ -1141,17 +1096,6 @@ index f6921089bd..0000000000 - [ -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|\ @@ -1225,71 +1169,6 @@ index c011920897..0000000000 -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 -deleted file mode 100644 -index 7943173e51..0000000000 ---- a/target/linux/ipq40xx/base-files/lib/firmware/ath10k/fwcfg-ipq4019.txt -+++ /dev/null -@@ -1,15 +0,0 @@ --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 -deleted file mode 100644 -index 560c8103d7..0000000000 ---- a/target/linux/ipq40xx/base-files/lib/firmware/ath10k/fwcfg-qca9888.txt -+++ /dev/null -@@ -1,16 +0,0 @@ --# 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 -deleted file mode 100644 -index 924a689000..0000000000 ---- a/target/linux/ipq40xx/base-files/lib/firmware/ath10k/fwcfg-qca9984.txt -+++ /dev/null -@@ -1,16 +0,0 @@ --# 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/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 deleted file mode 100644 index ce0b55bb80..0000000000 @@ -1672,10 +1551,10 @@ index f3fb626d1f..0000000000 -} diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh deleted file mode 100644 -index 11cfdfb46c..0000000000 +index 647ffc5c43..0000000000 --- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh +++ /dev/null -@@ -1,254 +0,0 @@ +@@ -1,239 +0,0 @@ -PART_NAME=firmware -REQUIRE_IMAGE_METADATA=1 - @@ -1705,6 +1584,7 @@ index 11cfdfb46c..0000000000 - ;; - zte,mf18a |\ - zte,mf286d |\ +- zte,mf287|\ - zte,mf287plus |\ - zte,mf287pro |\ - zte,mf289f) @@ -1789,6 +1669,7 @@ index 11cfdfb46c..0000000000 - avm,fritzrepeater-3000 |\ - buffalo,wtr-m2133hp |\ - cilab,meshpoint-one |\ +- edgecore,ecw5211 |\ - edgecore,oap100 |\ - engenius,eap2200 |\ - glinet,gl-a1300 |\ @@ -1835,24 +1716,6 @@ index 11cfdfb46c..0000000000 - 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 @@ -1906,6 +1769,7 @@ index 11cfdfb46c..0000000000 - teltonika,rutx50 |\ - zte,mf18a |\ - zte,mf286d |\ +- zte,mf287 |\ - zte,mf287plus |\ - zte,mf287pro |\ - zte,mf289f) @@ -4508,10 +4372,10 @@ index a8f24aa00e..0000000000 -}; 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 deleted file mode 100644 -index e3e1785e1f..0000000000 +index 3060b7bd1c..0000000000 --- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-ecw5211.dts +++ /dev/null -@@ -1,339 +0,0 @@ +@@ -1,329 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT - -#include "qcom-ipq4019.dtsi" @@ -4769,16 +4633,6 @@ index e3e1785e1f..0000000000 - label = "rootfs"; - reg = <0x00000000 0x04000000>; - }; -- -- partition@1 { -- label = "rootfs1"; -- reg = <0x00000000 0x04000000>; -- }; -- -- partition@4000000 { -- label = "rootfs2"; -- reg = <0x04000000 0x04000000>; -- }; - }; - }; -}; @@ -7865,220 +7719,26 @@ index 62ba76802d..0000000000 - }; - }; -}; -diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287.dtsi +diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287.dts deleted file mode 100644 -index 3cbe2eaa38..0000000000 ---- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287.dtsi +index 43e39bdf96..0000000000 +--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287.dts +++ /dev/null -@@ -1,183 +0,0 @@ +@@ -1,221 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -// Copyright (c) 2022, Pawel Dembicki . -// Copyright (c) 2022, Giammarco Marzano . -// Copyright (c) 2023, Andreas Böhler - --#include "qcom-ipq4019.dtsi" --#include --#include --#include --#include +-#include "qcom-ipq4018-mf287_common.dtsi" - -/ { -- aliases { -- led-boot = &led_status; -- led-failsafe = &led_status; -- led-running = &led_status; -- led-upgrade = &led_status; -- }; -- -- chosen { -- /* -- * bootargs forced by u-boot bootipq command: -- * 'ubi.mtd=rootfs root=mtd:ubi_rootfs rootfstype=squashfs rootwait' -- */ -- bootargs-append = " root=/dev/ubiblock0_1"; -- }; -- -- leds { -- compatible = "gpio-leds"; -- -- led_status: led-0 { -- label = "blue:power"; -- function = LED_FUNCTION_POWER; -- color = ; -- }; -- }; -- -- keys { -- compatible = "gpio-keys"; -- -- key_reset: key-reset { -- label = "reset"; -- linux,code = ; -- }; -- -- key_wps: key-wps { -- label = "wps"; -- linux,code = ; -- }; -- }; -- -- soc { -- rng@22000 { -- status = "okay"; -- }; -- -- tcsr@1949000 { -- compatible = "qcom,tcsr"; -- reg = <0x1949000 0x100>; -- qcom,wifi_glb_cfg = ; -- }; -- -- tcsr@194b000 { -- /* select hostmode */ -- compatible = "qcom,tcsr"; -- reg = <0x194b000 0x100>; -- qcom,usb-hsphy-mode-select = ; -- status = "okay"; -- }; -- -- ess_tcsr@1953000 { -- compatible = "qcom,tcsr"; -- reg = <0x1953000 0x1000>; -- qcom,ess-interface-select = ; -- }; -- -- tcsr@1957000 { -- compatible = "qcom,tcsr"; -- reg = <0x1957000 0x100>; -- qcom,wifi_noc_memtype_m0_m2 = ; -- }; -- }; +- model = "ZTE MF287"; +- compatible = "zte,mf287"; -}; - --&mdio { -- status = "okay"; --}; -- --&watchdog { -- status = "okay"; --}; -- --&blsp_dma { -- status = "okay"; --}; -- --&usb2 { -- status = "okay"; --}; -- --&usb3 { -- status = "okay"; --}; -- --&blsp1_uart1 { -- pinctrl-0 = <&serial_pins>; -- pinctrl-names = "default"; -- status = "okay"; --}; -- --&crypto { -- status = "okay"; --}; -- --&cryptobam { -- status = "okay"; --}; -- --&gmac { -- status = "okay"; -- nvmem-cell-names = "mac-address"; -- nvmem-cells = <&macaddr_mac_0>; -- mac-address-increment = <2>; --}; -- --&switch { -- status = "okay"; --}; -- --&swport2 { -- status = "okay"; -- -- label = "lan1"; --}; -- --&swport3 { -- status = "okay"; -- -- label = "lan2"; --}; -- --&swport4 { -- status = "okay"; -- -- label = "lan3"; --}; -- --&swport5 { -- status = "okay"; -- -- label = "lan4"; --}; -- --&qpic_bam { -- status = "okay"; --}; -- --&usb2_hs_phy { -- status = "okay"; --}; -- --&usb3_ss_phy { -- status = "okay"; --}; -- --&usb3_hs_phy { -- status = "okay"; --}; -- --&wifi0 { -- status = "okay"; -- nvmem-cell-names = "pre-calibration", "mac-address"; -- nvmem-cells = <&precal_art_1000>, <&macaddr_mac_0>; -- qcom,ath10k-calibration-variant = "zte,mf287plus"; --}; -- --&wifi1 { -- status = "okay"; -- nvmem-cell-names = "pre-calibration", "mac-address"; -- nvmem-cells = <&precal_art_5000>, <&macaddr_mac_0>; -- mac-address-increment = <1>; -- qcom,ath10k-calibration-variant = "zte,mf287plus"; --}; -diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287plus.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287plus.dts -deleted file mode 100644 -index db8c8c9ad0..0000000000 ---- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287plus.dts -+++ /dev/null -@@ -1,218 +0,0 @@ --// SPDX-License-Identifier: GPL-2.0-or-later OR MIT --// Copyright (c) 2022, Pawel Dembicki . --// Copyright (c) 2022, Giammarco Marzano . --// Copyright (c) 2023, Andreas Böhler -- --#include "qcom-ipq4018-mf287.dtsi" -- --/ { -- model = "ZTE MF287Plus"; -- compatible = "zte,mf287plus"; -- -- /* -- * This node is used to restart modem module to avoid anomalous -- * behaviours on initial communication. -- */ -- gpio-restart { -- compatible = "gpio-restart"; -- gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>; -- }; +-&gpio_modem_reset { +- gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>; -}; - -&key_reset { @@ -8278,34 +7938,455 @@ index db8c8c9ad0..0000000000 - }; - }; -}; -diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287pro.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287pro.dts +- +-&wifi0 { +- qcom,ath10k-calibration-variant = "zte,mf287"; +-}; +- +-&wifi1{ +- qcom,ath10k-calibration-variant = "zte,mf287"; +-}; +diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287_common.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287_common.dtsi deleted file mode 100644 -index dda0f74449..0000000000 ---- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287pro.dts +index 5227243467..0000000000 +--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287_common.dtsi +++ /dev/null -@@ -1,265 +0,0 @@ +@@ -1,191 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -// Copyright (c) 2022, Pawel Dembicki . -// Copyright (c) 2022, Giammarco Marzano . -// Copyright (c) 2023, Andreas Böhler - --#include "qcom-ipq4018-mf287.dtsi" +-#include "qcom-ipq4019.dtsi" +-#include +-#include +-#include +-#include - -/ { -- model = "ZTE MF287Pro"; -- compatible = "zte,mf287pro"; +- aliases { +- led-boot = &led_status; +- led-failsafe = &led_status; +- led-running = &led_status; +- led-upgrade = &led_status; +- }; +- +- chosen { +- /* +- * bootargs forced by u-boot bootipq command: +- * 'ubi.mtd=rootfs root=mtd:ubi_rootfs rootfstype=squashfs rootwait' +- */ +- bootargs-append = " root=/dev/ubiblock0_1"; +- }; +- +- leds { +- compatible = "gpio-leds"; +- +- led_status: led-0 { +- label = "blue:power"; +- function = LED_FUNCTION_POWER; +- color = ; +- }; +- }; - - gpio_export { - compatible = "gpio-export"; - #size-cells = <0>; - -- modem { +- gpio_modem_reset: modem { - gpio-export,name = "modem-reset"; - gpio-export,output = <0>; -- gpios = <&tlmm 8 GPIO_ACTIVE_HIGH>; - }; - }; - +- keys { +- compatible = "gpio-keys"; +- +- key_reset: key-reset { +- label = "reset"; +- linux,code = ; +- }; +- +- key_wps: key-wps { +- label = "wps"; +- linux,code = ; +- }; +- }; +- +- soc { +- rng@22000 { +- status = "okay"; +- }; +- +- tcsr@1949000 { +- compatible = "qcom,tcsr"; +- reg = <0x1949000 0x100>; +- qcom,wifi_glb_cfg = ; +- }; +- +- tcsr@194b000 { +- /* select hostmode */ +- compatible = "qcom,tcsr"; +- reg = <0x194b000 0x100>; +- qcom,usb-hsphy-mode-select = ; +- status = "okay"; +- }; +- +- ess_tcsr@1953000 { +- compatible = "qcom,tcsr"; +- reg = <0x1953000 0x1000>; +- qcom,ess-interface-select = ; +- }; +- +- tcsr@1957000 { +- compatible = "qcom,tcsr"; +- reg = <0x1957000 0x100>; +- qcom,wifi_noc_memtype_m0_m2 = ; +- }; +- }; +-}; +- +-&mdio { +- status = "okay"; +-}; +- +-&watchdog { +- status = "okay"; +-}; +- +-&blsp_dma { +- status = "okay"; +-}; +- +-&usb2 { +- status = "okay"; +-}; +- +-&usb3 { +- status = "okay"; +-}; +- +-&blsp1_uart1 { +- pinctrl-0 = <&serial_pins>; +- pinctrl-names = "default"; +- status = "okay"; +-}; +- +-&crypto { +- status = "okay"; +-}; +- +-&cryptobam { +- status = "okay"; +-}; +- +-&gmac { +- status = "okay"; +- nvmem-cell-names = "mac-address"; +- nvmem-cells = <&macaddr_mac_0>; +- mac-address-increment = <2>; +-}; +- +-&switch { +- status = "okay"; +-}; +- +-&swport2 { +- status = "okay"; +- +- label = "lan1"; +-}; +- +-&swport3 { +- status = "okay"; +- +- label = "lan2"; +-}; +- +-&swport4 { +- status = "okay"; +- +- label = "lan3"; +-}; +- +-&swport5 { +- status = "okay"; +- +- label = "lan4"; +-}; +- +-&qpic_bam { +- status = "okay"; +-}; +- +-&usb2_hs_phy { +- status = "okay"; +-}; +- +-&usb3_ss_phy { +- status = "okay"; +-}; +- +-&usb3_hs_phy { +- status = "okay"; +-}; +- +-&wifi0 { +- status = "okay"; +- nvmem-cell-names = "pre-calibration", "mac-address"; +- nvmem-cells = <&precal_art_1000>, <&macaddr_mac_0>; +-}; +- +-&wifi1 { +- status = "okay"; +- nvmem-cell-names = "pre-calibration", "mac-address"; +- nvmem-cells = <&precal_art_5000>, <&macaddr_mac_0>; +- mac-address-increment = <1>; +-}; +diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287plus.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287plus.dts +deleted file mode 100644 +index f09a77ff59..0000000000 +--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287plus.dts ++++ /dev/null +@@ -1,221 +0,0 @@ +-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +-// Copyright (c) 2022, Pawel Dembicki . +-// Copyright (c) 2022, Giammarco Marzano . +-// Copyright (c) 2023, Andreas Böhler +- +-#include "qcom-ipq4018-mf287_common.dtsi" +- +-/ { +- model = "ZTE MF287Plus"; +- compatible = "zte,mf287plus"; +-}; +- +-&gpio_modem_reset { +- gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>; +-}; +- +-&key_reset { +- gpios = <&tlmm 63 GPIO_ACTIVE_LOW>; +-}; +- +-&key_wps { +- gpios = <&tlmm 2 GPIO_ACTIVE_LOW>; +-}; +- +-&led_status { +- gpios = <&tlmm 0 GPIO_ACTIVE_LOW>; +-}; +- +-&blsp1_spi1 { +- pinctrl-0 = <&spi_0_pins>; +- pinctrl-names = "default"; +- status = "okay"; +- cs-gpios = <&tlmm 54 GPIO_ACTIVE_HIGH>, +- <&tlmm 59 GPIO_ACTIVE_HIGH>, +- <&tlmm 1 GPIO_ACTIVE_HIGH>; +- +- flash@0 { +- compatible = "jedec,spi-nor"; +- #address-cells = <1>; +- #size-cells = <1>; +- reg = <0>; +- spi-max-frequency = <24000000>; +- +- partitions { +- compatible = "fixed-partitions"; +- #address-cells = <1>; +- #size-cells = <1>; +- +- partition@0 { +- label = "0:SBL1"; +- reg = <0x0 0x40000>; +- read-only; +- }; +- +- partition@40000 { +- label = "0:MIBIB"; +- reg = <0x40000 0x20000>; +- read-only; +- }; +- +- partition@60000 { +- label = "0:QSEE"; +- reg = <0x60000 0x60000>; +- read-only; +- }; +- +- partition@c0000 { +- label = "0:CDT"; +- reg = <0xc0000 0x10000>; +- read-only; +- }; +- +- partition@d0000 { +- label = "0:DDRPARAMS"; +- reg = <0xd0000 0x10000>; +- read-only; +- }; +- +- partition@e0000 { +- label = "0:APPSBLENV"; +- reg = <0xe0000 0x10000>; +- read-only; +- }; +- +- partition@f0000 { +- label = "0:APPSBL"; +- reg = <0xf0000 0xc0000>; +- read-only; +- }; +- +- partition@1b0000 { +- label = "0:reserved1"; +- reg = <0x1b0000 0x50000>; +- read-only; +- }; +- }; +- }; +- +- spi-nand@1 { /* flash@1 ? */ +- compatible = "spi-nand"; +- reg = <1>; +- spi-max-frequency = <24000000>; +- +- partitions { +- compatible = "fixed-partitions"; +- #address-cells = <1>; +- #size-cells = <1>; +- +- partition@0 { +- label = "fota-flag"; +- reg = <0x0 0x140000>; +- read-only; +- }; +- +- partition@140000 { +- label = "ART"; +- reg = <0x140000 0x140000>; +- read-only; +- compatible = "nvmem-cells"; +- #address-cells = <1>; +- #size-cells = <1>; +- +- precal_art_1000: precal@1000 { +- reg = <0x1000 0x2f20>; +- }; +- +- precal_art_5000: precal@5000 { +- reg = <0x5000 0x2f20>; +- }; +- }; +- +- partition@280000 { +- label = "mac"; +- reg = <0x280000 0x140000>; +- read-only; +- compatible = "nvmem-cells"; +- #address-cells = <1>; +- #size-cells = <1>; +- +- macaddr_mac_0: macaddr@0 { +- reg = <0x0 0x6>; +- }; +- }; +- +- partition@3c0000 { +- label = "cfg-param"; +- reg = <0x3c0000 0x600000>; +- read-only; +- }; +- +- partition@9c0000 { +- label = "oops"; +- reg = <0x9c0000 0x140000>; +- }; +- +- partition@b00000 { +- label = "web"; +- reg = <0xb00000 0x800000>; +- }; +- +- partition@1300000 { +- label = "rootfs"; +- reg = <0x1300000 0x2200000>; +- }; +- +- partition@3500000 { +- label = "data"; +- reg = <0x3500000 0x1900000>; +- }; +- +- partition@4e00000 { +- label = "fota"; +- reg = <0x4e00000 0x3200000>; +- }; +- }; +- }; +- +- zigbee@2 { +- #address-cells = <1>; +- #size-cells = <0>; +- +- compatible = "silabs,em3581"; +- reg = <2>; +- spi-max-frequency = <12000000>; +- }; +-}; +- +-&tlmm { +- serial_pins: serial_pinmux { +- mux { +- pins = "gpio60", "gpio61"; +- function = "blsp_uart0"; +- bias-disable; +- }; +- }; +- +- spi_0_pins: spi_0_pinmux { +- pinmux { +- function = "blsp_spi0"; +- pins = "gpio55", "gpio56", "gpio57"; +- drive-strength = <12>; +- bias-disable; +- }; +- +- pinmux_cs { +- function = "gpio"; +- pins = "gpio54", "gpio59", "gpio1"; +- drive-strength = <2>; +- bias-disable; +- output-high; +- }; +- }; +-}; +- +-&wifi0 { +- qcom,ath10k-calibration-variant = "zte,mf287plus"; +-}; +- +-&wifi1{ +- qcom,ath10k-calibration-variant = "zte,mf287plus"; +-}; +diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287pro.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287pro.dts +deleted file mode 100644 +index 4fd44989c5..0000000000 +--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287pro.dts ++++ /dev/null +@@ -1,268 +0,0 @@ +-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +-// Copyright (c) 2022, Pawel Dembicki . +-// Copyright (c) 2022, Giammarco Marzano . +-// Copyright (c) 2023, Andreas Böhler +- +-#include "qcom-ipq4018-mf287_common.dtsi" +- +-/ { +- model = "ZTE MF287Pro"; +- compatible = "zte,mf287pro"; +- - regulator-usb-vbus { - compatible = "regulator-fixed"; - regulator-name = "USB_VBUS"; @@ -8317,6 +8398,10 @@ index dda0f74449..0000000000 - }; -}; - +-&gpio_modem_reset { +- gpios = <&tlmm 8 GPIO_ACTIVE_HIGH>; +-}; +- -&key_reset { - gpios = <&tlmm 18 GPIO_ACTIVE_LOW>; -}; @@ -8549,6 +8634,16 @@ index dda0f74449..0000000000 - }; - }; -}; +- +-/* The MF287Plus and MF287Pro share the same board data file */ +-&wifi0 { +- qcom,ath10k-calibration-variant = "zte,mf287plus"; +-}; +- +-/* The MF287Plus and MF287Pro share the same board data file */ +-&wifi1{ +- qcom,ath10k-calibration-variant = "zte,mf287plus"; +-}; diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-nbg6617.dts deleted file mode 100644 index ff7252d696..0000000000 @@ -32226,10 +32321,10 @@ index f6ac69ecf1..0000000000 -TARGET_DEVICES += google_wifi diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk deleted file mode 100644 -index 08cbd63b3c..0000000000 +index 99a9b78b78..0000000000 --- a/target/linux/ipq40xx/image/generic.mk +++ /dev/null -@@ -1,1234 +0,0 @@ +@@ -1,1241 +0,0 @@ - -DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID -DEVICE_VARS += RAS_BOARD RAS_ROOTFS_SIZE RAS_VERSION @@ -33396,7 +33491,6 @@ index 08cbd63b3c..0000000000 - -define Device/zte_mf287_common - $(call Device/zte_mf28x_common) -- DEVICE_PACKAGES += ipq-wifi-zte_mf287plus - SOC := qcom-ipq4018 -# The recovery image is used to return back to stock (an initramfs-based image -# that can be flashed to the device via sysupgrade @@ -33409,15 +33503,23 @@ index 08cbd63b3c..0000000000 - -define Device/zte_mf287plus - $(call Device/zte_mf287_common) +- DEVICE_PACKAGES += ipq-wifi-zte_mf287plus - DEVICE_DTS_CONFIG := config@ap.dk01.1-c2 - DEVICE_MODEL := MF287Plus -- DEVICE_ALT0_VENDOR := ZTE -- DEVICE_ALT0_MODEL := MF287 -endef -TARGET_DEVICES += zte_mf287plus - +-define Device/zte_mf287 +- $(call Device/zte_mf287_common) +- DEVICE_PACKAGES += ipq-wifi-zte_mf287 +- DEVICE_DTS_CONFIG := config@ap.dk01.1-c2 +- DEVICE_MODEL := MF287 +-endef +-TARGET_DEVICES += zte_mf287 +- -define Device/zte_mf287pro - $(call Device/zte_mf287_common) +- DEVICE_PACKAGES += ipq-wifi-zte_mf287plus - DEVICE_DTS_CONFIG := config@ap.dk04.1-c1 - DEVICE_MODEL := MF287Pro -endef @@ -35421,29 +35523,6 @@ index 145d3f49ed..0000000000 -+ }; -+ }; - }; -diff --git a/target/linux/ipq40xx/patches-5.15/900-pstore.patch b/target/linux/ipq40xx/patches-5.15/900-pstore.patch -deleted file mode 100644 -index 940ee02020..0000000000 ---- a/target/linux/ipq40xx/patches-5.15/900-pstore.patch -+++ /dev/null -@@ -1,17 +0,0 @@ --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 { diff --git a/target/linux/ipq40xx/patches-5.15/902-dts-ipq4019-ap-dk04.1.patch b/target/linux/ipq40xx/patches-5.15/902-dts-ipq4019-ap-dk04.1.patch deleted file mode 100644 index c7688de7e8..0000000000