modules: switch to OpenWrt master

2019-08-04 20:40:45 +02:00 · 2019-08-04 20:40:45 +02:00 · 105dc7b285
commit 105dc7b285
parent a3a55d6461
15 changed files with 6 additions and 1390 deletions
--- a/12
+++ b/12
@ -1,16 +1,16 @@
 GLUON_FEEDS='packages routing gluon'
 OPENWRT_REPO=https://github.com/openwrt/openwrt.git
-OPENWRT_BRANCH=openwrt-19.07
+OPENWRT_BRANCH=master
-OPENWRT_COMMIT=b515edb7750c67b05ebfaf0311780a894f9d0a3d
+OPENWRT_COMMIT=1bfba18a3643f2e73c7e7e7ed3cd3a350900a9cd
 PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
-PACKAGES_PACKAGES_BRANCH=openwrt-19.07
+PACKAGES_PACKAGES_BRANCH=master
-PACKAGES_PACKAGES_COMMIT=e76090945523c71c2406276f6d42b2e7f078a2d8
+PACKAGES_PACKAGES_COMMIT=34215c958ee74c9bd151c895a57613cd49434110
 PACKAGES_ROUTING_REPO=https://github.com/openwrt-routing/packages.git
-PACKAGES_ROUTING_BRANCH=openwrt-19.07
+PACKAGES_ROUTING_BRANCH=master
-PACKAGES_ROUTING_COMMIT=9b42e24a54f03ebb6f58224b49036e8f739b175f
+PACKAGES_ROUTING_COMMIT=8f9aa112b54492964c00ebe6404e53eb869b0404
 PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
 PACKAGES_GLUON_COMMIT=12e41d0ff07ec54bbd67a31ab50d12ca04f2238c
--- a/patches/openwrt/0003-dropbear-add-a-failsafe-mode-that-will-always-allow-password-less-root-login.patch
+++ b/patches/openwrt/0003-dropbear-add-a-failsafe-mode-that-will-always-allow-password-less-root-login.patch
--- a/patches/openwrt/0003-libjson-c-Add-support-for-custom-format-strings-for-doubles.patch
+++ b/patches/openwrt/0003-libjson-c-Add-support-for-custom-format-strings-for-doubles.patch
@ -1,101 +0,0 @@
 From: Jan-Philipp Litza <janphilipp@litza.de>
 Date: Fri, 6 May 2016 16:44:29 +0200
 Subject: libjson-c: Add support for custom format strings for doubles
 diff --git a/package/libs/libjson-c/patches/002-custom-format-string.patch b/package/libs/libjson-c/patches/002-custom-format-string.patch
 new file mode 100644
 index 0000000000000000000000000000000000000000..b67433a7baf37654a17fa5036c4266b33bdda9f2
 --- /dev/null
 +++ b/package/libs/libjson-c/patches/002-custom-format-string.patch
