diff --git a/package/boot/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile
index b032e07c37..7d464f8d08 100644
--- a/package/boot/uboot-envtools/Makefile
+++ b/package/boot/uboot-envtools/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=uboot-envtools
 PKG_DISTNAME:=u-boot
 PKG_VERSION:=2020.04
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_DISTNAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:= \
diff --git a/package/boot/uboot-envtools/files/ar71xx b/package/boot/uboot-envtools/files/ar71xx
deleted file mode 100644
index 9625c6bdd1..0000000000
--- a/package/boot/uboot-envtools/files/ar71xx
+++ /dev/null
@@ -1,114 +0,0 @@
-#!/bin/sh
-#
-# Copyright (C) 2011-2014 OpenWrt.org
-#
-
-[ -e /etc/config/ubootenv ] && exit 0
-
-touch /etc/config/ubootenv
-
-. /lib/uboot-envtools.sh
-. /lib/functions.sh
-
-board=$(board_name)
-
-case "$board" in
-a40|\
-a60|\
-alfa-ap120c|\
-all0258n|\
-ap121f|\
-ap90q|\
-ap91-5g|\
-arduino-yun|\
-cap324|\
-cap4200ag|\
-carambola2|\
-cpe830|\
-cpe870|\
-cr3000|\
-cr5000|\
-dw33d|\
-e1700ac-v2|\
-e600g-v2|\
-e600gac-v2|\
-eap300v2|\
-ens202ext|\
-gl-ar300m|\
-gl-ar750|\
-hornet-ub|\
-hornet-ub-x2|\
-jwap230|\
-koala|\
-mr1750|\
-mr1750v2|\
-mr600|\
-mr600v2|\
-mr900|\
-mr900v2|\
-n5q|\
-nbg6716|\
-om5p|\
-om5p-ac|\
-om5p-acv2|\
-om5p-an|\
-r36a|\
-rme-eg200|\
-sr3200|\
-t830|\
-tube2h|\
-wam250|\
-wnr1000-v2|\
-wnr2000-v3|\
-wnr2200|\
-wnr612-v2|\
-xd3200)
-	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x10000" "0x10000"
-	;;
-alfa-ap96|\
-all0315n|\
-om2p|\
-om2p-hs|\
-om2p-hsv2|\
-om2p-hsv3|\
-om2p-hsv4|\
-om2p-lc|\
-om2pv2|\
-om2pv4)
-	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x40000"
-	;;
-dap-2695-a1|\
-wzr-hp-ag300h)
-	ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x10000" "0x10000"
-	;;
-dr342|\
-dr531)
-	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0xf800" "0x10000"
-	;;
-gl-ar150|\
-gl-domino|\
-gl-mifi)
-	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x8000" "0x10000"
-	;;
-rambutan)
-	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x20000"
-	ubootenv_add_uci_config "/dev/mtd1" "0x100000" "0x20000" "0x20000"
-	;;
-qihoo-c301)
-	ubootenv_add_uci_config "/dev/mtd9" "0x0" "0x10000" "0x10000"
-	;;
-wi2a-ac200i)
-	ubootenv_add_uci_config "/dev/mtd4" "0x0" "0x8000" "0x10000"
-	;;
-wndr3700)
-	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x10000"
-	;;
-wndr4300)
-	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x20000"
-	;;
-esac
-
-config_load ubootenv
-config_foreach ubootenv_add_app_config ubootenv
-
-exit 0
diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79
index f61e38929d..d127714420 100644
--- a/package/boot/uboot-envtools/files/ath79
+++ b/package/boot/uboot-envtools/files/ath79
@@ -14,14 +14,14 @@ board=$(board_name)
 
 case "$board" in
 alfa-network,ap121f|\
+allnet,all-wap02860ac|\
+arduino,yun|\
 buffalo,bhr-4grv2|\
 devolo,magic-2-wifi|\
 engenius,ecb1750|\
+engenius,enh202-v1|\
+engenius,ens202ext-v1|\
 etactica,eg200|\
-glinet,gl-ar300m-lite|\
-glinet,gl-ar300m-nand|\
-glinet,gl-ar300m-nor|\
-glinet,gl-ar300m16|\
 glinet,gl-ar750s-nor|\
 glinet,gl-ar750s-nor-nand|\
 librerouter,librerouter-v1|\
@@ -40,21 +40,36 @@ openmesh,om5p-ac-v2|\
 ubnt,nanostation-m|\
 yuncore,a770|\
 yuncore,a782|\
