diff --git a/config.yml b/config.yml index 14daada7..a09d22cc 100644 --- a/config.yml +++ b/config.yml @@ -4,5 +4,12 @@ revision: 378769b5551714ccaa821b481bfeecbf362f351e output_dir: ./output patch_folders: - - backports/ - - patches/ + - patches/backports/ + - patches/ath79 + - patches/base + - patches/ramips + - patches/ipq40xx + - patches/ipq806x + - patches/ipq807x + - patches/wifi + - patches/rest diff --git a/patches/0023-ipq40xx-add-ath10k-ct-fw.cfg-stubs.patch b/patches/0023-ipq40xx-add-ath10k-ct-fw.cfg-stubs.patch deleted file mode 100644 index 455d44eb..00000000 --- a/patches/0023-ipq40xx-add-ath10k-ct-fw.cfg-stubs.patch +++ /dev/null @@ -1,137 +0,0 @@ -From f6f9f9f095bdd05c66f23357228b90a8daeedd14 Mon Sep 17 00:00:00 2001 -From: John Crispin -Date: Thu, 25 Mar 2021 08:03:48 +0100 -Subject: [PATCH 23/43] ipq40xx: add ath10k-ct fw.cfg stubs - -Signed-off-by: John Crispin ---- - .../etc/hotplug.d/firmware/40-ct-fw-cfg | 46 +++++++++++++++++++ - .../lib/firmware/ath10k/fwcfg-ipq4019.txt | 15 ++++++ - .../lib/firmware/ath10k/fwcfg-qca9888.txt | 16 +++++++ - .../lib/firmware/ath10k/fwcfg-qca9984.txt | 16 +++++++ - 4 files changed, 93 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 - -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..fe8dab3367 ---- /dev/null -+++ b/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/40-ct-fw-cfg -@@ -0,0 +1,46 @@ -+#!/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 -+ ;; -+ath10k/fwcfg-pci-0001:01:00.0.txt) -+ case "$(board_name)" in -+ edgecore,ecw5410) -+ fwcfg_symlink qca9984 -+ ;; -+ esac -+ ;; -+ath10k/fwcfg-pci-0002:01:00.0.txt) -+ case "$(board_name)" in -+ edgecore,ecw5410) -+ 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 --- -2.25.1 - diff --git a/patches/0046-ipq4018-add-EdgeCore-SPW2AC1200-lan-poe-support.patch b/patches/0046-ipq4018-add-EdgeCore-SPW2AC1200-lan-poe-support.patch deleted file mode 100644 index 90514c02..00000000 --- a/patches/0046-ipq4018-add-EdgeCore-SPW2AC1200-lan-poe-support.patch +++ /dev/null @@ -1,148 +0,0 @@ -From a0eb587ea9e4d905e1796c4f0d64fff9cd8a88f3 Mon Sep 17 00:00:00 2001 -From: John Crispin -Date: Thu, 14 Oct 2021 15:13:56 +0200 -Subject: [PATCH] spwlanpoe - -Signed-off-by: John Crispin ---- - package/boot/uboot-envtools/files/ipq40xx | 1 + - target/linux/ipq40xx/base-files/etc/board.d/01_leds | 1 + - .../linux/ipq40xx/base-files/etc/board.d/02_network | 1 + - .../etc/hotplug.d/firmware/11-ath10k-caldata | 2 ++ - .../ipq40xx/base-files/lib/upgrade/platform.sh | 3 ++- - .../boot/dts/qcom-ipq4018-spw2ac1200-lan-poe.dts | 6 ++++++ - target/linux/ipq40xx/image/generic.mk | 13 +++++++++++++ - .../patches-5.4/901-arm-boot-add-dts-files.patch | 3 ++- - 8 files changed, 28 insertions(+), 2 deletions(-) - create mode 100644 target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-spw2ac1200-lan-poe.dts - -diff --git a/package/boot/uboot-envtools/files/ipq40xx b/package/boot/uboot-envtools/files/ipq40xx -index fd7ad69eff..c51b40ab12 100644 ---- a/package/boot/uboot-envtools/files/ipq40xx -+++ b/package/boot/uboot-envtools/files/ipq40xx -@@ -35,6 +35,7 @@ alfa-network,ap120c-ac |\ - devolo,magic-2-wifi-next |\ - edgecore,ecw5211 |\ - edgecore,spw2ac1200 |\ -+edgecore,spw2ac1200-lan-poe |\ - glinet,gl-ap1300 |\ - glinet,gl-b1300 |\ - luma,wrtq-329acn |\ -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 d944d72184..5476dd5df6 100755 ---- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds -+++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds -@@ -72,6 +72,7 @@ qxwlan,e2600ac-c2) - ;; - edgecore,ecw5211 |\ - edgecore,spw2ac1200 |\ -+edgecore,spw2ac1200-lan-poe |\ - cig,wf610d |\ - zyxel,nbg6617 |\ - zyxel,wre6606) -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 e4b009bf93..f533c39179 100755 ---- a/target/linux/ipq40xx/base-files/etc/board.d/02_network -+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network -@@ -15,6 +15,7 @@ ipq40xx_setup_interfaces() - 8dev,habanero-dvk|\ - 8dev,jalapeno|\ - alfa-network,ap120c-ac|\ -+ edgecore,spw2ac1200-lan-poe |\ - engenius,emr3500|\ - engenius,ens620ext|\ - luma,wrtq-329acn|\ -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 97dd1b4039..e36821a596 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 -@@ -105,6 +105,7 @@ case "$FIRMWARE" in - compex,wpj428 |\ - edgecore,ecw5211 |\ - edgecore,spw2ac1200 |\ -+ edgecore,spw2ac1200-lan-poe |\ - edgecore,oap100 |\ - engenius,eap1300 |\ - engenius,eap2200 |\ -@@ -226,6 +227,7 @@ case "$FIRMWARE" in - compex,wpj428 |\ - edgecore,ecw5211 |\ - edgecore,spw2ac1200 |\ -+ edgecore,spw2ac1200-lan-poe |\ - edgecore,oap100 |\ - engenius,eap1300 |\ - engenius,eap2200 |\ -diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh -index 806b3edb66..d44a57c62a 100644 ---- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh -+++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh -@@ -90,7 +90,8 @@ platform_do_upgrade() { - fi - nand_do_upgrade "$1" - ;; -- edgecore,spw2ac1200) -+ edgecore,spw2ac1200|\ -+ edgecore,spw2ac1200-lan-poe) - CI_UBIPART="$(awk -F 'ubi.mtd=' '{printf $2}' /proc/cmdline | sed -e 's/ .*$//')" - nand_do_upgrade "$1" - ;; -diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-spw2ac1200-lan-poe.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-spw2ac1200-lan-poe.dts -new file mode 100644 -index 0000000000..1c2a2a8621 ---- /dev/null -+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-spw2ac1200-lan-poe.dts -@@ -0,0 +1,6 @@ -+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT -+ -+#include "qcom-ipq4018-spw2ac1200.dts" -+/ { -+ compatible = "edgecore,spw2ac1200-lan-poe"; -+}; -diff --git a/target/linux/ipq40xx/image/generic.mk b/target/linux/ipq40xx/image/generic.mk -index ae1e2e49cf..7e6118e61c 100644 ---- a/target/linux/ipq40xx/image/generic.mk -+++ b/target/linux/ipq40xx/image/generic.mk -@@ -387,6 +387,19 @@ define Device/edgecore_spw2ac1200 - endef - TARGET_DEVICES += edgecore_spw2ac1200 - -+define Device/edgecore_spw2ac1200-lan-poe -+ $(call Device/FitImage) -+ $(call Device/UbiFit) -+ DEVICE_VENDOR := Edgecore -+ DEVICE_MODEL := SPW2AC1200 -+ SOC := qcom-ipq4018 -+ BLOCKSIZE := 128k -+ PAGESIZE := 2048 -+ DEVICE_DTS_CONFIG := config@ap.dk01.1-c2 -+ DEVICE_PACKAGES := kmod-tpm-i2c-atmel kmod-usb-acm uboot-envtools kmod-usb-net kmod-usb-net-cdc-qmi uqmi -+endef -+TARGET_DEVICES += edgecore_spw2ac1200-lan-poe -+ - define Device/edgecore_oap100 - $(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 826e17b0e9..c4ecf62313 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 - - --- a/arch/arm/boot/dts/Makefile - +++ b/arch/arm/boot/dts/Makefile --@@ -837,11 +837,63 @@ dtb-$(CONFIG_ARCH_QCOM) += \ -+@@ -837,11 +837,64 @@ dtb-$(CONFIG_ARCH_QCOM) += \ - qcom-apq8074-dragonboard.dtb \ - qcom-apq8084-ifc6540.dtb \ - qcom-apq8084-mtp.dtb \ -@@ -23,6 +23,7 @@ Signed-off-by: John Crispin - + qcom-ipq4018-eap1300.dtb \ - + qcom-ipq4018-ecw5211.dtb \ - + qcom-ipq4018-spw2ac1200.dtb \ -++ qcom-ipq4018-spw2ac1200-lan-poe.dtb \ - + qcom-ipq4018-emd1.dtb \ - + qcom-ipq4018-emr3500.dtb \ - + qcom-ipq4018-ens620ext.dtb \ --- -2.25.1 - diff --git a/patches/0047-scripts-gen_config.py-add-host_dependencies-option.patch b/patches/0047-scripts-gen_config.py-add-host_dependencies-option.patch deleted file mode 100644 index 349a0fab..00000000 --- a/patches/0047-scripts-gen_config.py-add-host_dependencies-option.patch +++ /dev/null @@ -1,78 +0,0 @@ -From b144b80999d1e1facf299b57c5fa3305cdfd9ee8 Mon Sep 17 00:00:00 2001 -From: Paul Spooren -Date: Thu, 4 Nov 2021 12:48:04 -1000 -Subject: [PATCH] scripts: gen_config.py add host_dependencies option - -In case a package/image requres specific host dependencies it is -possible to define entries in the `host_dependencies` array. Each entry -is an object containing at least `name` and `which`. The `which` array -contains tools to be checked in the current `PATH`. - -Optionally the two options `success_diffconfig` and -`fallback_diffconfig` can be set. The former is optionally added in case -the tool is found. The latter is added if the dependency is not -available. - -If the dependecy is not available and no `fallback_diffconfig` is set, -the config generation is considered impossible and stopped. - -Signed-off-by: Paul Spooren ---- - scripts/gen_config.py | 27 +++++++++++++++++++++++++-- - 1 file changed, 25 insertions(+), 2 deletions(-) - -diff --git a/scripts/gen_config.py b/scripts/gen_config.py -index a348386124..5572de80c7 100755 ---- a/scripts/gen_config.py -+++ b/scripts/gen_config.py -@@ -2,7 +2,7 @@ - - from os import getenv - from pathlib import Path --from shutil import rmtree -+from shutil import rmtree, which - from subprocess import run - import sys - import yaml -@@ -36,7 +36,27 @@ def usage(code: int = 0): - sys.exit(code) - - --def load_yaml(fname: str, profile: dict, include = True): -+def process_host_dependency(dependecy: dict, profile: dict): -+ print(f"Checking host dependecy {dependecy['name']}") -+ found = False -+ for w in dependecy["which"]: -+ if which(w): -+ print(f"-> Found {w}") -+ found = True -+ break -+ -+ if found: -+ profile["diffconfig"] += dependecy.get("success_diffconfig", "") -+ else: -+ print(f"-> Could not find host dependecy {dependecy['name']}.") -+ print(f" -> Please make sure one of {dependecy['which']} is available") -+ if "fallback_diffconfig" in dependecy: -+ profile["diffconfig"] += dependecy["fallback_diffconfig"] -+ else: -+ die("Can't continue without dependency and no `fallback_diffconfig` set") -+ -+ -+def load_yaml(fname: str, profile: dict, include=True): - profile_file = (profile_folder / fname).with_suffix(".yml") - - if not profile_file.is_file(): -@@ -59,6 +79,9 @@ def load_yaml(fname: str, profile: dict, include = True): - if f.get("name", "") == "" or (f.get("uri", "") == "" and f.get("path", "") == ""): - die(f"Found bad feed {f}") - profile["feeds"][f.get("name")] = f -+ elif n in {"host_dependecies"}: -+ for d in new.get(n): -+ process_host_dependency(d, profile) - - if "include" in new and include: - for i in range(len(new["include"])): --- -2.30.2 - diff --git a/patches/0048-scripts-gen_config-allow-explicit-warning-message.patch b/patches/0048-scripts-gen_config-allow-explicit-warning-message.patch deleted file mode 100644 index faaff74c..00000000 --- a/patches/0048-scripts-gen_config-allow-explicit-warning-message.patch +++ /dev/null @@ -1,54 +0,0 @@ -From bcb6e18b492d4fa055c136729ad85c53c725f241 Mon Sep 17 00:00:00 2001 -From: Paul Spooren -Date: Fri, 5 Nov 2021 12:12:25 -1000 -Subject: [PATCH] scripts: gen_config allow explicit warning message - -Instead of generically mentioning a missing dependency the host -dependency can also be explained by defining a `warning`. - -Warning messages are collected and printed at the end. - -Signed-off-by: Paul Spooren ---- - scripts/gen_config.py | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/scripts/gen_config.py b/scripts/gen_config.py -index 5572de80c7..071e00bb4d 100755 ---- a/scripts/gen_config.py -+++ b/scripts/gen_config.py -@@ -8,6 +8,7 @@ import sys - import yaml - - profile_folder = Path(getenv("PROFILES", "./profiles")).absolute() -+warnings = [] - - - def die(msg: str): -@@ -48,8 +49,13 @@ def process_host_dependency(dependecy: dict, profile: dict): - if found: - profile["diffconfig"] += dependecy.get("success_diffconfig", "") - else: -- print(f"-> Could not find host dependecy {dependecy['name']}.") -- print(f" -> Please make sure one of {dependecy['which']} is available") -+ if "warning" in dependecy: -+ warnings.append(f"Dependecy {dependecy['name']}: {dependecy['warning']}") -+ else: -+ warnings.append( -+ f"Dependecy {dependecy['name']}: Please install {dependecy['which']}" -+ ) -+ - if "fallback_diffconfig" in dependecy: - profile["diffconfig"] += dependecy["fallback_diffconfig"] - else: -@@ -220,3 +226,7 @@ if __name__ == "__main__": - print("Running make defconfig") - if run(["make", "defconfig"]).returncode: - die(f"Error running make defconfig") -+ -+ print("#########################\n" * 3) -+ print("\n".join(warnings)) -+ print("#########################\n" * 3) --- -2.30.2 - diff --git a/patches/0025-ath79-add-Support-for-Indio-305AC.patch b/patches/ath79/0001-ath79-add-Support-for-Indio-305AC.patch similarity index 100% rename from patches/0025-ath79-add-Support-for-Indio-305AC.patch rename to patches/ath79/0001-ath79-add-Support-for-Indio-305AC.patch diff --git a/patches/0026-ath79-tl-wpa8630p-fixes.patch b/patches/ath79/0002-ath79-tl-wpa8630p-fixes.patch similarity index 100% rename from patches/0026-ath79-tl-wpa8630p-fixes.patch rename to patches/ath79/0002-ath79-tl-wpa8630p-fixes.patch diff --git a/patches/0027-ath79-add-support-for-TP-Link-CPE710-v1.patch b/patches/ath79/0003-ath79-add-support-for-TP-Link-CPE710-v1.patch similarity index 100% rename from patches/0027-ath79-add-support-for-TP-Link-CPE710-v1.patch rename to patches/ath79/0003-ath79-add-support-for-TP-Link-CPE710-v1.patch diff --git a/patches/0034-ath79-various-fixes.patch b/patches/ath79/0004-ath79-various-fixes.patch similarity index 100% rename from patches/0034-ath79-various-fixes.patch rename to patches/ath79/0004-ath79-various-fixes.patch diff --git a/patches/ath79/0005-certificates-add-ability-to-persistently-store-certi.patch b/patches/ath79/0005-certificates-add-ability-to-persistently-store-certi.patch new file mode 100644 index 00000000..2092c50d --- /dev/null +++ b/patches/ath79/0005-certificates-add-ability-to-persistently-store-certi.patch @@ -0,0 +1,30 @@ +From ee837f028bd7af515d30a8a90cc2b5ee61eecf19 Mon Sep 17 00:00:00 2001 +From: John Crispin +Date: Sat, 4 Sep 2021 06:04:54 +0200 +Subject: [PATCH 35/43] certificates: add ability to persistently store + certificates + +Signed-off-by: John Crispin +--- + target/linux/ath79/dts/qca9563_tplink_cpe710-v1.dts | 7 ++++++- + 3 files changed, 13 insertions(+), 4 deletions(-) + +diff --git a/target/linux/ath79/dts/qca9563_tplink_cpe710-v1.dts b/target/linux/ath79/dts/qca9563_tplink_cpe710-v1.dts +index 830c3d30b8..71c6381f86 100644 +--- a/target/linux/ath79/dts/qca9563_tplink_cpe710-v1.dts ++++ b/target/linux/ath79/dts/qca9563_tplink_cpe710-v1.dts +@@ -86,7 +86,12 @@ + partition@70000 { + compatible = "denx,uimage"; + label = "firmware"; +- reg = <0x070000 0xf50000>; ++ reg = <0x070000 0xf40000>; ++ }; ++ ++ partition@fb0000 { ++ label = "certificates"; ++ reg = <0xfb0000 0x10000>; + }; + + partition@fc0000 { + diff --git a/backports/0001-build-build-kernel-image-before-building-modules-pac.patch b/patches/backports/0001-build-build-kernel-image-before-building-modules-pac.patch similarity index 100% rename from backports/0001-build-build-kernel-image-before-building-modules-pac.patch rename to patches/backports/0001-build-build-kernel-image-before-building-modules-pac.patch diff --git a/backports/0002-build-fix-build-with-CONFIG_STRIP_KERNEL_EXPORTS.patch b/patches/backports/0002-build-fix-build-with-CONFIG_STRIP_KERNEL_EXPORTS.patch similarity index 100% rename from backports/0002-build-fix-build-with-CONFIG_STRIP_KERNEL_EXPORTS.patch rename to patches/backports/0002-build-fix-build-with-CONFIG_STRIP_KERNEL_EXPORTS.patch diff --git a/backports/0003-kernel-add-linux-5.10-support.patch b/patches/backports/0003-kernel-add-linux-5.10-support.patch similarity index 100% rename from backports/0003-kernel-add-linux-5.10-support.patch rename to patches/backports/0003-kernel-add-linux-5.10-support.patch diff --git a/backports/0004-mediatek-update-to-latest-trunk-version.patch b/patches/backports/0004-mediatek-update-to-latest-trunk-version.patch similarity index 100% rename from backports/0004-mediatek-update-to-latest-trunk-version.patch rename to patches/backports/0004-mediatek-update-to-latest-trunk-version.patch diff --git a/backports/0005-sysupgrade-nand-allow-limiting-rootfs_data-by-settin.patch b/patches/backports/0005-sysupgrade-nand-allow-limiting-rootfs_data-by-settin.patch similarity index 100% rename from backports/0005-sysupgrade-nand-allow-limiting-rootfs_data-by-settin.patch rename to patches/backports/0005-sysupgrade-nand-allow-limiting-rootfs_data-by-settin.patch diff --git a/backports/0006-uboot-mediatek-add-support-for-linksys-e8450.patch b/patches/backports/0006-uboot-mediatek-add-support-for-linksys-e8450.patch similarity index 100% rename from backports/0006-uboot-mediatek-add-support-for-linksys-e8450.patch rename to patches/backports/0006-uboot-mediatek-add-support-for-linksys-e8450.patch diff --git a/backports/0007-uboot-envtools-add-defaults-for-linksys-e8450-ubi.patch b/patches/backports/0007-uboot-envtools-add-defaults-for-linksys-e8450-ubi.patch similarity index 100% rename from backports/0007-uboot-envtools-add-defaults-for-linksys-e8450-ubi.patch rename to patches/backports/0007-uboot-envtools-add-defaults-for-linksys-e8450-ubi.patch diff --git a/backports/0008-realtek-update-to-latest-owrt-HEAD.patch b/patches/backports/0008-realtek-update-to-latest-owrt-HEAD.patch similarity index 100% rename from backports/0008-realtek-update-to-latest-owrt-HEAD.patch rename to patches/backports/0008-realtek-update-to-latest-owrt-HEAD.patch diff --git a/backports/0009-include-set-kernel-version.mk.patch b/patches/backports/0009-include-set-kernel-version.mk.patch similarity index 100% rename from backports/0009-include-set-kernel-version.mk.patch rename to patches/backports/0009-include-set-kernel-version.mk.patch diff --git a/backports/0011-backport-mkits.sh.patch b/patches/backports/0011-backport-mkits.sh.patch similarity index 100% rename from backports/0011-backport-mkits.sh.patch rename to patches/backports/0011-backport-mkits.sh.patch diff --git a/backports/0012-libubox-update-to-latest-HEAD.patch b/patches/backports/0012-libubox-update-to-latest-HEAD.patch similarity index 100% rename from backports/0012-libubox-update-to-latest-HEAD.patch rename to patches/backports/0012-libubox-update-to-latest-HEAD.patch diff --git a/backports/0013-umdns-update-to-latest-HEAD.patch b/patches/backports/0013-umdns-update-to-latest-HEAD.patch similarity index 100% rename from backports/0013-umdns-update-to-latest-HEAD.patch rename to patches/backports/0013-umdns-update-to-latest-HEAD.patch diff --git a/backports/0014-kernel-add-bdpu-filter-support.patch b/patches/backports/0014-kernel-add-bdpu-filter-support.patch similarity index 100% rename from backports/0014-kernel-add-bdpu-filter-support.patch rename to patches/backports/0014-kernel-add-bdpu-filter-support.patch diff --git a/backports/0015-uhttpd-add-config-option-for-json_script.patch b/patches/backports/0015-uhttpd-add-config-option-for-json_script.patch similarity index 100% rename from backports/0015-uhttpd-add-config-option-for-json_script.patch rename to patches/backports/0015-uhttpd-add-config-option-for-json_script.patch diff --git a/backports/0016-iwinfo-update-to-latest-git-HEAD.patch b/patches/backports/0016-iwinfo-update-to-latest-git-HEAD.patch similarity index 100% rename from backports/0016-iwinfo-update-to-latest-git-HEAD.patch rename to patches/backports/0016-iwinfo-update-to-latest-git-HEAD.patch diff --git a/backports/0017-netifd-update-to-latest-HEAD.patch b/patches/backports/0017-netifd-update-to-latest-HEAD.patch similarity index 100% rename from backports/0017-netifd-update-to-latest-HEAD.patch rename to patches/backports/0017-netifd-update-to-latest-HEAD.patch diff --git a/backports/0018-mac80211-update-to-latest-HEAD.patch b/patches/backports/0018-mac80211-update-to-latest-HEAD.patch similarity index 100% rename from backports/0018-mac80211-update-to-latest-HEAD.patch rename to patches/backports/0018-mac80211-update-to-latest-HEAD.patch diff --git a/backports/0019-hostapd-update-to-latest-HEAD.patch b/patches/backports/0019-hostapd-update-to-latest-HEAD.patch similarity index 100% rename from backports/0019-hostapd-update-to-latest-HEAD.patch rename to patches/backports/0019-hostapd-update-to-latest-HEAD.patch diff --git a/backports/0020-procd-add-uxc-support.patch b/patches/backports/0020-procd-add-uxc-support.patch similarity index 100% rename from backports/0020-procd-add-uxc-support.patch rename to patches/backports/0020-procd-add-uxc-support.patch diff --git a/backports/0021-build-create-APK-files-parrallel-to-IPK.patch b/patches/backports/0021-build-create-APK-files-parrallel-to-IPK.patch similarity index 100% rename from backports/0021-build-create-APK-files-parrallel-to-IPK.patch rename to patches/backports/0021-build-create-APK-files-parrallel-to-IPK.patch diff --git a/backports/0022-fstools-update-to-git-HEAD.patch b/patches/backports/0022-fstools-update-to-git-HEAD.patch similarity index 100% rename from backports/0022-fstools-update-to-git-HEAD.patch rename to patches/backports/0022-fstools-update-to-git-HEAD.patch diff --git a/backports/0023-tools-libressl-update-to-3.3.3.patch b/patches/backports/0023-tools-libressl-update-to-3.3.3.patch similarity index 100% rename from backports/0023-tools-libressl-update-to-3.3.3.patch rename to patches/backports/0023-tools-libressl-update-to-3.3.3.patch diff --git a/backports/0024-uvol-backport-package.patch b/patches/backports/0024-uvol-backport-package.patch similarity index 100% rename from backports/0024-uvol-backport-package.patch rename to patches/backports/0024-uvol-backport-package.patch diff --git a/backports/0025-apk-backport-package.patch b/patches/backports/0025-apk-backport-package.patch similarity index 100% rename from backports/0025-apk-backport-package.patch rename to patches/backports/0025-apk-backport-package.patch diff --git a/backports/0026-lua-lzlib-backport-package.patch b/patches/backports/0026-lua-lzlib-backport-package.patch similarity index 100% rename from backports/0026-lua-lzlib-backport-package.patch rename to patches/backports/0026-lua-lzlib-backport-package.patch diff --git a/backports/0027-lua-make-it-easier-to-detect-host-built-Lua.patch b/patches/backports/0027-lua-make-it-easier-to-detect-host-built-Lua.patch similarity index 100% rename from backports/0027-lua-make-it-easier-to-detect-host-built-Lua.patch rename to patches/backports/0027-lua-make-it-easier-to-detect-host-built-Lua.patch diff --git a/backports/0028-mt76-update-to-latest-HEAD.patch b/patches/backports/0028-mt76-update-to-latest-HEAD.patch similarity index 100% rename from backports/0028-mt76-update-to-latest-HEAD.patch rename to patches/backports/0028-mt76-update-to-latest-HEAD.patch diff --git a/backports/0030-iproute2-m_xt.so-depends-on-dynsyms.list.patch b/patches/backports/0030-iproute2-m_xt.so-depends-on-dynsyms.list.patch similarity index 100% rename from backports/0030-iproute2-m_xt.so-depends-on-dynsyms.list.patch rename to patches/backports/0030-iproute2-m_xt.so-depends-on-dynsyms.list.patch diff --git a/backports/0031-ubus-update-to-the-latest-version.patch b/patches/backports/0031-ubus-update-to-the-latest-version.patch similarity index 100% rename from backports/0031-ubus-update-to-the-latest-version.patch rename to patches/backports/0031-ubus-update-to-the-latest-version.patch diff --git a/backports/0032-rpcd-bump-to-git-HEAD.patch b/patches/backports/0032-rpcd-bump-to-git-HEAD.patch similarity index 100% rename from backports/0032-rpcd-bump-to-git-HEAD.patch rename to patches/backports/0032-rpcd-bump-to-git-HEAD.patch diff --git a/backports/0050-bpf-headers-add-a-package-with-kernel-headers-for-eb.patch b/patches/backports/0050-bpf-headers-add-a-package-with-kernel-headers-for-eb.patch similarity index 100% rename from backports/0050-bpf-headers-add-a-package-with-kernel-headers-for-eb.patch rename to patches/backports/0050-bpf-headers-add-a-package-with-kernel-headers-for-eb.patch diff --git a/backports/0051-bpf-headers-unset-PKG_CONFIG_PATH.patch b/patches/backports/0051-bpf-headers-unset-PKG_CONFIG_PATH.patch similarity index 100% rename from backports/0051-bpf-headers-unset-PKG_CONFIG_PATH.patch rename to patches/backports/0051-bpf-headers-unset-PKG_CONFIG_PATH.patch diff --git a/backports/0052-tools-llvm-bpf-add-llvm-clang-build-suitable-for-com.patch b/patches/backports/0052-tools-llvm-bpf-add-llvm-clang-build-suitable-for-com.patch similarity index 100% rename from backports/0052-tools-llvm-bpf-add-llvm-clang-build-suitable-for-com.patch rename to patches/backports/0052-tools-llvm-bpf-add-llvm-clang-build-suitable-for-com.patch diff --git a/backports/0053-llvm-bpf-move-to-staging_dir-host-llvm-bpf.patch b/patches/backports/0053-llvm-bpf-move-to-staging_dir-host-llvm-bpf.patch similarity index 100% rename from backports/0053-llvm-bpf-move-to-staging_dir-host-llvm-bpf.patch rename to patches/backports/0053-llvm-bpf-move-to-staging_dir-host-llvm-bpf.patch diff --git a/backports/0054-build-fix-bpf-toolchain-dependency-for-qosify.patch b/patches/backports/0054-build-fix-bpf-toolchain-dependency-for-qosify.patch similarity index 100% rename from backports/0054-build-fix-bpf-toolchain-dependency-for-qosify.patch rename to patches/backports/0054-build-fix-bpf-toolchain-dependency-for-qosify.patch diff --git a/backports/0055-include-bpf.mk-fix-typo.patch b/patches/backports/0055-include-bpf.mk-fix-typo.patch similarity index 100% rename from backports/0055-include-bpf.mk-fix-typo.patch rename to patches/backports/0055-include-bpf.mk-fix-typo.patch diff --git a/backports/0056-include-bpf.mk-fix-compile-for-big-endian-targets.patch b/patches/backports/0056-include-bpf.mk-fix-compile-for-big-endian-targets.patch similarity index 100% rename from backports/0056-include-bpf.mk-fix-compile-for-big-endian-targets.patch rename to patches/backports/0056-include-bpf.mk-fix-compile-for-big-endian-targets.patch diff --git a/backports/0057-include-bpf.mk-add-LD_LIBRARY_PATH.patch b/patches/backports/0057-include-bpf.mk-add-LD_LIBRARY_PATH.patch similarity index 100% rename from backports/0057-include-bpf.mk-add-LD_LIBRARY_PATH.patch rename to patches/backports/0057-include-bpf.mk-add-LD_LIBRARY_PATH.patch diff --git a/backports/0058-kernel-backport-napi-threading-patches.patch b/patches/backports/0058-kernel-backport-napi-threading-patches.patch similarity index 100% rename from backports/0058-kernel-backport-napi-threading-patches.patch rename to patches/backports/0058-kernel-backport-napi-threading-patches.patch diff --git a/patches/0001-.gitignore-add-the-profiles-folder.patch b/patches/base/0001-.gitignore-add-the-profiles-folder.patch similarity index 100% rename from patches/0001-.gitignore-add-the-profiles-folder.patch rename to patches/base/0001-.gitignore-add-the-profiles-folder.patch diff --git a/patches/0003-pending-scripts-add-gen_config.py.patch b/patches/base/0003-pending-scripts-add-gen_config.py.patch similarity index 78% rename from patches/0003-pending-scripts-add-gen_config.py.patch rename to patches/base/0003-pending-scripts-add-gen_config.py.patch index ec1ee792..a050c010 100644 --- a/patches/0003-pending-scripts-add-gen_config.py.patch +++ b/patches/base/0003-pending-scripts-add-gen_config.py.patch @@ -1,32 +1,33 @@ -From 4b5a9307be956685ed6bd14a3e2cb8727eae0b08 Mon Sep 17 00:00:00 2001 +From 3b8b9898226f49379e34356fd8d2b0abc8947994 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Fri, 19 Jun 2020 10:45:22 +0200 -Subject: [PATCH 03/43] pending: scripts: add gen_config.py +Subject: [PATCH] pending: scripts: add gen_config.py This script is used to setup the tree based on the profiles/. Signed-off-by: John Crispin --- - scripts/gen_config.py | 199 ++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 199 insertions(+) + scripts/gen_config.py | 236 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 236 insertions(+) create mode 100755 scripts/gen_config.py diff --git a/scripts/gen_config.py b/scripts/gen_config.py new file mode 100755 -index 0000000000..a36f244e56 +index 0000000000..d39066f44d --- /dev/null +++ b/scripts/gen_config.py -@@ -0,0 +1,199 @@ +@@ -0,0 +1,236 @@ +#!/usr/bin/env python3 + +from os import getenv +from pathlib import Path -+from shutil import rmtree ++from shutil import rmtree, which +from subprocess import run +import sys +import yaml + +profile_folder = Path(getenv("PROFILES", "./profiles")).absolute() ++warnings = [] + + +def die(msg: str): @@ -55,7 +56,32 @@ index 0000000000..a36f244e56 + sys.exit(code) + + -+def load_yaml(fname: str, profile: dict, include = True): ++def process_host_dependency(dependecy: dict, profile: dict): ++ print(f"Checking host dependecy {dependecy['name']}") ++ found = False ++ for w in dependecy["which"]: ++ if which(w): ++ print(f"-> Found {w}") ++ found = True ++ break ++ ++ if found: ++ profile["diffconfig"] += dependecy.get("success_diffconfig", "") ++ else: ++ if "warning" in dependecy: ++ warnings.append(f"Dependecy {dependecy['name']}: {dependecy['warning']}") ++ else: ++ warnings.append( ++ f"Dependecy {dependecy['name']}: Please install {dependecy['which']}" ++ ) ++ ++ if "fallback_diffconfig" in dependecy: ++ profile["diffconfig"] += dependecy["fallback_diffconfig"] ++ else: ++ die("Can't continue without dependency and no `fallback_diffconfig` set") ++ ++ ++def load_yaml(fname: str, profile: dict, include=True): + profile_file = (profile_folder / fname).with_suffix(".yml") + + if not profile_file.is_file(): @@ -78,10 +104,13 @@ index 0000000000..a36f244e56 + if f.get("name", "") == "" or (f.get("uri", "") == "" and f.get("path", "") == ""): + die(f"Found bad feed {f}") + profile["feeds"][f.get("name")] = f ++ elif n in {"host_dependecies"}: ++ for d in new.get(n): ++ process_host_dependency(d, profile) + + if "include" in new and include: + for i in range(len(new["include"])): -+ profile = load_yaml(new["include"][i], profile, False) ++ profile = load_yaml(new["include"][i], profile) + return profile + + @@ -149,6 +178,10 @@ index 0000000000..a36f244e56 + ["./scripts/feeds", "install", "-a", "-f", "-p", f.get("name")] + ).returncode: + die(f"Error installing {feed}") ++ if run( ++ ["./scripts/feeds", "install", "-f", "-p", f.get("name"), f.get("name")] ++ ).returncode: ++ die(f"Error installing {feed}") + + packages = ["./scripts/feeds", "install" ] + for package in profile.get("packages", []): @@ -216,6 +249,10 @@ index 0000000000..a36f244e56 + print("Running make defconfig") + if run(["make", "defconfig"]).returncode: + die(f"Error running make defconfig") ++ ++ print("#########################\n" * 3) ++ print("\n".join(warnings)) ++ print("#########################\n" * 3) -- 2.25.1 diff --git a/patches/0004-scripts-update-feed-script.patch b/patches/base/0004-scripts-update-feed-script.patch similarity index 100% rename from patches/0004-scripts-update-feed-script.patch rename to patches/base/0004-scripts-update-feed-script.patch diff --git a/patches/0005-scripts-ubinize-image.sh-allow-setting-the-rootfs-na.patch b/patches/base/0005-scripts-ubinize-image.sh-allow-setting-the-rootfs-na.patch similarity index 100% rename from patches/0005-scripts-ubinize-image.sh-allow-setting-the-rootfs-na.patch rename to patches/base/0005-scripts-ubinize-image.sh-allow-setting-the-rootfs-na.patch diff --git a/patches/0006-base-files-set-default-password-to-openwifi.patch b/patches/base/0006-base-files-set-default-password-to-openwifi.patch similarity index 100% rename from patches/0006-base-files-set-default-password-to-openwifi.patch rename to patches/base/0006-base-files-set-default-password-to-openwifi.patch diff --git a/patches/0007-base-files-update-banner.patch b/patches/base/0007-base-files-update-banner.patch similarity index 100% rename from patches/0007-base-files-update-banner.patch rename to patches/base/0007-base-files-update-banner.patch diff --git a/patches/0008-base-files-add-the-wlan-ap-repo-hash.patch b/patches/base/0008-base-files-add-the-wlan-ap-repo-hash.patch similarity index 91% rename from patches/0008-base-files-add-the-wlan-ap-repo-hash.patch rename to patches/base/0008-base-files-add-the-wlan-ap-repo-hash.patch index 41c92e31..a93b671e 100644 --- a/patches/0008-base-files-add-the-wlan-ap-repo-hash.patch +++ b/patches/base/0008-base-files-add-the-wlan-ap-repo-hash.patch @@ -117,19 +117,6 @@ index 0000000000..4e8f05a700 +-- +2.25.1 + -diff --git a/scripts/gen_config.py b/scripts/gen_config.py -index a36f244e56..a348386124 100755 ---- a/scripts/gen_config.py -+++ b/scripts/gen_config.py -@@ -62,7 +62,7 @@ def load_yaml(fname: str, profile: dict, include = True): - - if "include" in new and include: - for i in range(len(new["include"])): -- profile = load_yaml(new["include"][i], profile, False) -+ profile = load_yaml(new["include"][i], profile) - return profile - - diff --git a/scripts/getver.sh b/scripts/getver.sh index dc3d1bb1c3..cd4d7aedf4 100755 --- a/scripts/getver.sh diff --git a/patches/0009-base-files-make-sysupgrade-work-on-qcom-AX.patch b/patches/base/0009-base-files-make-sysupgrade-work-on-qcom-AX.patch similarity index 100% rename from patches/0009-base-files-make-sysupgrade-work-on-qcom-AX.patch rename to patches/base/0009-base-files-make-sysupgrade-work-on-qcom-AX.patch diff --git a/patches/0010-base-files-add-support-for-v4.4-style-netdev-led-tri.patch b/patches/base/0010-base-files-add-support-for-v4.4-style-netdev-led-tri.patch similarity index 100% rename from patches/0010-base-files-add-support-for-v4.4-style-netdev-led-tri.patch rename to patches/base/0010-base-files-add-support-for-v4.4-style-netdev-led-tri.patch diff --git a/patches/0011-busybox-enable-the-watchdog-tool.patch b/patches/base/0011-busybox-enable-the-watchdog-tool.patch similarity index 100% rename from patches/0011-busybox-enable-the-watchdog-tool.patch rename to patches/base/0011-busybox-enable-the-watchdog-tool.patch diff --git a/patches/0013-base-files-ignore-sysupgrade-that-was-not-ours.patch b/patches/base/0013-base-files-ignore-sysupgrade-that-was-not-ours.patch similarity index 100% rename from patches/0013-base-files-ignore-sysupgrade-that-was-not-ours.patch rename to patches/base/0013-base-files-ignore-sysupgrade-that-was-not-ours.patch diff --git a/patches/0033-feeds.conf.default-drop-luci.patch b/patches/base/0014-feeds.conf.default-drop-luci.patch similarity index 100% rename from patches/0033-feeds.conf.default-drop-luci.patch rename to patches/base/0014-feeds.conf.default-drop-luci.patch diff --git a/patches/0024-target-add-pstore-support.patch b/patches/base/0015-target-add-pstore-support.patch similarity index 100% rename from patches/0024-target-add-pstore-support.patch rename to patches/base/0015-target-add-pstore-support.patch diff --git a/patches/0029-base-files-add-a-turnoff-command-to-the-led-script.patch b/patches/base/0016-base-files-add-a-turnoff-command-to-the-led-script.patch similarity index 100% rename from patches/0029-base-files-add-a-turnoff-command-to-the-led-script.patch rename to patches/base/0016-base-files-add-a-turnoff-command-to-the-led-script.patch diff --git a/patches/0041-base-files-fix-rootfs_data_max-support-during-sysupg.patch b/patches/base/0017-base-files-fix-rootfs_data_max-support-during-sysupg.patch similarity index 100% rename from patches/0041-base-files-fix-rootfs_data_max-support-during-sysupg.patch rename to patches/base/0017-base-files-fix-rootfs_data_max-support-during-sysupg.patch diff --git a/patches/0054-base-files-add-wifi-scanning-radio-support-to-board_.patch b/patches/base/0054-base-files-add-wifi-scanning-radio-support-to-board_.patch similarity index 100% rename from patches/0054-base-files-add-wifi-scanning-radio-support-to-board_.patch rename to patches/base/0054-base-files-add-wifi-scanning-radio-support-to-board_.patch diff --git a/patches/0022-Revert-ipq40xx-revert-usage-of-VLAN-S-TAG.patch b/patches/ipq40xx/0001-Revert-ipq40xx-revert-usage-of-VLAN-S-TAG.patch similarity index 100% rename from patches/0022-Revert-ipq40xx-revert-usage-of-VLAN-S-TAG.patch rename to patches/ipq40xx/0001-Revert-ipq40xx-revert-usage-of-VLAN-S-TAG.patch diff --git a/patches/ipq40xx/0002-ipq40xx-add-ath10k-ct-fw.cfg-stubs.patch b/patches/ipq40xx/0002-ipq40xx-add-ath10k-ct-fw.cfg-stubs.patch new file mode 100644 index 00000000..2be30496 --- /dev/null +++ b/patches/ipq40xx/0002-ipq40xx-add-ath10k-ct-fw.cfg-stubs.patch @@ -0,0 +1,282 @@ +From bda0e566a474677412cc3097e93b954b628c626b Mon Sep 17 00:00:00 2001 +From: John Crispin +Date: Thu, 25 Mar 2021 08:03:48 +0100 +Subject: [PATCH 01/31] ipq40xx: add ath10k-ct fw.cfg stubs + +Signed-off-by: John Crispin +--- + ...the-dst-buffer-to-of_get_mac_address.patch | 29 ----------------- + ...ss-the-dst-buffer-to-of_get_mac_addr.patch | 26 --------------- + .../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 ++++++++++ + .../etc/hotplug.d/firmware/40-ct-fw-cfg | 32 +++++++++++++++++++ + .../lib/firmware/ath10k/fwcfg-qca9888.txt | 16 ++++++++++ + .../lib/firmware/ath10k/fwcfg-qca9984.txt | 16 ++++++++++ + 9 files changed, 143 insertions(+), 55 deletions(-) + delete mode 100644 package/kernel/mac80211/patches/subsys/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch + delete mode 100644 package/kernel/mt76/patches/100-Revert-of-net-pass-the-dst-buffer-to-of_get_mac_addr.patch + 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/etc/hotplug.d/firmware/40-ct-fw-cfg + 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/package/kernel/mac80211/patches/subsys/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch b/package/kernel/mac80211/patches/subsys/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch +deleted file mode 100644 +index 26af6a2fb9..0000000000 +--- a/package/kernel/mac80211/patches/subsys/782-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch ++++ /dev/null +@@ -1,29 +0,0 @@ +---- a/backport-include/linux/of_net.h +-+++ /dev/null +-@@ -1,26 +0,0 @@ +--#ifndef _BP_OF_NET_H +--#define _BP_OF_NET_H +--#include_next +--#include +--#include +-- +--/* The behavior of of_get_mac_address() changed in kernel 5.2, it now +-- * returns an error code and not NULL in case of an error. +-- */ +--#if LINUX_VERSION_IS_LESS(5,13,0) +--static inline int backport_of_get_mac_address(struct device_node *np, u8 *mac_out) +--{ +-- const void *mac = of_get_mac_address(np); +-- +-- if (!mac) +-- return -ENODEV; +-- if (IS_ERR(mac)) +-- return PTR_ERR(mac); +-- ether_addr_copy(mac_out, mac); +-- +-- return 0; +--} +--#define of_get_mac_address LINUX_BACKPORT(of_get_mac_address) +--#endif /* < 5.2 */ +-- +--#endif /* _BP_OF_NET_H */ +diff --git a/package/kernel/mt76/patches/100-Revert-of-net-pass-the-dst-buffer-to-of_get_mac_addr.patch b/package/kernel/mt76/patches/100-Revert-of-net-pass-the-dst-buffer-to-of_get_mac_addr.patch +deleted file mode 100644 +index 24b1240548..0000000000 +--- a/package/kernel/mt76/patches/100-Revert-of-net-pass-the-dst-buffer-to-of_get_mac_addr.patch ++++ /dev/null +@@ -1,26 +0,0 @@ +-From: Felix Fietkau +-Date: Tue, 23 Nov 2021 17:01:45 +0100 +-Subject: [PATCH] Revert "of: net: pass the dst buffer to of_get_mac_address()" +- +-This reverts commit 4932c5d80153c336c77dbe8d7af9f8fdd879d01f. +---- +- +---- a/eeprom.c +-+++ b/eeprom.c +-@@ -105,9 +105,15 @@ mt76_eeprom_override(struct mt76_phy *ph +- { +- struct mt76_dev *dev = phy->dev; +- +-+#ifdef CONFIG_OF +- struct device_node *np = dev->dev->of_node; +-+ const u8 *mac = NULL; +- +-- of_get_mac_address(np, phy->macaddr); +-+ if (np) +-+ mac = of_get_mac_address(np); +-+ if (!IS_ERR_OR_NULL(mac)) +-+ ether_addr_copy(phy->macaddr, mac); +-+#endif +- +- if (!is_valid_ether_addr(phy->macaddr)) { +- eth_random_addr(phy->macaddr); +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/etc/hotplug.d/firmware/40-ct-fw-cfg b/target/linux/ipq806x/base-files/etc/hotplug.d/firmware/40-ct-fw-cfg +new file mode 100644 +index 0000000000..c33bbea506 +--- /dev/null ++++ b/target/linux/ipq806x/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-pci-0001:01:00.0.txt) ++ case "$(board_name)" in ++ edgecore,ssw2ac2600|\ ++ edgecore,ecw5410) ++ fwcfg_symlink qca9984 ++ ;; ++ esac ++ ;; ++ath10k/fwcfg-pci-0002:01:00.0.txt) ++ case "$(board_name)" in ++ edgecore,ssw2ac2600|\ ++ edgecore,ecw5410) ++ fwcfg_symlink qca9984 ++ ;; ++ esac ++ ;; ++esac ++ ++exit 0 +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.25.1 + diff --git a/patches/0028-ipq4019-add-CIG-wf610d.patch b/patches/ipq40xx/0003-ipq4019-add-CIG-wf610d.patch similarity index 100% rename from patches/0028-ipq4019-add-CIG-wf610d.patch rename to patches/ipq40xx/0003-ipq4019-add-CIG-wf610d.patch diff --git a/patches/0031-ipq40xx-add-tplink-ec420-support.patch b/patches/ipq40xx/0004-ipq40xx-add-tplink-ec420-support.patch similarity index 99% rename from patches/0031-ipq40xx-add-tplink-ec420-support.patch rename to patches/ipq40xx/0004-ipq40xx-add-tplink-ec420-support.patch index fd4be5e4..cc42f45f 100644 --- a/patches/0031-ipq40xx-add-tplink-ec420-support.patch +++ b/patches/ipq40xx/0004-ipq40xx-add-tplink-ec420-support.patch @@ -33,6 +33,22 @@ index b24cbf979e..44a8688dbe 100644 zyxel,nbg6617) ubootenv_add_uci_config "/dev/mtd6" "0x0" "0x10000" "0x10000" ;; +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 b12c9af9a7..b7ee73b12e 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 +@@ -265,6 +265,11 @@ case "$FIRMWARE" in + caldata_extract "ART" 0x5000 0x2f20 + ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -1) + ;; ++ tp-link,ap2220 |\ ++ tp-link,ec420-g1) ++ ath10kcal_extract "0:ART" 4096 12064 ++ ath10kcal_patch_mac_crc $(macaddr_add "$(get_tip mac_address)" 9) #2.4G, wlan1 ++ ;; + esac + ;; + *) diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile index b996ee311f..c9d113ae6a 100644 --- a/package/firmware/ipq-wifi/Makefile diff --git a/patches/0036-ipq4018-add-EdgeCore-SPW2AC1200-support.patch b/patches/ipq40xx/0005-ipq4018-add-EdgeCore-SPW2AC1200-support.patch similarity index 100% rename from patches/0036-ipq4018-add-EdgeCore-SPW2AC1200-support.patch rename to patches/ipq40xx/0005-ipq4018-add-EdgeCore-SPW2AC1200-support.patch diff --git a/patches/0040-ipq40xx-add-Wallys-DR40x9-support.patch b/patches/ipq40xx/0006-ipq40xx-add-Wallys-DR40x9-support.patch similarity index 100% rename from patches/0040-ipq40xx-add-Wallys-DR40x9-support.patch rename to patches/ipq40xx/0006-ipq40xx-add-Wallys-DR40x9-support.patch diff --git a/patches/0042-ipq40xx-add-HFCL-ION4-support.patch b/patches/ipq40xx/0007-ipq40xx-add-HFCL-ION4-support.patch similarity index 100% rename from patches/0042-ipq40xx-add-HFCL-ION4-support.patch rename to patches/ipq40xx/0007-ipq40xx-add-HFCL-ION4-support.patch diff --git a/patches/0056-ipq40xx-enable-napi-threading.patch b/patches/ipq40xx/0008-ipq40xx-enable-napi-threading.patch similarity index 100% rename from patches/0056-ipq40xx-enable-napi-threading.patch rename to patches/ipq40xx/0008-ipq40xx-enable-napi-threading.patch diff --git a/patches/0055-ipq40xx-add-packet_steering-script-from-19.07.patch b/patches/ipq40xx/0009-ipq40xx-add-packet_steering-script-from-19.07.patch similarity index 100% rename from patches/0055-ipq40xx-add-packet_steering-script-from-19.07.patch rename to patches/ipq40xx/0009-ipq40xx-add-packet_steering-script-from-19.07.patch diff --git a/patches/ipq40xx/0010-certificates-add-ability-to-persistently-store-certi.patch b/patches/ipq40xx/0010-certificates-add-ability-to-persistently-store-certi.patch new file mode 100644 index 00000000..85e006b0 --- /dev/null +++ b/patches/ipq40xx/0010-certificates-add-ability-to-persistently-store-certi.patch @@ -0,0 +1,31 @@ +From ee837f028bd7af515d30a8a90cc2b5ee61eecf19 Mon Sep 17 00:00:00 2001 +From: John Crispin +Date: Sat, 4 Sep 2021 06:04:54 +0200 +Subject: [PATCH 35/43] certificates: add ability to persistently store + certificates + +Signed-off-by: John Crispin +--- + target/linux/ath79/dts/qca9563_tplink_cpe710-v1.dts | 7 ++++++- + .../files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi | 3 +-- + .../linux/ramips/dts/mt7628an_tplink_8m-split-uboot.dtsi | 7 ++++++- + 3 files changed, 13 insertions(+), 4 deletions(-) + +diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi +index 8f971e505c..0f1f083a5b 100644 +--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi ++++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-xx8300.dtsi +@@ -229,9 +229,8 @@ + }; + + partition@b880000 { +- label = "syscfg"; ++ label = "certificates"; + reg = <0xb880000 0x4680000>; +- read-only; + }; + }; + }; +-- +2.25.1 + diff --git a/patches/0014-ipq806x-simplify-ecw5410-dts.patch b/patches/ipq806x/0001-ipq806x-simplify-ecw5410-dts.patch similarity index 100% rename from patches/0014-ipq806x-simplify-ecw5410-dts.patch rename to patches/ipq806x/0001-ipq806x-simplify-ecw5410-dts.patch diff --git a/patches/0032-ipq806x-update-to-latest-HEAD.patch b/patches/ipq806x/0002-ipq806x-update-to-latest-HEAD.patch similarity index 100% rename from patches/0032-ipq806x-update-to-latest-HEAD.patch rename to patches/ipq806x/0002-ipq806x-update-to-latest-HEAD.patch diff --git a/patches/0043-ipq806x-add-edgecore_ssw2ac2600-support.patch b/patches/ipq806x/0003-ipq806x-add-edgecore_ssw2ac2600-support.patch similarity index 100% rename from patches/0043-ipq806x-add-edgecore_ssw2ac2600-support.patch rename to patches/ipq806x/0003-ipq806x-add-edgecore_ssw2ac2600-support.patch diff --git a/patches/0002-Revert-toolchain-gcc-Remove-support-for-GCC-5.patch b/patches/ipq807x/0001-Revert-toolchain-gcc-Remove-support-for-GCC-5.patch similarity index 100% rename from patches/0002-Revert-toolchain-gcc-Remove-support-for-GCC-5.patch rename to patches/ipq807x/0001-Revert-toolchain-gcc-Remove-support-for-GCC-5.patch diff --git a/patches/0015-ipq807x-buildsystem-patches-required-by-the-target.patch b/patches/ipq807x/0002-ipq807x-buildsystem-patches-required-by-the-target.patch similarity index 100% rename from patches/0015-ipq807x-buildsystem-patches-required-by-the-target.patch rename to patches/ipq807x/0002-ipq807x-buildsystem-patches-required-by-the-target.patch diff --git a/patches/0016-linux-modules-fix-some-v4.4-dependencies.patch b/patches/ipq807x/0003-linux-modules-fix-some-v4.4-dependencies.patch similarity index 100% rename from patches/0016-linux-modules-fix-some-v4.4-dependencies.patch rename to patches/ipq807x/0003-linux-modules-fix-some-v4.4-dependencies.patch diff --git a/patches/0017-ipq807x-add-the-Qualcomm-AX-target-support.patch b/patches/ipq807x/0004-ipq807x-add-the-Qualcomm-AX-target-support.patch similarity index 94% rename from patches/0017-ipq807x-add-the-Qualcomm-AX-target-support.patch rename to patches/ipq807x/0004-ipq807x-add-the-Qualcomm-AX-target-support.patch index e2302830..19bd55e5 100644 --- a/patches/0017-ipq807x-add-the-Qualcomm-AX-target-support.patch +++ b/patches/ipq807x/0004-ipq807x-add-the-Qualcomm-AX-target-support.patch @@ -228,22 +228,6 @@ index 0000000000..6c429f1852 +config_foreach ubootenv_add_app_config ubootenv + +exit 0 -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 b12c9af9a7..b7ee73b12e 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 -@@ -265,6 +265,11 @@ case "$FIRMWARE" in - caldata_extract "ART" 0x5000 0x2f20 - ath10k_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) -1) - ;; -+ tp-link,ap2220 |\ -+ tp-link,ec420-g1) -+ ath10kcal_extract "0:ART" 4096 12064 -+ ath10kcal_patch_mac_crc $(macaddr_add "$(get_tip mac_address)" 9) #2.4G, wlan1 -+ ;; - esac - ;; - *) diff --git a/toolchain/kernel-headers/Makefile b/toolchain/kernel-headers/Makefile index c33f26d46d..06236b5a47 100644 --- a/toolchain/kernel-headers/Makefile diff --git a/patches/0018-ramips-add-tplink-ex228-support.patch b/patches/ramips/0001-ramips-add-tplink-ex228-support.patch similarity index 100% rename from patches/0018-ramips-add-tplink-ex228-support.patch rename to patches/ramips/0001-ramips-add-tplink-ex228-support.patch diff --git a/patches/0020-ramips-make-wifi-work.patch b/patches/ramips/0002-ramips-make-wifi-work.patch similarity index 100% rename from patches/0020-ramips-make-wifi-work.patch rename to patches/ramips/0002-ramips-make-wifi-work.patch diff --git a/patches/0045-mt7621-add-linksys-ea6350-and-ea7200-support.patch b/patches/ramips/0003-mt7621-add-linksys-ea6350-and-ea7200-support.patch similarity index 100% rename from patches/0045-mt7621-add-linksys-ea6350-and-ea7200-support.patch rename to patches/ramips/0003-mt7621-add-linksys-ea6350-and-ea7200-support.patch diff --git a/patches/0035-certificates-add-ability-to-persistently-store-certi.patch b/patches/ramips/0004-certificates-add-ability-to-persistently-store-certi.patch similarity index 100% rename from patches/0035-certificates-add-ability-to-persistently-store-certi.patch rename to patches/ramips/0004-certificates-add-ability-to-persistently-store-certi.patch diff --git a/patches/0012-dnsmasq-add-relay-option82-support.patch b/patches/rest/0012-dnsmasq-add-relay-option82-support.patch similarity index 100% rename from patches/0012-dnsmasq-add-relay-option82-support.patch rename to patches/rest/0012-dnsmasq-add-relay-option82-support.patch diff --git a/patches/0019-lldp-add-TIP-tweaks.patch b/patches/rest/0019-lldp-add-TIP-tweaks.patch similarity index 100% rename from patches/0019-lldp-add-TIP-tweaks.patch rename to patches/rest/0019-lldp-add-TIP-tweaks.patch diff --git a/patches/0021-ugps-update-to-latest-HEAD.patch b/patches/rest/0021-ugps-update-to-latest-HEAD.patch similarity index 100% rename from patches/0021-ugps-update-to-latest-HEAD.patch rename to patches/rest/0021-ugps-update-to-latest-HEAD.patch diff --git a/patches/0030-ath10k-ct-update-the-driver.patch b/patches/rest/0030-ath10k-ct-update-the-driver.patch similarity index 100% rename from patches/0030-ath10k-ct-update-the-driver.patch rename to patches/rest/0030-ath10k-ct-update-the-driver.patch diff --git a/patches/0037-Revert-libusb-update-to-1.0.24.patch b/patches/rest/0037-Revert-libusb-update-to-1.0.24.patch similarity index 100% rename from patches/0037-Revert-libusb-update-to-1.0.24.patch rename to patches/rest/0037-Revert-libusb-update-to-1.0.24.patch diff --git a/patches/0038-firewall-enable-ssh-on-wan-during-early-boot-stage.patch b/patches/rest/0038-firewall-enable-ssh-on-wan-during-early-boot-stage.patch similarity index 100% rename from patches/0038-firewall-enable-ssh-on-wan-during-early-boot-stage.patch rename to patches/rest/0038-firewall-enable-ssh-on-wan-during-early-boot-stage.patch diff --git a/patches/0039-netifd-fix-compile-on-older-kernels.patch b/patches/rest/0039-netifd-fix-compile-on-older-kernels.patch similarity index 100% rename from patches/0039-netifd-fix-compile-on-older-kernels.patch rename to patches/rest/0039-netifd-fix-compile-on-older-kernels.patch diff --git a/patches/0044-mac80211-fix-builds-on-ath79-targets.patch b/patches/rest/0044-mac80211-fix-builds-on-ath79-targets.patch similarity index 100% rename from patches/0044-mac80211-fix-builds-on-ath79-targets.patch rename to patches/rest/0044-mac80211-fix-builds-on-ath79-targets.patch diff --git a/patches/0049-hostapd-add-wispr-bandwidth-patch.patch b/patches/rest/0049-hostapd-add-wispr-bandwidth-patch.patch similarity index 100% rename from patches/0049-hostapd-add-wispr-bandwidth-patch.patch rename to patches/rest/0049-hostapd-add-wispr-bandwidth-patch.patch diff --git a/patches/0052-hostapd-allow-hostapd-under-ujail-to-communicate-wit.patch b/patches/rest/0052-hostapd-allow-hostapd-under-ujail-to-communicate-wit.patch similarity index 100% rename from patches/0052-hostapd-allow-hostapd-under-ujail-to-communicate-wit.patch rename to patches/rest/0052-hostapd-allow-hostapd-under-ujail-to-communicate-wit.patch