@@ -0,0 +1,91 @@
 +From 21dc5dc92bd56f5f4dc2c90b9ea6bf1e1407714e Mon Sep 17 00:00:00 2001
 +From: Jan-Philipp Litza <janphilipp@litza.de>
 +Date: Fri, 6 May 2016 16:12:44 +0200
 +Subject: [PATCH] Export json_object_double_to_json_string() and use custom
 + format string
 +BCC: janphilipp@litza.de
 +
 +---
 + json_object.c | 12 ++++++------
 + json_object.h | 28 ++++++++++++++++++++++++++++
 + 2 files changed, 34 insertions(+), 6 deletions(-)
 +
 +--- a/json_object.c
 ++++ b/json_object.c
 +@@ -55,7 +55,6 @@ static struct json_object* json_object_n
 + static json_object_to_json_string_fn json_object_object_to_json_string;
 + static json_object_to_json_string_fn json_object_boolean_to_json_string;
 + static json_object_to_json_string_fn json_object_int_to_json_string;
 +-static json_object_to_json_string_fn json_object_double_to_json_string;
 + static json_object_to_json_string_fn json_object_string_to_json_string;
 + static json_object_to_json_string_fn json_object_array_to_json_string;
 + 
 +@@ -560,10 +559,10 @@ int64_t json_object_get_int64(struct jso
 + 
 + /* json_object_double */
 + 
 +-static int json_object_double_to_json_string(struct json_object* jso,
 +-					     struct printbuf *pb,
 +-					     int level,
 +-						 int flags)
 ++int json_object_double_to_json_string(struct json_object* jso,
 ++				      struct printbuf *pb,
 ++				      int level,
 ++				      int flags)
 + {
 +   char buf[128], *p, *q;
 +   int size;
 +@@ -579,7 +578,8 @@ static int json_object_double_to_json_st
 +     else
 +       size = snprintf(buf, sizeof(buf), "-Infinity");
 +   else
 +-    size = snprintf(buf, sizeof(buf), "%.17g", jso->o.c_double);
 ++    size = snprintf(buf, sizeof(buf),
 ++        jso->_userdata ? (const char*) jso->_userdata : "%.17g", jso->o.c_double);
 + 
 +   p = strchr(buf, ',');
 +   if (p) {
 +--- a/json_object.h
 ++++ b/json_object.h
 +@@ -515,6 +515,9 @@ extern int64_t json_object_get_int64(str
 + /* double type methods */
 + 
 + /** Create a new empty json_object of type json_type_double
 ++ *
 ++ * @see json_object_double_to_json_string() for how to set a custom format string.
 ++ *
 +  * @param d the double
 +  * @returns a json_object of type json_type_double
 +  */
 +@@ -543,6 +546,31 @@ extern struct json_object* json_object_n
 +  */
 + extern struct json_object* json_object_new_double_s(double d, const char *ds);
 + 
 ++
 ++/** Serialize a json_object of type json_type_double to a string.
 ++ *
 ++ * This function isn't meant to be called directly. Instead, you can set a
 ++ * custom format string for the serialization of this double using the
 ++ * following call (where "%.17g" actually is the default):
 ++ *
 ++ * @code
 ++ *   jso = json_object_new_double(d);
 ++ *   json_object_set_serializer(jso, json_object_double_to_json_string,
 ++ *       "%.17g", NULL);
 ++ * @endcode
 ++ *
 ++ * @see printf(3) man page for format strings
 ++ *
 ++ * @param jso The json_type_double object that is serialized.
 ++ * @param pb The destination buffer.
 ++ * @param level Ignored.
 ++ * @param flags Ignored.
 ++ */
 ++extern int json_object_double_to_json_string(struct json_object* jso,
 ++					     struct printbuf *pb,
 ++					     int level,
 ++					     int flags);
 ++
 + /** Get the double floating point value of a json_object
 +  *
 +  * The type is coerced to a double if the passed object is not a double.
--- a/patches/openwrt/0004-kernel-ebtables-add-support-for-ICMP-IGMP-type-matches.patch
+++ b/patches/openwrt/0004-kernel-ebtables-add-support-for-ICMP-IGMP-type-matches.patch
--- a/patches/openwrt/0006-build-set-TARGET_ROOTFS_PARTSIZE-to-make-combined-image-fit-in-128MB.patch
+++ b/patches/openwrt/0006-build-set-TARGET_ROOTFS_PARTSIZE-to-make-combined-image-fit-in-128MB.patch
@ -1,27 +0,0 @@
 From: Matthias Schiffer <mschiffer@universe-factory.net>
 Date: Sat, 21 Sep 2019 13:21:36 +0200
 Subject: build: set TARGET_ROOTFS_PARTSIZE to make combined image fit in 128MB
 Change TARGET_ROOTFS_PARTSIZE from 128 to 104 MiB, so the whole image
 (bootloader + boot + root) will fit on a 128MB CF card by default.
 With these settings, the generated images (tested on x86-generic and
 x86-64) have 126,353,408 bytes; the smallest CF card marketed as "128MB"
 that I found a datasheet for (a Transcend TS128MCF80) has 126,959,616
 bytes.
 Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
 diff --git a/config/Config-images.in b/config/Config-images.in
 index 8548c7cd24742daad4fb1c64e58bad82590795c2..dc7a9cbd54ffbe3c78a7fdbd124f389c102ef6c1 100644
 --- a/config/Config-images.in
 +++ b/config/Config-images.in
@@ -274,7 +274,7 @@ menu "Target Images"
 	config TARGET_ROOTFS_PARTSIZE
 		int "Root filesystem partition size (in MB)"
 		depends on GRUB_IMAGES || USES_ROOTFS_PART || TARGET_ROOTFS_EXT4FS || TARGET_omap || TARGET_rb532 || TARGET_sunxi || TARGET_uml
 -		default 256
 +		default 104
 		help
 		  Select the root filesystem partition size.
--- a/patches/openwrt/0006-mt76-mt76x0-disable-GTK-offloading.patch
+++ b/patches/openwrt/0006-mt76-mt76x0-disable-GTK-offloading.patch
--- a/patches/openwrt/0007-ipq-wifi-add-BDF-for-Aruba-AP-303.patch
+++ b/patches/openwrt/0007-ipq-wifi-add-BDF-for-Aruba-AP-303.patch
@ -1,92 +0,0 @@
 From: David Bauer <mail@david-bauer.net>
 Date: Sun, 15 Dec 2019 23:02:54 +0100
 Subject: ipq-wifi: add BDF for Aruba AP-303
 The BDF originates from the vendor-firmware.
 Signed-off-by: David Bauer <mail@david-bauer.net>
 (cherry picked from commit 4113d8a2554adf5ecee55cc07956eafad378eaff)
 diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile
 index eb7c2df1aa36ded7774a772c8a7e02b2acb81b40..cc0505b97c6a04bafd88972cf6ce7890a637c33b 100644
 --- a/package/firmware/ipq-wifi/Makefile
 +++ b/package/firmware/ipq-wifi/Makefile
@@ -25,6 +25,7 @@ endef
 ALLWIFIBOARDS:= \
 	alfa-network_ap120c-ac \
 +	aruba_ap-303 \
 	asus_map-ac2200 \
 	avm_fritzbox-7530 \
 	avm_fritzrepeater-1200 \
@@ -97,6 +98,7 @@ endef
 # Add $(eval $(call generate-ipq-wifi-package,<devicename>,<display name>))
 $(eval $(call generate-ipq-wifi-package,alfa-network_ap120c-ac,ALFA Network AP120C-AC))
 +$(eval $(call generate-ipq-wifi-package,aruba_ap-303,Aruba AP-303))
 $(eval $(call generate-ipq-wifi-package,asus_map-ac2200,ASUS MAP-AC2200))
 $(eval $(call generate-ipq-wifi-package,avm_fritzbox-7530,AVM FRITZ!Box 7530))
 $(eval $(call generate-ipq-wifi-package,avm_fritzrepeater-1200,AVM FRITZRepeater 1200))
 diff --git a/package/firmware/ipq-wifi/board-aruba_ap-303.qca4019 b/package/firmware/ipq-wifi/board-aruba_ap-303.qca4019
 new file mode 100644
 index 0000000000000000000000000000000000000000..4848115cfbe3a4a0ed6b17cac929731ecbd7968c
 GIT binary patch
 literal 24316
 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
 NIrrxNmNc!u{{!hMI2Hf^
 literal 0
 HcmV?d00001
--- a/patches/openwrt/0008-ipq40xx-add-support-for-Aruba-AP-303.patch
+++ b/patches/openwrt/0008-ipq40xx-add-support-for-Aruba-AP-303.patch
@ -1,646 +0,0 @@
 From: David Bauer <mail@david-bauer.net>
 Date: Wed, 23 Oct 2019 22:25:14 +0200
 Subject: ipq40xx: add support for Aruba AP-303
 Hardware
 --------
 SoC:   Qualcomm IPQ4029
 RAM:   512M DDR3
 FLASH: - 128MB NAND (Macronix MX30LF1G18AC)
       - 4MB SPI-NOR (Macronix MX25R3235F)
 TPM:   Atmel AT97SC3203
 BLE:   Texas Instruments CC2540T
       attached to ttyMSM0
 ETH:   Atheros AR8035
 LED:   WiFi (amber / green)
       System (red / green)
 BTN:   Reset
 To connect to the serial console, you can solder to the labled pads next
 to the USB port or use your Aruba supplied UARt adapter.
 Do NOT plug a standard USB cable into the Console labled USB-port!
 Aruba/HPE simply put UART on the micro-USB pins. You can solder yourself
 an adapter cable:
 VCC - NC
 D+ - TX
 D- - RX
 GND - GND
 The console setting in bootloader and OS is 9600 8N1. Voltage level is
 3.3V.
 To enable a full list of commands in the U-Boot "help" command, execute
 the literal "diag" command.
 Installation
 ------------
 1. Get the OpenWrt initramfs image. Rename it to ipq40xx.ari and put it
   into the TFTP server root directory. Configure the TFTP server to
   be reachable at 192.168.1.75/24. Connect the machine running the TFTP
   server to the ethernet port of the access point.
 2. Connect to the serial console. Interrupt autobooting by pressing
   Enter when prompted.
 3. Configure the bootargs and bootcmd for OpenWrt.
   $ setenv bootargs_openwrt "setenv bootargs console=ttyMSM1,9600n8"
   $ setenv nandboot_openwrt "run bootargs_openwrt; ubi part aos1;
     ubi read 0x85000000 kernel; bootm 0x85000000"
   $ setenv ramboot_openwrt "run bootargs_openwrt;
     setenv ipaddr 192.168.1.105; setenv serverip 192.168.1.75;
     netget; set fdt_high 0x87000000; bootm"
   $ setenv bootcmd "run nandboot_openwrt"
   $ saveenv
 4. Load OpenWrt into RAM:
   $ run ramboot_openwrt
 5. After OpenWrt booted, transfer the OpenWrt sysupgrade image to the
   /tmp folder on the device.
 6. Flash OpenWrt:
   $ ubidetach -p /dev/mtd1
   $ ubiformat /dev/mtd1
   $ sysupgrade -n /tmp/openwrt-sysupgrade.bin
 To go back to the stock firmware, simply reset the bootcmd in the
 bootloader to the original value:
  $ setenv bootcmd "boot"
  $ saveenv
 Signed-off-by: David Bauer <mail@david-bauer.net>
 (cherry picked from commit 102c8c55f217606cdbdc9a449667e034676b3e75)
 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 01825b8bac46eec6325de00396d96307c946f975..49dd570242533068adf2c9df89e78560ba5f70eb 100755
 --- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
 +++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -39,6 +39,7 @@ ipq40xx_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
 		;;
 +	aruba,ap-303|\
 	avm,fritzrepeater-1200|\
 	engenius,eap1300|\
 	meraki,mr33|\
 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 b0035ce8a394b6e87d7d89b9f55a6ec7c66e448e..15a2f2c09f8a92cc0accfbf9a977dbeb3355570d 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
@@ -137,6 +137,10 @@ case "$FIRMWARE" in
 	qcom,ap-dk01.1-c1)
 		ath10kcal_extract "ART" 4096 12064
 		;;
 +	aruba,ap-303)
 +		ath10kcal_extract "ART" 4096 12064
 +		ath10kcal_patch_mac_crc $(mtd_get_mac_binary mfginfo 29)
 +		;;
 	asus,map-ac2200)
 		ath10kcal_ubi_extract "Factory" 4096 12064
 		;;
@@ -199,6 +203,10 @@ case "$FIRMWARE" in
 	qcom,ap-dk01.1-c1)
 		ath10kcal_extract "ART" 20480 12064
 		;;
 +	aruba,ap-303)
 +		ath10kcal_extract "ART" 20480 12064
 +		ath10kcal_patch_mac_crc $(macaddr_add $(mtd_get_mac_binary mfginfo 29) +1)
 +		;;
 	asus,map-ac2200)
 		ath10kcal_ubi_extract "Factory" 20480 12064
 		;;
 diff --git a/target/linux/ipq40xx/base-files/etc/inittab b/target/linux/ipq40xx/base-files/etc/inittab
 index 809bba5e5ff49869429c91cf791cea73ab67d14e..3181021a0592720657b815c3eac803a57f4ea438 100644
 --- a/target/linux/ipq40xx/base-files/etc/inittab
 +++ b/target/linux/ipq40xx/base-files/etc/inittab
@@ -2,3 +2,4 @@
 ::sysinit:/etc/init.d/rcS S boot
 ::shutdown:/etc/init.d/rcS K shutdown
 ttyMSM0::askfirst:/usr/libexec/login.sh
 +ttyMSM1::askfirst:/usr/libexec/login.sh
 diff --git a/target/linux/ipq40xx/base-files/lib/preinit/06_set_preinit_iface_ipq40xx.sh b/target/linux/ipq40xx/base-files/lib/preinit/06_set_preinit_iface_ipq40xx.sh
 index be4b6322cb6a91f489dfec237ac6b79ce079e0eb..a0dec1042a3dd7416ece3307666c8ecf9d15d277 100644
 --- a/target/linux/ipq40xx/base-files/lib/preinit/06_set_preinit_iface_ipq40xx.sh
 +++ b/target/linux/ipq40xx/base-files/lib/preinit/06_set_preinit_iface_ipq40xx.sh
@@ -4,6 +4,7 @@ set_preinit_iface() {
 	. /lib/functions.sh
 	case $(board_name) in
 +	aruba,ap-303| \
 	asus,rt-ac58u| \
 	avm,fritzbox-4040| \
 	glinet,gl-b1300| \
 diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
 index a7b7da1bf378f7cc19e960c497bc52efb3bae4fb..7253139497a8a8b9fab49cef3fce5eabe98d8002 100644
 --- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -48,6 +48,7 @@ platform_do_upgrade() {
 	case "$(board_name)" in
 	8dev,jalapeno |\
 	alfa-network,ap120c-ac |\
 +	aruba,ap-303 |\
 	avm,fritzbox-7530 |\
 	avm,fritzrepeater-1200 |\
 	avm,fritzrepeater-3000 |\
 diff --git a/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts
 new file mode 100644
 index 0000000000000000000000000000000000000000..7929494d027aca5c696910232a36d484f5ce6562
 --- /dev/null
 +++ b/target/linux/ipq40xx/files-4.14/arch/arm/boot/dts/qcom-ipq4029-ap-303.dts
@@ -0,0 +1,418 @@
 +// SPDX-License-Identifier: GPL-2.0 OR MIT
 +
 +#include "qcom-ipq4019.dtsi"
 +#include <dt-bindings/gpio/gpio.h>
 +#include <dt-bindings/input/input.h>
 +#include <dt-bindings/soc/qcom,tcsr.h>
 +
 +/ {
 +	model = "Aruba AP-303";
 +	compatible = "aruba,ap-303";
 +
 +	aliases {
 +		led-boot = &led_system_green;
 +		led-failsafe = &led_system_red;
 +		led-running = &led_system_green;
 +		led-upgrade = &led_system_red;
 +	};
 +
 +	memory {
 +		device_type = "memory";
 +		reg = <0x80000000 0x10000000>;
 +	};
 +
 +	soc {
 +		mdio@90000 {
 +			status = "okay";
 +			pinctrl-0 = <&mdio_pins>;
 +			pinctrl-names = "default";
 +
 +			/delete-node/ ethernet-phy@0;
 +			/delete-node/ ethernet-phy@2;
 +			/delete-node/ ethernet-phy@3;
 +			/delete-node/ ethernet-phy@4;
 +
 +			ethernet-phy@5 {
 +				reg = <0x5>;
 +			};
 +		};
 +
 +		counter@4a1000 {
 +			compatible = "qcom,qca-gcnt";
 +			reg = <0x4a1000 0x4>;
 +		};
 +
 +		ess_tcsr@1953000 {
 +			compatible = "qcom,tcsr";
 +			reg = <0x1953000 0x1000>;
 +			qcom,ess-interface-select = <TCSR_ESS_PSGMII_RGMII5>;
 +		};
 +
 +		tcsr@1949000 {
 +			compatible = "qcom,tcsr";
 +			reg = <0x1949000 0x100>;
 +			qcom,wifi_glb_cfg = <TCSR_WIFI_GLB_CFG>;
 +		};
 +
 +		tcsr@1957000 {
 +			compatible = "qcom,tcsr";
 +			reg = <0x1957000 0x100>;
 +			qcom,wifi_noc_memtype_m0_m2 = <TCSR_WIFI_NOC_MEMTYPE_M0_M2>;
 +		};
 +
 +		blsp1_uart2: serial@78b0000 {
 +		};
 +
 +		crypto@8e3a000 {
 +			status = "okay";
 +		};
 +
 +		watchdog@b017000 {
 +			status = "okay";
 +		};
 +
 +		ess-switch@c000000 {
 +			switch_mac_mode = <0x3>; /* mac mode for RGMII RMII */
 +			switch_lan_bmp = <0x0>; /* lan port bitmap */
 +			switch_wan_bmp = <0x10>; /* wan port bitmap */
 +		};
 +
 +		edma@c080000 {
 +			qcom,single-phy;
 +			qcom,num_gmac = <1>;
 +			phy-mode = "rgmii-id";
 +			status = "okay";
 +		};
 +
 +		i2c_0: i2c@78b7000 {
 +			pinctrl-0 = <&i2c_0_pins>;
 +			pinctrl-names = "default";
 +			status = "ok";
 +
 +			tpm@29 {
 +				/* No Driver */
 +				compatible = "atmel,at97sc3203";
 +				reg = <0x29>;
 +				read-only;
 +			};
 +		};
 +	};
 +
 +	leds {
 +		compatible = "gpio-leds";
 +
 +		wifi_green {
 +			label = "ap-303:green:wifi";
 +			gpios = <&tlmm 39 GPIO_ACTIVE_HIGH>;
 +			linux,default-trigger = "phy0tpt";
 +		};
 +
 +		wifi_amber {
 +			label = "ap-303:amber:wifi";
 +			gpios = <&tlmm 40 GPIO_ACTIVE_HIGH>;
 +			linux,default-trigger = "phy1tpt";
 +		};
 +
 +		led_system_red: system_red {
 +			label = "ap-303:red:system";
 +			gpios = <&tlmm 46 GPIO_ACTIVE_HIGH>;
 +		};
 +
 +		led_system_green: system_green {
 +			label = "ap-303:green:system";
 +			gpios = <&tlmm 47 GPIO_ACTIVE_HIGH>;
 +		};
 +	};
 +
 +	keys {
 +		compatible = "gpio-keys";
 +
 +		reset {
 +			label = "Reset button";
 +			gpios = <&tlmm 50 GPIO_ACTIVE_LOW>;
 +			linux,code = <KEY_RESTART>;
 +		};
 +	};
 +};
 +
 +&blsp_dma {
 +	status = "okay";
 +};
 +
 +&blsp1_uart1 {
 +	/* Texas Instruments CC2540T BLE radio */
 +	pinctrl-0 = <&serial_0_pins>;
 +	pinctrl-names = "default";
 +	status = "okay";
 +};
 +
 +&blsp1_uart2 {
 +	pinctrl-0 = <&serial_1_pins>;
 +	pinctrl-names = "default";
 +	status = "okay";
 +};
 +
 +&cryptobam {
 +	status = "okay";
 +};
 +
 +&gmac0 {
 +	qcom,phy_mdio_addr = <5>;
 +	qcom,poll_required = <1>;
 +	vlan_tag = <0 0x20>;
 +};
 +
 +&qpic_bam {
 +	status = "okay";
 +};
 +
 +&tlmm {
 +	/*
 +	 * In addition to the Pins listed below,
 +	 * the following GPIOs have "features":
 +	 * 54 - out - active low to force HW reset
 +	 * 41 - out - active low to reset TPM
 +	 * 43 - out - active low to reset BLE radio
 +	 * 19 - in  - active high when DC powered
 +	 */
 +	mdio_pins: mdio_pinmux {
 +		mux_1 {
 +			pins = "gpio6";
 +			function = "mdio";
 +			bias-pull-up;
 +		};
 +		mux_2 {
 +			pins = "gpio7";
 +			function = "mdc";
 +			bias-pull-up;
 +		};
 +	};
 +
 +	nand_pins: nand_pins {
 +		pullups {
 +			pins = "gpio53", "gpio58", "gpio59";
 +			function = "qpic";
 +			bias-pull-up;
 +		};
 +
 +		pulldowns {
 +			pins = "gpio54", "gpio55", "gpio56",
 +				"gpio57", "gpio60", "gpio61",
 +				"gpio62", "gpio63", "gpio64",
 +				"gpio65", "gpio66", "gpio67",
 +				"gpio68", "gpio69";
 +			function = "qpic";
 +			bias-pull-down;
 +		};
 +	};
 +
 +	spi_0_pins: spi_0_pinmux {
 +		pin {
 +			function = "blsp_spi0";
 +			pins = "gpio13", "gpio14", "gpio15";
 +			drive-strength = <12>;
 +			bias-disable;
 +		};
 +		pin_cs {
 +			function = "gpio";
 +			pins = "gpio12";
 +			drive-strength = <2>;
 +			bias-disable;
 +			output-high;
 +		};
 +	};
 +	i2c_0_pins: i2c_0_pinmux {
 +		mux {
 +			pins = "gpio10", "gpio11";
 +			function = "blsp_i2c0";
 +			drive-strength = <4>;
 +			bias-disable;
 +		};
 +	};
 +
 +	serial_0_pins: serial_0_pinmux {
 +		mux {
 +			pins = "gpio16", "gpio17";
 +			function = "blsp_uart0";
 +			bias-disable;
 +		};
 +	};
 +
 +	serial_1_pins: serial_1_pinmux {
 +		mux {
 +			pins = "gpio8", "gpio9";
 +			function = "blsp_uart1";
 +			bias-disable;
 +		};
 +	};
 +
 +	phy-reset {
 +		line-name = "PHY-reset";
 +		gpios = <42 GPIO_ACTIVE_HIGH>;
 +		gpio-hog;
 +		output-high;
 +	};
 +};
 +
 +&nand {
 +	pinctrl-0 = <&nand_pins>;
 +	pinctrl-names = "default";
 +	status = "okay";
 +
 +	nand@0 {
 +		partitions {
 +			compatible = "fixed-partitions";
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +
 +			partition@0 {
 +				/* 'aos0' in Aruba firmware */
 +				label = "aos0";
 +				reg = <0x0 0x2000000>;
 +				read-only;
 +			};
 +
 +			partition@2000000 {
 +				/* 'aos1' in AVM firmware */
 +				label = "ubi";
 +				reg = <0x2000000 0x2000000>;
 +			};
 +
 +			partition@4000000 {
 +				label = "aruba-ubifs";
 +				reg = <0x4000000 0x4000000>;
 +				read-only;
 +			};
 +		};
 +	};
 +};
 +
 +&blsp1_spi1 {
 +	pinctrl-0 = <&spi_0_pins>;
 +	pinctrl-names = "default";
 +	status = "okay";
 +	cs-gpios = <&tlmm 12 GPIO_ACTIVE_HIGH>;
 +
 +	flash@0 {
 +		compatible = "jedec,spi-nor";
 +		reg = <0>;
 +		spi-max-frequency = <24000000>;
 +
 +		partitions {
 +			compatible = "fixed-partitions";
 +			#address-cells = <1>;
 +			#size-cells = <1>;
 +
 +			/*
 +			 * There is no partition map for the NOR flash
 +			 * in the stock firmware.
 +			 *
 +			 * All partitions here are based on offsets
 +			 * found in the U-Boot GPL code and information
 +			 * from smem.
 +			 */
 +
 +			partition@0 {
 +				label = "sbl1";
 +				reg = <0x0 0x40000>;
 +				read-only;
 +			};
 +
 +			partition@40000 {
 +				label = "mibib";
 +				reg = <0x40000 0x20000>;
 +				read-only;
 +			};
 +
 +			partition@60000 {
 +				label = "qsee";
 +				reg = <0x60000 0x60000>;
 +				read-only;
 +			};
 +
 +			partition@c0000 {
 +				label = "cdt";
 +				reg = <0xc0000 0x10000>;
 +				read-only;
 +			};
 +
 +			partition@d0000 {
 +				label = "ddrparams";
 +				reg = <0xd0000 0x10000>;
 +				read-only;
 +			};
 +
 +			partition@e0000 {
 +				label = "ART";
 +				reg = <0xe0000 0x10000>;
 +				read-only;
 +			};
 +
 +			partition@f0000 {
 +				label = "appsbl";
 +				reg = <0xf0000 0xf0000>;
 +				read-only;
 +			};
 +
 +			partition@1e0000 {
 +				label = "mfginfo";
 +				reg = <0x1e0000 0x10000>;
 +				read-only;
 +			};
 +
 +			partition@1f0000 {
 +				label = "apcd";
 +				reg = <0x1f0000 0x10000>;
 +				read-only;
 +			};
 +
 +			partition@200000 {
 +				label = "osss";
 +				reg = <0x200000 0x180000>;
 +				read-only;
 +			};
 +
 +			partition@380000 {
 +				/* This is empty */
 +				label = "appsblenv";
 +				reg = <0x380000 0x10000>;
 +				read-only;
 +			};
 +
 +			partition@390000 {
 +				label = "pds";
 +				reg = <0x390000 0x10000>;
 +				read-only;
 +			};
 +
 +			partition@3a0000 {
 +				label = "fcache";
 +				reg = <0x3a0000 0x10000>;
 +				read-only;
 +			};
 +
 +			partition@3b0000 {
 +				/* Called osss1 in smem */
 +				label = "u-boot-env-bak";
 +				reg = <0x3b0000 0x10000>;
 +				read-only;
 +			};
 +
 +			partition@3f0000 {
 +				label = "u-boot-env";
 +				reg = <0x3f0000 0x10000>;
 +				read-only;
 +			};
 +		};
 +	};
 +};
 +
 +&wifi0 {
 +	status = "okay";
 +	qcom,ath10k-calibration-variant = "Aruba-AP-303";
 +};
 +
 +&wifi1 {
 +	status = "okay";
 +	qcom,ath10k-calibration-variant = "Aruba-AP-303";
 +};
 diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile
 index 98c81726d9c12bd466df2150c3e98a76cfb46f78..68dcbc59a42f6d8360b87c7b4e74cd34f697b465 100644
 --- a/target/linux/ipq40xx/image/Makefile
 +++ b/target/linux/ipq40xx/image/Makefile
@@ -85,6 +85,15 @@ define Device/alfa-network_ap120c-ac
 endef
 TARGET_DEVICES += alfa-network_ap120c-ac
 +define Device/aruba_ap-303
 +	$(call Device/FitImageLzma)
 +	DEVICE_TITLE := Aruba AP-303
 +	DEVICE_DTS := qcom-ipq4029-ap-303
 +	DEVICE_PACKAGES := ipq-wifi-aruba_ap-303
 +	IMAGES := sysupgrade.bin
 +endef
 +TARGET_DEVICES += aruba_ap-303
 +
 define Device/asus_map-ac2200
 	$(call Device/FitImageLzma)
 	DEVICE_DTS := qcom-ipq4019-map-ac2200
 diff --git a/target/linux/ipq40xx/patches-4.14/304-mtd-spi-nor-Add-support-for-mx25r3235f.patch b/target/linux/ipq40xx/patches-4.14/304-mtd-spi-nor-Add-support-for-mx25r3235f.patch
 new file mode 100644
 index 0000000000000000000000000000000000000000..d95923a1610d4764538e79bb783702903edcdcad
 --- /dev/null
 +++ b/target/linux/ipq40xx/patches-4.14/304-mtd-spi-nor-Add-support-for-mx25r3235f.patch
@@ -0,0 +1,26 @@
 +From 158acdbf0336f601971637f988b57a6a67a0869b Mon Sep 17 00:00:00 2001
 +From: David Bauer <mail@david-bauer.net>
 +Date: Sun, 15 Dec 2019 13:10:50 +0100
 +Subject: [PATCH] mtd: spi-nor: Add support for mx25r3235f
 +
 +Add MTD support for the Macronix MX25R3235F SPI NOR chip from Macronix.
 +The chip has 4MB of total capacity, divided into a total of 64 sectors,
 +each 64KB sized. The chip also supports 4KB large sectors.
 +Additionally, it supports dual and quad read modes.
 +
 +Signed-off-by: David Bauer <mail@david-bauer.net>
 +---
 + drivers/mtd/spi-nor/spi-nor.c | 2 ++
 + 1 file changed, 2 insertions(+)
 +
 +--- a/drivers/mtd/spi-nor/spi-nor.c
 ++++ b/drivers/mtd/spi-nor/spi-nor.c
 +@@ -1024,6 +1024,8 @@ static const struct flash_info spi_nor_i
 + 	{ "mx25l3205d",  INFO(0xc22016, 0, 64 * 1024,  64, SECT_4K) },
 + 	{ "mx25l3255e",  INFO(0xc29e16, 0, 64 * 1024,  64, SECT_4K) },
 + 	{ "mx25l6405d",  INFO(0xc22017, 0, 64 * 1024, 128, SECT_4K) },
 ++	{ "mx25r3235f",  INFO(0xc22816, 0, 64 * 1024,  64,
 ++			 SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
 + 	{ "mx25u3235f",	 INFO(0xc22536, 0, 64 * 1024, 64, 0) },
 + 	{ "mx25u2033e",  INFO(0xc22532, 0, 64 * 1024,   4, SECT_4K) },
 + 	{ "mx25u4035",   INFO(0xc22533, 0, 64 * 1024,   8, SECT_4K) },
 diff --git a/target/linux/ipq40xx/patches-4.14/901-arm-boot-add-dts-files.patch b/target/linux/ipq40xx/patches-4.14/901-arm-boot-add-dts-files.patch
 index f7efd415f1f1c000867793b3b133e44b3e50b0fd..fc8a88336491c2ac7c2a93fafb1f2b6fd38695be 100644
 --- a/target/linux/ipq40xx/patches-4.14/901-arm-boot-add-dts-files.patch
 +++ b/target/linux/ipq40xx/patches-4.14/901-arm-boot-add-dts-files.patch
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
 -@@ -697,7 +697,31 @@ dtb-$(CONFIG_ARCH_QCOM) += \
 +@@ -697,7 +697,32 @@ dtb-$(CONFIG_ARCH_QCOM) += \
  	qcom-apq8074-dragonboard.dtb \
  	qcom-apq8084-ifc6540.dtb \
  	qcom-apq8084-mtp.dtb \
@@ -37,6 +37,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +	qcom-ipq4019-qxwlan-e2600ac-c1.dtb \
 +	qcom-ipq4019-qxwlan-e2600ac-c2.dtb \
 +	qcom-ipq4028-wpj428.dtb \
 ++	qcom-ipq4029-ap-303.dtb \
 +	qcom-ipq4029-gl-b1300.dtb \
 +	qcom-ipq4029-mr33.dtb \
  	qcom-ipq8064-ap148.dtb \
--- a/patches/openwrt/0009-ath79-enable-GL-AR750S-NOR-variant-from-master.patch
+++ b/patches/openwrt/0009-ath79-enable-GL-AR750S-NOR-variant-from-master.patch
@ -1,61 +0,0 @@
 From: Jan Alexander <jan@nalx.net>
 Date: Tue, 31 Mar 2020 21:50:28 +0200
 Subject: ath79: enable GL-AR750S NOR variant from master
 diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network
 index f6efc4d4d658c29459205f29e537066e03870afa..1a0b5624db3807bc2d5b02652d2e9756795a5088 100755
 --- a/target/linux/ath79/base-files/etc/board.d/02_network
 +++ b/target/linux/ath79/base-files/etc/board.d/02_network
@@ -153,7 +153,7 @@ ath79_setup_interfaces()
 	etactica,eg200)
 		ucidef_set_interface_lan "eth0" "dhcp"
 		;;
 -	glinet,gl-ar750s)
 +	glinet,gl-ar750s-nor)
 		ucidef_add_switch "switch0" \
 			"0@eth0" "2:lan:2" "3:lan:1" "1:wan"
 		;;
 diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 index d93e6dcd71ab19c53905daa41e95cc4fc614f114..c917f38211d0b246f064dba4b7feefecf61f5856 100644
 --- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
 +++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -117,7 +117,7 @@ case "$FIRMWARE" in
 		ath10kcal_extract "art" 20480 2116
 		ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +1)
 		;;
 -	glinet,gl-ar750s)
 +	glinet,gl-ar750s-nor)
 		ath10kcal_extract "art" 20480 2116
 		ath10kcal_patch_mac $(macaddr_add $(mtd_get_mac_binary art 0) +1)
 		;;
 diff --git a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts
 index 0145a24fbae2cdbe6fb6445607795af6b792352d..ebecb8cc776091ec019638589cb88159345d367f 100644
 --- a/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts
 +++ b/target/linux/ath79/dts/qca9563_glinet_gl-ar750s.dts
