diff --git a/root/package/boot/uboot-envtools/Makefile b/root/package/boot/uboot-envtools/Makefile
old mode 100755
new mode 100644
index 5ea32d88..a9eccec0
--- a/root/package/boot/uboot-envtools/Makefile
+++ b/root/package/boot/uboot-envtools/Makefile
@@ -9,16 +9,17 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uboot-envtools
 PKG_DISTNAME:=u-boot
-PKG_VERSION:=2020.04
-PKG_RELEASE:=1
+PKG_VERSION:=2021.01
+PKG_RELEASE:=$(AUTORELEASE)
 
-PKG_SOURCE_PROTO:=git
 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:= \
+    https://ftp.denx.de/pub/u-boot \
+    https://mirror.cyberbits.eu/u-boot \
+    ftp://ftp.denx.de/pub/u-boot
+PKG_HASH:=b407e1510a74e863b8b5cb42a24625344f0e0c2fc7582d8c866bd899367d0454
 PKG_SOURCE_SUBDIR:=$(PKG_DISTNAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_DISTNAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=https://git.denx.de/u-boot.git
-PKG_SOURCE_VERSION:=36fec02b1f90b92cf51ec531564f9284eae27ab4
-PKG_MIRROR_HASH:=fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372
 
 PKG_BUILD_DEPENDS:=fstools
 
diff --git a/root/package/boot/uboot-rockchip/Makefile b/root/package/boot/uboot-rockchip/Makefile
old mode 100755
new mode 100644
index 75825ce6..393e8c3a
--- a/root/package/boot/uboot-rockchip/Makefile
+++ b/root/package/boot/uboot-rockchip/Makefile
@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
-PKG_VERSION:=2021.04
+PKG_VERSION:=2021.01
 PKG_RELEASE:=1
 
-PKG_HASH:=0d438b1bb5cceb57a18ea2de4a0d51f7be5b05b98717df05938636e0aadfe11a
+PKG_HASH:=b407e1510a74e863b8b5cb42a24625344f0e0c2fc7582d8c866bd899367d0454
 
 PKG_MAINTAINER:=Tobias Maedel <openwrt@tbspace.de>
 
@@ -38,16 +38,6 @@ endef
 
 # RK3399 boards
 
-define U-Boot/nanopi-r4s-rk3399
-  BUILD_SUBTARGET:=armv8
-  NAME:=NanoPi R4S
-  BUILD_DEVICES:= \
-    friendlyarm_nanopi-r4s
-  DEPENDS:=+PACKAGE_u-boot-nanopi-r4s-rk3399:arm-trusted-firmware-rockchip
-  PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip
-  ATF:=rk3399_bl31.elf
-endef
-
 define U-Boot/rock-pi-4-rk3399
   BUILD_SUBTARGET:=armv8
   NAME:=Rock Pi 4
@@ -69,7 +59,6 @@ define U-Boot/rockpro64-rk3399
 endef
 
 UBOOT_TARGETS := \
-  nanopi-r4s-rk3399 \
   rock-pi-4-rk3399 \
   rockpro64-rk3399 \
   nanopi-r2s-rk3328
@@ -86,7 +75,7 @@ ifneq ($(OF_PLATDATA),)
 	mkdir -p $(PKG_BUILD_DIR)/tpl/dts
 	mkdir -p $(PKG_BUILD_DIR)/include/generated
 
-	$(CP) $(PKG_BUILD_DIR)/of-platdata/$(OF_PLATDATA)/dt-plat.c $(PKG_BUILD_DIR)/tpl/dts/dt-plat.c
+	$(CP) $(PKG_BUILD_DIR)/of-platdata/$(OF_PLATDATA)/dt-platdata.c $(PKG_BUILD_DIR)/tpl/dts/dt-platdata.c
 	$(CP) $(PKG_BUILD_DIR)/of-platdata/$(OF_PLATDATA)/dt-structs-gen.h $(PKG_BUILD_DIR)/include/generated/dt-structs-gen.h
 endif
 
diff --git a/root/package/boot/uboot-rockchip/patches/002-spl-remove-dtoc-of-pdata-generation.patch b/root/package/boot/uboot-rockchip/patches/002-spl-remove-dtoc-of-pdata-generation.patch
old mode 100755
new mode 100644
index 61a56c2a..bd401103
--- a/root/package/boot/uboot-rockchip/patches/002-spl-remove-dtoc-of-pdata-generation.patch
+++ b/root/package/boot/uboot-rockchip/patches/002-spl-remove-dtoc-of-pdata-generation.patch
@@ -17,13 +17,15 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 
 --- a/scripts/Makefile.spl
 +++ b/scripts/Makefile.spl
-@@ -329,10 +329,6 @@ PHONY += dts_dir
+@@ -321,12 +321,6 @@ PHONY += dts_dir
  dts_dir:
  	$(shell [ -d $(obj)/dts ] || mkdir -p $(obj)/dts)
  
--include/generated/dt-structs-gen.h $(u-boot-spl-platdata_c) &: \
--		$(obj)/$(SPL_BIN).dtb dts_dir FORCE
--	$(call if_changed,dtoc)
+-include/generated/dt-structs-gen.h: $(obj)/$(SPL_BIN).dtb dts_dir FORCE
+-	$(call if_changed,dtoch)
+-
+-$(obj)/dts/dt-platdata.c: $(obj)/$(SPL_BIN).dtb dts_dir FORCE
+-	$(call if_changed,dtocc)
 -
  ifdef CONFIG_SAMSUNG
  ifdef CONFIG_VAR_SIZE_SPL
diff --git a/root/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-structs-gen.h b/root/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-structs-gen.h
old mode 100755
new mode 100644
index b1ff08a9..847b121a
--- a/root/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-structs-gen.h
+++ b/root/package/boot/uboot-rockchip/src/of-platdata/nanopi-r2s-rk3328/dt-structs-gen.h
@@ -1,8 +1,7 @@
 /*
  * DO NOT MODIFY
  *
- * Defines the structs used to hold devicetree data.
- * This was generated by dtoc from a .dtb (device tree binary) file.
+ * This file was generated by dtoc from a .dtb (device tree binary) file.
  */
 
 #include <stdbool.h>
@@ -19,6 +18,23 @@ struct dtd_ns16550_serial {
 	fdt32_t		reg_io_width;
 	fdt32_t		reg_shift;
 };
+struct dtd_regulator_fixed {
+	fdt32_t		gpio[3];
+	fdt32_t		pinctrl_0;
+	const char *	pinctrl_names;
+	bool		regulator_boot_on;
+	fdt32_t		regulator_max_microvolt;
+	fdt32_t		regulator_min_microvolt;
+	const char *	regulator_name;
+	fdt32_t		vin_supply;
+};
+struct dtd_rockchip_gpio_bank {
+	struct phandle_1_arg clocks[1];
+	bool		gpio_controller;
+	bool		interrupt_controller;
+	fdt32_t		interrupts[3];
+	fdt64_t		reg[2];
+};
 struct dtd_rockchip_rk3288_dw_mshc {
 	fdt32_t		bus_width;
 	bool		cap_sd_highspeed;
@@ -49,3 +65,7 @@ struct dtd_rockchip_rk3328_dmc {
 struct dtd_rockchip_rk3328_grf {
 	fdt64_t		reg[2];
 };
+struct dtd_rockchip_rk3328_pinctrl {
+	bool		ranges;
+	fdt32_t		rockchip_grf;
+};
diff --git a/root/package/firmware/ipq-wifi/Makefile b/root/package/firmware/ipq-wifi/Makefile
old mode 100755
new mode 100644
index b43b5e02..389b9d4a
--- a/root/package/firmware/ipq-wifi/Makefile
+++ b/root/package/firmware/ipq-wifi/Makefile
@@ -43,12 +43,13 @@ ALLWIFIBOARDS:= \
 	linksys_ea8300 \
 	linksys_mr8300-v0 \
 	luma_wrtq-329acn \
+	mikrotik_hap-ac2 \
+	mikrotik_sxtsq-5-ac \
 	mobipromo_cm520-79f \
 	nec_wg2600hp3 \
 	plasmacloud_pa1200 \
 	plasmacloud_pa2200 \
   pangu_l1000 \
-  p2w_r619ac \
 	qxwlan_e2600ac
 
 ALLWIFIPACKAGES:=$(foreach BOARD,$(ALLWIFIBOARDS),ipq-wifi-$(BOARD))
@@ -128,12 +129,13 @@ $(eval $(call generate-ipq-wifi-package,glinet_gl-s1300,GL.iNet GL-S1300))
 $(eval $(call generate-ipq-wifi-package,linksys_ea8300,Linksys EA8300))
 $(eval $(call generate-ipq-wifi-package,linksys_mr8300-v0,Linksys MR8300))
 $(eval $(call generate-ipq-wifi-package,luma_wrtq-329acn,Luma WRTQ-329ACN))
+$(eval $(call generate-ipq-wifi-package,mikrotik_hap-ac2,Mikrotik hAP ac2))
+$(eval $(call generate-ipq-wifi-package,mikrotik_sxtsq-5-ac,MikroTik SXTsq 5 ac))
 $(eval $(call generate-ipq-wifi-package,mobipromo_cm520-79f,MobiPromo CM520-79F))
 $(eval $(call generate-ipq-wifi-package,nec_wg2600hp3,NEC Platforms WG2600HP3))
 $(eval $(call generate-ipq-wifi-package,plasmacloud_pa1200,Plasma Cloud PA1200))
 $(eval $(call generate-ipq-wifi-package,plasmacloud_pa2200,Plasma Cloud PA2200))
-$(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
 $(eval $(call generate-ipq-wifi-package,pangu_l1000,PANGU L1000))
-$(eval $(call generate-ipq-wifi-package,p2w_r619ac,P&W R619AC))
+$(eval $(call generate-ipq-wifi-package,qxwlan_e2600ac,Qxwlan E2600AC))
 
-$(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))
\ No newline at end of file
+$(foreach PACKAGE,$(ALLWIFIPACKAGES),$(eval $(call BuildPackage,$(PACKAGE))))
diff --git a/root/package/firmware/ipq-wifi/board-p2w_r619ac.qca4019 b/root/package/firmware/ipq-wifi/board-p2w_r619ac.qca4019
deleted file mode 100755
index 0ebe2857..00000000
Binary files a/root/package/firmware/ipq-wifi/board-p2w_r619ac.qca4019 and /dev/null differ
diff --git a/root/package/kernel/rtl8812au-ct/Makefile b/root/package/kernel/rtl8812au-ct/Makefile
old mode 100755
new mode 100644
index 3ac2f193..4dab3fd2
--- a/root/package/kernel/rtl8812au-ct/Makefile
+++ b/root/package/kernel/rtl8812au-ct/Makefile
@@ -1,16 +1,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rtl8812au-ct
-PKG_RELEASE=1
+PKG_RELEASE=2
 
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=
 
 PKG_SOURCE_URL:=https://github.com/greearb/rtl8812AU_8821AU_linux.git
-#PKG_MIRROR_HASH:=aee819df4ba83251b59bd1d4f412287b27105e5de9284bb09579f0e1a1538328
+PKG_MIRROR_HASH:=fa689e034cad9e4683ea784b8f3cb590492ab5c68e8babd492a4e8bf2de3b114
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2021-09-14
-PKG_SOURCE_VERSION:=39df55967b7de9f6c9600017b724303f95a8b9e2
+PKG_SOURCE_DATE:=2020-01-12
+PKG_SOURCE_VERSION:=e0d586aa93cb8687dd7dc0e593b6a820df2d6e1d
 
 PKG_MAINTAINER:=Ben Greear <greearb@candelatech.com>
 PKG_BUILD_PARALLEL:=1
diff --git a/root/package/utils/wmt/Makefile b/root/package/utils/wmt/Makefile
deleted file mode 100755
index dffd032e..00000000
--- a/root/package/utils/wmt/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=wmt
-PKG_VERSION:=1.0.0
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/abbradar/wmt
-PKG_SOURCE_VERSION:=2127e23dd94df960b12f3ffff806bcf41ebbf4b8
-PKG_MAINTAINER:=Nikolay Amiantov <ab@fmap.me>
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=wmt utility for MT6625L
-  DEPENDS:=kmod-mt6625l-wlan-gen2
-  MAINTAINER:=Jinkai li <lijk@synertone.net>
-endef
-
-define Package/$(PKG_NAME)/description
-  Utility for loading MT6625L firmware.
-endef
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/stp_uart_launcher $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wmt_loader $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wmt_loopback $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/system/etc/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/config/WMT_SOC.cfg $(1)/system/etc/firmware
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/config/WMT_SOC.cfg $(1)/system/etc/firmware/WMT.cfg
-	$(INSTALL_DIR) $(1)/etc/firmware
-	$(CP) -r $(PKG_BUILD_DIR)/firmware/* $(1)/etc/firmware/
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/wmt.init $(1)/etc/init.d/wmt
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/wmt.defaults $(1)/etc/uci-defaults/8803-wmt
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/root/package/utils/wmt/files/wmt.defaults b/root/package/utils/wmt/files/wmt.defaults
deleted file mode 100755
index ff619a29..00000000
--- a/root/package/utils/wmt/files/wmt.defaults
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-if [ -z "$(uci -q get ucitrack.@wmt[0])" ]; then
-	uci -q batch <<-EOF
-		set ucitrack.@wmt[-1]=wmt
-		set ucitrack.@wmt[-1].init=wmt
-		add_list ucitrack.@wireless[0].affects=wmt
-		commit ucitrack
-	EOF
-fi
-exit 0
diff --git a/root/package/utils/wmt/files/wmt.init b/root/package/utils/wmt/files/wmt.init
deleted file mode 100755
index bf4580e3..00000000
--- a/root/package/utils/wmt/files/wmt.init
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=69
-
-check_mtk_device() {
-	config_get phy "$1" phy
-	[ "$phy" = "mtkp2p0" ] && {
-		[ "$(uci -q get wireless.$1.disabled)" = "1" ] || apmode="$1"
-		[ -z "$(uci -q get wireless.default_$1.ifname)" ] && {
-			uci -q batch <<-EOF
-				set wireless.default_$1.ifname=mtkap0
-				set wireless.default_$1.bss_load_update_period=0
-				rename wireless.$1=ap
-				rename wireless.default_$1=default_ap
-				set wireless.default_$1.device=ap
-			EOF
-		}
-	}
-	[ "$phy" = "mtkphy0" ] && {
-		[ "$(uci -q get wireless.$1.disabled)" = "1" ] || wlanmode="$1"
-		[ "$(uci -q get wireless.default_$1.mode)" = "ap" ] && {
-			uci -q batch <<-EOF
-				set wireless.default_$1.mode=sta
-			EOF
-		}
-		[ -z "$(uci -q get wireless.default_$1.ifname)" ] && {
-			uci -q batch <<-EOF
-				set wireless.default_$1.ifname=mtkwlan0
-				set wireless.default_$1.bss_load_update_period=0
-				rename wireless.$1=client
-				rename wireless.default_$1=default_client
-				set wireless.default_$1.device=client
-			EOF
-		}
-	}
-}
-
-find_radio() {
-	config_load wireless
-	apmode=""
-	wlanmode=""
-	config_foreach check_mtk_device wifi-device
-	uci -q commit wireless
-}
-
-start_ap() {
-	echo A > /dev/wmtWifi
-	# Those are recommended by vendor to avoid chip lockup.
-	tc qdisc add dev mtkap0 root handle 1: htb default 11
-	tc class add dev mtkap0 parent 1:1 classid 1:2 htb rate 8Mbit ceil 4Mbit prio 2
-
-	find_radio
-	if [ -n "$apmode" ]; then
-		config_get_bool disabled "$apmode" disabled
-		[ "$disabled" = "1" ] || wifi up "$apmode" 2>/dev/null
-	fi
-}
-
-start_wlan() {
-	echo 1 > /dev/wmtWifi
-	# Those are recommended by vendor to avoid chip lockup.
-	tc qdisc add dev mtkap0 root handle 1: htb default 11
-	tc class add dev mtkap0 parent 1:1 classid 1:2 htb rate 8Mbit ceil 4Mbit prio 2
-
-	find_radio
-	if [ -n "$wlanmode" ]; then
-		config_get_bool disabled "$wlanmode" disabled
-		[ "$disabled" = "1" ] || wifi up "$wlanmode" 2>/dev/null
-	fi
-}
-
-stop_apwlan() {
-	find_radio
-	[ -n "$apmode" ] && wifi down "$apmode" 2>/dev/null
-	[ -n "$wlanmode" ] && wifi down "$wlanmode" 2>/dev/null
-	echo 0 > /dev/wmtWifi
-
-}
-
-start() {
-	find_radio
-
-	[ -c /dev/stpwmt ] || /usr/bin/wmt_loader 2>&1
-	/usr/bin/stp_uart_launcher -p /etc/firmware 2>&1 | logger -t stp_uart_launcher &
-	echo "$!" > /var/run/stp_uart_launcher.pid
-	sleep 3
-	if [ -c /dev/wmtWifi ]; then
-		[ -n "$apmode" ] && start_ap
-		[ -n "$wlanmode" ] && start_wlan
-		[ -z "$apmode" ] && [ -z "$wlanmode" ] && start_ap
-		return 0
-	else
-		return 1
-	fi
-}
-
-stop() {
-	find_radio
-
-	if [ -c /dev/wmtWifi ]; then
-		stop_apwlan
-		stp_pid="$(cat /var/run/stp_uart_launcher.pid 2>/dev/null)"
-		if [ -n "$stp_pid" ]; then
-			kill "$stp_pid"
-			rm /var/run/stp_uart_launcher.pid
-		fi
-	fi
-}
-
-reload() {
-	find_radio
-
-	if [ -c /dev/wmtWifi ]; then
-		stop_apwlan
-		[ -n "$apmode" ] && start_ap
-		[ -n "$wlanmode" ] && start_wlan
-		[ -z "$apmode" ] && [ -z "$wlanmode" ] && start_ap
-	fi
-}
diff --git a/root/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/root/target/linux/ipq40xx/base-files/etc/board.d/01_leds
old mode 100644
new mode 100755
index a2a69eae..620c29b8
--- a/root/target/linux/ipq40xx/base-files/etc/board.d/01_leds
+++ b/root/target/linux/ipq40xx/base-files/etc/board.d/01_leds
@@ -1,3 +1,4 @@
+#!/bin/sh
 #
 # Copyright (C) 2015 OpenWrt.org
 #
@@ -45,6 +46,14 @@ engenius,ens620ext)
 	ucidef_set_led_netdev "lan1" "LAN1" "green:lan1" "eth0"
 	ucidef_set_led_netdev "lan2" "LAN2" "green:lan2" "eth1"
 	;;
+mikrotik,sxtsq-5-ac)
+	ucidef_set_rssimon "wlan0" "200000" "1"
+	ucidef_set_led_rssi "rssilow" "rssilow" "green:rssilow" "wlan0" "1" "100"
+	ucidef_set_led_rssi "rssimediumlow" "rssimediumlow" "green:rssimediumlow" "wlan0" "21" "100"
+	ucidef_set_led_rssi "rssimedium" "rssimedium" "green:rssimedium" "wlan0" "41" "100"
+	ucidef_set_led_rssi "rssimediumhigh" "rssimediumhigh" "green:rssimediumhigh" "wlan0" "61" "100"
+	ucidef_set_led_rssi "rssihigh" "rssihigh" "green:rssihigh" "wlan0" "81" "100"
+	;;
 mobipromo,cm520-79f)
 	ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1"
 	ucidef_set_led_switch "lan1" "LAN1" "blue:lan1" "switch0" "0x10"
@@ -66,14 +75,6 @@ zbt,z4019)
 	ucidef_set_led_netdev "wwan1" "4G1" "green:4g2" "wwan1"
 	ucidef_set_led_netdev "wwan2" "4G2" "green:4g3" "wwan2"
 	;;
-8dev,jalapeno)
-	ucidef_set_led_default "power" "POWER" "blue:power" "1"
-    ucidef_set_led_wlan "wlan2g" "WLAN2G" "blue:wlan2g" "phy0tpt"
-	ucidef_set_led_netdev "wan" "WAN" "blue:wan" "eth1"
-	ucidef_set_led_netdev "4g1" "4g1" "blue:4g1" "4g1"
-	ucidef_set_led_netdev "4g2" "4g2" "blue:4g2" "4g2"
-	ucidef_set_led_netdev "4g3" "4g3" "blue:4g3" "4g3"
-    ;;
 netgear,ex6100v2 |\
 netgear,ex6150v2)
 	ucidef_set_led_wlan "wlan2g" "WLAN2G" "green:router" "phy0tpt"
@@ -93,4 +94,4 @@ esac
 
 board_config_flush
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/root/target/linux/ipq40xx/base-files/etc/board.d/02_network b/root/target/linux/ipq40xx/base-files/etc/board.d/02_network
old mode 100644
new mode 100755
index 0752f8be..d9ea13ce
--- a/root/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/root/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -1,3 +1,4 @@
+#!/bin/sh
 #
 # Copyright (c) 2015 The Linux Foundation. All rights reserved.
 # Copyright (c) 2011-2015 OpenWrt.org
@@ -28,6 +29,7 @@ ipq40xx_setup_interfaces()
 	engenius,eap1300|\
 	engenius,emd1|\
 	meraki,mr33|\
+	mikrotik,sxtsq-5-ac|\
 	netgear,ex6100v2|\
 	netgear,ex6150v2|\
 	zyxel,wre6606)
@@ -47,6 +49,7 @@ ipq40xx_setup_interfaces()
 		ucidef_set_interfaces_lan_wan "eth1" "eth0"
 		;;
 	asus,rt-ac58u|\
+	mikrotik,hap-ac2|\
 	zyxel,nbg6617)
 		ucidef_set_interfaces_lan_wan "eth0" "eth1"
 		ucidef_add_switch "switch0" \
@@ -54,13 +57,18 @@ ipq40xx_setup_interfaces()
 		;;
 	avm,fritzbox-4040|\
 	linksys,ea6350v3|\
-    pangu,l1000|\
+	pangu,l1000|\
 	linksys,ea8300|\
 	linksys,mr8300)
 		ucidef_set_interfaces_lan_wan "eth0" "eth1"
 		ucidef_add_switch "switch0" \
 			"0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
 		;;
+	zbt,z4019)
+		ucidef_set_interfaces_lan_wan "eth0" "eth1"
+		ucidef_add_switch "switch0" \
+			"0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
+		;;
 	avm,fritzbox-7530)
 		ucidef_add_switch "switch0" \
 			"0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
@@ -110,7 +118,7 @@ ipq40xx_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"0u@eth0" "3:lan" "4:lan" "0u@eth1" "5:wan"
 		;;
-        zbt,z4019)
+	zbt,z4019)
 		ucidef_set_interfaces_lan_wan "eth0" "eth1"
 		ucidef_add_switch "switch0" \
 			"0u@eth0" "1:lan" "2:lan" "3:lan" "4:lan"
@@ -164,7 +172,7 @@ ipq40xx_setup_macs()
 		lan_mac=$(mtd_get_mac_ascii 0:APPSBLENV ethaddr)
 		label_mac=$wan_mac
 		;;
-    zbt,z4019)
+	zbt,z4019)
 		wan_mac=$(mtd_get_mac_binary "0:ART" 0x0)
 		lan_mac=$(mtd_get_mac_binary "0:ART" 0x6)
 		;;
@@ -179,6 +187,15 @@ ipq40xx_setup_macs()
 		wan_mac=$(mtd_get_mac_ascii devinfo hw_mac_addr)
 		lan_mac=$(macaddr_add "$wan_mac" 1)
 		;;
+	mikrotik,hap-ac2)
+		wan_mac=$(cat /sys/firmware/mikrotik/hard_config/mac_base)
+		lan_mac=$(macaddr_add $wan_mac 1)
+		label_mac="$wan_mac"
+		;;
+	mikrotik,sxtsq-5-ac)
+		lan_mac=$(cat /sys/firmware/mikrotik/hard_config/mac_base)
+		label_mac="$lan_mac"
+		;;
 	esac
 
 	[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
@@ -192,4 +209,4 @@ ipq40xx_setup_interfaces $board
 ipq40xx_setup_macs $board
 board_config_flush
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/root/target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches b/root/target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches
old mode 100644
new mode 100755
index a15f60b8..c255707f
--- a/root/target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches
+++ b/root/target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 . /lib/functions/uci-defaults.sh
 
 board_config_update
@@ -21,4 +23,4 @@ esac
 
 board_config_flush
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
index f073af48..5a7dc452 100644
--- a/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
+++ b/root/target/linux/ipq40xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
@@ -12,7 +12,7 @@ case "$FIRMWARE" in
 	meraki,mr33)
 		caldata_extract_ubi "ART" 0x9000 0x844
 		caldata_valid "4408" || caldata_extract "ART" 0x9000 0x844
-		ath10k_patch_mac $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) 1)
+		ath10k_patch_mac $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) +1)
 		;;
 	esac
 	;;
@@ -128,7 +128,7 @@ case "$FIRMWARE" in
 		;;
 	engenius,ens620ext)
 		caldata_extract "ART" 0x1000 0x2f20
-		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) 2)
+		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +2)
 		;;
 	linksys,ea8300 |\
 	linksys,mr8300)
@@ -142,7 +142,7 @@ case "$FIRMWARE" in
 	meraki,mr33)
 		caldata_extract_ubi "ART" 0x1000 0x2f20
 		caldata_valid "202f" || caldata_extract "ART" 0x1000 0x2f20
-		ath10k_patch_mac $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) 2)
+		ath10k_patch_mac $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) +2)
 		;;
 	mikrotik,hap-ac2)
 		wlan_data="/sys/firmware/mikrotik/hard_config/wlan_data"
@@ -154,10 +154,6 @@ case "$FIRMWARE" in
 		caldata_extract "ART" 0x1000 0x2f20
 		ath10k_patch_mac $(mtd_get_mac_binary dnidata 0x0)
 		;;
-	netgear,wac510)
-		caldata_extract "0:ART" 0x1000 0x2f20
-		ath10k_patch_mac $(mtd_get_mac_binary "0:MANUDATA" 0x6)
-		;;
 	zyxel,nbg6617 |\
 	zyxel,wre6606)
 		caldata_extract "ART" 0x1000 0x2f20
@@ -188,7 +184,7 @@ case "$FIRMWARE" in
 	aruba,ap-303h |\
 	aruba,ap-365)
 		caldata_extract "ART" 0x5000 0x2f20
-		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary mfginfo 0x1D) 1)
+		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary mfginfo 0x1D) +1)
 		;;
 	asus,map-ac2200)
 		caldata_extract_ubi "Factory" 0x5000 0x2f20
@@ -241,15 +237,15 @@ case "$FIRMWARE" in
 		;;
 	engenius,emd1)
 		caldata_extract "0:ART" 0x5000 0x2f20
-		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:APPSBLENV wlanaddr) 1)
+		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:APPSBLENV wlanaddr) +1)
 		;;
 	engenius,emr3500)
 		caldata_extract "0:ART" 0x5000 0x2f20
-		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:APPSBLENV ethaddr) 1)
+		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii 0:APPSBLENV ethaddr) +1)
 		;;
 	engenius,ens620ext)
 		caldata_extract "ART" 0x5000 0x2f20
-		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) 3)
+		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_ascii u-boot-env ethaddr) +3)
 		;;
 	linksys,ea8300 |\
 	linksys,mr8300)
@@ -263,7 +259,7 @@ case "$FIRMWARE" in
 	meraki,mr33)
 		caldata_extract_ubi "ART" 0x5000 0x2f20
 		caldata_valid "202f" || caldata_extract "ART" 0x5000 0x2f20
-		ath10k_patch_mac $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) 3)
+		ath10k_patch_mac $(macaddr_add $(get_mac_binary "/sys/bus/i2c/devices/0-0050/eeprom" 0x66) +3)
 		;;
 	mikrotik,hap-ac2|\
 	mikrotik,sxtsq-5-ac)
@@ -276,10 +272,6 @@ case "$FIRMWARE" in
 		caldata_extract "ART" 0x5000 0x2f20
 		ath10k_patch_mac $(mtd_get_mac_binary dnidata 0xc)
 		;;
-	netgear,wac510)
-		caldata_extract "0:ART" 0x5000 0x2f20
-		ath10k_patch_mac $(macaddr_add $(mtd_get_mac_binary "0:MANUDATA" 0x6) 16)
-		;;
 	zyxel,nbg6617 |\
 	zyxel,wre6606)
 		caldata_extract "ART" 0x5000 0x2f20
@@ -294,4 +286,4 @@ case "$FIRMWARE" in
 *)
 	exit 1
 	;;
-esac
\ No newline at end of file
+esac
diff --git a/root/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh b/root/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh
index c7ee381f..de09d34a 100755
--- a/root/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh
+++ b/root/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh
@@ -119,4 +119,4 @@ platform_do_upgrade_linksys() {
 			get_image "$1" | mtd write - "$part_label"
 		fi
 	}
-}
\ No newline at end of file
+}
diff --git a/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
index 2ed19f12..e586af32 100644
--- a/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
+++ b/root/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -59,7 +59,7 @@ platform_do_upgrade() {
 	case "$(board_name)" in
 	8dev,jalapeno |\
 	aruba,ap-303 |\
-    pangu,l1000 |\
+	pangu,l1000 |\
 	aruba,ap-303h |\
 	aruba,ap-365 |\
 	avm,fritzbox-7530 |\
@@ -72,10 +72,8 @@ platform_do_upgrade() {
 	engenius,eap2200 |\
 	glinet,gl-ap1300 |\
 	luma,wrtq-329acn |\
-	zbt,z4019 |\
 	mobipromo,cm520-79f |\
-    p2w,r619ac-64m |\
- 	p2w,r619ac-128m |\
+	zbt,z4019 |\
 	qxwlan,e2600ac-c2)
 		nand_do_upgrade "$1"
 		;;
@@ -115,6 +113,11 @@ platform_do_upgrade() {
 		CI_KERNPART="part.safe"
 		nand_do_upgrade "$1"
 		;;
+	mikrotik,hap-ac2|\
+	mikrotik,sxtsq-5-ac)
+		[ "$(rootfs_type)" = "tmpfs" ] && mtd erase firmware
+		default_do_upgrade "$1"
+		;;
 	openmesh,a42 |\
 	openmesh,a62 |\
 	plasmacloud,pa1200 |\
@@ -129,4 +132,4 @@ platform_do_upgrade() {
 		default_do_upgrade "$1"
 		;;
 	esac
-}
\ No newline at end of file
+}
diff --git a/root/target/linux/ipq40xx/config-5.4 b/root/target/linux/ipq40xx/config-5.4
old mode 100755
new mode 100644
index 7f452031..f23e8b47
--- a/root/target/linux/ipq40xx/config-5.4
+++ b/root/target/linux/ipq40xx/config-5.4
@@ -54,7 +54,6 @@ CONFIG_BOUNCE=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_QCOM=y
 CONFIG_CLONE_BACKWARDS=y
-CONFIG_CMDLINE_PARTITION=y
 CONFIG_COMMON_CLK=y
 CONFIG_COMMON_CLK_QCOM=y
 CONFIG_COMPAT_32BIT_TIME=y
@@ -199,6 +198,8 @@ CONFIG_HWSPINLOCK=y
 CONFIG_HWSPINLOCK_QCOM=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_OPTEE=y
+CONFIG_HZ=100
+CONFIG_HZ_100=y
 CONFIG_HZ_FIXED=0
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
@@ -225,7 +226,6 @@ CONFIG_IRQ_WORK=y
 CONFIG_LEDS_LP5523=y
 CONFIG_LEDS_LP5562=y
 CONFIG_LEDS_LP55XX_COMMON=y
-CONFIG_LEDS_TLC591XX=y
 CONFIG_LIBFDT=y
 CONFIG_LOCK_DEBUGGING_SUPPORT=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
@@ -382,6 +382,9 @@ CONFIG_QCOM_WDT=y
 # CONFIG_QRTR is not set
 CONFIG_RAS=y
 CONFIG_RATIONAL=y
+CONFIG_RCU_CPU_STALL_TIMEOUT=21
+CONFIG_RCU_NEED_SEGCBLIST=y
+CONFIG_RCU_STALL_COMMON=y
 CONFIG_REFCOUNT_FULL=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
@@ -443,6 +446,10 @@ CONFIG_TIMER_PROBE=y
 CONFIG_TREE_RCU=y
 CONFIG_TREE_SRCU=y
 CONFIG_UBIFS_FS=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_UBIFS_FS_ZSTD=y
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNWINDER_ARM=y
diff --git a/root/target/linux/ipq40xx/image/generic.mk b/root/target/linux/ipq40xx/image/generic.mk
index cc8eefec..3bf64a07 100644
--- a/root/target/linux/ipq40xx/image/generic.mk
+++ b/root/target/linux/ipq40xx/image/generic.mk
@@ -35,7 +35,7 @@ define Device/DniImage
 	IMAGES += factory.img
 	IMAGE/factory.img := append-kernel | pad-offset 64k 64 | append-uImage-fakehdr filesystem | append-rootfs | pad-rootfs | netgear-dni
 	IMAGE/sysupgrade.bin := append-kernel | pad-offset 64k 64 | append-uImage-fakehdr filesystem | \
-		append-rootfs | pad-rootfs | check-size | append-metadata
+		append-rootfs | pad-rootfs | append-metadata | check-size
 endef
 
 define Build/append-rootfshdr
@@ -62,7 +62,6 @@ define Build/mkmylofw_32m
 	@mv $@.new $@
 endef
 
-
 define Build/qsdk-ipq-factory-nand-askey
 	$(TOPDIR)/scripts/mkits-qsdk-ipq-image.sh $@.its\
 		askey_kernel $(IMAGE_KERNEL) \
@@ -97,25 +96,10 @@ define Device/8dev_habanero-dvk
 	IMAGE_SIZE := 30976k
 	SOC := qcom-ipq4019
 	DEVICE_PACKAGES := ipq-wifi-8dev_habanero-dvk
-	IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | append-rootfs | pad-rootfs | check-size | append-metadata
+	IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | append-rootfs | pad-rootfs | append-metadata | check-size
 endef
 TARGET_DEVICES += 8dev_habanero-dvk
 
-define Device/8dev_jalapeno-common
-	$(call Device/FitImage)
-	$(call Device/UbiFit)
-	BLOCKSIZE := 128k
-	PAGESIZE := 2048
-	SOC := qcom-ipq4018
-endef
-
-define Device/8dev_jalapeno
-	$(call Device/8dev_jalapeno-common)
-	DEVICE_VENDOR := 8devices
-	DEVICE_MODEL := Jalapeno
-endef
-TARGET_DEVICES += 8dev_jalapeno
-
 define Device/pangu_l1000
 	$(call Device/FitImage)
 	$(call Device/UbiFit)
@@ -131,6 +115,34 @@ define Device/pangu_l1000
 endef
 TARGET_DEVICES += pangu_l1000
 
+define Device/zbt_z4019
+	$(call Device/FitImage)
+	$(call Device/UbiFit)
+	DEVICE_VENDOR := ZBT
+	DEVICE_MODEL := Z4019
+	SOC := qcom-ipq4019
+	BLOCKSIZE := 128k
+	PAGESIZE := 2048
+	DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers
+endef
+TARGET_DEVICES += zbt_z4019
+
+
+define Device/8dev_jalapeno-common
+	$(call Device/FitImage)
+	$(call Device/UbiFit)
+	BLOCKSIZE := 128k
+	PAGESIZE := 2048
+	SOC := qcom-ipq4018
+endef
+
+define Device/8dev_jalapeno
+	$(call Device/8dev_jalapeno-common)
+	DEVICE_VENDOR := 8devices
+	DEVICE_MODEL := Jalapeno
+endef
+TARGET_DEVICES += 8dev_jalapeno
+
 define Device/alfa-network_ap120c-ac
 	$(call Device/FitImage)
 	$(call Device/UbiFit)
@@ -213,7 +225,7 @@ define Device/avm_fritzbox-4040
 	UBOOT_PARTITION_SIZE := 524288
 	IMAGES += eva.bin
 	IMAGE/eva.bin := append-uboot | pad-to $$$$(UBOOT_PARTITION_SIZE) | append-kernel | append-rootfs | pad-rootfs
-	IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size | append-metadata
+	IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size
 	DEVICE_PACKAGES := fritz-tffs fritz-caldata
 endef
 TARGET_DEVICES += avm_fritzbox-4040
@@ -501,7 +513,7 @@ endef
 TARGET_DEVICES += glinet_gl-ap1300
 
 define Device/glinet_gl-b1300
-	$(call Device/FitzImage)
+	$(call Device/FitImage)
 	DEVICE_VENDOR := GL.iNet
 	DEVICE_MODEL := GL-B1300
 	BOARD_NAME := gl-b1300
@@ -512,20 +524,8 @@ define Device/glinet_gl-b1300
 endef
 TARGET_DEVICES += glinet_gl-b1300
 
-define Device/zbt_z4019
-	$(call Device/FitImage)
-	$(call Device/UbiFit)
-	DEVICE_VENDOR := ZBT
-	DEVICE_MODEL := Z4019
-	SOC := qcom-ipq4019
-	BLOCKSIZE := 128k
-	PAGESIZE := 2048
-	DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers
-endef
-TARGET_DEVICES += zbt_z4019
-
 define Device/glinet_gl-s1300
-	$(call Device/FitzImage)
+	$(call Device/FitImage)
 	DEVICE_VENDOR := GL.iNet
 	DEVICE_MODEL := GL-S1300
 	SOC := qcom-ipq4029
@@ -828,7 +828,7 @@ define Device/zyxel_wre6606
 	DEVICE_DTS_CONFIG := config@4
 	SOC := qcom-ipq4018
 	IMAGE_SIZE := 13184k
-	IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | check-size | append-metadata
+	IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size
 	DEVICE_PACKAGES := -kmod-ath10k-ct kmod-ath10k-ct-smallbuffers
 endef
 TARGET_DEVICES += zyxel_wre6606
diff --git a/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch b/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
old mode 100755
new mode 100644
index 51cd7da5..3cea070c
--- a/root/target/linux/ipq40xx/patches-5.4/901-arm-boot-add-dts-files.patch
+++ b/root/target/linux/ipq40xx/patches-5.4/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
-@@ -837,11 +837,60 @@ dtb-$(CONFIG_ARCH_QCOM) += \
+@@ -837,11 +837,62 @@ dtb-$(CONFIG_ARCH_QCOM) += \
  	qcom-apq8074-dragonboard.dtb \
  	qcom-apq8084-ifc6540.dtb \
  	qcom-apq8084-mtp.dtb \
@@ -31,6 +31,8 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +	qcom-ipq4018-gl-ap1300.dtb \
 +	qcom-ipq4018-jalapeno.dtb \
 +	qcom-ipq4018-meshpoint-one.dtb \
++	qcom-ipq4018-hap-ac2.dtb \
++	qcom-ipq4018-sxtsq-5-ac.dtb \
 +	qcom-ipq4018-nbg6617.dtb \
 +	qcom-ipq4019-oap100.dtb \
 +	qcom-ipq4018-pa1200.dtb \
@@ -70,4 +72,4 @@ Signed-off-by: John Crispin <john@phrozen.org>
 +	qcom-ipq4019-z4019.dtb \
  	qcom-ipq8064-ap148.dtb \
  	qcom-msm8660-surf.dtb \
- 	qcom-msm8960-cdp.dtb \
\ No newline at end of file
+ 	qcom-msm8960-cdp.dtb \