-yuncore,xd4200)
+yuncore,xd4200|\
+zyxel,nbg6616)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x10000" "0x10000"
 	;;
 buffalo,wzr-hp-ag300h)
 	ubootenv_add_uci_config "/dev/mtd3" "0x0" "0x10000" "0x10000"
 	;;
+domywifi,dw33d)
+	ubootenv_add_uci_config "/dev/mtd4" "0x0" "0x10000" "0x10000"
+	;;
 glinet,gl-ar150)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x8000" "0x10000"
 	;;
+glinet,gl-ar300m-lite|\
+glinet,gl-ar300m-nand|\
+glinet,gl-ar300m-nor|\
+glinet,gl-ar300m16)
+	idx="$(find_mtd_index u-boot-env)"
+	[ -n "$idx" ] && \
+		ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x10000" "0x10000"
+	;;
 netgear,wndr3700|\
-netgear,wndr3700-v2)
+netgear,wndr3700-v2|\
+netgear,wndrmac-v1)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x10000"
 	;;
 netgear,wndr3700-v4|\
-netgear,wndr4300)
+netgear,wndr4300|\
+netgear,wndr4300tn|\
+netgear,wndr4300sw)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x20000"
 	;;
 qihoo,c301)
diff --git a/package/boot/uboot-envtools/files/ipq40xx b/package/boot/uboot-envtools/files/ipq40xx
index 7bcad00b01..f427661cf7 100644
--- a/package/boot/uboot-envtools/files/ipq40xx
+++ b/package/boot/uboot-envtools/files/ipq40xx
@@ -37,6 +37,9 @@ openmesh,a42 |\
 openmesh,a62)
 	ubootenv_add_uci_config "/dev/mtd5" "0x0" "0x10000" "0x10000"
 	;;
+buffalo,wtr-m2133hp)
+	ubootenv_add_uci_config "/dev/mtd8" "0x0" "0x40000" "0x20000"
+	;;
 linksys,ea6350v3)
 	ubootenv_add_uci_config "/dev/mtd7" "0x0" "0x20000" "0x20000"
 	;;
diff --git a/package/boot/uboot-envtools/files/kirkwood b/package/boot/uboot-envtools/files/kirkwood
index b5f7ddccb7..401df74597 100644
--- a/package/boot/uboot-envtools/files/kirkwood
+++ b/package/boot/uboot-envtools/files/kirkwood
@@ -13,17 +13,20 @@ touch /etc/config/ubootenv
 board=$(board_name)
 
 case "$board" in
+checkpoint,l-50|\
 cloudengines,pogoe02|\
 cloudengines,pogoplugv4|\
 iom,ix2-200|\
-linksys,viper|\
+linksys,e4200-v2|\
+linksys,ea4500|\
 raidsonic,ib-nas62x0|\
 seagate,dockstar|\
 zyxel,nsa310b|\
+zyxel,nsa310s|\
 zyxel,nsa325)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x20000" "0x20000"
 	;;
-linksys,audi)
+linksys,ea3500)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x4000" "0x4000"
 	;;
 esac
diff --git a/package/boot/uboot-envtools/files/mvebu b/package/boot/uboot-envtools/files/mvebu
index 72e2df5d19..8ed1f87ead 100644
--- a/package/boot/uboot-envtools/files/mvebu
+++ b/package/boot/uboot-envtools/files/mvebu
@@ -24,7 +24,8 @@ globalscale,espressobin|\
 globalscale,espressobin-emmc|\
 globalscale,espressobin-v7|\
 globalscale,espressobin-v7-emmc|\
-marvell,armada8040-mcbin)
+marvell,armada8040-mcbin-doubleshot|\
+marvell,armada8040-mcbin-singleshot)
 	ubootenv_add_uci_config "/dev/mtd0" "0x3f0000" "0x10000" "0x10000" "1"
 	;;
 linksys,wrt1200ac|\
diff --git a/package/boot/uboot-envtools/files/ramips b/package/boot/uboot-envtools/files/ramips
index 59f6f4d609..630fdc091f 100644
--- a/package/boot/uboot-envtools/files/ramips
+++ b/package/boot/uboot-envtools/files/ramips
@@ -33,6 +33,13 @@ xiaomi,miwifi-nano|\
 zbtlink,zbt-wg2626)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x1000" "0x10000"
 	;;
+hootoo,ht-tm05|\
+ravpower,rp-wd03)
+	idx="$(find_mtd_index u-boot-env)"
+	[ -n "$idx" ] && \
+		ubootenv_add_uci_config "/dev/mtd$idx" "0x4000" "0x1000" "0x1000"
+	;;
+linksys,ea7300-v1|\
 linksys,ea7500-v2|\
 xiaomi,mir3p|\
 xiaomi,mir3g|\