@@ -7,8 +7,8 @@
 #include "qca956x.dtsi"
 / {
 -	compatible = "glinet,gl-ar750s", "qca,qca9563";
 -	model = "GL.iNet GL-AR750S";
 +	compatible = "glinet,gl-ar750s-nor", "qca,qca9563";
 +	model = "GL.iNet GL-AR750S (NOR)";
 	chosen {
 		bootargs = "console=ttyS0,115200n8";
 diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
 index 55053be34f11f0df982c85f94c9180fdba9ff221..892ef10f870e347c8a1509cecd35bce4b5e98bee 100644
 --- a/target/linux/ath79/image/generic.mk
 +++ b/target/linux/ath79/image/generic.mk
@@ -403,9 +403,9 @@ define Device/glinet_gl-ar750s
   DEVICE_TITLE := GL.iNet GL-AR750S
   DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca9887-ct block-mount
   IMAGE_SIZE := 16000k
 -  SUPPORTED_DEVICES += gl-ar750s
 +  SUPPORTED_DEVICES += gl-ar750s glinet,gl-ar750s-nor
 endef
 -#TARGET_DEVICES += glinet_gl-ar750s
 +TARGET_DEVICES += glinet_gl-ar750s
 define Device/glinet_gl-x750
   ATH_SOC := qca9531
--- a/patches/openwrt/0010-tools-add-zstd.patch
+++ b/patches/openwrt/0010-tools-add-zstd.patch
@ -1,113 +0,0 @@
 From: Matthias Schiffer <mschiffer@universe-factory.net>
 Date: Wed, 13 May 2020 20:22:12 +0200
 Subject: tools: add zstd
 Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
 (cherry picked from commit 258dc0d0fd3aae47add9b7dca40848a92d03a4ea)
 diff --git a/tools/Makefile b/tools/Makefile
 index d7207ba89dd91df558eaf970961fdef225aa1f37..14fe4fb4b5f4e0c745cb8592a39bcf238dcc5444 100644
 --- a/tools/Makefile
 +++ b/tools/Makefile
@@ -33,7 +33,7 @@ tools-$(CONFIG_TARGET_mxs) += elftosb sdimage
 tools-$(CONFIG_TARGET_ar71xx) += lzma-old
 tools-$(CONFIG_TARGET_ar71xx)$(CONFIG_TARGET_ath79) += squashfs
 tools-$(CONFIG_USES_MINOR) += kernel2minor
 -tools-y += lzma squashfskit4 zip
 +tools-y += lzma squashfskit4 zip zstd
 tools-$(BUILD_B43_TOOLS) += b43-tools
 tools-$(BUILD_ISL) += isl
 tools-$(CONFIG_USE_SPARSE) += sparse
 diff --git a/tools/zstd/Makefile b/tools/zstd/Makefile
 new file mode 100644
 index 0000000000000000000000000000000000000000..7459725e8e79b846ed96551753d07fdd02459598
 --- /dev/null
 +++ b/tools/zstd/Makefile
@@ -0,0 +1,20 @@
 +include $(TOPDIR)/rules.mk
 +
 +PKG_NAME:=zstd
 +PKG_VERSION:=1.4.4
 +
 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 +PKG_SOURCE_URL:=@GITHUB/facebook/zstd/releases/download/v$(PKG_VERSION)
 +PKG_HASH:=a364f5162c7d1a455cc915e8e3cf5f4bd8b75d09bc0f53965b0c9ca1383c52c8
 +
 +PKG_LICENSE:=BSD-3-Clause
 +PKG_LICENSE_FILES:=LICENSE
 +PKG_CPE_ID:=cpe:/a:facebook:zstandard
 +
 +HOST_BUILD_PARALLEL:=1
 +
 +include $(INCLUDE_DIR)/host-build.mk
 +
 +HOST_MAKE_FLAGS = PREFIX=$(HOST_BUILD_PREFIX) HAVE_ZLIB=0 HAVE_LZMA=0 HAVE_LZ4=0
 +
 +$(eval $(call HostBuild))
 diff --git a/tools/zstd/patches/0001-build-issue-More-portable-header-prefix-usage-1987.patch b/tools/zstd/patches/0001-build-issue-More-portable-header-prefix-usage-1987.patch
 new file mode 100644
 index 0000000000000000000000000000000000000000..6d743aa3855262c2a0956f70ec99588ce9ebe53b
 --- /dev/null
 +++ b/tools/zstd/patches/0001-build-issue-More-portable-header-prefix-usage-1987.patch
@@ -0,0 +1,61 @@
 +From 06a57cf57e3c4e887cadcf688e3081154f3f6db4 Mon Sep 17 00:00:00 2001
 +Message-Id: <06a57cf57e3c4e887cadcf688e3081154f3f6db4.1589392463.git.mschiffer@universe-factory.net>
 +From: Bimba Shrestha <bimbashrestha@fb.com>
 +Date: Thu, 6 Feb 2020 14:10:51 -0800
 +Subject: [PATCH] [build-issue] More portable header prefix usage (#) (#1987)
 +
 +* make 4.3 build issue fix
 +
 +* Changing header name and adding comment
 +---
 + programs/Makefile | 11 +++++++----
 + 1 file changed, 7 insertions(+), 4 deletions(-)
 +
 +diff --git a/programs/Makefile b/programs/Makefile
 +index b75314a83f43..a9ee3cb5311b 100644
 +--- a/programs/Makefile
 ++++ b/programs/Makefile
 +@@ -94,9 +94,12 @@ endif
 + 
 + VOID = /dev/null
 + 
 ++# Make 4.3 doesn't support '\#' anymore (https://lwn.net/Articles/810071/)
 ++NUM_SYMBOL := \#
 ++
 + # thread detection
 + NO_THREAD_MSG := ==> no threads, building without multithreading support
 +-HAVE_PTHREAD := $(shell printf '\#include <pthread.h>\nint main(void) { return 0; }' > have_pthread.c && $(CC) $(FLAGS) -o have_pthread$(EXT) have_pthread.c -pthread 2> $(VOID) && rm have_pthread$(EXT) && echo 1 || echo 0; rm have_pthread.c)
 ++HAVE_PTHREAD := $(shell printf '$(NUM_SYMBOL)include <pthread.h>\nint main(void) { return 0; }' > have_pthread.c && $(CC) $(FLAGS) -o have_pthread$(EXT) have_pthread.c -pthread 2> $(VOID) && rm have_pthread$(EXT) && echo 1 || echo 0; rm have_pthread.c)
 + HAVE_THREAD := $(shell [ "$(HAVE_PTHREAD)" -eq "1" -o -n "$(filter Windows%,$(OS))" ] && echo 1 || echo 0)
 + ifeq ($(HAVE_THREAD), 1)
 + THREAD_MSG := ==> building with threading support
 +@@ -108,7 +111,7 @@ endif
 + 
 + # zlib detection
 + NO_ZLIB_MSG := ==> no zlib, building zstd without .gz support
 +-HAVE_ZLIB := $(shell printf '\#include <zlib.h>\nint main(void) { return 0; }' > have_zlib.c && $(CC) $(FLAGS) -o have_zlib$(EXT) have_zlib.c -lz 2> $(VOID) && rm have_zlib$(EXT) && echo 1 || echo 0; rm have_zlib.c)
 ++HAVE_ZLIB := $(shell printf '$(NUM_SYMBOL)include <zlib.h>\nint main(void) { return 0; }' > have_zlib.c && $(CC) $(FLAGS) -o have_zlib$(EXT) have_zlib.c -lz 2> $(VOID) && rm have_zlib$(EXT) && echo 1 || echo 0; rm have_zlib.c)
 + ifeq ($(HAVE_ZLIB), 1)
 + ZLIB_MSG := ==> building zstd with .gz compression support
 + ZLIBCPP = -DZSTD_GZCOMPRESS -DZSTD_GZDECOMPRESS
 +@@ -119,7 +122,7 @@ endif
 + 
 + # lzma detection
 + NO_LZMA_MSG := ==> no liblzma, building zstd without .xz/.lzma support
 +-HAVE_LZMA := $(shell printf '\#include <lzma.h>\nint main(void) { return 0; }' > have_lzma.c && $(CC) $(FLAGS) -o have_lzma$(EXT) have_lzma.c -llzma 2> $(VOID) && rm have_lzma$(EXT) && echo 1 || echo 0; rm have_lzma.c)
 ++HAVE_LZMA := $(shell printf '$(NUM_SYMBOL)include <lzma.h>\nint main(void) { return 0; }' > have_lzma.c && $(CC) $(FLAGS) -o have_lzma$(EXT) have_lzma.c -llzma 2> $(VOID) && rm have_lzma$(EXT) && echo 1 || echo 0; rm have_lzma.c)
 + ifeq ($(HAVE_LZMA), 1)
 + LZMA_MSG := ==> building zstd with .xz/.lzma compression support
 + LZMACPP = -DZSTD_LZMACOMPRESS -DZSTD_LZMADECOMPRESS
 +@@ -130,7 +133,7 @@ endif
 + 
 + # lz4 detection
 + NO_LZ4_MSG := ==> no liblz4, building zstd without .lz4 support
 +-HAVE_LZ4 := $(shell printf '\#include <lz4frame.h>\n\#include <lz4.h>\nint main(void) { return 0; }' > have_lz4.c && $(CC) $(FLAGS) -o have_lz4$(EXT) have_lz4.c -llz4 2> $(VOID) && rm have_lz4$(EXT) && echo 1 || echo 0; rm have_lz4.c)
 ++HAVE_LZ4 := $(shell printf '$(NUM_SYMBOL)include <lz4frame.h>\n\#include <lz4.h>\nint main(void) { return 0; }' > have_lz4.c && $(CC) $(FLAGS) -o have_lz4$(EXT) have_lz4.c -llz4 2> $(VOID) && rm have_lz4$(EXT) && echo 1 || echo 0; rm have_lz4.c)
 + ifeq ($(HAVE_LZ4), 1)
 + LZ4_MSG := ==> building zstd with .lz4 compression support
 + LZ4CPP = -DZSTD_LZ4COMPRESS -DZSTD_LZ4DECOMPRESS
 +-- 
 +2.26.2
 +
--- a/patches/openwrt/0011-build-compress-kernel-debuginfo-using-zstd.patch
+++ b/patches/openwrt/0011-build-compress-kernel-debuginfo-using-zstd.patch
@ -1,43 +0,0 @@
 From: Matthias Schiffer <mschiffer@universe-factory.net>
 Date: Wed, 13 May 2020 20:33:46 +0200
 Subject: build: compress kernel debuginfo using zstd
 zstd with its default settings (compression level -3) compresses better
 than bzip2 -9 (which is the default setting), and is an order of magnitude
 faster.
 I made the following measurements for the most common compression tools
 (all standard Debian Buster versions, default flags unless noted
 otherwise), using the debug information of a large x86-64 kernel with
 ALL_KMODS:
 * kernel-debug.tar: 376M
 * kernel-debug.tar.gz: 101M, compressed in ~12s
 * kernel-debug.tar.bz2: 91M, compressed in ~15s
 * kernel-debug.tar.xz: 57M, compressed in ~101s
 * kernel-debug.tar.zst: 86M, compressed in ~1s
 With zstd, there is still some room for improvement by increasing the
 compression, but the slight increase in compression ratio
 (22.83% -> 19.46%) does not justify the significant increase in
 compression time (about 5 times on my machine) in my opinion.
 Note that multithreaded compression (-T argument) does not affect
 reproducibility with zstd.
 Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
 (cherry picked from commit 4bd7990488b0ca7b5cae16f0a9147a4146759053)
 diff --git a/include/kernel-build.mk b/include/kernel-build.mk
 index 3fdf7efc52857a5184348cc1261848f75751b8a9..af7c3a8f0bb15c7e0d7072876705ff0bf4f9c8d1 100644
 --- a/include/kernel-build.mk
 +++ b/include/kernel-build.mk
@@ -70,7 +70,7 @@ ifdef CONFIG_COLLECT_KERNEL_DEBUG
 	$(FIND) $(KERNEL_BUILD_DIR)/debug -type f | $(XARGS) $(KERNEL_CROSS)strip --only-keep-debug
 	$(TAR) c -C $(KERNEL_BUILD_DIR) debug \
 		$(if $(SOURCE_DATE_EPOCH),--mtime="@$(SOURCE_DATE_EPOCH)") \
 -		| bzip2 -c -9 > $(BIN_DIR)/kernel-debug.tar.bz2
 +		| zstd -T0 -f -o $(BIN_DIR)/kernel-debug.tar.zst
   endef
 endif
--- a/patches/openwrt/0012-mac80211-rt2800-enable-MFP-support-unconditionally.patch
+++ b/patches/openwrt/0012-mac80211-rt2800-enable-MFP-support-unconditionally.patch
@ -1,62 +0,0 @@
 From: Rui Salvaterra <rsalvaterra@gmail.com>
 Date: Mon, 25 May 2020 14:49:07 +0100
 Subject: mac80211: rt2800: enable MFP support unconditionally
 This gives us WPA3 support out of the box without having to manually disable
 hardware crypto. The driver will fall back to software crypto if the connection
 requires management frame protection.
 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
 [apply to openwrt-1907]
 Signed-off-by: David Bauer <mail@david-bauer.net>
 diff --git a/package/kernel/mac80211/patches/rt2x00/080-rt2800-enable-MFP-support-unconditionally.patch b/package/kernel/mac80211/patches/rt2x00/080-rt2800-enable-MFP-support-unconditionally.patch
 new file mode 100644
 index 0000000000000000000000000000000000000000..1d55b2756c365a13b2315e874809e2397fb35855
 --- /dev/null
 +++ b/package/kernel/mac80211/patches/rt2x00/080-rt2800-enable-MFP-support-unconditionally.patch
@@ -0,0 +1,44 @@
 +From b6b15e20421fefae9f78274f9fef80bc97bf5d5c Mon Sep 17 00:00:00 2001
 +From: Rui Salvaterra <rsalvaterra@gmail.com>
 +Date: Mon, 25 May 2020 14:49:07 +0100
 +Subject: [PATCH] rt2800: enable MFP support unconditionally
 +
 +This gives us WPA3 support out of the box without having to manually disable
 +hardware crypto. The driver will fall back to software crypto if the connection
 +requires management frame protection.
 +
 +Suggested-by: Stanislaw Gruszka <stf_xl@wp.pl>
 +Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
 +Acked-by: Stanislaw Gruszka <stf_xl@wp.pl>
 +Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
 +Link: https://lore.kernel.org/r/20200525134906.1672-1-rsalvaterra@gmail.com
 +---
 + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 4 +---
 + drivers/net/wireless/ralink/rt2x00/rt2x00mac.c | 3 ++-
 + 2 files changed, 3 insertions(+), 4 deletions(-)
 +
 +--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
 ++++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
 +@@ -9985,9 +9985,7 @@ static int rt2800_probe_hw_mode(struct r
 + 	if (!rt2x00_is_usb(rt2x00dev))
 + 		ieee80211_hw_set(rt2x00dev->hw, HOST_BROADCAST_PS_BUFFERING);
 + 
 +-	/* Set MFP if HW crypto is disabled. */
 +-	if (rt2800_hwcrypt_disabled(rt2x00dev))
 +-		ieee80211_hw_set(rt2x00dev->hw, MFP_CAPABLE);
 ++	ieee80211_hw_set(rt2x00dev->hw, MFP_CAPABLE);
 + 
 + 	SET_IEEE80211_DEV(rt2x00dev->hw, rt2x00dev->dev);
 + 	SET_IEEE80211_PERM_ADDR(rt2x00dev->hw,
 +--- a/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
 ++++ b/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
 +@@ -459,7 +459,8 @@ int rt2x00mac_set_key(struct ieee80211_h
 + 	if (!test_bit(DEVICE_STATE_PRESENT, &rt2x00dev->flags))
 + 		return 0;
 + 
 +-	if (!rt2x00_has_cap_hw_crypto(rt2x00dev))
 ++	/* The hardware can't do MFP */
 ++	if (!rt2x00_has_cap_hw_crypto(rt2x00dev) || (sta && sta->mfp))
 + 		return -EOPNOTSUPP;
 + 
 + 	/*
--- a/patches/openwrt/0014-mac80211-create-channel-list-for-fixed-channel-operation.patch
+++ b/patches/openwrt/0014-mac80211-create-channel-list-for-fixed-channel-operation.patch
@ -1,28 +0,0 @@
 From: David Bauer <mail@david-bauer.net>
 Date: Sat, 4 Jul 2020 13:20:02 +0200
 Subject: mac80211: create channel list for fixed channel operation
 Currently a device which has a DFS channel selected using the UCI
 channel setting might switch to a non-DFS channel in case no chanlist is
 provided (UCI setting "channels") when the radio detects a DFS event.
 Automatically add a chanlist consisting of the configured channel when
 the device does not operate in auto-channel mode and no chanlist set to
 circumvent this issue.
 Signed-off-by: David Bauer <mail@david-bauer.net>
 diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
 index 634aadcee949bd1c3ad9963d01d9eb444250aa0b..49e51618ab71e197f27ec0581470e81056f1e8b7 100644
 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
 +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
@@ -100,6 +100,9 @@ mac80211_hostapd_setup_base() {
 	json_get_vars noscan ht_coex
 	json_get_values ht_capab_list ht_capab tx_burst
 +	[ "$auto_channel" = 0 ] && [ -z "$channel_list" ] && \
 +		channel_list="$channel"
 +
 	set_default noscan 0
 	[ "$noscan" -gt 0 ] && hostapd_noscan=1
--- a/patches/openwrt/0015-hostapd-enter-DFS-state-if-no-available-channel-is-found.patch
+++ b/patches/openwrt/0015-hostapd-enter-DFS-state-if-no-available-channel-is-found.patch
@ -1,47 +0,0 @@
 From: David Bauer <mail@david-bauer.net>
 Date: Sat, 4 Jul 2020 13:20:07 +0200
 Subject: hostapd: enter DFS state if no available channel is found
 Previously hostapd would not stop transmitting when a DFS event was
 detected and no available channel to switch to was available.
 Disable and re-enable the interface to enter DFS state. This way, TX
 does not happen until the kernel notifies hostapd about the NOP
 expiring.
 Signed-off-by: David Bauer <mail@david-bauer.net>
 diff --git a/package/network/services/hostapd/patches/800-dfs-enter-DFS-state-if-no-available-channel-is-found.patch b/package/network/services/hostapd/patches/800-dfs-enter-DFS-state-if-no-available-channel-is-found.patch
 new file mode 100644
 index 0000000000000000000000000000000000000000..59e903f06ae66208517c2d620b4cd128f41f25c1
 --- /dev/null
 +++ b/package/network/services/hostapd/patches/800-dfs-enter-DFS-state-if-no-available-channel-is-found.patch
@@ -0,0 +1,28 @@
 +From cefc52e6b93731c713f1bba1cb5e7e92105b758b Mon Sep 17 00:00:00 2001
 +From: David Bauer <mail@david-bauer.net>
 +Date: Fri, 3 Jul 2020 23:00:34 +0200
 +Subject: [PATCH] dfs: enter DFS state if no available channel is found
 +
 +Previously hostapd would not stop transmitting when a DFS event was
 +detected and no available channel to switch to was available.
 +
 +Disable and re-enable the interface to enter DFS state. This way, TX
 +does not happen until the kernel notifies hostapd about the NOP
 +expiring.
 +
 +Signed-off-by: David Bauer <mail@david-bauer.net>
 +---
 + src/ap/dfs.c | 11 +++++++++--
 + 1 file changed, 9 insertions(+), 2 deletions(-)
 +
 +--- a/src/ap/dfs.c
 ++++ b/src/ap/dfs.c
 +@@ -930,6 +930,8 @@ static int hostapd_dfs_start_channel_swi
 + 			wpa_printf(MSG_INFO,
 + 				   "%s: no DFS channels left, waiting for NOP to finish",
 + 				   __func__);
 ++			hostapd_disable_iface(iface);
 ++			hostapd_enable_iface(iface);
 + 			return err;
 + 		}
 + 
--- a/patches/packages/packages/0001-fastd-update-to-v19.patch
+++ b/patches/packages/packages/0001-fastd-update-to-v19.patch
@ -1,164 +0,0 @@
 From: Matthias Schiffer <mschiffer@universe-factory.net>
 Date: Fri, 22 May 2020 21:09:21 +0200
 Subject: fastd: update to v19
 Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
 diff --git a/net/fastd/Config.in b/net/fastd/Config.in
 index 3350eb3099a26c870d70373c0712a8b59881ee5c..e6440075e561093c86543943cb982d010a4ef0e0 100644
 --- a/net/fastd/Config.in
 +++ b/net/fastd/Config.in
@@ -36,16 +36,6 @@ config FASTD_ENABLE_METHOD_NULL
 	depends on PACKAGE_fastd
 	default y
 -config FASTD_ENABLE_METHOD_XSALSA20_POLY1305
 -	bool "Enable xsalsa20-poly1305 method"
 -	depends on PACKAGE_fastd
 -	default n
 -
 -
 -config FASTD_ENABLE_CIPHER_AES128_CTR
 -	bool "Enable the AES128-CTR cipher"
 -	depends on PACKAGE_fastd
 -	default n
 config FASTD_ENABLE_CIPHER_NULL
 	bool "Enable the null cipher"
 diff --git a/net/fastd/Makefile b/net/fastd/Makefile
 index 44b37b6ca300ba43f15d7a116fb654ccd0a69e99..8eabc34db6f3b906ddb1b5df5c232309e85d2ffb 100644
 --- a/net/fastd/Makefile
 +++ b/net/fastd/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 PKG_NAME:=fastd
 -PKG_VERSION:=18
 -PKG_RELEASE:=4
 +PKG_VERSION:=19
 +PKG_RELEASE:=1
 PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/NeoRaider/fastd/releases/download/v$(PKG_VERSION)
 -PKG_HASH:=714ff09d7bd75f79783f744f6f8c5af2fe456c8cf876feaa704c205a73e043c9
 +PKG_HASH:=6054608e2103b634c9d19ecd1ae058d4ec694747047130719db180578729783a
 PKG_LICENSE:=BSD-2-Clause
 PKG_LICENSE_FILES:=COPYRIGHT
@@ -27,8 +27,6 @@ PKG_CONFIG_DEPENDS:=\
 	CONFIG_FASTD_ENABLE_METHOD_GENERIC_POLY1305 \
 	CONFIG_FASTD_ENABLE_METHOD_GENERIC_UMAC \
 	CONFIG_FASTD_ENABLE_METHOD_NULL \
 -	CONFIG_FASTD_ENABLE_METHOD_XSALSA20_POLY1305 \
 -	CONFIG_FASTD_ENABLE_CIPHER_AES128_CTR \
 	CONFIG_FASTD_ENABLE_CIPHER_NULL \
 	CONFIG_FASTD_ENABLE_CIPHER_SALSA20 \
 	CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 \
@@ -44,6 +42,7 @@ PKG_CONFIG_DEPENDS:=\
 PKG_BUILD_DEPENDS:=nacl
 +PKG_BUILD_PARALLEL:=1
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
@@ -73,7 +72,6 @@ CMAKE_OPTIONS += \
 	-DWITH_METHOD_GENERIC_POLY1305:BOOL=FALSE \
 	-DWITH_METHOD_GENERIC_UMAC:BOOL=FALSE \
 	-DWITH_METHOD_NULL:BOOL=FALSE \
 -	-DWITH_METHOD_XSALSA20_POLY1305:BOOL=FALSE \
 	-DWITH_CIPHER_AES128_CTR:BOOL=FALSE \
 	-DWITH_CIPHER_NULL:BOOL=FALSE \
 	-DWITH_CIPHER_SALSA20:BOOL=FALSE \
@@ -120,14 +118,6 @@ ifeq ($(CONFIG_FASTD_ENABLE_METHOD_NULL),y)
 CMAKE_OPTIONS += -DWITH_METHOD_NULL:BOOL=TRUE
 endif
 -ifeq ($(CONFIG_FASTD_ENABLE_METHOD_XSALSA20_POLY1305),y)
 -CMAKE_OPTIONS += -DWITH_METHOD_XSALSA20_POLY1305:BOOL=TRUE
 -endif
 -
 -
 -ifeq ($(CONFIG_FASTD_ENABLE_CIPHER_AES128_CTR),y)
 -CMAKE_OPTIONS += -DWITH_CIPHER_AES128_CTR:BOOL=TRUE
 -endif
 ifeq ($(CONFIG_FASTD_ENABLE_CIPHER_NULL),y)
 CMAKE_OPTIONS += -DWITH_CIPHER_NULL:BOOL=TRUE
 diff --git a/net/fastd/patches/0001-resolve-fix-segmentation-fault-with-musl-1.1.20.patch b/net/fastd/patches/0001-resolve-fix-segmentation-fault-with-musl-1.1.20.patch
 deleted file mode 100644
 index 52c19174083c29e5da02cabb2ddc02474cf11b37..0000000000000000000000000000000000000000
 --- a/net/fastd/patches/0001-resolve-fix-segmentation-fault-with-musl-1.1.20.patch
 +++ /dev/null
@@ -1,35 +0,0 @@
 -From 9710132c04cd378bd36f16a2a3d98d9c4c5fdbac Mon Sep 17 00:00:00 2001
 -From: David Bauer <mail@david-bauer.net>
 -Date: Thu, 25 Jul 2019 18:51:25 +0200
 -Subject: [PATCH] resolve: fix segmentation fault with musl >1.1.20
 -
 -When compiled with musl >1.1.20, fastd will crash in case it can't
 -resolve a peers hostname. This is due to a changed implementation of
 -freeaddrinfo in musl 1.1.21 onwards.
 -
 -This segfault is fixed by not calling freeaddrinfo in case the supplied
 -pointer is null.
 -
 -Signed-off-by: David Bauer <mail@david-bauer.net>
 ----
 - src/resolve.c | 4 +++-
 - 1 file changed, 3 insertions(+), 1 deletion(-)
 -
 -diff --git a/src/resolve.c b/src/resolve.c
 -index 9bdfa1c..bfd2a59 100644
 ---- a/src/resolve.c
 -+++ b/src/resolve.c
 -@@ -104,7 +104,9 @@ static void * resolve_peer(void *varg) {
 - 
 - 	fastd_async_enqueue(ASYNC_TYPE_RESOLVE_RETURN, ret, sizeof(fastd_async_resolve_return_t) + n_addr*sizeof(fastd_peer_address_t));
 - 
 --	freeaddrinfo(res);
 -+	if (res)
 -+		freeaddrinfo(res);
 -+
 - 	free(arg->hostname);
 - 	free(arg);
 - 
 --- 
 -2.20.1
 -
 diff --git a/net/fastd/patches/0002-doc-examples-openwrt-fix-init-script-wasn-t-working-.patch b/net/fastd/patches/0002-doc-examples-openwrt-fix-init-script-wasn-t-working-.patch
 deleted file mode 100644
 index b576a987369e93f3cd14fbc83f3c4bffe5cc97d1..0000000000000000000000000000000000000000
 --- a/net/fastd/patches/0002-doc-examples-openwrt-fix-init-script-wasn-t-working-.patch
 +++ /dev/null
@@ -1,29 +0,0 @@
 -From c29b4b0e3cc5bf68129fd0f94f424950b7888deb Mon Sep 17 00:00:00 2001
 -Message-Id: <c29b4b0e3cc5bf68129fd0f94f424950b7888deb.1567630068.git.mschiffer@universe-factory.net>
 -From: Wilfried Klaebe <wklaebe@users.noreply.github.com>
 -Date: Sat, 31 Aug 2019 21:44:13 +0200
 -Subject: [PATCH] doc: examples/openwrt: fix init script, wasn't working with
 - two VPNs
 -
 -If two VPNs were configured via uci, the init script complained about
 -the peer group of its peers not matching its net.
 ----
 - doc/examples/openwrt/fastd.init | 2 +-
 - 1 file changed, 1 insertion(+), 1 deletion(-)
 -
 -diff --git a/doc/examples/openwrt/fastd.init b/doc/examples/openwrt/fastd.init
 -index 15737b403ec2..4ba69ece9887 100644
 ---- a/doc/examples/openwrt/fastd.init
 -+++ b/doc/examples/openwrt/fastd.init
 -@@ -233,7 +233,7 @@ generate_peer_group_config() {
 - 	config_get group_parent "$group" parent
 - 	[ "$parent" = "$group_parent" ] || return 0
 - 
 --	if [ "$net" != "$peer_net" ]; then
 -+	if [ "$net" != "$group_net" ]; then
 - 		[ -z "$parent" ] || error "warning: the parent of peer group '$group' doesn't match its net, the peer group will be ignored"
 - 		return 0
 - 	fi
 --- 
 -2.23.0
 -