diff --git a/config/Config-build.in b/config/Config-build.in
index 199277167b..499f84690f 100644
--- a/config/Config-build.in
+++ b/config/Config-build.in
@@ -103,6 +103,15 @@ menu "Global build settings"
 		help
 		  If enabled, buildinfo files will be stored in /etc/build.* of firmware.
 
+	config REPRODUCIBLE_DEBUG_INFO
+		bool "Make debug information reproducible"
+		default BUILDBOT
+		help
+		  This strips the local build path out of debug information. This has the
+		  advantage of making it reproducible, but the disadvantage of making local
+		  debugging using ./scripts/remote-gdb harder, since the debug data will
+		  no longer point to the full path on the build host.
+
 	config COLLECT_KERNEL_DEBUG
 		bool
 		prompt "Collect kernel debug information"
diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 83dad0f2dc..4637c6ca50 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -114,6 +114,10 @@ $(eval $(call SetupHostCommand,grep,Please install GNU 'grep', \
 	ggrep --version 2>&1 | grep GNU, \
 	grep --version 2>&1 | grep GNU))
 
+$(eval $(call SetupHostCommand,egrep,Please install GNU 'grep', \
+	gegrep --version 2>&1 | grep GNU, \
+	egrep --version 2>&1 | grep GNU))
+
 $(eval $(call SetupHostCommand,getopt, \
 	Please install an extended getopt version that supports --long, \
 	gnugetopt -o t --long test -- --test | grep '^ *--test *--', \
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 7e0d341705..c3d2aac2bb 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk
 include $(INCLUDE_DIR)/feeds.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=225
+PKG_RELEASE:=226
 PKG_FLAGS:=nonshared
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh
index 323e057451..7da0c872fa 100755
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -107,9 +107,14 @@ config_unset() {
 # config_get <variable> <section> <option> [<default>]
 # config_get <section> <option>
 config_get() {
-	case "$3" in
-		"") eval echo "\"\${CONFIG_${1}_${2}:-\${4}}\"";;
-		*)  eval export ${NO_EXPORT:+-n} -- "${1}=\${CONFIG_${2}_${3}:-\${4}}";;
+	case "$2${3:-$1}" in
+		*[^A-Za-z0-9_]*) : ;;
+		*)
+			case "$3" in
+				"") eval echo "\"\${CONFIG_${1}_${2}:-\${4}}\"";;
+				*)  eval export ${NO_EXPORT:+-n} -- "${1}=\${CONFIG_${2}_${3}:-\${4}}";;
+			esac
+		;;
 	esac
 }
 
diff --git a/package/boot/uboot-envtools/files/ath79 b/package/boot/uboot-envtools/files/ath79
index 0442e9e485..aca8a089c3 100644
--- a/package/boot/uboot-envtools/files/ath79
+++ b/package/boot/uboot-envtools/files/ath79
@@ -64,6 +64,7 @@ netgear,wndrmac-v1)
 	;;
 netgear,wndr3700-v4|\
 netgear,wndr4300|\
+netgear,wndr4300tn|\
 netgear,wndr4300sw)
 	ubootenv_add_uci_config "/dev/mtd1" "0x0" "0x40000" "0x20000"
 	;;
diff --git a/package/devel/binutils/Makefile b/package/devel/binutils/Makefile
index e04611f5d3..6ad326efa0 100644
--- a/package/devel/binutils/Makefile
+++ b/package/devel/binutils/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=binutils
-PKG_VERSION:=2.27
+PKG_VERSION:=2.34
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=@GNU/binutils
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_VERSION:=$(PKG_VERSION)
-PKG_HASH:=369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88
+PKG_HASH:=f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952
 
 PKG_FIXUP:=autoreconf
 PKG_LIBTOOL_PATHS:=. gas bfd opcodes gprof binutils ld libiberty gold intl
@@ -37,10 +37,17 @@ define Package/libbfd
   DEPENDS:=+zlib $(ICONV_DEPENDS) $(INTL_DEPENDS)
 endef
 
+define Package/libctf
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=libctf
+  DEPENDS:=+libbfd
+endef
+
 define Package/libopcodes
   SECTION:=libs
   CATEGORY:=Libraries
-  TITLE:=libbfd
+  TITLE:=libopcodes
   DEPENDS:=+libbfd
 endef
 
@@ -56,7 +63,7 @@ define Package/objdump
   SECTION:=devel
   CATEGORY:=Development
   TITLE:=objdump
-  DEPENDS:=+libopcodes
+  DEPENDS:=+libopcodes +libctf
 endef
 
 define Package/ar
@@ -94,7 +101,12 @@ endef
 
 define Package/libbfd/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libbfd*.so $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libbfd*.so* $(1)/usr/lib/
+endef
+
+define Package/libctf/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libctf.so* $(1)/usr/lib/
 endef
 
 define Package/libopcodes/install
@@ -121,6 +133,7 @@ define Package/binutils/install
 endef
 
 $(eval $(call BuildPackage,libbfd))
+$(eval $(call BuildPackage,libctf))
 $(eval $(call BuildPackage,libopcodes))
 $(eval $(call BuildPackage,binutils))
 $(eval $(call BuildPackage,objdump))
diff --git a/package/devel/binutils/patches/0001-Do-not-pass-host-compiler-sanitization-flags-on-to-l.patch b/package/devel/binutils/patches/0001-Do-not-pass-host-compiler-sanitization-flags-on-to-l.patch
deleted file mode 100644
index 823527a2bc..0000000000
--- a/package/devel/binutils/patches/0001-Do-not-pass-host-compiler-sanitization-flags-on-to-l.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 183eb37e25d903ccd68cc2d8f8a37e75872c03d2 Mon Sep 17 00:00:00 2001
-From: Nick Clifton <nickc@redhat.com>
-Date: Tue, 6 Sep 2016 17:35:35 +0100
-Subject: [PATCH 1/2] Do not pass host compiler sanitization flags on to linker
- testsuite.
-
-	* Makefile.am (CFLAGS_FOR_TARGET): Define as a copy of CFLAGS but
-	without any sanitization options.
-	(CXXFLAGS_FOR_TARGET): Define as a copy of CXXFLAGS but	without
-	any sanitization options.
-	(check-DEJAGNU): Pass CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET
-	as CFLAGS and CXXFLAGS respectively.
----
- ld/Makefile.am | 8 ++++++--
- ld/Makefile.in | 8 ++++++--
- 2 files changed, 12 insertions(+), 4 deletions(-)
-
---- a/ld/Makefile.am
-+++ b/ld/Makefile.am
-@@ -136,6 +136,10 @@ CXX_FOR_TARGET = ` \
-     fi; \
-   fi`
- 
-+# Strip out sanitization options as we want to test building binaries without any extra paraphernalia
-+CFLAGS_FOR_TARGET = `echo $(CFLAGS) | sed -e 's/-fsanitize=address//g' -e 's/-fsanitize=undefined//g'`
-+CXXFLAGS_FOR_TARGET = `echo $(CXXFLAGS) | sed -e 's/-fsanitize=address//g' -e 's/-fsanitize=undefined//g'`
-+
- transform = s/^ld-new$$/$(installed_linker)/;@program_transform_name@
- bin_PROGRAMS = ld-new
- info_TEXINFOS = ld.texinfo
-@@ -2075,8 +2079,8 @@ check-DEJAGNU: site.exp
- 	runtest=$(RUNTEST); \
- 	if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
- 	  $$runtest --tool $(DEJATOOL) --srcdir $${srcroot}/testsuite \
--		CC="$(CC_FOR_TARGET)" CFLAGS="$(CFLAGS)" \
--		CXX="$(CXX_FOR_TARGET)" CXXFLAGS="$(CXXFLAGS)" \
-+		CC="$(CC_FOR_TARGET)" CFLAGS="$(CFLAGS_FOR_TARGET)" \
-+		CXX="$(CXX_FOR_TARGET)" CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
- 		CC_FOR_HOST="$(CC)" CFLAGS_FOR_HOST="$(CFLAGS)" \
- 		OFILES="$(OFILES)" BFDLIB="$(TESTBFDLIB)" \
- 		LIBIBERTY="$(LIBIBERTY) $(LIBINTL)" LIBS="$(LIBS)" \
---- a/ld/Makefile.in
-+++ b/ld/Makefile.in
-@@ -507,6 +507,10 @@ CXX_FOR_TARGET = ` \
-     fi; \
-   fi`
- 
-+
-+# Strip out sanitization options as they require special host libraries.
-+CFLAGS_FOR_TARGET = `echo $(CFLAGS) | sed -e 's/-fsanitize=address//g' -e 's/-fsanitize=undefined//g'`
-+CXXFLAGS_FOR_TARGET = `echo $(CXXFLAGS) | sed -e 's/-fsanitize=address//g' -e 's/-fsanitize=undefined//g'`
- info_TEXINFOS = ld.texinfo
- ld_TEXINFOS = configdoc.texi
- noinst_TEXINFOS = ldint.texinfo
-@@ -3644,8 +3648,8 @@ check-DEJAGNU: site.exp
- 	runtest=$(RUNTEST); \
- 	if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \
- 	  $$runtest --tool $(DEJATOOL) --srcdir $${srcroot}/testsuite \
--		CC="$(CC_FOR_TARGET)" CFLAGS="$(CFLAGS)" \
--		CXX="$(CXX_FOR_TARGET)" CXXFLAGS="$(CXXFLAGS)" \
-+		CC="$(CC_FOR_TARGET)" CFLAGS="$(CFLAGS_FOR_TARGET)" \
-+		CXX="$(CXX_FOR_TARGET)" CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \
- 		CC_FOR_HOST="$(CC)" CFLAGS_FOR_HOST="$(CFLAGS)" \
- 		OFILES="$(OFILES)" BFDLIB="$(TESTBFDLIB)" \
- 		LIBIBERTY="$(LIBIBERTY) $(LIBINTL)" LIBS="$(LIBS)" \
diff --git a/package/devel/binutils/patches/0002-When-building-target-binaries-ensure-that-the-warnin.patch b/package/devel/binutils/patches/0002-When-building-target-binaries-ensure-that-the-warnin.patch
deleted file mode 100644
index b87c58ec77..0000000000
--- a/package/devel/binutils/patches/0002-When-building-target-binaries-ensure-that-the-warnin.patch
+++ /dev/null
@@ -1,1258 +0,0 @@
-From b8ff24c72174effd5c5527866313982e28507275 Mon Sep 17 00:00:00 2001
-From: Vlad Zakharov <vzakhar@synopsys.com>
-Date: Mon, 26 Sep 2016 16:36:08 +0100
-Subject: [PATCH 2/2] When building target binaries, ensure that the warning
- flags selected for the command line match the target compiler.
-
-bfd	* warning.m4 (AC_EGREP_CPP_FOR_BUILD): Introduce macro
-	to verify CC_FOR_BUILD compiler.
-	(AM_BINUTILS_WARNINGS): Introduce ac_cpp_for_build variable
-	and add CC_FOR_BUILD compiler checks.
-	* Makefile.in: Regenerate.
-	* configure: Likewise.
-	* doc/Makefile.in: Likewise.
-
-binutils	* Makefile.am: Replace AM_CLFAGS with AM_CFLAGS_FOR_BUILD
-	when building with CC_FOR_BUILD compiler.
-	* Makefile.in: Regenerate.
-	* configure: Likewise.
-	* doc/Makefile.in: Likewise.
-
-gas	* Makefile.in: Regenerate.
-	* configure: Likewise.
-	* doc/Makefile.in: Likewise.
-
-gold	* Makefile.in: Regenerate.
-	* configure: Likewise.
-	* testsuite/Makefile.in: Likewise.
-
-gprof	* Makefile.in: Regenerate.
-	* configure: Likewise.
-
-ld	* Makefile.in: Regenerate.
-	* configure: Likewise.
-
-opcodes	* Makefile.in: Regenerate.
-	* configure: Likewise.
----
- bfd/Makefile.in            |  1 +
- bfd/configure              | 56 +++++++++++++++++++++++++++++++++++++++++-----
- bfd/doc/Makefile.in        |  1 +
- bfd/warning.m4             | 47 ++++++++++++++++++++++++++++++++++----
- binutils/Makefile.am       | 10 +++++----
- binutils/Makefile.in       | 10 +++++----
- binutils/configure         | 56 +++++++++++++++++++++++++++++++++++++++++-----
- binutils/doc/Makefile.in   |  1 +
- gas/Makefile.in            |  1 +
- gas/configure              | 56 +++++++++++++++++++++++++++++++++++++++++-----
- gas/doc/Makefile.in        |  1 +
- gold/Makefile.in           |  5 +++--
- gold/configure             | 52 ++++++++++++++++++++++++++++++++++++++----
- gold/testsuite/Makefile.in |  1 +
- gprof/Makefile.in          |  1 +
- gprof/configure            | 56 +++++++++++++++++++++++++++++++++++++++++-----
- ld/Makefile.in             |  3 ++-
- ld/configure               | 56 +++++++++++++++++++++++++++++++++++++++++-----
- opcodes/Makefile.in        |  1 +
- opcodes/configure          | 56 +++++++++++++++++++++++++++++++++++++++++-----
- 20 files changed, 416 insertions(+), 55 deletions(-)
-
---- a/bfd/Makefile.in
-+++ b/bfd/Makefile.in
-@@ -288,6 +288,7 @@ TDEFINES = @TDEFINES@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
-+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@
- WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
---- a/bfd/configure
-+++ b/bfd/configure
-@@ -659,6 +659,7 @@ MAINTAINER_MODE_FALSE
- MAINTAINER_MODE_TRUE
- WARN_WRITE_STRINGS
- NO_WERROR
-+WARN_CFLAGS_FOR_BUILD
- WARN_CFLAGS
- REPORT_BUGS_TEXI
- REPORT_BUGS_TO
-@@ -11427,7 +11428,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11430 "configure"
-+#line 11431 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11533,7 +11534,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11536 "configure"
-+#line 11537 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -12240,8 +12241,12 @@ fi
- # Set the 'development' global.
- . $srcdir/../bfd/development.sh
- 
-+# Set acp_cpp_for_build variable
-+ac_cpp_for_build="$CC_FOR_BUILD -E $CPPFLAGS_FOR_BUILD"
-+
- # Default set of GCC warnings to enable.
- GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
-+GCC_WARN_CFLAGS_FOR_BUILD="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
- 
- # Add -Wshadow if the compiler is a sufficiently recent version of GCC.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -12286,6 +12291,36 @@ fi
- rm -f conftest*
- 
- 
-+# Verify CC_FOR_BUILD to be compatible with waring flags
-+
-+# Add -Wshadow if the compiler is a sufficiently recent version of GCC.
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+__GNUC__
-+_ACEOF
-+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-+  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
-+
-+else
-+  GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow"
-+fi
-+rm -f conftest*
-+
-+
-+# Add -Wstack-usage if the compiler is a sufficiently recent version of GCC.
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+__GNUC__
-+_ACEOF
-+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-+  $EGREP "^[0-4]$" >/dev/null 2>&1; then :
-+
-+else
-+  GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144"
-+fi
-+rm -f conftest*
-+
-+
- # Check whether --enable-werror was given.
- if test "${enable_werror+set}" = set; then :
-   enableval=$enable_werror; case "${enableval}" in
-@@ -12301,6 +12336,7 @@ case "${host}" in
-   *-*-mingw32*)
-     if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
-       GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format"
-+      GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wno-format"
-     fi
-     ;;
-   *) ;;
-@@ -12314,25 +12350,32 @@ fi
- NO_WERROR=
- if test "${ERROR_ON_WARNING}" = yes ; then
-     GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror"
-+    GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Werror"
-     NO_WERROR="-Wno-error"
- fi
- 
- if test "${GCC}" = yes ; then
-   WARN_CFLAGS="${GCC_WARN_CFLAGS}"
-+  WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}"
- fi
- 
- # Check whether --enable-build-warnings was given.
- if test "${enable_build_warnings+set}" = set; then :
-   enableval=$enable_build_warnings; case "${enableval}" in
--  yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}";;
-+  yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}"
-+        WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}";;
-   no)	if test "${GCC}" = yes ; then
- 	  WARN_CFLAGS="-w"
-+      WARN_CFLAGS_FOR_BUILD="-w"
- 	fi;;
-   ,*)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
--        WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}";;
-+        WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}"
-+        WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD} ${t}";;
-   *,)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
--        WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";;
--  *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;;
-+        WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}"
-+        WARN_CFLAGS_FOR_BUILD="${t} ${GCC_WARN_CFLAGS_FOR_BUILD}";;
-+  *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`
-+        WARN_CFLAGS_FOR_BUILD=`echo "${enableval}" | sed -e "s/,/ /g"`;;
- esac
- fi
- 
-@@ -12343,6 +12386,7 @@ fi
- 
- 
- 
-+
- 
- 
- 
---- a/bfd/doc/Makefile.in
-+++ b/bfd/doc/Makefile.in
-@@ -248,6 +248,7 @@ TDEFINES = @TDEFINES@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
-+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@
- WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
---- a/bfd/warning.m4
-+++ b/bfd/warning.m4
-@@ -17,12 +17,34 @@ dnl along with this program; see the fil
- dnl <http://www.gnu.org/licenses/>.
- dnl
- 
-+# AC_EGREP_CPP_FOR_BUILD(PATTERN, PROGRAM,
-+#              [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-+# ------------------------------------------------------
-+AC_DEFUN([AC_EGREP_CPP_FOR_BUILD],
-+[AC_LANG_PREPROC_REQUIRE()dnl
-+AC_REQUIRE([AC_PROG_EGREP])dnl
-+AC_LANG_CONFTEST([AC_LANG_SOURCE([[$2]])])
-+AS_IF([dnl eval is necessary to expand ac_cpp.
-+dnl Ultrix and Pyramid sh refuse to redirect output of eval, so use subshell.
-+(eval "$ac_cpp_for_build conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
-+dnl Quote $1 to prevent m4 from eating character classes
-+  $EGREP "[$1]" >/dev/null 2>&1],
-+  [$3],
-+  [$4])
-+rm -f conftest*
-+])# AC_EGREP_CPP_FOR_BUILD
-+
-+
- AC_DEFUN([AM_BINUTILS_WARNINGS],[
- # Set the 'development' global.
- . $srcdir/../bfd/development.sh
- 
-+# Set acp_cpp_for_build variable
-+ac_cpp_for_build="$CC_FOR_BUILD -E $CPPFLAGS_FOR_BUILD"
-+
- # Default set of GCC warnings to enable.
- GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
-+GCC_WARN_CFLAGS_FOR_BUILD="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
- 
- # Add -Wshadow if the compiler is a sufficiently recent version of GCC.
- AC_EGREP_CPP([^[0-3]$],[__GNUC__],,GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wshadow")
-@@ -34,6 +56,14 @@ AC_EGREP_CPP([^[0-4]$],[__GNUC__],,GCC_W
- WARN_WRITE_STRINGS=""
- AC_EGREP_CPP([^[0-3]$],[__GNUC__],,WARN_WRITE_STRINGS="-Wwrite-strings")
- 
-+# Verify CC_FOR_BUILD to be compatible with waring flags
-+
-+# Add -Wshadow if the compiler is a sufficiently recent version of GCC.
-+AC_EGREP_CPP_FOR_BUILD([^[0-3]$],[__GNUC__],,GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow")
-+
-+# Add -Wstack-usage if the compiler is a sufficiently recent version of GCC.
-+AC_EGREP_CPP_FOR_BUILD([^[0-4]$],[__GNUC__],,GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144")
-+
- AC_ARG_ENABLE(werror,
-   [  --enable-werror         treat compile warnings as errors],
-   [case "${enableval}" in
-@@ -47,6 +77,7 @@ case "${host}" in
-   *-*-mingw32*)
-     if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
-       GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format"
-+      GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wno-format"
-     fi
-     ;;
-   *) ;;
-@@ -60,25 +91,32 @@ fi
- NO_WERROR=
- if test "${ERROR_ON_WARNING}" = yes ; then
-     GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror"
-+    GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Werror"
-     NO_WERROR="-Wno-error"
- fi
- 
- if test "${GCC}" = yes ; then
-   WARN_CFLAGS="${GCC_WARN_CFLAGS}"
-+  WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}"
- fi
- 
- AC_ARG_ENABLE(build-warnings,
- [  --enable-build-warnings enable build-time compiler warnings],
- [case "${enableval}" in
--  yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}";;
-+  yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}" 
-+        WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}";;
-   no)	if test "${GCC}" = yes ; then
- 	  WARN_CFLAGS="-w"
-+      WARN_CFLAGS_FOR_BUILD="-w" 
- 	fi;;
-   ,*)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
--        WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}";;
-+        WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}"
-+        WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD} ${t}";;
-   *,)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
--        WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";;
--  *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;;
-+        WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}"
-+        WARN_CFLAGS_FOR_BUILD="${t} ${GCC_WARN_CFLAGS_FOR_BUILD}";;
-+  *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`
-+        WARN_CFLAGS_FOR_BUILD=`echo "${enableval}" | sed -e "s/,/ /g"`;;
- esac])
- 
- if test x"$silent" != x"yes" && test x"$WARN_CFLAGS" != x""; then
-@@ -86,6 +124,7 @@ if test x"$silent" != x"yes" && test x"$
- fi
- 
- AC_SUBST(WARN_CFLAGS)
-+AC_SUBST(WARN_CFLAGS_FOR_BUILD)
- AC_SUBST(NO_WERROR)
-      AC_SUBST(WARN_WRITE_STRINGS)
- ])
---- a/binutils/Makefile.am
-+++ b/binutils/Makefile.am
-@@ -47,8 +47,10 @@ ZLIB = @zlibdir@ -lz
- ZLIBINC = @zlibinc@
- 
- WARN_CFLAGS = @WARN_CFLAGS@
-+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@
- NO_WERROR = @NO_WERROR@
- AM_CFLAGS = $(WARN_CFLAGS) $(ZLIBINC)
-+AM_CFLAGS_FOR_BUILD = $(WARN_CFLAGS_FOR_BUILD) $(ZLIBINC)
- LIBICONV = @LIBICONV@
- 
- # these two are almost the same program
-@@ -305,17 +307,17 @@ sysinfo$(EXEEXT_FOR_BUILD): sysinfo.@OBJ
- 	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.@OBJEXT@ syslex_wrap.@OBJEXT@
- 
- syslex_wrap.@OBJEXT@: syslex_wrap.c syslex.c sysinfo.h config.h
--	$(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex_wrap.c
-+	$(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex_wrap.c
- 
- sysinfo.@OBJEXT@: sysinfo.c
- 	if [ -r sysinfo.c ]; then \
--	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) sysinfo.c ; \
-+	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NO_WERROR) sysinfo.c ; \
- 	else \
--	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/sysinfo.c ; \
-+	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/sysinfo.c ; \
- 	fi
- 
- bin2c$(EXEEXT_FOR_BUILD): bin2c.c
--	$(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c
-+	$(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c
- 
- embedspu: embedspu.sh Makefile
- 	awk '/^program_transform_name=/ {print "program_transform_name=\"$(program_transform_name)\""; next} {print}' < $< > $@
---- a/binutils/Makefile.in
-+++ b/binutils/Makefile.in
-@@ -401,6 +401,7 @@ STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
-+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@
- WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@
- XGETTEXT = @XGETTEXT@
- YACC = `if [ -f ../bison/bison ]; then echo ../bison/bison -y -L$(srcdir)/../bison/; else echo @YACC@; fi`
-@@ -478,6 +479,7 @@ am__skipyacc =
- ZLIB = @zlibdir@ -lz
- ZLIBINC = @zlibinc@
- AM_CFLAGS = $(WARN_CFLAGS) $(ZLIBINC)
-+AM_CFLAGS_FOR_BUILD = $(WARN_CFLAGS_FOR_BUILD) $(ZLIBINC)
- 
- # these two are almost the same program
- AR_PROG = ar
-@@ -1370,17 +1372,17 @@ sysinfo$(EXEEXT_FOR_BUILD): sysinfo.@OBJ
- 	$(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ sysinfo.@OBJEXT@ syslex_wrap.@OBJEXT@
- 
- syslex_wrap.@OBJEXT@: syslex_wrap.c syslex.c sysinfo.h config.h
--	$(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex_wrap.c
-+	$(CC_FOR_BUILD) -c -I. -I$(srcdir) $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/syslex_wrap.c
- 
- sysinfo.@OBJEXT@: sysinfo.c
- 	if [ -r sysinfo.c ]; then \
--	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) sysinfo.c ; \
-+	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NO_WERROR) sysinfo.c ; \
- 	else \
--	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/sysinfo.c ; \
-+	  $(CC_FOR_BUILD) -c -I. $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(NO_WERROR) $(srcdir)/sysinfo.c ; \
- 	fi
- 
- bin2c$(EXEEXT_FOR_BUILD): bin2c.c
--	$(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c
-+	$(CC_FOR_BUILD) -o $@ $(AM_CPPFLAGS) $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $(srcdir)/bin2c.c
- 
- embedspu: embedspu.sh Makefile
- 	awk '/^program_transform_name=/ {print "program_transform_name=\"$(program_transform_name)\""; next} {print}' < $< > $@
---- a/binutils/configure
-+++ b/binutils/configure
-@@ -652,6 +652,7 @@ YFLAGS
- YACC
- WARN_WRITE_STRINGS
- NO_WERROR
-+WARN_CFLAGS_FOR_BUILD
- WARN_CFLAGS
- OTOOL64
- OTOOL
-@@ -11225,7 +11226,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11228 "configure"
-+#line 11229 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11331,7 +11332,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11334 "configure"
-+#line 11335 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11945,8 +11946,12 @@ _ACEOF
- # Set the 'development' global.
- . $srcdir/../bfd/development.sh
- 
-+# Set acp_cpp_for_build variable
-+ac_cpp_for_build="$CC_FOR_BUILD -E $CPPFLAGS_FOR_BUILD"
-+
- # Default set of GCC warnings to enable.
- GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
-+GCC_WARN_CFLAGS_FOR_BUILD="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
- 
- # Add -Wshadow if the compiler is a sufficiently recent version of GCC.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -11991,6 +11996,36 @@ fi
- rm -f conftest*
- 
- 
-+# Verify CC_FOR_BUILD to be compatible with waring flags
-+
-+# Add -Wshadow if the compiler is a sufficiently recent version of GCC.
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+__GNUC__
-+_ACEOF
-+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-+  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
-+
-+else
-+  GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow"
-+fi
-+rm -f conftest*
-+
-+
-+# Add -Wstack-usage if the compiler is a sufficiently recent version of GCC.
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+__GNUC__
-+_ACEOF
-+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-+  $EGREP "^[0-4]$" >/dev/null 2>&1; then :
-+
-+else
-+  GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144"
-+fi
-+rm -f conftest*
-+
-+
- # Check whether --enable-werror was given.
- if test "${enable_werror+set}" = set; then :
-   enableval=$enable_werror; case "${enableval}" in
-@@ -12006,6 +12041,7 @@ case "${host}" in
-   *-*-mingw32*)
-     if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
-       GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format"
-+      GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wno-format"
-     fi
-     ;;
-   *) ;;
-@@ -12019,25 +12055,32 @@ fi
- NO_WERROR=
- if test "${ERROR_ON_WARNING}" = yes ; then
-     GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror"
-+    GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Werror"
-     NO_WERROR="-Wno-error"
- fi
- 
- if test "${GCC}" = yes ; then
-   WARN_CFLAGS="${GCC_WARN_CFLAGS}"
-+  WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}"
- fi
- 
- # Check whether --enable-build-warnings was given.
- if test "${enable_build_warnings+set}" = set; then :
-   enableval=$enable_build_warnings; case "${enableval}" in
--  yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}";;
-+  yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}"
-+        WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}";;
-   no)	if test "${GCC}" = yes ; then
- 	  WARN_CFLAGS="-w"
-+      WARN_CFLAGS_FOR_BUILD="-w"
- 	fi;;
-   ,*)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
--        WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}";;
-+        WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}"
-+        WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD} ${t}";;
-   *,)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
--        WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";;
--  *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;;
-+        WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}"
-+        WARN_CFLAGS_FOR_BUILD="${t} ${GCC_WARN_CFLAGS_FOR_BUILD}";;
-+  *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`
-+        WARN_CFLAGS_FOR_BUILD=`echo "${enableval}" | sed -e "s/,/ /g"`;;
- esac
- fi
- 
-@@ -12048,6 +12091,7 @@ fi
- 
- 
- 
-+
- 
- 
- 
---- a/binutils/doc/Makefile.in
-+++ b/binutils/doc/Makefile.in
-@@ -249,6 +249,7 @@ STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
-+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@
- WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@
- XGETTEXT = @XGETTEXT@
- YACC = @YACC@
---- a/gas/Makefile.in
-+++ b/gas/Makefile.in
-@@ -255,6 +255,7 @@ STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@ @WARN_WRITE_STRINGS@
-+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@
- WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@
- XGETTEXT = @XGETTEXT@
- YACC = `if [ -f ../bison/bison ] ; then echo ../bison/bison -y -L../bison/bison ; else echo @YACC@ ; fi`
---- a/gas/configure
-+++ b/gas/configure
-@@ -642,6 +642,7 @@ cgen_cpu_prefix
- GDBINIT
- WARN_WRITE_STRINGS
- NO_WERROR
-+WARN_CFLAGS_FOR_BUILD
- WARN_CFLAGS
- OTOOL64
- OTOOL
-@@ -10985,7 +10986,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 10988 "configure"
-+#line 10989 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11091,7 +11092,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11094 "configure"
-+#line 11095 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11721,8 +11722,12 @@ using_cgen=no
- # Set the 'development' global.
- . $srcdir/../bfd/development.sh
- 
-+# Set acp_cpp_for_build variable
-+ac_cpp_for_build="$CC_FOR_BUILD -E $CPPFLAGS_FOR_BUILD"
-+
- # Default set of GCC warnings to enable.
- GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
-+GCC_WARN_CFLAGS_FOR_BUILD="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
- 
- # Add -Wshadow if the compiler is a sufficiently recent version of GCC.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -11767,6 +11772,36 @@ fi
- rm -f conftest*
- 
- 
-+# Verify CC_FOR_BUILD to be compatible with waring flags
-+
-+# Add -Wshadow if the compiler is a sufficiently recent version of GCC.
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+__GNUC__
-+_ACEOF
-+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-+  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
-+
-+else
-+  GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow"
-+fi
-+rm -f conftest*
-+
-+
-+# Add -Wstack-usage if the compiler is a sufficiently recent version of GCC.
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+__GNUC__
-+_ACEOF
-+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-+  $EGREP "^[0-4]$" >/dev/null 2>&1; then :
-+
-+else
-+  GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144"
-+fi
-+rm -f conftest*
-+
-+
- # Check whether --enable-werror was given.
- if test "${enable_werror+set}" = set; then :
-   enableval=$enable_werror; case "${enableval}" in
-@@ -11782,6 +11817,7 @@ case "${host}" in
-   *-*-mingw32*)
-     if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
-       GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format"
-+      GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wno-format"
-     fi
-     ;;
-   *) ;;
-@@ -11795,25 +11831,32 @@ fi
- NO_WERROR=
- if test "${ERROR_ON_WARNING}" = yes ; then
-     GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror"
-+    GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Werror"
-     NO_WERROR="-Wno-error"
- fi
- 
- if test "${GCC}" = yes ; then
-   WARN_CFLAGS="${GCC_WARN_CFLAGS}"
-+  WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}"
- fi
- 
- # Check whether --enable-build-warnings was given.
- if test "${enable_build_warnings+set}" = set; then :
-   enableval=$enable_build_warnings; case "${enableval}" in
--  yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}";;
-+  yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}"
-+        WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}";;
-   no)	if test "${GCC}" = yes ; then
- 	  WARN_CFLAGS="-w"
-+      WARN_CFLAGS_FOR_BUILD="-w"
- 	fi;;
-   ,*)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
--        WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}";;
-+        WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}"
-+        WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD} ${t}";;
-   *,)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
--        WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";;
--  *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;;
-+        WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}"
-+        WARN_CFLAGS_FOR_BUILD="${t} ${GCC_WARN_CFLAGS_FOR_BUILD}";;
-+  *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`
-+        WARN_CFLAGS_FOR_BUILD=`echo "${enableval}" | sed -e "s/,/ /g"`;;
- esac
- fi
- 
-@@ -11824,6 +11867,7 @@ fi
- 
- 
- 
-+
- 
- 
- 
---- a/gas/doc/Makefile.in
-+++ b/gas/doc/Makefile.in
-@@ -230,6 +230,7 @@ STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
-+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@
- WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@
- XGETTEXT = @XGETTEXT@
- YACC = @YACC@
---- a/gold/Makefile.in
-+++ b/gold/Makefile.in
-@@ -87,8 +87,8 @@ subdir = .
- DIST_COMMON = NEWS README ChangeLog $(srcdir)/Makefile.in \
- 	$(srcdir)/Makefile.am $(top_srcdir)/configure \
- 	$(am__configure_deps) $(srcdir)/config.in \
--	$(srcdir)/../mkinstalldirs $(top_srcdir)/po/Make-in \
--	ftruncate.c pread.c mremap.c ffsll.c yyscript.h yyscript.c \
-+	$(srcdir)/../mkinstalldirs $(top_srcdir)/po/Make-in ffsll.c \
-+	mremap.c ftruncate.c pread.c yyscript.h yyscript.c \
- 	$(srcdir)/../depcomp $(srcdir)/../ylwrap
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
-@@ -409,6 +409,7 @@ TARGETOBJS = @TARGETOBJS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
-+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@
- WARN_CXXFLAGS = @WARN_CXXFLAGS@
- WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@
- XGETTEXT = @XGETTEXT@
---- a/gold/configure
-+++ b/gold/configure
-@@ -609,6 +609,7 @@ GOLD_LDFLAGS
- WARN_CXXFLAGS
- WARN_WRITE_STRINGS
- NO_WERROR
-+WARN_CFLAGS_FOR_BUILD
- WARN_CFLAGS
- IFUNC_STATIC_FALSE
- IFUNC_STATIC_TRUE
-@@ -6723,8 +6724,12 @@ fi
- # Set the 'development' global.
- . $srcdir/../bfd/development.sh
- 
-+# Set acp_cpp_for_build variable
-+ac_cpp_for_build="$CC_FOR_BUILD -E $CPPFLAGS_FOR_BUILD"
-+
- # Default set of GCC warnings to enable.
- GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
-+GCC_WARN_CFLAGS_FOR_BUILD="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
- 
- # Add -Wshadow if the compiler is a sufficiently recent version of GCC.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -6769,6 +6774,36 @@ fi
- rm -f conftest*
- 
- 
-+# Verify CC_FOR_BUILD to be compatible with waring flags
-+
-+# Add -Wshadow if the compiler is a sufficiently recent version of GCC.
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+__GNUC__
-+_ACEOF
-+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-+  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
-+
-+else
-+  GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow"
-+fi
-+rm -f conftest*
-+
-+
-+# Add -Wstack-usage if the compiler is a sufficiently recent version of GCC.
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+__GNUC__
-+_ACEOF
-+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-+  $EGREP "^[0-4]$" >/dev/null 2>&1; then :
-+
-+else
-+  GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144"
-+fi
-+rm -f conftest*
-+
-+
- # Check whether --enable-werror was given.
- if test "${enable_werror+set}" = set; then :
-   enableval=$enable_werror; case "${enableval}" in
-@@ -6784,6 +6819,7 @@ case "${host}" in
-   *-*-mingw32*)
-     if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
-       GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format"
-+      GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wno-format"
-     fi
-     ;;
-   *) ;;
-@@ -6797,25 +6833,32 @@ fi
- NO_WERROR=
- if test "${ERROR_ON_WARNING}" = yes ; then
-     GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror"
-+    GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Werror"
-     NO_WERROR="-Wno-error"
- fi
- 
- if test "${GCC}" = yes ; then
-   WARN_CFLAGS="${GCC_WARN_CFLAGS}"
-+  WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}"
- fi
- 
- # Check whether --enable-build-warnings was given.
- if test "${enable_build_warnings+set}" = set; then :
-   enableval=$enable_build_warnings; case "${enableval}" in
--  yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}";;
-+  yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}"
-+        WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}";;
-   no)	if test "${GCC}" = yes ; then
- 	  WARN_CFLAGS="-w"
-+      WARN_CFLAGS_FOR_BUILD="-w"
- 	fi;;
-   ,*)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
--        WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}";;
-+        WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}"
-+        WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD} ${t}";;
-   *,)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
--        WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";;
--  *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;;
-+        WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}"
-+        WARN_CFLAGS_FOR_BUILD="${t} ${GCC_WARN_CFLAGS_FOR_BUILD}";;
-+  *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`
-+        WARN_CFLAGS_FOR_BUILD=`echo "${enableval}" | sed -e "s/,/ /g"`;;
- esac
- fi
- 
-@@ -6826,6 +6869,7 @@ fi
- 
- 
- 
-+
- 
- 
- 
---- a/gold/testsuite/Makefile.in
-+++ b/gold/testsuite/Makefile.in
-@@ -2568,6 +2568,7 @@ TARGETOBJS = @TARGETOBJS@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
-+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@
- WARN_CXXFLAGS = @WARN_CXXFLAGS@
- WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@
- XGETTEXT = @XGETTEXT@
---- a/gprof/Makefile.in
-+++ b/gprof/Makefile.in
-@@ -267,6 +267,7 @@ STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
-+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@
- WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
---- a/gprof/configure
-+++ b/gprof/configure
-@@ -604,6 +604,7 @@ LTLIBOBJS
- LIBOBJS
- WARN_WRITE_STRINGS
- NO_WERROR
-+WARN_CFLAGS_FOR_BUILD
- WARN_CFLAGS
- GENINSRC_NEVER_FALSE
- GENINSRC_NEVER_TRUE
-@@ -10901,7 +10902,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 10904 "configure"
-+#line 10905 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11007,7 +11008,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11010 "configure"
-+#line 11011 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -12101,8 +12102,12 @@ fi
- # Set the 'development' global.
- . $srcdir/../bfd/development.sh
- 
-+# Set acp_cpp_for_build variable
-+ac_cpp_for_build="$CC_FOR_BUILD -E $CPPFLAGS_FOR_BUILD"
-+
- # Default set of GCC warnings to enable.
- GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
-+GCC_WARN_CFLAGS_FOR_BUILD="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
- 
- # Add -Wshadow if the compiler is a sufficiently recent version of GCC.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -12147,6 +12152,36 @@ fi
- rm -f conftest*
- 
- 
-+# Verify CC_FOR_BUILD to be compatible with waring flags
-+
-+# Add -Wshadow if the compiler is a sufficiently recent version of GCC.
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+__GNUC__
-+_ACEOF
-+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-+  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
-+
-+else
-+  GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow"
-+fi
-+rm -f conftest*
-+
-+
-+# Add -Wstack-usage if the compiler is a sufficiently recent version of GCC.
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+__GNUC__
-+_ACEOF
-+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-+  $EGREP "^[0-4]$" >/dev/null 2>&1; then :
-+
-+else
-+  GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144"
-+fi
-+rm -f conftest*
-+
-+
- # Check whether --enable-werror was given.
- if test "${enable_werror+set}" = set; then :
-   enableval=$enable_werror; case "${enableval}" in
-@@ -12162,6 +12197,7 @@ case "${host}" in
-   *-*-mingw32*)
-     if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
-       GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format"
-+      GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wno-format"
-     fi
-     ;;
-   *) ;;
-@@ -12175,25 +12211,32 @@ fi
- NO_WERROR=
- if test "${ERROR_ON_WARNING}" = yes ; then
-     GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror"
-+    GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Werror"
-     NO_WERROR="-Wno-error"
- fi
- 
- if test "${GCC}" = yes ; then
-   WARN_CFLAGS="${GCC_WARN_CFLAGS}"
-+  WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}"
- fi
- 
- # Check whether --enable-build-warnings was given.
- if test "${enable_build_warnings+set}" = set; then :
-   enableval=$enable_build_warnings; case "${enableval}" in
--  yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}";;
-+  yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}"
-+        WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}";;
-   no)	if test "${GCC}" = yes ; then
- 	  WARN_CFLAGS="-w"
-+      WARN_CFLAGS_FOR_BUILD="-w"
- 	fi;;
-   ,*)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
--        WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}";;
-+        WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}"
-+        WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD} ${t}";;
-   *,)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
--        WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";;
--  *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;;
-+        WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}"
-+        WARN_CFLAGS_FOR_BUILD="${t} ${GCC_WARN_CFLAGS_FOR_BUILD}";;
-+  *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`
-+        WARN_CFLAGS_FOR_BUILD=`echo "${enableval}" | sed -e "s/,/ /g"`;;
- esac
- fi
- 
-@@ -12204,6 +12247,7 @@ fi
- 
- 
- 
-+
- 
- 
- 
---- a/ld/Makefile.in
-+++ b/ld/Makefile.in
-@@ -354,6 +354,7 @@ TESTBFDLIB = @TESTBFDLIB@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
-+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@
- WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@
- XGETTEXT = @XGETTEXT@
- YACC = `if [ -f ../bison/bison ]; then echo ../bison/bison -y -L$(srcdir)/../bison/; else echo @YACC@; fi`
-@@ -508,7 +509,7 @@ CXX_FOR_TARGET = ` \
-   fi`
- 
- 
--# Strip out sanitization options as they require special host libraries.
-+# Strip out sanitization options as we want to test building binaries without any extra paraphernalia
- CFLAGS_FOR_TARGET = `echo $(CFLAGS) | sed -e 's/-fsanitize=address//g' -e 's/-fsanitize=undefined//g'`
- CXXFLAGS_FOR_TARGET = `echo $(CXXFLAGS) | sed -e 's/-fsanitize=address//g' -e 's/-fsanitize=undefined//g'`
- info_TEXINFOS = ld.texinfo
---- a/ld/configure
-+++ b/ld/configure
-@@ -646,6 +646,7 @@ LIBINTL
- USE_NLS
- WARN_WRITE_STRINGS
- NO_WERROR
-+WARN_CFLAGS_FOR_BUILD
- WARN_CFLAGS
- installed_linker
- install_as_default
-@@ -11723,7 +11724,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11726 "configure"
-+#line 11727 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11829,7 +11830,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11832 "configure"
-+#line 11833 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -15558,8 +15559,12 @@ fi
- # Set the 'development' global.
- . $srcdir/../bfd/development.sh
- 
-+# Set acp_cpp_for_build variable
-+ac_cpp_for_build="$CC_FOR_BUILD -E $CPPFLAGS_FOR_BUILD"
-+
- # Default set of GCC warnings to enable.
- GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
-+GCC_WARN_CFLAGS_FOR_BUILD="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
- 
- # Add -Wshadow if the compiler is a sufficiently recent version of GCC.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -15604,6 +15609,36 @@ fi
- rm -f conftest*
- 
- 
-+# Verify CC_FOR_BUILD to be compatible with waring flags
-+
-+# Add -Wshadow if the compiler is a sufficiently recent version of GCC.
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+__GNUC__
-+_ACEOF
-+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-+  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
-+
-+else
-+  GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow"
-+fi
-+rm -f conftest*
-+
-+
-+# Add -Wstack-usage if the compiler is a sufficiently recent version of GCC.
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+__GNUC__
-+_ACEOF
-+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-+  $EGREP "^[0-4]$" >/dev/null 2>&1; then :
-+
-+else
-+  GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144"
-+fi
-+rm -f conftest*
-+
-+
- # Check whether --enable-werror was given.
- if test "${enable_werror+set}" = set; then :
-   enableval=$enable_werror; case "${enableval}" in
-@@ -15619,6 +15654,7 @@ case "${host}" in
-   *-*-mingw32*)
-     if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
-       GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format"
-+      GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wno-format"
-     fi
-     ;;
-   *) ;;
-@@ -15632,25 +15668,32 @@ fi
- NO_WERROR=
- if test "${ERROR_ON_WARNING}" = yes ; then
-     GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror"
-+    GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Werror"
-     NO_WERROR="-Wno-error"
- fi
- 
- if test "${GCC}" = yes ; then
-   WARN_CFLAGS="${GCC_WARN_CFLAGS}"
-+  WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}"
- fi
- 
- # Check whether --enable-build-warnings was given.
- if test "${enable_build_warnings+set}" = set; then :
-   enableval=$enable_build_warnings; case "${enableval}" in
--  yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}";;
-+  yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}"
-+        WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}";;
-   no)	if test "${GCC}" = yes ; then
- 	  WARN_CFLAGS="-w"
-+      WARN_CFLAGS_FOR_BUILD="-w"
- 	fi;;
-   ,*)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
--        WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}";;
-+        WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}"
-+        WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD} ${t}";;
-   *,)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
--        WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";;
--  *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;;
-+        WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}"
-+        WARN_CFLAGS_FOR_BUILD="${t} ${GCC_WARN_CFLAGS_FOR_BUILD}";;
-+  *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`
-+        WARN_CFLAGS_FOR_BUILD=`echo "${enableval}" | sed -e "s/,/ /g"`;;
- esac
- fi
- 
-@@ -15661,6 +15704,7 @@ fi
- 
- 
- 
-+
- 
- 
- 
---- a/opcodes/Makefile.in
-+++ b/opcodes/Makefile.in
-@@ -267,6 +267,7 @@ STRIP = @STRIP@
- USE_NLS = @USE_NLS@
- VERSION = @VERSION@
- WARN_CFLAGS = @WARN_CFLAGS@
-+WARN_CFLAGS_FOR_BUILD = @WARN_CFLAGS_FOR_BUILD@
- WARN_WRITE_STRINGS = @WARN_WRITE_STRINGS@
- XGETTEXT = @XGETTEXT@
- abs_builddir = @abs_builddir@
---- a/opcodes/configure
-+++ b/opcodes/configure
-@@ -643,6 +643,7 @@ MAINTAINER_MODE_TRUE
- NO_WMISSING_FIELD_INITIALIZERS
- WARN_WRITE_STRINGS
- NO_WERROR
-+WARN_CFLAGS_FOR_BUILD
- WARN_CFLAGS
- OTOOL64
- OTOOL
-@@ -11150,7 +11151,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11153 "configure"
-+#line 11154 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11256,7 +11257,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 11259 "configure"
-+#line 11260 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11508,8 +11509,12 @@ fi
- # Set the 'development' global.
- . $srcdir/../bfd/development.sh
- 
-+# Set acp_cpp_for_build variable
-+ac_cpp_for_build="$CC_FOR_BUILD -E $CPPFLAGS_FOR_BUILD"
-+
- # Default set of GCC warnings to enable.
- GCC_WARN_CFLAGS="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
-+GCC_WARN_CFLAGS_FOR_BUILD="-W -Wall -Wstrict-prototypes -Wmissing-prototypes"
- 
- # Add -Wshadow if the compiler is a sufficiently recent version of GCC.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -11554,6 +11559,36 @@ fi
- rm -f conftest*
- 
- 
-+# Verify CC_FOR_BUILD to be compatible with waring flags
-+
-+# Add -Wshadow if the compiler is a sufficiently recent version of GCC.
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+__GNUC__
-+_ACEOF
-+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-+  $EGREP "^[0-3]$" >/dev/null 2>&1; then :
-+
-+else
-+  GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wshadow"
-+fi
-+rm -f conftest*
-+
-+
-+# Add -Wstack-usage if the compiler is a sufficiently recent version of GCC.
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+__GNUC__
-+_ACEOF
-+if (eval "$ac_cpp_for_build conftest.$ac_ext") 2>&5 |
-+  $EGREP "^[0-4]$" >/dev/null 2>&1; then :
-+
-+else
-+  GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wstack-usage=262144"
-+fi
-+rm -f conftest*
-+
-+
- # Check whether --enable-werror was given.
- if test "${enable_werror+set}" = set; then :
-   enableval=$enable_werror; case "${enableval}" in
-@@ -11569,6 +11604,7 @@ case "${host}" in
-   *-*-mingw32*)
-     if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then
-       GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Wno-format"
-+      GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Wno-format"
-     fi
-     ;;
-   *) ;;
-@@ -11582,25 +11618,32 @@ fi
- NO_WERROR=
- if test "${ERROR_ON_WARNING}" = yes ; then
-     GCC_WARN_CFLAGS="$GCC_WARN_CFLAGS -Werror"
-+    GCC_WARN_CFLAGS_FOR_BUILD="$GCC_WARN_CFLAGS_FOR_BUILD -Werror"
-     NO_WERROR="-Wno-error"
- fi
- 
- if test "${GCC}" = yes ; then
-   WARN_CFLAGS="${GCC_WARN_CFLAGS}"
-+  WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}"
- fi
- 
- # Check whether --enable-build-warnings was given.
- if test "${enable_build_warnings+set}" = set; then :
-   enableval=$enable_build_warnings; case "${enableval}" in
--  yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}";;
-+  yes)	WARN_CFLAGS="${GCC_WARN_CFLAGS}"
-+        WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD}";;
-   no)	if test "${GCC}" = yes ; then
- 	  WARN_CFLAGS="-w"
-+      WARN_CFLAGS_FOR_BUILD="-w"
- 	fi;;
-   ,*)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
--        WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}";;
-+        WARN_CFLAGS="${GCC_WARN_CFLAGS} ${t}"
-+        WARN_CFLAGS_FOR_BUILD="${GCC_WARN_CFLAGS_FOR_BUILD} ${t}";;
-   *,)   t=`echo "${enableval}" | sed -e "s/,/ /g"`
--        WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}";;
--  *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`;;
-+        WARN_CFLAGS="${t} ${GCC_WARN_CFLAGS}"
-+        WARN_CFLAGS_FOR_BUILD="${t} ${GCC_WARN_CFLAGS_FOR_BUILD}";;
-+  *)    WARN_CFLAGS=`echo "${enableval}" | sed -e "s/,/ /g"`
-+        WARN_CFLAGS_FOR_BUILD=`echo "${enableval}" | sed -e "s/,/ /g"`;;
- esac
- fi
- 
-@@ -11611,6 +11654,7 @@ fi
- 
- 
- 
-+
- 
- 
- ac_ext=c
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index 75d9cd9e6f..6a79949612 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -35,6 +35,7 @@ PKG_DRIVERS = \
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_kmod-mac80211 \
+	CONFIG_PACKAGE_CFG80211_TESTMODE \
 	CONFIG_PACKAGE_MAC80211_DEBUGFS \
 	CONFIG_PACKAGE_MAC80211_MESH \
 	CONFIG_PACKAGE_MAC80211_TRACING \
@@ -56,7 +57,6 @@ config_package=$(if $(CONFIG_PACKAGE_kmod-$(1)),m)
 
 config-y:= \
 	WLAN \
-	NL80211_TESTMODE \
 	CFG80211_WEXT \
 	CFG80211_CERTIFICATION_ONUS \
 	MAC80211_RC_MINSTREL \
@@ -80,6 +80,7 @@ config-y:= \
 	WLAN_VENDOR_ZYDAS \
 
 config-$(call config_package,cfg80211) += CFG80211
+config-$(CONFIG_PACKAGE_CFG80211_TESTMODE) += NL80211_TESTMODE
 
 config-$(call config_package,mac80211) += MAC80211
 config-$(CONFIG_PACKAGE_MAC80211_MESH) += MAC80211_MESH
@@ -108,6 +109,20 @@ define KernelPackage/cfg80211/description
 cfg80211 is the Linux wireless LAN (802.11) configuration API.
 endef
 
+define KernelPackage/cfg80211/config
+  if PACKAGE_kmod-cfg80211
+
+	config PACKAGE_CFG80211_TESTMODE
+		bool "Enable testmode command support"
+		default n
+		help
+		  This is typically used for tests and calibration during
+		  manufacturing, or vendor specific debugging features
+
+  endif
+endef
+
+
 define KernelPackage/mac80211
   $(call KernelPackage/mac80211/Default)
   TITLE:=Linux 802.11 Wireless Networking Stack
diff --git a/package/kernel/mac80211/patches/subsys/305-mac80211-improve-AQL-tx-airtime-estimation.patch b/package/kernel/mac80211/patches/subsys/305-mac80211-improve-AQL-tx-airtime-estimation.patch
new file mode 100644
index 0000000000..f344281439
--- /dev/null
+++ b/package/kernel/mac80211/patches/subsys/305-mac80211-improve-AQL-tx-airtime-estimation.patch
@@ -0,0 +1,81 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Fri, 24 Jul 2020 20:25:07 +0200
+Subject: [PATCH] mac80211: improve AQL tx airtime estimation
+
+AQL does not take into account that most HT/VHT/HE traffic is A-MPDU aggregated.
+Because of that, the per-packet airtime overhead is vastly overestimated.
+Improve it by assuming an average aggregation length of 16 for non-legacy
+traffic if not using the VO AC queue.
+This should improve performance with high data rates, especially with multiple
+stations
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/net/mac80211/airtime.c
++++ b/net/mac80211/airtime.c
+@@ -551,7 +551,7 @@ EXPORT_SYMBOL_GPL(ieee80211_calc_tx_airt
+ u32 ieee80211_calc_expected_tx_airtime(struct ieee80211_hw *hw,
+ 				       struct ieee80211_vif *vif,
+ 				       struct ieee80211_sta *pubsta,
+-				       int len)
++				       int len, bool ampdu)
+ {
+ 	struct ieee80211_supported_band *sband;
+ 	struct ieee80211_chanctx_conf *conf;
+@@ -572,10 +572,26 @@ u32 ieee80211_calc_expected_tx_airtime(s
+ 	if (pubsta) {
+ 		struct sta_info *sta = container_of(pubsta, struct sta_info,
+ 						    sta);
++		struct ieee80211_tx_rate *rate = &sta->tx_stats.last_rate;
++		u32 airtime;
+ 
+-		return ieee80211_calc_tx_airtime_rate(hw,
+-						      &sta->tx_stats.last_rate,
+-						      band, len);
++		if (!(rate->flags & (IEEE80211_TX_RC_VHT_MCS |
++				     IEEE80211_TX_RC_MCS)))
++			ampdu = false;
++
++		/*
++		 * Assume that HT/VHT transmission on any AC except VO will
++		 * use aggregation. Since we don't have reliable reporting
++		 * of aggregation length, assume an average of 16.
++		 * This will not be very accurate, but much better than simply
++		 * assuming un-aggregated tx.
++		 */
++		airtime = ieee80211_calc_tx_airtime_rate(hw, rate, band,
++							 ampdu ? len * 16 : len);
++		if (ampdu)
++			airtime /= 16;
++
++		return airtime;
+ 	}
+ 
+ 	if (!conf)
+--- a/net/mac80211/ieee80211_i.h
++++ b/net/mac80211/ieee80211_i.h
+@@ -2278,7 +2278,7 @@ extern const struct ethtool_ops ieee8021
+ u32 ieee80211_calc_expected_tx_airtime(struct ieee80211_hw *hw,
+ 				       struct ieee80211_vif *vif,
+ 				       struct ieee80211_sta *pubsta,
+-				       int len);
++				       int len, bool ampdu);
+ #ifdef CPTCFG_MAC80211_NOINLINE
+ #define debug_noinline noinline
+ #else
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -3694,10 +3694,11 @@ encap_out:
+ 
+ 	if (vif &&
+ 	    wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL)) {
++		bool ampdu = txq->ac != IEEE80211_AC_VO;
+ 		u32 airtime;
+ 
+ 		airtime = ieee80211_calc_expected_tx_airtime(hw, vif, txq->sta,
+-							     skb->len);
++							     skb->len, ampdu);
+ 		if (airtime) {
+ 			airtime = ieee80211_info_set_tx_time_est(info, airtime);
+ 			ieee80211_sta_update_pending_airtime(local, tx.sta,
diff --git a/package/kernel/mac80211/patches/subsys/306-mac80211-remove-STA-txq-pending-airtime-underflow-wa.patch b/package/kernel/mac80211/patches/subsys/306-mac80211-remove-STA-txq-pending-airtime-underflow-wa.patch
new file mode 100644
index 0000000000..ab3a77e19b
--- /dev/null
+++ b/package/kernel/mac80211/patches/subsys/306-mac80211-remove-STA-txq-pending-airtime-underflow-wa.patch
@@ -0,0 +1,31 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Sat, 25 Jul 2020 10:42:30 +0200
+Subject: [PATCH] mac80211: remove STA txq pending airtime underflow
+ warning
+
+This warning can trigger if there is a mismatch between frames that were
+sent with the sta pointer set vs tx status frames reported for the sta address.
+
+This can happen due to race conditions on re-creating stations, or even
+in the case of .sta_add/remove being used instead of .sta_state, which can cause
+frames to be sent to a station that has not been uploaded yet.
+
+If there is an actual underflow issue, it should show up in the device airtime
+warning below, so it is better to remove this one.
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/net/mac80211/sta_info.c
++++ b/net/mac80211/sta_info.c
+@@ -1924,9 +1924,7 @@ void ieee80211_sta_update_pending_airtim
+ 	if (sta) {
+ 		tx_pending = atomic_sub_return(tx_airtime,
+ 					       &sta->airtime[ac].aql_tx_pending);
+-		if (WARN_ONCE(tx_pending < 0,
+-			      "STA %pM AC %d txq pending airtime underflow: %u, %u",
+-			      sta->addr, ac, tx_pending, tx_airtime))
++		if (tx_pending < 0)
+ 			atomic_cmpxchg(&sta->airtime[ac].aql_tx_pending,
+ 				       tx_pending, 0);
+ 	}
diff --git a/package/kernel/mac80211/patches/subsys/307-mac80211-add-a-function-for-running-rx-without-passi.patch b/package/kernel/mac80211/patches/subsys/307-mac80211-add-a-function-for-running-rx-without-passi.patch
new file mode 100644
index 0000000000..5837a7b651
--- /dev/null
+++ b/package/kernel/mac80211/patches/subsys/307-mac80211-add-a-function-for-running-rx-without-passi.patch
@@ -0,0 +1,186 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Sat, 25 Jul 2020 20:53:23 +0200
+Subject: [PATCH] mac80211: add a function for running rx without passing skbs
+ to the stack
+
+This can be used to run mac80211 rx processing on a batch of frames in NAPI
+poll before passing them to the network stack in a large batch.
+This can improve icache footprint, or it can be used to pass frames via
+netif_receive_skb_list.
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/include/net/mac80211.h
++++ b/include/net/mac80211.h
+@@ -4358,6 +4358,31 @@ void ieee80211_free_hw(struct ieee80211_
+ void ieee80211_restart_hw(struct ieee80211_hw *hw);
+ 
+ /**
++ * ieee80211_rx_list - receive frame and store processed skbs in a list
++ *
++ * Use this function to hand received frames to mac80211. The receive
++ * buffer in @skb must start with an IEEE 802.11 header. In case of a
++ * paged @skb is used, the driver is recommended to put the ieee80211
++ * header of the frame on the linear part of the @skb to avoid memory
++ * allocation and/or memcpy by the stack.
++ *
++ * This function may not be called in IRQ context. Calls to this function
++ * for a single hardware must be synchronized against each other. Calls to
++ * this function, ieee80211_rx_ni() and ieee80211_rx_irqsafe() may not be
++ * mixed for a single hardware. Must not run concurrently with
++ * ieee80211_tx_status() or ieee80211_tx_status_ni().
++ *
++ * This function must be called with BHs disabled and RCU read lock
++ *
++ * @hw: the hardware this frame came in on
++ * @sta: the station the frame was received from, or %NULL
++ * @skb: the buffer to receive, owned by mac80211 after this call
++ * @list: the destination list
++ */
++void ieee80211_rx_list(struct ieee80211_hw *hw, struct ieee80211_sta *sta,
++		       struct sk_buff *skb, struct list_head *list);
++
++/**
+  * ieee80211_rx_napi - receive frame from NAPI context
+  *
+  * Use this function to hand received frames to mac80211. The receive
+--- a/net/mac80211/ieee80211_i.h
++++ b/net/mac80211/ieee80211_i.h
+@@ -218,7 +218,7 @@ enum ieee80211_rx_flags {
+ };
+ 
+ struct ieee80211_rx_data {
+-	struct napi_struct *napi;
++	struct list_head *list;
+ 	struct sk_buff *skb;
+ 	struct ieee80211_local *local;
+ 	struct ieee80211_sub_if_data *sdata;
+--- a/net/mac80211/rx.c
++++ b/net/mac80211/rx.c
+@@ -2552,8 +2552,8 @@ static void ieee80211_deliver_skb_to_loc
+ 		memset(skb->cb, 0, sizeof(skb->cb));
+ 
+ 		/* deliver to local stack */
+-		if (rx->napi)
+-			napi_gro_receive(rx->napi, skb);
++		if (rx->list)
++			list_add_tail(&skb->list, rx->list);
+ 		else
+ 			netif_receive_skb(skb);
+ 	}
+@@ -3843,7 +3843,6 @@ void ieee80211_release_reorder_timeout(s
+ 		/* This is OK -- must be QoS data frame */
+ 		.security_idx = tid,
+ 		.seqno_idx = tid,
+-		.napi = NULL, /* must be NULL to not have races */
+ 	};
+ 	struct tid_ampdu_rx *tid_agg_rx;
+ 
+@@ -4453,8 +4452,8 @@ static bool ieee80211_invoke_fast_rx(str
+ 	/* deliver to local stack */
+ 	skb->protocol = eth_type_trans(skb, fast_rx->dev);
+ 	memset(skb->cb, 0, sizeof(skb->cb));
+-	if (rx->napi)
+-		napi_gro_receive(rx->napi, skb);
++	if (rx->list)
++		list_add_tail(&skb->list, rx->list);
+ 	else
+ 		netif_receive_skb(skb);
+ 
+@@ -4521,7 +4520,7 @@ static bool ieee80211_prepare_and_rx_han
+ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw,
+ 					 struct ieee80211_sta *pubsta,
+ 					 struct sk_buff *skb,
+-					 struct napi_struct *napi)
++					 struct list_head *list)
+ {
+ 	struct ieee80211_local *local = hw_to_local(hw);
+ 	struct ieee80211_sub_if_data *sdata;
+@@ -4536,7 +4535,7 @@ static void __ieee80211_rx_handle_packet
+ 	memset(&rx, 0, sizeof(rx));
+ 	rx.skb = skb;
+ 	rx.local = local;
+-	rx.napi = napi;
++	rx.list = list;
+ 
+ 	if (ieee80211_is_data(fc) || ieee80211_is_mgmt(fc))
+ 		I802_DEBUG_INC(local->dot11ReceivedFragmentCount);
+@@ -4644,8 +4643,8 @@ static void __ieee80211_rx_handle_packet
+  * This is the receive path handler. It is called by a low level driver when an
+  * 802.11 MPDU is received from the hardware.
+  */
+-void ieee80211_rx_napi(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta,
+-		       struct sk_buff *skb, struct napi_struct *napi)
++void ieee80211_rx_list(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta,
++		       struct sk_buff *skb, struct list_head *list)
+ {
+ 	struct ieee80211_local *local = hw_to_local(hw);
+ 	struct ieee80211_rate *rate = NULL;
+@@ -4737,36 +4736,53 @@ void ieee80211_rx_napi(struct ieee80211_
+ 	status->rx_flags = 0;
+ 
+ 	/*
+-	 * key references and virtual interfaces are protected using RCU
+-	 * and this requires that we are in a read-side RCU section during
+-	 * receive processing
+-	 */
+-	rcu_read_lock();
+-
+-	/*
+ 	 * Frames with failed FCS/PLCP checksum are not returned,
+ 	 * all other frames are returned without radiotap header
+ 	 * if it was previously present.
+ 	 * Also, frames with less than 16 bytes are dropped.
+ 	 */
+ 	skb = ieee80211_rx_monitor(local, skb, rate);
+-	if (!skb) {
+-		rcu_read_unlock();
++	if (!skb)
+ 		return;
+-	}
+ 
+ 	ieee80211_tpt_led_trig_rx(local,
+ 			((struct ieee80211_hdr *)skb->data)->frame_control,
+ 			skb->len);
+ 
+-	__ieee80211_rx_handle_packet(hw, pubsta, skb, napi);
+-
+-	rcu_read_unlock();
++	__ieee80211_rx_handle_packet(hw, pubsta, skb, list);
+ 
+ 	return;
+  drop:
+ 	kfree_skb(skb);
+ }
++EXPORT_SYMBOL(ieee80211_rx_list);
++
++void ieee80211_rx_napi(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta,
++		       struct sk_buff *skb, struct napi_struct *napi)
++{
++	struct sk_buff *tmp;
++	LIST_HEAD(list);
++
++
++	/*
++	 * key references and virtual interfaces are protected using RCU
++	 * and this requires that we are in a read-side RCU section during
++	 * receive processing
++	 */
++	rcu_read_lock();
++	ieee80211_rx_list(hw, pubsta, skb, &list);
++	rcu_read_unlock();
++
++	if (!napi) {
++		netif_receive_skb_list(&list);
++		return;
++	}
++
++	list_for_each_entry_safe(skb, tmp, &list, list) {
++		skb_list_del_init(skb);
++		napi_gro_receive(napi, skb);
++	}
++}
+ EXPORT_SYMBOL(ieee80211_rx_napi);
+ 
+ /* This is a version of the rx handler that can be called from hard irq
diff --git a/package/kernel/mac80211/patches/subsys/308-net-fq_impl-use-skb_get_hash-instead-of-skb_get_hash.patch b/package/kernel/mac80211/patches/subsys/308-net-fq_impl-use-skb_get_hash-instead-of-skb_get_hash.patch
new file mode 100644
index 0000000000..77ecc82302
--- /dev/null
+++ b/package/kernel/mac80211/patches/subsys/308-net-fq_impl-use-skb_get_hash-instead-of-skb_get_hash.patch
@@ -0,0 +1,55 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Sun, 26 Jul 2020 14:37:02 +0200
+Subject: [PATCH] net/fq_impl: use skb_get_hash instead of
+ skb_get_hash_perturb
+
+This avoids unnecessary regenerating of the skb flow hash
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/include/net/fq.h
++++ b/include/net/fq.h
+@@ -69,15 +69,6 @@ struct fq {
+ 	struct list_head backlogs;
+ 	spinlock_t lock;
+ 	u32 flows_cnt;
+-#if LINUX_VERSION_IS_GEQ(5,3,10) || \
+-    LINUX_VERSION_IN_RANGE(4,19,83, 4,20,0) || \
+-    LINUX_VERSION_IN_RANGE(4,14,153, 4,15,0) || \
+-    LINUX_VERSION_IN_RANGE(4,9,200, 4,10,0) || \
+-    LINUX_VERSION_IN_RANGE(4,4,200, 4,5,0)
+-	siphash_key_t	perturbation;
+-#else
+-	u32 perturbation;
+-#endif
+ 	u32 limit;
+ 	u32 memory_limit;
+ 	u32 memory_usage;
+--- a/include/net/fq_impl.h
++++ b/include/net/fq_impl.h
+@@ -108,15 +108,7 @@ begin:
+ 
+ static u32 fq_flow_idx(struct fq *fq, struct sk_buff *skb)
+ {
+-#if LINUX_VERSION_IS_GEQ(5,3,10) || \
+-    LINUX_VERSION_IN_RANGE(4,19,83, 4,20,0) || \
+-    LINUX_VERSION_IN_RANGE(4,14,153, 4,15,0) || \
+-    LINUX_VERSION_IN_RANGE(4,9,200, 4,10,0) || \
+-    LINUX_VERSION_IN_RANGE(4,4,200, 4,5,0)
+-	u32 hash = skb_get_hash_perturb(skb, &fq->perturbation);
+-#else
+-	u32 hash = skb_get_hash_perturb(skb, fq->perturbation);
+-#endif
++	u32 hash = skb_get_hash(skb);
+ 
+ 	return reciprocal_scale(hash, fq->flows_cnt);
+ }
+@@ -316,7 +308,6 @@ static int fq_init(struct fq *fq, int fl
+ 	INIT_LIST_HEAD(&fq->backlogs);
+ 	spin_lock_init(&fq->lock);
+ 	fq->flows_cnt = max_t(u32, flows_cnt, 1);
+-	get_random_bytes(&fq->perturbation, sizeof(fq->perturbation));
+ 	fq->quantum = 300;
+ 	fq->limit = 8192;
+ 	fq->memory_limit = 16 << 20; /* 16 MBytes */
diff --git a/package/kernel/mac80211/patches/subsys/309-mac80211-calculcate-skb-hash-early-when-using-itxq.patch b/package/kernel/mac80211/patches/subsys/309-mac80211-calculcate-skb-hash-early-when-using-itxq.patch
new file mode 100644
index 0000000000..92b136279a
--- /dev/null
+++ b/package/kernel/mac80211/patches/subsys/309-mac80211-calculcate-skb-hash-early-when-using-itxq.patch
@@ -0,0 +1,19 @@
+From: Felix Fietkau <nbd@nbd.name>
+Date: Sun, 26 Jul 2020 14:42:58 +0200
+Subject: [PATCH] mac80211: calculcate skb hash early when using itxq
+
+This avoids flow separation issues when using software encryption
+
+Signed-off-by: Felix Fietkau <nbd@nbd.name>
+---
+
+--- a/net/mac80211/tx.c
++++ b/net/mac80211/tx.c
+@@ -3937,6 +3937,7 @@ void __ieee80211_subif_start_xmit(struct
+ 	if (local->ops->wake_tx_queue) {
+ 		u16 queue = __ieee80211_select_queue(sdata, sta, skb);
+ 		skb_set_queue_mapping(skb, queue);
++		skb_get_hash(skb);
+ 	}
+ 
+ 	if (sta) {
diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
index 27b6ed8797..30146f552d 100644
--- a/package/kernel/mt76/Makefile
+++ b/package/kernel/mt76/Makefile
@@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=
 
 PKG_SOURCE_URL:=https://github.com/openwrt/mt76
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2020-05-30
-PKG_SOURCE_VERSION:=85c516081338d3d1454fb53b5741321c2adefbef
-PKG_MIRROR_HASH:=a3e110700843ecfee10eba274ab6fe63b9d78a00eb96ee1634b145e0a9ae9a69
+PKG_SOURCE_DATE:=2020-07-22
+PKG_SOURCE_VERSION:=b5df0fbb1847a51f0a11f03a3fa8dc9d98d4df82
+PKG_MIRROR_HASH:=70aca7f8912b89af975c7b63fdf25d41be831c434e0c991fcbdaa60127d4acd5
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_BUILD_PARALLEL:=1
@@ -23,12 +23,17 @@ PKG_CONFIG_DEPENDS += \
 	CONFIG_PACKAGE_kmod-mt76x2-common \
 	CONFIG_PACKAGE_kmod-mt76x2 \
 	CONFIG_PACKAGE_kmod-mt76x2u \
-	CONFIG_PACKAGE_kmod-mt7603
+	CONFIG_PACKAGE_kmod-mt7603 \
+	CONFIG_PACKAGE_CFG80211_TESTMODE
 
 STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h
 
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+CMAKE_SOURCE_DIR:=$(PKG_BUILD_DIR)/tools
+CMAKE_BINARY_DIR:=$(PKG_BUILD_DIR)/tools
 
 define KernelPackage/mt76-default
   SUBMENU:=Wireless Drivers
@@ -170,10 +175,29 @@ define KernelPackage/mt7663-firmware-sta
   TITLE:=MediaTek MT7663e firmware (client mode offload)
 endef
 
+define KernelPackage/mt7663-usb-sdio
+  $(KernelPackage/mt76-default)
+  TITLE:=MediaTek MT7663 USB/SDIO shared code
+  DEPENDS+=+kmod-mt7615-common
+  HIDDEN:=1
+  FILES:= \
+	$(PKG_BUILD_DIR)/mt7615/mt7663-usb-sdio-common.ko
+endef
+
+define KernelPackage/mt7663s
+  $(KernelPackage/mt76-default)
+  TITLE:=MediaTek MT7663s wireless driver
+  DEPENDS+=+kmod-mmc +kmod-mt7615-common +kmod-mt7663-usb-sdio
+  FILES:= \
+	$(PKG_BUILD_DIR)/mt76-sdio.ko \
+	$(PKG_BUILD_DIR)/mt7615/mt7663s.ko
+  AUTOLOAD:=$(call AutoProbe,mt7663s)
+endef
+
 define KernelPackage/mt7663u
   $(KernelPackage/mt76-default)
   TITLE:=MediaTek MT7663u wireless driver
-  DEPENDS+=+kmod-mt76-usb +kmod-mt7615-common
+  DEPENDS+=+kmod-mt76-usb +kmod-mt7615-common +kmod-mt7663-usb-sdio
   FILES:= $(PKG_BUILD_DIR)/mt7615/mt7663u.ko
   AUTOLOAD:=$(call AutoProbe,mt7663u)
 endef
@@ -186,6 +210,15 @@ define KernelPackage/mt7915e
   AUTOLOAD:=$(call AutoProbe,mt7915e)
 endef
 
+define Package/mt76-test
+  SECTION:=devel
+  CATEGORY:=Development
+  TITLE:=mt76 testmode CLI
+  DEPENDS:=kmod-mt76-core +libnl-tiny
+endef
+
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/libnl-tiny
+
 NOSTDINC_FLAGS = \
 	-I$(PKG_BUILD_DIR) \
 	-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \
@@ -199,6 +232,11 @@ ifdef CONFIG_PACKAGE_MAC80211_MESH
   NOSTDINC_FLAGS += -DCONFIG_MAC80211_MESH
 endif
 
+ifdef CONFIG_PACKAGE_CFG80211_TESTMODE
+  NOSTDINC_FLAGS += -DCONFIG_NL80211_TESTMODE
+  PKG_MAKE_FLAGS += CONFIG_NL80211_TESTMODE=y
+endif
+
 ifdef CONFIG_PACKAGE_kmod-mt76-usb
   PKG_MAKE_FLAGS += CONFIG_MT76_USB=m
 endif
@@ -239,6 +277,13 @@ ifdef CONFIG_PACKAGE_kmod-mt7615e
     NOSTDINC_FLAGS += -DCONFIG_MT7622_WMAC
   endif
 endif
+ifdef CONFIG_PACKAGE_kmod-mt7663-usb-sdio
+  PKG_MAKE_FLAGS += CONFIG_MT7663_USB_SDIO_COMMON=m
+endif
+ifdef CONFIG_PACKAGE_kmod-mt7663s
+  PKG_MAKE_FLAGS += CONFIG_MT76_SDIO=m
+  PKG_MAKE_FLAGS += CONFIG_MT7663S=m
+endif
 ifdef CONFIG_PACKAGE_kmod-mt7663u
   PKG_MAKE_FLAGS += CONFIG_MT7663U=m
 endif
@@ -253,6 +298,11 @@ define Build/Compile
 		M="$(PKG_BUILD_DIR)" \
 		NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
 		modules
+	$(MAKE) -C $(PKG_BUILD_DIR)/tools
+endef
+
+define Build/Install
+	:
 endef
 
 define Package/kmod-mt76/install
@@ -334,6 +384,11 @@ define KernelPackage/mt7915e/install
 		$(1)/lib/firmware/mediatek
 endef
 
+define Package/mt76-test/install
+	mkdir -p $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/mt76-test $(1)/usr/sbin
+endef
+
 $(eval $(call KernelPackage,mt76-core))
 $(eval $(call KernelPackage,mt76-usb))
 $(eval $(call KernelPackage,mt76x02-usb))
@@ -350,6 +405,9 @@ $(eval $(call KernelPackage,mt7615-firmware))
 $(eval $(call KernelPackage,mt7615e))
 $(eval $(call KernelPackage,mt7663-firmware-ap))
 $(eval $(call KernelPackage,mt7663-firmware-sta))
+$(eval $(call KernelPackage,mt7663-usb-sdio))
 $(eval $(call KernelPackage,mt7663u))
+$(eval $(call KernelPackage,mt7663s))
 $(eval $(call KernelPackage,mt7915e))
 $(eval $(call KernelPackage,mt76))
+$(eval $(call BuildPackage,mt76-test))
diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile
index 025f6489e7..9d41ed7c7a 100644
--- a/package/libs/libubox/Makefile
+++ b/package/libs/libubox/Makefile
@@ -5,9 +5,9 @@ PKG_RELEASE=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/libubox.git
-PKG_MIRROR_HASH:=cb941cd33f43b38ef1a1f2b4fd212e0bb21c100dcdd2ab1976f8cc2071566d32
-PKG_SOURCE_DATE:=2020-07-11
-PKG_SOURCE_VERSION:=f4e9bf73ac5c0ee6b8f240e2a2100e70ca56d705
+PKG_MIRROR_HASH:=cf963b19f5a25da85b2d8888514cbcc33c3f641c4478c9c25312b8bf83fe9e6b
+PKG_SOURCE_DATE:=2020-08-06
+PKG_SOURCE_VERSION:=9e52171d70def760a6949676800d0b73f85ee22d
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=ISC
diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
index 22ecd12f07..ab3f4fd8d0 100644
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=dnsmasq
 PKG_UPSTREAM_VERSION:=2.82
 PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION)))
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz
 PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq
diff --git a/package/network/services/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
index c26433563e..2436c848c3 100644
--- a/package/network/services/dnsmasq/files/dnsmasq.init
+++ b/package/network/services/dnsmasq/files/dnsmasq.init
@@ -42,9 +42,13 @@ dnsmasq_ignore_opt() {
 		bootp-*|\
 		pxe-*)
 			[ -z "$dnsmasq_has_dhcp" ] ;;
-		dnssec-*|\
+		dnssec*|\
 		trust-anchor)
-			[ -z "$dnsmasq_has_dnssec" ] ;;
+			if [ -z "$dnsmasq_has_dnssec" ]; then
+				echo "dnsmasq: \"$opt\" requested, but dnssec support is not available" >&2
+				exit 1
+			fi
+			;;
 		tftp-*)
 			[ -z "$dnsmasq_has_tftp" ] ;;
 		ipset)
diff --git a/package/network/services/openvpn/Makefile b/package/network/services/openvpn/Makefile
index 8126b3a7c7..9482e9ce39 100644
--- a/package/network/services/openvpn/Makefile
+++ b/package/network/services/openvpn/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=openvpn
 
 PKG_VERSION:=2.4.9
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE_URL:=\
 	https://build.openvpn.net/downloads/releases/ \
diff --git a/package/network/services/openvpn/files/etc/hotplug.d/openvpn/01-user b/package/network/services/openvpn/files/etc/hotplug.d/openvpn/01-user
index 86be69e805..f93823e5c5 100644
--- a/package/network/services/openvpn/files/etc/hotplug.d/openvpn/01-user
+++ b/package/network/services/openvpn/files/etc/hotplug.d/openvpn/01-user
@@ -13,7 +13,8 @@
 case "$ACTION" in
 	up|down)
 		if get_openvpn_option "$config" command "$ACTION"; then
-			exec /bin/sh -c "$command $ACTION $INSTANCE $*"
+			shift
+			exec /bin/sh -c "$command $*"
 		fi
 	;;
 esac
diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile
index a595a7738a..88478927cc 100644
--- a/package/network/services/uhttpd/Makefile
+++ b/package/network/services/uhttpd/Makefile
@@ -12,9 +12,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/uhttpd.git
-PKG_SOURCE_DATE:=2020-06-03
-PKG_SOURCE_VERSION:=939c281c70ef82929ffcb3cb383fd6fdc40f341b
-PKG_MIRROR_HASH:=4cd16ef955fe32ddb579ec79f3d8f636e7100ccecd95be1991e7e4d317090a54
+PKG_SOURCE_DATE:=2020-08-05
+PKG_SOURCE_VERSION:=212f8364d49c1bc27dd8bdc394fc3615ea9b7ba3
+PKG_MIRROR_HASH:=c717924cd075951846cb8ad271f4754db56af53a271ed0afbdc5a2f482e15f97
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 PKG_LICENSE:=ISC
 
diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
index 4373149ff9..ba4af81a1a 100644
--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
@@ -12,9 +12,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git
-PKG_SOURCE_DATE:=2020-07-30
-PKG_SOURCE_VERSION:=2ae5cbcf1d4509837a16eceafca374e9bf0ea850
-PKG_MIRROR_HASH:=479d4a4bfb71ef54300e7b669846e596db7792566302b4d29e3265643d89bce3
+PKG_SOURCE_DATE:=2020-08-06
+PKG_SOURCE_VERSION:=ab55357dfe5bd0edac0b9556a83e69814df791b1
+PKG_MIRROR_HASH:=38c882e105811bcd10b5ce55f91a16a647ed2ad436aec01cd03fda588b7bfca9
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=GPL-2.0
diff --git a/rules.mk b/rules.mk
index e734b4a582..479172de03 100644
--- a/rules.mk
+++ b/rules.mk
@@ -144,7 +144,7 @@ ifeq ($(or $(CONFIG_EXTERNAL_TOOLCHAIN),$(CONFIG_TARGET_uml)),)
   ifeq ($(CONFIG_GCC_USE_IREMAP),y)
     iremap = -iremap$(1):$(2)
   else
-    iremap = -ffile-prefix-map=$(1)=$(2)
+    iremap = -f$(if $(CONFIG_REPRODUCIBLE_DEBUG_INFO),file,macro)-prefix-map=$(1)=$(2)
   endif
 endif
 
diff --git a/target/linux/apm821xx/config-4.19 b/target/linux/apm821xx/config-4.19
index 27385ef1fd..6d4c30b55d 100644
--- a/target/linux/apm821xx/config-4.19
+++ b/target/linux/apm821xx/config-4.19
@@ -130,7 +130,6 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
diff --git a/target/linux/apm821xx/config-5.4 b/target/linux/apm821xx/config-5.4
index f2caef0e26..d54eb95d14 100644
--- a/target/linux/apm821xx/config-5.4
+++ b/target/linux/apm821xx/config-5.4
@@ -145,7 +145,6 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
diff --git a/target/linux/ar71xx/config-4.14 b/target/linux/ar71xx/config-4.14
index 5be477c371..c3545da533 100644
--- a/target/linux/ar71xx/config-4.14
+++ b/target/linux/ar71xx/config-4.14
@@ -339,7 +339,6 @@ CONFIG_GPIO_GENERIC=y
 # CONFIG_GPIO_LATCH is not set
 CONFIG_GPIO_NXP_74HC153=y
 CONFIG_GPIO_PCF857X=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
diff --git a/target/linux/archs38/config-5.4 b/target/linux/archs38/config-5.4
index ab03472cd7..d98ba4ce32 100644
--- a/target/linux/archs38/config-5.4
+++ b/target/linux/archs38/config-5.4
@@ -122,7 +122,6 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIO_DWAPB=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_SNPS_CREG=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_GRACE_PERIOD=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HAS_DMA=y
diff --git a/target/linux/at91/config-4.14 b/target/linux/at91/config-4.14
index b1b49054ab..b4fc644015 100644
--- a/target/linux/at91/config-4.14
+++ b/target/linux/at91/config-4.14
@@ -211,7 +211,6 @@ CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GLOB=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
-CONFIG_GPIO_SYSFS=y
 # CONFIG_GRO_CELLS is not set
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
diff --git a/target/linux/ath25/config-4.14 b/target/linux/ath25/config-4.14
index 4d3f0c697e..734f598cd0 100644
--- a/target/linux/ath25/config-4.14
+++ b/target/linux/ath25/config-4.14
@@ -62,7 +62,6 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_AR2315=y
 CONFIG_GPIO_AR5312=y
-CONFIG_GPIO_SYSFS=y
 # CONFIG_GRO_CELLS is not set
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDWARE_WATCHPOINTS=y
diff --git a/target/linux/ath79/config-4.19 b/target/linux/ath79/config-4.19
index c1b15301ef..eaaedd6c51 100644
--- a/target/linux/ath79/config-4.19
+++ b/target/linux/ath79/config-4.19
@@ -81,7 +81,6 @@ CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_74X164=y
 CONFIG_GPIO_ATH79=y
 CONFIG_GPIO_GENERIC=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
diff --git a/target/linux/ath79/config-5.4 b/target/linux/ath79/config-5.4
index f0679933ae..6ef32cfefa 100644
--- a/target/linux/ath79/config-5.4
+++ b/target/linux/ath79/config-5.4
@@ -90,7 +90,6 @@ CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_74X164=y
 CONFIG_GPIO_ATH79=y
 CONFIG_GPIO_GENERIC=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
index 90978fb99f..f2909061da 100644
--- a/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr.dtsi
@@ -40,7 +40,7 @@
 		};
 	};
 
-	leds {
+	leds: leds {
 		compatible = "gpio-leds";
 
 		pinctrl-names = "default";
@@ -57,16 +57,6 @@
 			default-state = "keep";
 		};
 
-		wan_green {
-			label = "netgear:green:wan";
-			gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
-		};
-
-		wan_amber {
-			label = "netgear:amber:wan";
-			gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
-		};
-
 		wlan2g_green {
 			label = "netgear:green:wlan2g";
 			gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
@@ -88,13 +78,6 @@
 			label = "netgear:amber:wps";
 			gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
 		};
-
-		usb_green {
-			label = "netgear:green:usb";
-			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-			trigger-sources = <&hub_port>;
-			linux,default-trigger = "usbport";
-		};
 	};
 
 	ubi-concat {
@@ -272,28 +255,6 @@
 		qca,no-eeprom;
 		#gpio-cells = <2>;
 		gpio-controller;
-
-		usb_power {
-			gpio-hog;
-			line-name = "netgear:power:usb";
-			gpios = <0 GPIO_ACTIVE_HIGH>;
-			output-high;
-		};
-	};
-};
-
-&usb_phy {
-	status = "okay";
-};
-
-&usb {
-	status = "okay";
-	#address-cells = <1>;
-	#size-cells = <0>;
-
-	hub_port: port@1 {
-		reg = <1>;
-		#trigger-source-cells = <0>;
 	};
 };
 
diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr3700-v4.dts b/target/linux/ath79/dts/ar9344_netgear_wndr3700-v4.dts
index 8a38aeab59..a7756f1d44 100644
--- a/target/linux/ath79/dts/ar9344_netgear_wndr3700-v4.dts
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr3700-v4.dts
@@ -2,6 +2,8 @@
 /dts-v1/;
 
 #include "ar9344_netgear_wndr.dtsi"
+#include "ar9344_netgear_wndr_wan.dtsi"
+#include "ar9344_netgear_wndr_usb.dtsi"
 
 / {
 	compatible = "netgear,wndr3700-v4", "qca,ar9344";
diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr4300.dts b/target/linux/ath79/dts/ar9344_netgear_wndr4300.dts
index 9b57bb88a6..235181d8d4 100644
--- a/target/linux/ath79/dts/ar9344_netgear_wndr4300.dts
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr4300.dts
@@ -2,6 +2,8 @@
 /dts-v1/;
 
 #include "ar9344_netgear_wndr.dtsi"
+#include "ar9344_netgear_wndr_wan.dtsi"
+#include "ar9344_netgear_wndr_usb.dtsi"
 
 / {
 	compatible = "netgear,wndr4300", "qca,ar9344";
diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr4300sw.dts b/target/linux/ath79/dts/ar9344_netgear_wndr4300sw.dts
index fb90eee550..7643b3c140 100644
--- a/target/linux/ath79/dts/ar9344_netgear_wndr4300sw.dts
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr4300sw.dts
@@ -2,6 +2,8 @@
 /dts-v1/;
 
 #include "ar9344_netgear_wndr.dtsi"
+#include "ar9344_netgear_wndr_wan.dtsi"
+#include "ar9344_netgear_wndr_usb.dtsi"
 
 / {
 	compatible = "netgear,wndr4300sw", "qca,ar9344";
diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr4300tn.dts b/target/linux/ath79/dts/ar9344_netgear_wndr4300tn.dts
new file mode 100644
index 0000000000..bed85a3877
--- /dev/null
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr4300tn.dts
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include "ar9344_netgear_wndr.dtsi"
+
+/ {
+	compatible = "netgear,wndr4300tn", "qca,ar9344";
+	model = "Netgear WNDR4300TN";
+};
diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr_usb.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr_usb.dtsi
new file mode 100644
index 0000000000..e3780632e9
--- /dev/null
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr_usb.dtsi
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+&leds {
+	usb_green {
+		label = "netgear:green:usb";
+		gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+		trigger-sources = <&hub_port>;
+		linux,default-trigger = "usbport";
+	};
+};
+
+&ath9k {
+	usb_power {
+		gpio-hog;
+		line-name = "netgear:power:usb";
+		gpios = <0 GPIO_ACTIVE_HIGH>;
+		output-high;
+	};
+};
+
+&usb_phy {
+	status = "okay";
+};
+
+&usb {
+	status = "okay";
+	#address-cells = <1>;
+	#size-cells = <0>;
+
+	hub_port: port@1 {
+		reg = <1>;
+		#trigger-source-cells = <0>;
+	};
+};
diff --git a/target/linux/ath79/dts/ar9344_netgear_wndr_wan.dtsi b/target/linux/ath79/dts/ar9344_netgear_wndr_wan.dtsi
new file mode 100644
index 0000000000..91c2971f8c
--- /dev/null
+++ b/target/linux/ath79/dts/ar9344_netgear_wndr_wan.dtsi
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+&leds {
+	wan_green {
+		label = "netgear:green:wan";
+		gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
+	};
+
+	wan_amber {
+		label = "netgear:amber:wan";
+		gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
+	};
+};
diff --git a/target/linux/ath79/image/nand.mk b/target/linux/ath79/image/nand.mk
index 2efe85d17f..c7f96eb6d4 100644
--- a/target/linux/ath79/image/nand.mk
+++ b/target/linux/ath79/image/nand.mk
@@ -206,6 +206,16 @@ define Device/netgear_wndr4300sw
 endef
 TARGET_DEVICES += netgear_wndr4300sw
 
+define Device/netgear_wndr4300tn
+  SOC := ar9344
+  DEVICE_MODEL := WNDR4300TN
+  NETGEAR_KERNEL_MAGIC := 0x33373033
+  NETGEAR_BOARD_ID := WNDR4300TN
+  NETGEAR_HW_ID := 29763948+0+128+128+2x2+3x3
+  $(Device/netgear_ath79_nand)
+endef
+TARGET_DEVICES += netgear_wndr4300tn
+
 define Device/netgear_wndr4300-v2
   SOC := qca9563
   DEVICE_MODEL := WNDR4300
diff --git a/target/linux/ath79/nand/base-files/etc/board.d/02_network b/target/linux/ath79/nand/base-files/etc/board.d/02_network
index daba0e9679..910df517aa 100755
--- a/target/linux/ath79/nand/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/nand/base-files/etc/board.d/02_network
@@ -29,6 +29,10 @@ ath79_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "5:wan"
 		;;
+	netgear,wndr4300tn)
+		ucidef_add_switch "switch0" \
+			"0@eth0" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1"
+		;;
 	zyxel,nbg6716)
 		ucidef_add_switch "switch0" \
 			"0@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:wan" "6@eth1"
diff --git a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
index 60defa5f8b..cac955905a 100644
--- a/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
+++ b/target/linux/ath79/nand/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom
@@ -15,6 +15,7 @@ case "$FIRMWARE" in
 	netgear,wndr3700-v4|\
 	netgear,wndr4300|\
 	netgear,wndr4300sw|\
+	netgear,wndr4300tn|\
 	netgear,wndr4300-v2|\
 	netgear,wndr4500-v3)
 		caldata_extract "caldata" 0x1000 0x440
@@ -29,6 +30,7 @@ case "$FIRMWARE" in
 	netgear,wndr3700-v4|\
 	netgear,wndr4300|\
 	netgear,wndr4300sw|\
+	netgear,wndr4300tn|\
 	netgear,wndr4300-v2|\
 	netgear,wndr4500-v3)
 		caldata_extract "caldata" 0x5000 0x440
diff --git a/target/linux/bcm27xx/bcm2708/config-5.4 b/target/linux/bcm27xx/bcm2708/config-5.4
index 1f3fbbdf3a..ccc2b69556 100644
--- a/target/linux/bcm27xx/bcm2708/config-5.4
+++ b/target/linux/bcm27xx/bcm2708/config-5.4
@@ -205,7 +205,6 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
 # CONFIG_GPIO_BCM_VIRT is not set
 CONFIG_GPIO_RASPBERRYPI_EXP=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
diff --git a/target/linux/bcm27xx/bcm2709/config-5.4 b/target/linux/bcm27xx/bcm2709/config-5.4
index 2d4e438ced..ce873e213d 100644
--- a/target/linux/bcm27xx/bcm2709/config-5.4
+++ b/target/linux/bcm27xx/bcm2709/config-5.4
@@ -260,7 +260,6 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_BCM_VIRT=y
 CONFIG_GPIO_RASPBERRYPI_EXP=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
diff --git a/target/linux/bcm27xx/bcm2710/config-5.4 b/target/linux/bcm27xx/bcm2710/config-5.4
index aa9be56ca2..b1923da347 100644
--- a/target/linux/bcm27xx/bcm2710/config-5.4
+++ b/target/linux/bcm27xx/bcm2710/config-5.4
@@ -308,7 +308,6 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_BCM_VIRT=y
 CONFIG_GPIO_RASPBERRYPI_EXP=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
diff --git a/target/linux/bcm27xx/bcm2711/config-5.4 b/target/linux/bcm27xx/bcm2711/config-5.4
index 935a06fb72..9c09fb02af 100644
--- a/target/linux/bcm27xx/bcm2711/config-5.4
+++ b/target/linux/bcm27xx/bcm2711/config-5.4
@@ -314,7 +314,6 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_BCM_VIRT=y
 CONFIG_GPIO_RASPBERRYPI_EXP=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
diff --git a/target/linux/bcm47xx/config-4.19 b/target/linux/bcm47xx/config-4.19
index 8f679b377f..2747efc04d 100644
--- a/target/linux/bcm47xx/config-4.19
+++ b/target/linux/bcm47xx/config-4.19
@@ -83,7 +83,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_WDT=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDWARE_WATCHPOINTS=y
diff --git a/target/linux/bcm47xx/config-5.4 b/target/linux/bcm47xx/config-5.4
index 8f679b377f..2747efc04d 100644
--- a/target/linux/bcm47xx/config-5.4
+++ b/target/linux/bcm47xx/config-5.4
@@ -83,7 +83,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_WDT=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDWARE_WATCHPOINTS=y
diff --git a/target/linux/bcm53xx/config-4.19 b/target/linux/bcm53xx/config-4.19
index f592a15401..2531a86046 100644
--- a/target/linux/bcm53xx/config-4.19
+++ b/target/linux/bcm53xx/config-4.19
@@ -162,7 +162,6 @@ CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_74X164=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
diff --git a/target/linux/bcm53xx/config-5.4 b/target/linux/bcm53xx/config-5.4
index ff2e7e886a..ea10eba992 100644
--- a/target/linux/bcm53xx/config-5.4
+++ b/target/linux/bcm53xx/config-5.4
@@ -173,7 +173,6 @@ CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_74X164=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
diff --git a/target/linux/bcm63xx/config-5.4 b/target/linux/bcm63xx/config-5.4
index c1587b84d6..6c2cbb4cc3 100644
--- a/target/linux/bcm63xx/config-5.4
+++ b/target/linux/bcm63xx/config-5.4
@@ -107,7 +107,6 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_BCM63XX=y
 CONFIG_GPIO_GENERIC=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
diff --git a/target/linux/bcm63xx/patches-5.4/120-leds-bcm6328-support-second-hw-blinking-interval.patch b/target/linux/bcm63xx/patches-5.4/030-v5.9-leds-bcm6328-support-second-hw-blinking-interval.patch
similarity index 53%
rename from target/linux/bcm63xx/patches-5.4/120-leds-bcm6328-support-second-hw-blinking-interval.patch
rename to target/linux/bcm63xx/patches-5.4/030-v5.9-leds-bcm6328-support-second-hw-blinking-interval.patch
index 6ed26f2741..9bf6b0fc87 100644
--- a/target/linux/bcm63xx/patches-5.4/120-leds-bcm6328-support-second-hw-blinking-interval.patch
+++ b/target/linux/bcm63xx/patches-5.4/030-v5.9-leds-bcm6328-support-second-hw-blinking-interval.patch
@@ -1,37 +1,66 @@
+From e190f57df3c7e7713687905c14e72fbcbd81c5e4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Thu, 4 Jun 2020 15:59:05 +0200
+Subject: [PATCH] leds-bcm6328: support second hw blinking interval
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Right now the driver uses only 3 LED modes:
+0: On
+1: HW Blinking (Interval 1)
+3: Off
+
+However, the controller supports a second HW blinking interval, which results
+in 4 possible LED modes:
+0: On
+1: HW Blinking (Interval 1)
+2: HW Blinking (Interval 2)
+3: Off
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Signed-off-by: Pavel Machek <pavel@ucw.cz>
+---
+ drivers/leds/leds-bcm6328.c | 97 ++++++++++++++++++++++++++++---------
+ 1 file changed, 75 insertions(+), 22 deletions(-)
+
 --- a/drivers/leds/leds-bcm6328.c
 +++ b/drivers/leds/leds-bcm6328.c
-@@ -24,12 +24,16 @@
+@@ -24,12 +24,17 @@
  
  #define BCM6328_LED_MAX_COUNT		24
  #define BCM6328_LED_DEF_DELAY		500
-+#define BCM6328_LED_INTERVAL_NUM	2
- #define BCM6328_LED_INTERVAL_MS		20
+-#define BCM6328_LED_INTERVAL_MS		20
  
- #define BCM6328_LED_INTV_MASK		0x3f
+-#define BCM6328_LED_INTV_MASK		0x3f
 -#define BCM6328_LED_FAST_INTV_SHIFT	6
 -#define BCM6328_LED_FAST_INTV_MASK	(BCM6328_LED_INTV_MASK << \
 -					 BCM6328_LED_FAST_INTV_SHIFT)
-+#define BCM6328_LED_INTV1_SHIFT		0
-+#define BCM6328_LED_INTV1_MASK		(BCM6328_LED_INTV_MASK << \
-+					 BCM6328_LED_INTV1_SHIFT)
-+#define BCM6328_LED_INTV2_SHIFT		6
-+#define BCM6328_LED_INTV2_MASK		(BCM6328_LED_INTV_MASK << \
-+					 BCM6328_LED_INTV2_SHIFT)
++#define BCM6328_LED_BLINK_DELAYS	2
++#define BCM6328_LED_BLINK_MS		20
++
++#define BCM6328_LED_BLINK_MASK		0x3f
++#define BCM6328_LED_BLINK1_SHIFT	0
++#define BCM6328_LED_BLINK1_MASK		(BCM6328_LED_BLINK_MASK << \
++					 BCM6328_LED_BLINK1_SHIFT)
++#define BCM6328_LED_BLINK2_SHIFT	6
++#define BCM6328_LED_BLINK2_MASK		(BCM6328_LED_BLINK_MASK << \
++					 BCM6328_LED_BLINK2_SHIFT)
  #define BCM6328_SERIAL_LED_EN		BIT(12)
  #define BCM6328_SERIAL_LED_MUX		BIT(13)
  #define BCM6328_SERIAL_LED_CLK_NPOL	BIT(14)
-@@ -45,8 +49,8 @@
+@@ -45,8 +50,8 @@
  
  #define BCM6328_LED_MODE_MASK		3
  #define BCM6328_LED_MODE_ON		0
 -#define BCM6328_LED_MODE_FAST		1
 -#define BCM6328_LED_MODE_BLINK		2
-+#define BCM6328_LED_MODE_INTV1		1
-+#define BCM6328_LED_MODE_INTV2		2
++#define BCM6328_LED_MODE_BLINK1		1
++#define BCM6328_LED_MODE_BLINK2		2
  #define BCM6328_LED_MODE_OFF		3
  #define BCM6328_LED_SHIFT(X)		((X) << 1)
  
-@@ -127,12 +131,18 @@ static void bcm6328_led_set(struct led_c
+@@ -127,12 +132,18 @@ static void bcm6328_led_set(struct led_c
  	unsigned long flags;
  
  	spin_lock_irqsave(led->lock, flags);
@@ -51,7 +80,28 @@
  	spin_unlock_irqrestore(led->lock, flags);
  }
  
-@@ -176,20 +186,59 @@ static int bcm6328_blink_set(struct led_
+@@ -140,8 +151,8 @@ static unsigned long bcm6328_blink_delay
+ {
+ 	unsigned long bcm6328_delay;
+ 
+-	bcm6328_delay = delay + BCM6328_LED_INTERVAL_MS / 2;
+-	bcm6328_delay = bcm6328_delay / BCM6328_LED_INTERVAL_MS;
++	bcm6328_delay = delay + BCM6328_LED_BLINK_MS / 2;
++	bcm6328_delay = bcm6328_delay / BCM6328_LED_BLINK_MS;
+ 	if (bcm6328_delay == 0)
+ 		bcm6328_delay = 1;
+ 
+@@ -168,28 +179,68 @@ static int bcm6328_blink_set(struct led_
+ 		return -EINVAL;
+ 	}
+ 
+-	if (delay > BCM6328_LED_INTV_MASK) {
++	if (delay > BCM6328_LED_BLINK_MASK) {
+ 		dev_dbg(led_cdev->dev,
+ 			"fallback to soft blinking (delay > %ums)\n",
+-			BCM6328_LED_INTV_MASK * BCM6328_LED_INTERVAL_MS);
++			BCM6328_LED_BLINK_MASK * BCM6328_LED_BLINK_MS);
+ 		return -EINVAL;
  	}
  
  	spin_lock_irqsave(led->lock, flags);
@@ -62,75 +112,76 @@
 +	 * Check if any of the two configurable HW blinking intervals is
 +	 * available:
 +	 *   1. No LEDs assigned to the HW blinking interval.
-+	 *   2. LEDs with the same delay assigned.
++	 *   2. Only this LED is assigned to the HW blinking interval.
++	 *   3. LEDs with the same delay assigned.
 +	 */
 +	if (led->blink_leds[0] == 0 ||
 +	    led->blink_leds[0] == BIT(led->pin) ||
 +	    led->blink_delay[0] == delay) {
-+		unsigned long val;
-+
+ 		unsigned long val;
+ 
+-		*(led->blink_leds) |= BIT(led->pin);
+-		*(led->blink_delay) = delay;
 +		/* Add LED to the first HW blinking interval cache */
 +		led->blink_leds[0] |= BIT(led->pin);
 +
 +		/* Remove LED from the second HW blinking interval cache */
 +		led->blink_leds[1] &= ~BIT(led->pin);
-+
-+		/* Cache the LED in the first HW blinking interval delay */
+ 
++		/* Cache first HW blinking interval delay */
 +		led->blink_delay[0] = delay;
 +
 +		/* Update the delay for the first HW blinking interval */
-+		val = bcm6328_led_read(led->mem + BCM6328_REG_INIT);
-+		val &= ~BCM6328_LED_INTV1_MASK;
-+		val |= (delay << BCM6328_LED_INTV1_SHIFT);
-+		bcm6328_led_write(led->mem + BCM6328_REG_INIT, val);
-+
+ 		val = bcm6328_led_read(led->mem + BCM6328_REG_INIT);
+-		val &= ~BCM6328_LED_FAST_INTV_MASK;
+-		val |= (delay << BCM6328_LED_FAST_INTV_SHIFT);
++		val &= ~BCM6328_LED_BLINK1_MASK;
++		val |= (delay << BCM6328_LED_BLINK1_SHIFT);
+ 		bcm6328_led_write(led->mem + BCM6328_REG_INIT, val);
+ 
+-		bcm6328_led_mode(led, BCM6328_LED_MODE_BLINK);
 +		/* Set the LED to first HW blinking interval */
-+		bcm6328_led_mode(led, BCM6328_LED_MODE_INTV1);
++		bcm6328_led_mode(led, BCM6328_LED_MODE_BLINK1);
 +
 +		rc = 0;
 +	} else if (led->blink_leds[1] == 0 ||
 +		   led->blink_leds[1] == BIT(led->pin) ||
 +		   led->blink_delay[1] == delay) {
- 		unsigned long val;
- 
--		*(led->blink_leds) |= BIT(led->pin);
--		*(led->blink_delay) = delay;
++		unsigned long val;
++
 +		/* Remove LED from the first HW blinking interval */
 +		led->blink_leds[0] &= ~BIT(led->pin);
 +
 +		/* Add LED to the second HW blinking interval */
 +		led->blink_leds[1] |= BIT(led->pin);
- 
-+		/* Cache the LED in the first HW blinking interval delay */
++
++		/* Cache second HW blinking interval delay */
 +		led->blink_delay[1] = delay;
 +
 +		/* Update the delay for the second HW blinking interval */
- 		val = bcm6328_led_read(led->mem + BCM6328_REG_INIT);
--		val &= ~BCM6328_LED_FAST_INTV_MASK;
--		val |= (delay << BCM6328_LED_FAST_INTV_SHIFT);
-+		val &= ~BCM6328_LED_INTV2_MASK;
-+		val |= (delay << BCM6328_LED_INTV2_SHIFT);
- 		bcm6328_led_write(led->mem + BCM6328_REG_INIT, val);
- 
--		bcm6328_led_mode(led, BCM6328_LED_MODE_BLINK);
++		val = bcm6328_led_read(led->mem + BCM6328_REG_INIT);
++		val &= ~BCM6328_LED_BLINK2_MASK;
++		val |= (delay << BCM6328_LED_BLINK2_SHIFT);
++		bcm6328_led_write(led->mem + BCM6328_REG_INIT, val);
++
 +		/* Set the LED to second HW blinking interval */
-+		bcm6328_led_mode(led, BCM6328_LED_MODE_INTV2);
++		bcm6328_led_mode(led, BCM6328_LED_MODE_BLINK2);
 +
  		rc = 0;
  	} else {
  		dev_dbg(led_cdev->dev,
-@@ -363,11 +412,13 @@ static int bcm6328_leds_probe(struct pla
+@@ -363,11 +414,13 @@ static int bcm6328_leds_probe(struct pla
  	if (!lock)
  		return -ENOMEM;
  
 -	blink_leds = devm_kzalloc(dev, sizeof(*blink_leds), GFP_KERNEL);
-+	blink_leds = devm_kcalloc(dev, BCM6328_LED_INTERVAL_NUM,
++	blink_leds = devm_kcalloc(dev, BCM6328_LED_BLINK_DELAYS,
 +				  sizeof(*blink_leds), GFP_KERNEL);
  	if (!blink_leds)
  		return -ENOMEM;
  
 -	blink_delay = devm_kzalloc(dev, sizeof(*blink_delay), GFP_KERNEL);
-+	blink_delay = devm_kcalloc(dev, BCM6328_LED_INTERVAL_NUM,
++	blink_delay = devm_kcalloc(dev, BCM6328_LED_BLINK_DELAYS,
 +				   sizeof(*blink_delay), GFP_KERNEL);
  	if (!blink_delay)
  		return -ENOMEM;
diff --git a/target/linux/bcm63xx/patches-5.4/031-v5.9-MIPS-BCM63xx-add-endif-comments.patch b/target/linux/bcm63xx/patches-5.4/031-v5.9-MIPS-BCM63xx-add-endif-comments.patch
new file mode 100644
index 0000000000..bb56363e39
--- /dev/null
+++ b/target/linux/bcm63xx/patches-5.4/031-v5.9-MIPS-BCM63xx-add-endif-comments.patch
@@ -0,0 +1,155 @@
+From c425423a075718eac625c78351fa5907d4f3a9de Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Mon, 8 Jun 2020 12:18:28 +0200
+Subject: [PATCH] MIPS: BCM63xx: add endif comments
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There are plenty of ifdefs in board_bcm963xx.c without endif comments.
+Let's make the code easier to follow by adding proper comments.
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
+---
+ arch/mips/bcm63xx/boards/board_bcm963xx.c | 33 +++++++++++------------
+ 1 file changed, 15 insertions(+), 18 deletions(-)
+
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -67,7 +67,7 @@ static struct board_info __initdata boar
+ 	.ephy_reset_gpio		= 36,
+ 	.ephy_reset_gpio_flags		= GPIOF_INIT_HIGH,
+ };
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_3368 */
+ 
+ /*
+  * known 6328 boards
+@@ -115,7 +115,7 @@ static struct board_info __initdata boar
+ 		},
+ 	},
+ };
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_6328 */
+ 
+ /*
+  * known 6338 boards
+@@ -204,7 +204,7 @@ static struct board_info __initdata boar
+ 		},
+ 	},
+ };
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_6338 */
+ 
+ /*
+  * known 6345 boards
+@@ -216,7 +216,7 @@ static struct board_info __initdata boar
+ 
+ 	.has_uart0			= 1,
+ };
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_6345 */
+ 
+ /*
+  * known 6348 boards
+@@ -464,7 +464,6 @@ static struct board_info __initdata boar
+ 	},
+ };
+ 
+-
+ static struct board_info __initdata board_DV201AMR = {
+ 	.name				= "DV201AMR",
+ 	.expected_cpu_id		= 0x6348,
+@@ -505,7 +504,7 @@ static struct board_info __initdata boar
+ 
+ 	.has_ohci0 = 1,
+ };
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_6348 */
+ 
+ /*
+  * known 6358 boards
+@@ -530,7 +529,6 @@ static struct board_info __initdata boar
+ 		.force_duplex_full	= 1,
+ 	},
+ 
+-
+ 	.has_ohci0 = 1,
+ 	.has_pccard = 1,
+ 	.has_ehci0 = 1,
+@@ -654,7 +652,7 @@ static struct board_info __initdata boar
+ 
+ 	.has_ohci0			= 1,
+ };
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_6358 */
+ 
+ /*
+  * all boards
+@@ -662,17 +660,17 @@ static struct board_info __initdata boar
+ static const struct board_info __initconst *bcm963xx_boards[] = {
+ #ifdef CONFIG_BCM63XX_CPU_3368
+ 	&board_cvg834g,
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_3368 */
+ #ifdef CONFIG_BCM63XX_CPU_6328
+ 	&board_96328avng,
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_6328 */
+ #ifdef CONFIG_BCM63XX_CPU_6338
+ 	&board_96338gw,
+ 	&board_96338w,
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_6338 */
+ #ifdef CONFIG_BCM63XX_CPU_6345
+ 	&board_96345gw2,
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_6345 */
+ #ifdef CONFIG_BCM63XX_CPU_6348
+ 	&board_96348r,
+ 	&board_96348gw,
+@@ -682,14 +680,13 @@ static const struct board_info __initcon
+ 	&board_DV201AMR,
+ 	&board_96348gw_a,
+ 	&board_rta1025w_16,
+-#endif
+-
++#endif /* CONFIG_BCM63XX_CPU_6348 */
+ #ifdef CONFIG_BCM63XX_CPU_6358
+ 	&board_96358vw,
+ 	&board_96358vw2,
+ 	&board_AGPFS0,
+ 	&board_DWVS0,
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_6358 */
+ };
+ 
+ /*
+@@ -728,7 +725,7 @@ int bcm63xx_get_fallback_sprom(struct ss
+ 		return -EINVAL;
+ 	}
+ }
+-#endif
++#endif /* CONFIG_SSB_PCIHOST */
+ 
+ /*
+  * return board name for /proc/cpuinfo
+@@ -807,7 +804,7 @@ void __init board_prom_init(void)
+ 		if (BCMCPU_IS_6348())
+ 			val |= GPIO_MODE_6348_G2_PCI;
+ 	}
+-#endif
++#endif /* CONFIG_PCI */
+ 
+ 	if (board.has_pccard) {
+ 		if (BCMCPU_IS_6348())
+@@ -892,7 +889,7 @@ int __init board_register_devices(void)
+ 				&bcm63xx_get_fallback_sprom) < 0)
+ 			pr_err("failed to register fallback SPROM\n");
+ 	}
+-#endif
++#endif /* CONFIG_SSB_PCIHOST */
+ 
+ 	bcm63xx_spi_register();
+ 
diff --git a/target/linux/bcm63xx/patches-5.4/032-v5.9-MIPS-BCM63xx-improve-CFE-version-detection.patch b/target/linux/bcm63xx/patches-5.4/032-v5.9-MIPS-BCM63xx-improve-CFE-version-detection.patch
new file mode 100644
index 0000000000..1daa3e6149
--- /dev/null
+++ b/target/linux/bcm63xx/patches-5.4/032-v5.9-MIPS-BCM63xx-improve-CFE-version-detection.patch
@@ -0,0 +1,56 @@
+From e27e1cc9d360a347dbd5a398e9df21cfb4e60e3c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Mon, 8 Jun 2020 11:28:35 +0200
+Subject: [PATCH] MIPS: BCM63xx: improve CFE version detection
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There are some CFE variants that start with 'cfe-vd' instead of 'cfe-v', such
+as the one used in the Huawei HG556a: "cfe-vd081.5003". In this case, the CFE
+version is stored as is (string vs number bytes).
+
+Some newer devices have an additional version number, such as the Comtrend
+VR-3032u: "1.0.38-112.118-11".
+
+Finally, print the string as is if the version doesn't start with "cfe-v" or
+"cfe-vd", but starts with "cfe-".
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
+---
+ arch/mips/bcm63xx/boards/board_bcm963xx.c | 22 ++++++++++++++++++----
+ 1 file changed, 18 insertions(+), 4 deletions(-)
+
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -760,11 +760,25 @@ void __init board_prom_init(void)
+ 
+ 	/* dump cfe version */
+ 	cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
+-	if (!memcmp(cfe, "cfe-v", 5))
+-		snprintf(cfe_version, sizeof(cfe_version), "%u.%u.%u-%u.%u",
+-			 cfe[5], cfe[6], cfe[7], cfe[8], cfe[9]);
+-	else
++	if (strstarts(cfe, "cfe-")) {
++		if(cfe[4] == 'v') {
++			if(cfe[5] == 'd')
++				snprintf(cfe_version, 11, "%s",
++					 (char *) &cfe[5]);
++			else if (cfe[10] > 0)
++				snprintf(cfe_version, sizeof(cfe_version),
++					 "%u.%u.%u-%u.%u-%u", cfe[5], cfe[6],
++					 cfe[7], cfe[8], cfe[9], cfe[10]);
++			else
++				snprintf(cfe_version, sizeof(cfe_version),
++					 "%u.%u.%u-%u.%u", cfe[5], cfe[6],
++					 cfe[7], cfe[8], cfe[9]);
++		} else {
++			snprintf(cfe_version, 12, "%s", (char *) &cfe[4]);
++		}
++	} else {
+ 		strcpy(cfe_version, "unknown");
++	}
+ 	pr_info("CFE version: %s\n", cfe_version);
+ 
+ 	bcm63xx_nvram_init(boot_addr + BCM963XX_NVRAM_OFFSET);
diff --git a/target/linux/bcm63xx/patches-5.4/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch b/target/linux/bcm63xx/patches-5.4/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch
index 6fc5551884..b2fbb68ee1 100644
--- a/target/linux/bcm63xx/patches-5.4/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch
+++ b/target/linux/bcm63xx/patches-5.4/106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch
@@ -24,7 +24,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
  #include <bcm63xx_dev_usb_usbd.h>
  #include <board_bcm963xx.h>
  
-@@ -881,6 +882,9 @@ int __init board_register_devices(void)
+@@ -892,6 +893,9 @@ int __init board_register_devices(void)
  	if (board.has_usbd)
  		bcm63xx_usbd_register(&board.usbd);
  
diff --git a/target/linux/bcm63xx/patches-5.4/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch b/target/linux/bcm63xx/patches-5.4/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch
index 3db82bb483..feb99a1cd7 100644
--- a/target/linux/bcm63xx/patches-5.4/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch
+++ b/target/linux/bcm63xx/patches-5.4/109-MIPS-BCM63XX-register-EHCI-controller-if-board-enabl.patch
@@ -24,7 +24,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org>
  #include <bcm63xx_dev_usb_ohci.h>
  #include <bcm63xx_dev_usb_usbd.h>
  #include <board_bcm963xx.h>
-@@ -882,6 +883,9 @@ int __init board_register_devices(void)
+@@ -893,6 +894,9 @@ int __init board_register_devices(void)
  	if (board.has_usbd)
  		bcm63xx_usbd_register(&board.usbd);
  
diff --git a/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch b/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch
index 652eb6c9bf..a53274a4ba 100644
--- a/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch
+++ b/target/linux/bcm63xx/patches-5.4/207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch
@@ -61,7 +61,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  /*
   * known 3368 boards
   */
-@@ -695,52 +683,6 @@ static const struct board_info __initcon
+@@ -692,52 +680,6 @@ static const struct board_info __initcon
  };
  
  /*
@@ -100,7 +100,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 -		return -EINVAL;
 -	}
 -}
--#endif
+-#endif /* CONFIG_SSB_PCIHOST */
 -
 -/*
 - * return board name for /proc/cpuinfo
@@ -114,7 +114,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
   * early init callback, read nvram data from flash and checksum it
   */
  void __init board_prom_init(void)
-@@ -785,137 +727,15 @@ void __init board_prom_init(void)
+@@ -796,137 +738,15 @@ void __init board_prom_init(void)
  		if (strncmp(board_name, bcm963xx_boards[i]->name, 16))
  			continue;
  		/* copy, board desc array is marked initdata */
@@ -144,8 +144,8 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 -		bcm63xx_pci_enabled = 1;
 -		if (BCMCPU_IS_6348())
 -			val |= GPIO_MODE_6348_G2_PCI;
- 	}
--#endif
+-	}
+-#endif /* CONFIG_PCI */
 -
 -	if (board.has_pccard) {
 -		if (BCMCPU_IS_6348())
@@ -235,8 +235,8 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 -		if (ssb_arch_register_fallback_sprom(
 -				&bcm63xx_get_fallback_sprom) < 0)
 -			pr_err("failed to register fallback SPROM\n");
--	}
--#endif
+ 	}
+-#endif /* CONFIG_SSB_PCIHOST */
 -
 -	bcm63xx_spi_register();
 -
diff --git a/target/linux/bcm63xx/patches-5.4/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch b/target/linux/bcm63xx/patches-5.4/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch
index 7f9479b825..3cf3afd49d 100644
--- a/target/linux/bcm63xx/patches-5.4/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch
+++ b/target/linux/bcm63xx/patches-5.4/208-MIPS-BCM63XX-pass-a-mac-addresss-allocator-to-board-.patch
@@ -17,7 +17,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -727,7 +727,8 @@ void __init board_prom_init(void)
+@@ -738,7 +738,8 @@ void __init board_prom_init(void)
  		if (strncmp(board_name, bcm963xx_boards[i]->name, 16))
  			continue;
  		/* copy, board desc array is marked initdata */
diff --git a/target/linux/bcm63xx/patches-5.4/309-cfe_version_mod.patch b/target/linux/bcm63xx/patches-5.4/309-cfe_version_mod.patch
deleted file mode 100644
index fe6c6d2909..0000000000
--- a/target/linux/bcm63xx/patches-5.4/309-cfe_version_mod.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -707,10 +707,20 @@ void __init board_prom_init(void)
- 
- 	/* dump cfe version */
- 	cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET;
--	if (!memcmp(cfe, "cfe-v", 5))
--		snprintf(cfe_version, sizeof(cfe_version), "%u.%u.%u-%u.%u",
--			 cfe[5], cfe[6], cfe[7], cfe[8], cfe[9]);
--	else
-+	if (strstarts(cfe, "cfe-")) {
-+		if(cfe[4] == 'v') {
-+			if(cfe[5] == 'd')
-+				snprintf(cfe_version, 11, "%s", (char *) &cfe[5]);
-+			else if (cfe[10] > 0)
-+				snprintf(cfe_version, sizeof(cfe_version), "%u.%u.%u-%u.%u-%u",
-+					 cfe[5], cfe[6], cfe[7], cfe[8], cfe[9], cfe[10]);
-+			else
-+				snprintf(cfe_version, sizeof(cfe_version), "%u.%u.%u-%u.%u",
-+					 cfe[5], cfe[6], cfe[7], cfe[8], cfe[9]);
-+		} else {
-+			snprintf(cfe_version, 12, "%s", (char *) &cfe[4]);
-+		}
-+	} else
- 		strcpy(cfe_version, "unknown");
- 	pr_info("CFE version: %s\n", cfe_version);
- 
diff --git a/target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch b/target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch
index ec978a031d..8f50dd689b 100644
--- a/target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch
+++ b/target/linux/bcm63xx/patches-5.4/322-MIPS-BCM63XX-switch-to-IRQ_DOMAIN.patch
@@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -290,6 +290,9 @@ config BCM63XX
+@@ -291,6 +291,9 @@ config BCM63XX
  	select SYNC_R4K
  	select DMA_NONCOHERENT
  	select IRQ_MIPS_CPU
diff --git a/target/linux/bcm63xx/patches-5.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch b/target/linux/bcm63xx/patches-5.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch
index aba4b9415a..b1831026d4 100644
--- a/target/linux/bcm63xx/patches-5.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch
+++ b/target/linux/bcm63xx/patches-5.4/339-MIPS-BCM63XX-add-support-for-BCM63268.patch
@@ -35,7 +35,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  source "arch/mips/bcm63xx/boards/Kconfig"
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -697,7 +697,7 @@ void __init board_prom_init(void)
+@@ -694,7 +694,7 @@ void __init board_prom_init(void)
  	/* read base address of boot chip select (0)
  	 * 6328/6362 do not have MPI but boot from a fixed address
  	 */
diff --git a/target/linux/bcm63xx/patches-5.4/341-MIPS-BCM63XX-add-support-for-BCM6318.patch b/target/linux/bcm63xx/patches-5.4/341-MIPS-BCM63XX-add-support-for-BCM6318.patch
index a022f8c5f0..c297321b64 100644
--- a/target/linux/bcm63xx/patches-5.4/341-MIPS-BCM63XX-add-support-for-BCM6318.patch
+++ b/target/linux/bcm63xx/patches-5.4/341-MIPS-BCM63XX-add-support-for-BCM6318.patch
@@ -35,7 +35,7 @@ Subject: [PATCH 51/53] MIPS: BCM63XX: add support for BCM6318
  	select SYS_HAS_CPU_BMIPS4350
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -697,7 +697,7 @@ void __init board_prom_init(void)
+@@ -694,7 +694,7 @@ void __init board_prom_init(void)
  	/* read base address of boot chip select (0)
  	 * 6328/6362 do not have MPI but boot from a fixed address
  	 */
diff --git a/target/linux/bcm63xx/patches-5.4/351-set-board-usbh-ports.patch b/target/linux/bcm63xx/patches-5.4/351-set-board-usbh-ports.patch
index 531adc9f1b..2543ad7922 100644
--- a/target/linux/bcm63xx/patches-5.4/351-set-board-usbh-ports.patch
+++ b/target/linux/bcm63xx/patches-5.4/351-set-board-usbh-ports.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -576,6 +576,7 @@ static struct board_info __initdata boar
+@@ -574,6 +574,7 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  	.has_pccard = 1,
  	.has_ehci0 = 1,
diff --git a/target/linux/bcm63xx/patches-5.4/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch b/target/linux/bcm63xx/patches-5.4/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch
index 51908d99d2..6301f73bca 100644
--- a/target/linux/bcm63xx/patches-5.4/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch
+++ b/target/linux/bcm63xx/patches-5.4/354-MIPS-BCM63XX-allow-building-support-for-more-than-on.patch
@@ -35,7 +35,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 +endmenu
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -686,7 +686,7 @@ static const struct board_info __initcon
+@@ -683,7 +683,7 @@ static const struct board_info __initcon
  /*
   * early init callback, read nvram data from flash and checksum it
   */
diff --git a/target/linux/bcm63xx/patches-5.4/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch b/target/linux/bcm63xx/patches-5.4/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch
index f540eabeff..170578f8bc 100644
--- a/target/linux/bcm63xx/patches-5.4/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch
+++ b/target/linux/bcm63xx/patches-5.4/358-MIPS-BCM63XX-make-fallback-sprom-optional.patch
@@ -74,7 +74,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  
  	.enet0 = {
  		.has_phy		= 1,
-@@ -461,6 +468,7 @@ static struct board_info __initdata boar
+@@ -460,6 +467,7 @@ static struct board_info __initdata boar
  
  	.has_uart0			= 1,
  	.has_pci			= 1,
@@ -82,7 +82,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  	.has_ohci0			= 1,
  
  	.has_enet0			= 1,
-@@ -483,6 +491,7 @@ static struct board_info __initdata boar
+@@ -482,6 +490,7 @@ static struct board_info __initdata boar
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
@@ -90,7 +90,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  
  	.enet0 = {
  		.has_phy		= 1,
-@@ -509,6 +518,7 @@ static struct board_info __initdata boar
+@@ -508,6 +517,7 @@ static struct board_info __initdata boar
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
@@ -98,7 +98,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  
  	.enet0 = {
  		.has_phy		= 1,
-@@ -561,6 +571,7 @@ static struct board_info __initdata boar
+@@ -559,6 +569,7 @@ static struct board_info __initdata boar
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
@@ -106,7 +106,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  
  	.enet0 = {
  		.has_phy		= 1,
-@@ -632,6 +643,7 @@ static struct board_info __initdata boar
+@@ -630,6 +641,7 @@ static struct board_info __initdata boar
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
diff --git a/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch b/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch
index 7069c231de..ba7346ce28 100644
--- a/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch
+++ b/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch
@@ -16,8 +16,8 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -695,6 +695,10 @@ static const struct board_info __initcon
- #endif
+@@ -692,6 +692,10 @@ static const struct board_info __initcon
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
  };
  
 +static struct of_device_id const bcm963xx_boards_dt[] = {
@@ -27,7 +27,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  /*
   * early init callback, read nvram data from flash and checksum it
   */
-@@ -706,6 +710,7 @@ void __init board_bcm963xx_init(void)
+@@ -703,6 +707,7 @@ void __init board_bcm963xx_init(void)
  	char *board_name = NULL;
  	u32 val;
  	struct bcm_hcs *hcs;
@@ -35,7 +35,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
  
  	/* read base address of boot chip select (0)
  	 * 6328/6362 do not have MPI but boot from a fixed address
-@@ -745,6 +750,16 @@ void __init board_bcm963xx_init(void)
+@@ -746,6 +751,16 @@ void __init board_bcm963xx_init(void)
  	} else {
  		board_name = bcm63xx_nvram_get_name();
  	}
diff --git a/target/linux/bcm63xx/patches-5.4/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch b/target/linux/bcm63xx/patches-5.4/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch
index 5dd4cbaeec..0221e75bfc 100644
--- a/target/linux/bcm63xx/patches-5.4/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch
+++ b/target/linux/bcm63xx/patches-5.4/369-MIPS-BCM63XX-populate-the-compatible-to-board_info-l.patch
@@ -14,24 +14,26 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -696,6 +696,48 @@ static const struct board_info __initcon
+@@ -693,6 +693,52 @@ static const struct board_info __initcon
  };
  
  static struct of_device_id const bcm963xx_boards_dt[] = {
 +#ifdef CONFIG_OF
 +#ifdef CONFIG_BCM63XX_CPU_3368
 +	{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
-+#endif
++#endif /* CONFIG_BCM63XX_CPU_3368 */
++#ifdef CONFIG_BCM63XX_CPU_6318
++#endif /* CONFIG_BCM63XX_CPU_6318 */
 +#ifdef CONFIG_BCM63XX_CPU_6328
 +	{ .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },
-+#endif
++#endif /* CONFIG_BCM63XX_CPU_6328 */
 +#ifdef CONFIG_BCM63XX_CPU_6338
 +	{ .compatible = "brcm,bcm96338gw", .data = &board_96338gw, },
 +	{ .compatible = "brcm,bcm96338w", .data = &board_96338w, },
-+#endif
++#endif /* CONFIG_BCM63XX_CPU_6338 */
 +#ifdef CONFIG_BCM63XX_CPU_6345
 +	{ .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },
-+#endif
++#endif /* CONFIG_BCM63XX_CPU_6345 */
 +#ifdef CONFIG_BCM63XX_CPU_6348
 +	{ .compatible = "belkin,f5d7633", .data = &board_96348gw_10, },
 +	{ .compatible = "brcm,bcm96348r", .data = &board_96348r, },
@@ -44,7 +46,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 +	{ .compatible = "sagem,fast-2404", .data = &board_FAST2404, },
 +	{ .compatible = "tp-link,td-w8900gb", .data = &board_96348gw_11, },
 +	{ .compatible = "usrobotics,usr9108", .data = &board_96348gw_a, },
-+#endif
++#endif /* CONFIG_BCM63XX_CPU_6348 */
 +#ifdef CONFIG_BCM63XX_CPU_6358
 +	{ .compatible = "alcatel,rg100a", .data = &board_96358vw2, },
 +	{ .compatible = "brcm,bcm96358vw", .data = &board_96358vw, },
@@ -54,11 +56,13 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 +	{ .compatible = "pirelli,a226m", .data = &board_DWVS0, },
 +	{ .compatible = "pirelli,a226m-fwb", .data = &board_DWVS0, },
 +	{ .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, },
-+#endif
++#endif /* CONFIG_BCM63XX_CPU_6358 */
++#ifdef CONFIG_BCM63XX_CPU_6362
++#endif /* CONFIG_BCM63XX_CPU_6362 */
 +#ifdef CONFIG_BCM63XX_CPU_6368
-+#endif
++#endif /* CONFIG_BCM63XX_CPU_6368 */
 +#ifdef CONFIG_BCM63XX_CPU_63268
-+#endif
++#endif /* CONFIG_BCM63XX_CPU_63268 */
 +#endif /* CONFIG_OF */
  	{ },
  };
diff --git a/target/linux/bcm63xx/patches-5.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch b/target/linux/bcm63xx/patches-5.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch
index c061ec4e60..890f326bf4 100644
--- a/target/linux/bcm63xx/patches-5.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch
+++ b/target/linux/bcm63xx/patches-5.4/377-MIPS-BCM63XX-register-lookup-for-ephy-reset-gpio.patch
@@ -22,7 +22,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
 -	.ephy_reset_gpio_flags		= GPIOF_INIT_HIGH,
 +	.ephy_reset_gpio_flags		= GPIO_ACTIVE_LOW,
  };
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_3368 */
  
 --- a/arch/mips/bcm63xx/boards/board_common.c
 +++ b/arch/mips/bcm63xx/boards/board_common.c
diff --git a/target/linux/bcm63xx/patches-5.4/391-MIPS-BCM63XX-do-not-register-uart.patch b/target/linux/bcm63xx/patches-5.4/391-MIPS-BCM63XX-do-not-register-uart.patch
index e9d4481d14..bab5bbee6f 100644
--- a/target/linux/bcm63xx/patches-5.4/391-MIPS-BCM63XX-do-not-register-uart.patch
+++ b/target/linux/bcm63xx/patches-5.4/391-MIPS-BCM63XX-do-not-register-uart.patch
@@ -175,7 +175,7 @@
 -
 -	.has_uart0			= 1,
  };
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6345 */
  
 @@ -217,7 +209,6 @@ static struct board_info __initdata boar
  	.name				= "96348R",
@@ -217,7 +217,7 @@
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
-@@ -466,7 +453,6 @@ static struct board_info __initdata boar
+@@ -465,7 +452,6 @@ static struct board_info __initdata boar
  	.name				= "DV201AMR",
  	.expected_cpu_id		= 0x6348,
  
@@ -225,7 +225,7 @@
  	.has_pci			= 1,
  	.use_fallback_sprom		= 1,
  	.has_ohci0			= 1,
-@@ -487,7 +473,6 @@ static struct board_info __initdata boar
+@@ -486,7 +472,6 @@ static struct board_info __initdata boar
  	.name				= "96348GW-A",
  	.expected_cpu_id		= 0x6348,
  
@@ -233,7 +233,7 @@
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
-@@ -514,7 +499,6 @@ static struct board_info __initdata boar
+@@ -513,7 +498,6 @@ static struct board_info __initdata boar
  	.name				= "96358VW",
  	.expected_cpu_id		= 0x6358,
  
@@ -241,7 +241,7 @@
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
-@@ -567,7 +551,6 @@ static struct board_info __initdata boar
+@@ -565,7 +549,6 @@ static struct board_info __initdata boar
  	.name				= "96358VW2",
  	.expected_cpu_id		= 0x6358,
  
@@ -249,7 +249,7 @@
  	.has_enet0			= 1,
  	.has_enet1			= 1,
  	.has_pci			= 1,
-@@ -617,7 +600,6 @@ static struct board_info __initdata boar
+@@ -615,7 +598,6 @@ static struct board_info __initdata boar
  	.name				= "AGPF-S0",
  	.expected_cpu_id		= 0x6358,
  
diff --git a/target/linux/bcm63xx/patches-5.4/392-MIPS-BCM63XX-remove-leds-and-buttons.patch b/target/linux/bcm63xx/patches-5.4/392-MIPS-BCM63XX-remove-leds-and-buttons.patch
index e1394267b5..8aaf093dff 100644
--- a/target/linux/bcm63xx/patches-5.4/392-MIPS-BCM63XX-remove-leds-and-buttons.patch
+++ b/target/linux/bcm63xx/patches-5.4/392-MIPS-BCM63XX-remove-leds-and-buttons.patch
@@ -58,7 +58,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
 -		},
 -	},
  };
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6328 */
  
 @@ -119,35 +82,6 @@ static struct board_info __initdata boar
  	},
@@ -130,7 +130,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
 -		},
 -	},
  };
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6338 */
  
 @@ -217,36 +122,6 @@ static struct board_info __initdata boar
  		.has_phy		= 1,
@@ -277,7 +277,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  static struct board_info __initdata board_FAST2404 = {
-@@ -518,33 +306,6 @@ static struct board_info __initdata boar
+@@ -516,33 +304,6 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  	.has_pccard = 1,
  	.has_ehci0 = 1,
@@ -311,7 +311,7 @@ Subject: [PATCH] MIPS: BCM63XX: remove leds and buttons
  };
  
  static struct board_info __initdata board_96358vw2 = {
-@@ -571,29 +332,6 @@ static struct board_info __initdata boar
+@@ -569,29 +330,6 @@ static struct board_info __initdata boar
  	.has_pccard = 1,
  	.has_ehci0 = 1,
  	.num_usbh_ports			= 2,
diff --git a/target/linux/bcm63xx/patches-5.4/427-boards_probe_switch.patch b/target/linux/bcm63xx/patches-5.4/427-boards_probe_switch.patch
index 4b206a259e..0c00ff0da7 100644
--- a/target/linux/bcm63xx/patches-5.4/427-boards_probe_switch.patch
+++ b/target/linux/bcm63xx/patches-5.4/427-boards_probe_switch.patch
@@ -63,7 +63,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -252,6 +266,8 @@ static struct board_info __initdata boar
+@@ -251,6 +265,8 @@ static struct board_info __initdata boar
  		.use_internal_phy	= 1,
  	},
  	.enet1 = {
@@ -72,7 +72,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -271,6 +287,8 @@ static struct board_info __initdata boar
+@@ -270,6 +286,8 @@ static struct board_info __initdata boar
  		.use_internal_phy	= 1,
  	},
  	.enet1 = {
@@ -81,7 +81,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -298,6 +316,8 @@ static struct board_info __initdata boar
+@@ -297,6 +315,8 @@ static struct board_info __initdata boar
  	},
  
  	.enet1 = {
@@ -90,7 +90,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -323,6 +343,8 @@ static struct board_info __initdata boar
+@@ -321,6 +341,8 @@ static struct board_info __initdata boar
  	},
  
  	.enet1 = {
@@ -99,7 +99,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -348,6 +370,8 @@ static struct board_info __initdata boar
+@@ -346,6 +368,8 @@ static struct board_info __initdata boar
  	},
  
  	.enet1 = {
@@ -108,7 +108,7 @@
  		.force_speed_100	= 1,
  		.force_duplex_full	= 1,
  	},
-@@ -371,6 +395,8 @@ static struct board_info __initdata boar
+@@ -369,6 +393,8 @@ static struct board_info __initdata boar
  	},
  
  	.enet1 = {
diff --git a/target/linux/bcm63xx/patches-5.4/499-allow_better_context_for_board_patches.patch b/target/linux/bcm63xx/patches-5.4/499-allow_better_context_for_board_patches.patch
deleted file mode 100644
index dd63183a08..0000000000
--- a/target/linux/bcm63xx/patches-5.4/499-allow_better_context_for_board_patches.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -46,7 +46,7 @@ static struct board_info __initdata boar
- 	.ephy_reset_gpio		= 36,
- 	.ephy_reset_gpio_flags		= GPIO_ACTIVE_LOW,
- };
--#endif
-+#endif /* CONFIG_BCM63XX_CPU_3368 */
- 
- /*
-  * known 6328 boards
-@@ -65,7 +65,7 @@ static struct board_info __initdata boar
- 		.port_no		= 0,
- 	},
- };
--#endif
-+#endif /* CONFIG_BCM63XX_CPU_6328 */
- 
- /*
-  * known 6338 boards
-@@ -98,7 +98,7 @@ static struct board_info __initdata boar
- 		.force_duplex_full	= 1,
- 	},
- };
--#endif
-+#endif /* CONFIG_BCM63XX_CPU_6338 */
- 
- /*
-  * known 6345 boards
-@@ -108,7 +108,7 @@ static struct board_info __initdata boar
- 	.name				= "96345GW2",
- 	.expected_cpu_id		= 0x6345,
- };
--#endif
-+#endif /* CONFIG_BCM63XX_CPU_6345 */
- 
- /*
-  * known 6348 boards
-@@ -295,7 +295,7 @@ static struct board_info __initdata boar
- 
- 	.has_ohci0 = 1,
- };
--#endif
-+#endif /* CONFIG_BCM63XX_CPU_6348 */
- 
- /*
-  * known 6358 boards
-@@ -403,7 +403,7 @@ static struct board_info __initdata boar
- 
- 	.has_ohci0			= 1,
- };
--#endif
-+#endif /* CONFIG_BCM63XX_CPU_6358 */
- 
- /*
-  * all boards
diff --git a/target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch b/target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch
index 456b2a4466..399fda760d 100644
--- a/target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch
+++ b/target/linux/bcm63xx/patches-5.4/500-board-D4PW.patch
@@ -1,36 +1,36 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -295,6 +295,21 @@ static struct board_info __initdata boar
+@@ -294,6 +294,21 @@ static struct board_info __initdata boar
  
  	.has_ohci0 = 1,
  };
 +
 +static struct board_info __initdata board_96348_D4PW = {
-+	.name				= "D-4P-W",
-+	.expected_cpu_id		= 0x6348,
++	.name = "D-4P-W",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
++	.has_pci = 1,
 +
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -431,6 +446,7 @@ static const struct board_info __initcon
+@@ -429,6 +444,7 @@ static const struct board_info __initcon
  	&board_DV201AMR,
  	&board_96348gw_a,
  	&board_rta1025w_16,
 +	&board_96348_D4PW,
- #endif
- 
+ #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -462,6 +478,7 @@ static struct of_device_id const bcm963x
+ 	&board_96358vw,
+@@ -461,6 +477,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, },
  	{ .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
  	{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
diff --git a/target/linux/bcm63xx/patches-5.4/501-board-NB4.patch b/target/linux/bcm63xx/patches-5.4/501-board-NB4.patch
index 41c8a7e862..9eb7655d33 100644
--- a/target/linux/bcm63xx/patches-5.4/501-board-NB4.patch
+++ b/target/linux/bcm63xx/patches-5.4/501-board-NB4.patch
@@ -1,81 +1,77 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -418,6 +418,60 @@ static struct board_info __initdata boar
+@@ -416,6 +416,56 @@ static struct board_info __initdata boar
  
  	.has_ohci0			= 1,
  };
 +
 +static struct board_info __initdata board_nb4_ser_r0 = {
-+	.name				= "NB4-SER-r0",
-+	.expected_cpu_id		= 0x6358,
++	.name = "NB4-SER-r0",
++	.expected_cpu_id = 0x6358,
 +
-+	.has_enet0			= 1,
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
-+
-+	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
-+	},
-+
-+	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
-+	},
-+
-+
-+	.has_ohci0 = 1,
 +	.has_pccard = 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
 +	.has_ehci0 = 1,
-+	.num_usbh_ports			= 2,
++	.num_usbh_ports = 2,
++
++	.has_enet0 = 1,
++	.enet0 = {
++		.has_phy = 1,
++		.use_internal_phy = 1,
++	},
++
++	.has_enet1 = 1,
++	.enet1 = {
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
++	},
 +};
 +
 +static struct board_info __initdata board_nb4_fxc_r1 = {
-+	.name				= "NB4-FXC-r1",
-+	.expected_cpu_id		= 0x6358,
++	.name = "NB4-FXC-r1",
++	.expected_cpu_id = 0x6358,
 +
-+	.has_enet0			= 1,
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
-+
-+	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
-+	},
-+
-+	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
-+	},
-+
-+
-+	.has_ohci0 = 1,
 +	.has_pccard = 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
 +	.has_ehci0 = 1,
-+	.num_usbh_ports			= 2,
++	.num_usbh_ports = 2,
++
++	.has_enet0 = 1,
++	.enet0 = {
++		.has_phy = 1,
++		.use_internal_phy = 1,
++	},
++
++	.has_enet1 = 1,
++	.enet1 = {
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
++	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -454,6 +508,8 @@ static const struct board_info __initcon
+@@ -451,6 +501,8 @@ static const struct board_info __initcon
  	&board_96358vw2,
  	&board_AGPFS0,
  	&board_DWVS0,
 +	&board_nb4_ser_r0,
 +	&board_nb4_fxc_r1,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
  };
  
-@@ -495,6 +551,8 @@ static struct of_device_id const bcm963x
+@@ -494,6 +546,8 @@ static struct of_device_id const bcm963x
  	{ .compatible = "pirelli,a226m", .data = &board_DWVS0, },
  	{ .compatible = "pirelli,a226m-fwb", .data = &board_DWVS0, },
  	{ .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, },
 +	{ .compatible = "sfr,neufbox-4-sercomm-r0", .data = &board_nb4_ser_r0, },
 +	{ .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, },
- #endif
- #ifdef CONFIG_BCM63XX_CPU_6368
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
+ #ifdef CONFIG_BCM63XX_CPU_6362
+ #endif /* CONFIG_BCM63XX_CPU_6362 */
diff --git a/target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch b/target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch
index 69cc716e1a..ccf9fa5ce4 100644
--- a/target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch
+++ b/target/linux/bcm63xx/patches-5.4/502-board-96338W2_E7T.patch
@@ -1,39 +1,38 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -98,6 +98,20 @@ static struct board_info __initdata boar
+@@ -98,6 +98,19 @@ static struct board_info __initdata boar
  		.force_duplex_full	= 1,
  	},
  };
 +
 +static struct board_info __initdata board_96338w2_e7t = {
-+	.name				= "96338W2_E7T",
-+	.expected_cpu_id		= 0x6338,
-+
-+	.has_enet0			= 1,
++	.name = "96338W2_E7T",
++	.expected_cpu_id = 0x6338,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  
  /*
-@@ -487,6 +501,7 @@ static const struct board_info __initcon
+@@ -481,6 +494,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
  	&board_96338w,
 +	&board_96338w2_e7t,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6338 */
  #ifdef CONFIG_BCM63XX_CPU_6345
  	&board_96345gw2,
-@@ -524,6 +539,7 @@ static struct of_device_id const bcm963x
+@@ -519,6 +533,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6338
  	{ .compatible = "brcm,bcm96338gw", .data = &board_96338gw, },
  	{ .compatible = "brcm,bcm96338w", .data = &board_96338w, },
 +	{ .compatible = "d-link,dsl-2640u", .data = &board_96338w2_e7t, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6338 */
  #ifdef CONFIG_BCM63XX_CPU_6345
  	{ .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },
diff --git a/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch b/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch
index 9e3c4e0081..26a107c6b5 100644
--- a/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch
+++ b/target/linux/bcm63xx/patches-5.4/503-board-CPVA642.patch
@@ -1,32 +1,30 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -385,6 +385,25 @@ static struct board_info __initdata boar
+@@ -382,6 +382,23 @@ static struct board_info __initdata boar
  	.num_usbh_ports			= 2,
  };
  
 +static struct board_info __initdata board_CPVA642 = {
-+	.name                           = "CPVA642",
-+	.expected_cpu_id                = 0x6358,
-+
-+	.has_enet1                      = 1,
-+	.has_pci                        = 1,
-+
-+	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100        = 1,
-+		.force_duplex_full      = 1,
-+ 	},
++	.name = "CPVA642",
++	.expected_cpu_id = 0x6358,
 +
++	.has_pci = 1,
 +	.has_ohci0 = 1,
 +	.has_ehci0 = 1,
-+};
 +
++	.has_enet1 = 1,
++	.enet1 = {
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
++ 	},
++};
 +
  static struct board_info __initdata board_AGPFS0 = {
  	.name				= "AGPF-S0",
  	.expected_cpu_id		= 0x6358,
-@@ -522,6 +541,7 @@ static const struct board_info __initcon
+@@ -514,6 +531,7 @@ static const struct board_info __initcon
  	&board_96358vw,
  	&board_96358vw2,
  	&board_AGPFS0,
@@ -34,11 +32,11 @@
  	&board_DWVS0,
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
-@@ -569,6 +589,7 @@ static struct of_device_id const bcm963x
+@@ -563,6 +581,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, },
  	{ .compatible = "sfr,neufbox-4-sercomm-r0", .data = &board_nb4_ser_r0, },
  	{ .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, },
 +	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
- #endif
- #ifdef CONFIG_BCM63XX_CPU_6368
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
+ #ifdef CONFIG_BCM63XX_CPU_6362
+ #endif /* CONFIG_BCM63XX_CPU_6362 */
diff --git a/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch b/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch
index e78832ecb2..90ece67f71 100644
--- a/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch
+++ b/target/linux/bcm63xx/patches-5.4/504-board_dsl_274xb_rev_c.patch
@@ -1,37 +1,37 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -452,6 +452,22 @@ static struct board_info __initdata boar
+@@ -447,6 +447,22 @@ static struct board_info __initdata boar
  	.has_ohci0			= 1,
  };
  
 +/* D-Link DSL-274xB revison C2/C3 */
 +static struct board_info __initdata board_dsl_274xb_rev_c = {
-+	.name				= "AW4139",
-+	.expected_cpu_id		= 0x6358,
++	.name = "AW4139",
++	.expected_cpu_id = 0x6358,
 +
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
++	.has_pci = 1,
 +
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
 +
  static struct board_info __initdata board_nb4_ser_r0 = {
- 	.name				= "NB4-SER-r0",
- 	.expected_cpu_id		= 0x6358,
-@@ -543,6 +559,7 @@ static const struct board_info __initcon
+ 	.name = "NB4-SER-r0",
+ 	.expected_cpu_id = 0x6358,
+@@ -533,6 +549,7 @@ static const struct board_info __initcon
  	&board_AGPFS0,
  	&board_CPVA642,
  	&board_DWVS0,
 +	&board_dsl_274xb_rev_c,
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
- #endif
-@@ -582,6 +599,7 @@ static struct of_device_id const bcm963x
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
+@@ -574,6 +591,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "alcatel,rg100a", .data = &board_96358vw2, },
  	{ .compatible = "brcm,bcm96358vw", .data = &board_96358vw, },
  	{ .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },
diff --git a/target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch b/target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch
index f5ca73d7e2..4f57d441bc 100644
--- a/target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch
+++ b/target/linux/bcm63xx/patches-5.4/505-board_spw500v.patch
@@ -1,7 +1,7 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -324,6 +324,36 @@ static struct board_info __initdata boar
- 		.force_duplex_full	= 1,
+@@ -322,6 +322,36 @@ static struct board_info __initdata boar
+ 		.force_duplex_full = 1,
  	},
  };
 +
@@ -14,42 +14,42 @@
 +};
 +
 +static struct board_info __initdata board_spw500v = {
-+	.name				= "SPW500V",
-+	.expected_cpu_id		= 0x6348,
++	.name = "SPW500V",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_enet0			= 1,
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
++	.has_pci = 1,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
++		.has_phy = 1,
++		.use_internal_phy = 1,
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type			= SPROM_BCM4318,
-+		.pci_bus		= 0,
-+		.pci_dev		= 1,
-+		.board_fixups		= spw500v_fixups,
-+		.num_board_fixups	= ARRAY_SIZE(spw500v_fixups),
++		.type = SPROM_BCM4318,
++		.pci_bus = 0,
++		.pci_dev = 1,
++		.board_fixups = spw500v_fixups,
++		.num_board_fixups = ARRAY_SIZE(spw500v_fixups),
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -551,6 +581,7 @@ static const struct board_info __initcon
+@@ -542,6 +572,7 @@ static const struct board_info __initcon
  	&board_96348gw_a,
  	&board_rta1025w_16,
  	&board_96348_D4PW,
 +	&board_spw500v,
- #endif
- 
+ #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -592,6 +623,7 @@ static struct of_device_id const bcm963x
+ 	&board_96358vw,
+@@ -584,6 +615,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
  	{ .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, },
  	{ .compatible = "sagem,fast-2404", .data = &board_FAST2404, },
 +	{ .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, },
  	{ .compatible = "tp-link,td-w8900gb", .data = &board_96348gw_11, },
  	{ .compatible = "usrobotics,usr9108", .data = &board_96348gw_a, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6348 */
diff --git a/target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch b/target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch
index 77948d19fc..1384ac6b07 100644
--- a/target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch
+++ b/target/linux/bcm63xx/patches-5.4/506-board_gw6200_gw6000.patch
@@ -1,55 +1,53 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -217,6 +217,48 @@ static struct board_info __initdata boar
+@@ -216,6 +216,46 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  };
  
 +static struct board_info __initdata board_gw6200 = {
-+	.name				= "GW6200",
-+	.expected_cpu_id		= 0x6348,
-+
-+	.has_enet0			= 1,
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
-+
-+	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
-+	},
-+	.enet1 = {
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
-+	},
++	.name = "GW6200",
++	.expected_cpu_id = 0x6348,
 +
++	.has_pci = 1,
 +	.has_ohci0 = 1,
++
++	.has_enet0 = 1,
++	.enet0 = {
++		.has_phy = 1,
++		.use_internal_phy = 1,
++	},
++
++	.has_enet1 = 1,
++	.enet1 = {
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
++	},
 +};
 +
 +static struct board_info __initdata board_gw6000 = {
-+	.name				= "GW6000",
-+	.expected_cpu_id		= 0x6348,
-+
-+	.has_enet0			= 1,
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
-+
-+	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
-+	},
-+	.enet1 = {
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
-+	},
++	.name = "GW6000",
++	.expected_cpu_id = 0x6348,
 +
++	.has_pci = 1,
 +	.has_ohci0 = 1,
++
++	.has_enet0 = 1,
++	.enet0 = {
++		.has_phy = 1,
++		.use_internal_phy = 1,
++	},
++
++	.has_enet1 = 1,
++	.enet1 = {
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
++	},
 +};
-+
-+
 +
  static struct board_info __initdata board_FAST2404 = {
  	.name				= "F@ST2404",
  	.expected_cpu_id		= 0x6348,
-@@ -574,6 +616,8 @@ static const struct board_info __initcon
+@@ -565,6 +605,8 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6348
  	&board_96348r,
  	&board_96348gw,
@@ -58,7 +56,7 @@
  	&board_96348gw_10,
  	&board_96348gw_11,
  	&board_FAST2404,
-@@ -624,6 +668,8 @@ static struct of_device_id const bcm963x
+@@ -616,6 +658,8 @@ static struct of_device_id const bcm963x
  	{ .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, },
  	{ .compatible = "sagem,fast-2404", .data = &board_FAST2404, },
  	{ .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, },
@@ -66,4 +64,4 @@
 +	{ .compatible = "tecom,gw6200", .data = &board_gw6200, },
  	{ .compatible = "tp-link,td-w8900gb", .data = &board_96348gw_11, },
  	{ .compatible = "usrobotics,usr9108", .data = &board_96348gw_a, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6348 */
diff --git a/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch b/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch
index 3a88e01005..58bd2f3983 100644
--- a/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch
+++ b/target/linux/bcm63xx/patches-5.4/507-board-MAGIC.patch
@@ -1,50 +1,49 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -396,6 +396,31 @@ static struct board_info __initdata boar
- 		.num_board_fixups	= ARRAY_SIZE(spw500v_fixups),
+@@ -392,6 +392,30 @@ static struct board_info __initdata boar
+ 		.num_board_fixups = ARRAY_SIZE(spw500v_fixups),
  	},
  };
 +
 +static struct board_info __initdata board_96348sv = {
-+	.name				= "MAGIC",
-+	.expected_cpu_id		= 0x6348,
++	.name = "MAGIC",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_enet0			= 1,
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
++	.has_pccard = 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
++		.has_phy = 1,
++		.use_internal_phy = 1,
 +	},
++
++	.has_enet1 = 1,
 +	.enet1 = {
 +		/* it has BP_ENET_EXTERNAL_PHY */
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
-+
-+	.has_ohci0			= 1,
-+	.has_pccard			= 1,
-+	.has_ehci0			= 1,
 +};
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -626,6 +651,7 @@ static const struct board_info __initcon
+@@ -615,6 +639,7 @@ static const struct board_info __initcon
  	&board_rta1025w_16,
  	&board_96348_D4PW,
  	&board_spw500v,
 +	&board_96348sv,
- #endif
- 
+ #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -670,6 +696,7 @@ static struct of_device_id const bcm963x
+ 	&board_96358vw,
+@@ -660,6 +685,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, },
  	{ .compatible = "tecom,gw6000", .data = &board_gw6000, },
  	{ .compatible = "tecom,gw6200", .data = &board_gw6200, },
 +	{ .compatible = "telsey,magic", .data = &board_96348sv, },
  	{ .compatible = "tp-link,td-w8900gb", .data = &board_96348gw_11, },
  	{ .compatible = "usrobotics,usr9108", .data = &board_96348gw_a, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6348 */
diff --git a/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch b/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch
index e6e94f71ff..b03b14f96e 100644
--- a/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch
+++ b/target/linux/bcm63xx/patches-5.4/508-board_hw553.patch
@@ -1,47 +1,46 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -618,6 +618,32 @@ static struct board_info __initdata boar
- 	.has_ehci0 = 1,
- 	.num_usbh_ports			= 2,
+@@ -606,6 +606,31 @@ static struct board_info __initdata boar
+ 		.force_duplex_full = 1,
+ 	},
  };
 +
 +static struct board_info __initdata board_HW553 = {
-+	.name                           = "HW553",
-+	.expected_cpu_id                = 0x6358,
-+
-+	.has_enet1                      = 1,
-+	.has_pci                        = 1,
-+	.use_fallback_sprom		= 1,
-+
-+	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100        = 1,
-+		.force_duplex_full      = 1,
-+	},
++	.name = "HW553",
++	.expected_cpu_id = 0x6358,
 +
++	.has_pci = 1,
 +	.has_ohci0 = 1,
 +	.has_ehci0 = 1,
-+	.num_usbh_ports			= 2,
++	.num_usbh_ports = 2,
 +
++	.has_enet1 = 1,
++	.enet1 = {
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
++	},
++
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM4318,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
++		.type = SPROM_BCM4318,
++		.pci_bus = 0,
++		.pci_dev = 1,
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -663,6 +689,7 @@ static const struct board_info __initcon
+@@ -650,6 +675,7 @@ static const struct board_info __initcon
  	&board_dsl_274xb_rev_c,
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
 +	&board_HW553,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
  };
  
-@@ -706,6 +733,7 @@ static struct of_device_id const bcm963x
+@@ -695,6 +721,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },
  	{ .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
  	{ .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },
diff --git a/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch b/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch
index cfe55552f3..1cc900baf9 100644
--- a/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch
+++ b/target/linux/bcm63xx/patches-5.4/509-board_rta1320_16m.patch
@@ -1,39 +1,38 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -112,6 +112,20 @@ static struct board_info __initdata boar
- 		.force_duplex_full	= 1,
+@@ -111,6 +111,19 @@ static struct board_info __initdata boar
+ 		.force_duplex_full = 1,
  	},
  };
 +
 +static struct board_info __initdata board_rta1320_16m = {
-+	.name				= "RTA1320_16M",
-+	.expected_cpu_id		= 0x6338,
-+
-+	.has_enet0			= 1,
++	.name = "RTA1320_16M",
++	.expected_cpu_id = 0x6338,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6338 */
  
  /*
-@@ -660,6 +674,7 @@ static const struct board_info __initcon
+@@ -647,6 +660,7 @@ static const struct board_info __initcon
  	&board_96338gw,
  	&board_96338w,
  	&board_96338w2_e7t,
 +	&board_rta1320_16m,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6338 */
  #ifdef CONFIG_BCM63XX_CPU_6345
  	&board_96345gw2,
-@@ -704,6 +719,7 @@ static struct of_device_id const bcm963x
+@@ -692,6 +706,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6338
  	{ .compatible = "brcm,bcm96338gw", .data = &board_96338gw, },
  	{ .compatible = "brcm,bcm96338w", .data = &board_96338w, },
 +	{ .compatible = "dynalink,rta1320", .data = &board_rta1320_16m, },
  	{ .compatible = "d-link,dsl-2640u", .data = &board_96338w2_e7t, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6338 */
  #ifdef CONFIG_BCM63XX_CPU_6345
diff --git a/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch b/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch
index 69432c94dc..26e99196fd 100644
--- a/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch
+++ b/target/linux/bcm63xx/patches-5.4/510-board_spw303v.patch
@@ -1,39 +1,39 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -658,6 +658,20 @@ static struct board_info __initdata boar
- 		.pci_dev			= 1,
+@@ -644,6 +644,20 @@ static struct board_info __initdata boar
+ 		.pci_dev = 1,
  	},
  };
 +
 + /* T-Home Speedport W 303V Typ B */
 +static struct board_info __initdata board_spw303v = {
-+	.name			= "96358-502V",
-+	.expected_cpu_id	= 0x6358,
++	.name = "96358-502V",
++	.expected_cpu_id = 0x6358,
 +
-+	.has_enet0		= 1,
-+	.has_pci		= 1,
++	.has_pci = 1,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy 		= 1,
-+		.use_internal_phy 	= 1,
++		.has_phy = 1,
++		.use_internal_phy = 1,
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -705,6 +719,7 @@ static const struct board_info __initcon
+@@ -690,6 +704,7 @@ static const struct board_info __initcon
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
  	&board_HW553,
 +	&board_spw303v,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
  };
  
-@@ -756,6 +771,7 @@ static struct of_device_id const bcm963x
+@@ -743,6 +758,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "pirelli,agpf-s0", .data = &board_AGPFS0, },
  	{ .compatible = "sfr,neufbox-4-sercomm-r0", .data = &board_nb4_ser_r0, },
  	{ .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, },
 +	{ .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, },
  	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
- #endif
- #ifdef CONFIG_BCM63XX_CPU_6368
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
+ #ifdef CONFIG_BCM63XX_CPU_6362
diff --git a/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch b/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch
index 47590af6e3..e72c208cb3 100644
--- a/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch
+++ b/target/linux/bcm63xx/patches-5.4/511-board_V2500V.patch
@@ -1,41 +1,42 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -435,6 +435,26 @@ static struct board_info __initdata boar
- 	.has_pccard			= 1,
- 	.has_ehci0			= 1,
+@@ -429,6 +429,27 @@ static struct board_info __initdata boar
+ 		.force_duplex_full = 1,
+ 	},
  };
 +
 +static struct board_info __initdata board_V2500V_BB = {
-+	.name				= "V2500V_BB",
-+        .expected_cpu_id                = 0x6348,
++	.name = "V2500V_BB",
++	.expected_cpu_id = 0x6348,
 +
-+        .has_enet0                      = 1,
-+        .has_enet1                      = 1,
-+        .has_pci                        = 1,
++	.has_pci = 1,
 +
-+        .enet0 = {
-+                .has_phy                = 1,
-+                .use_internal_phy       = 1,
-+        },
-+        .enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+                .force_speed_100        = 1,
-+                .force_duplex_full      = 1,
++	.has_enet0 = 1,
++	.enet0 = {
++		.has_phy = 1,
++		.use_internal_phy = 1,
++	},
++
++	.has_enet1 = 1,
++	.enet1 = {
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6348 */
  
  /*
-@@ -707,6 +727,7 @@ static const struct board_info __initcon
+@@ -693,6 +714,7 @@ static const struct board_info __initcon
  	&board_96348_D4PW,
  	&board_spw500v,
  	&board_96348sv,
 +	&board_V2500V_BB,
- #endif
- 
+ #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -746,6 +767,7 @@ static struct of_device_id const bcm963x
+ 	&board_96358vw,
+@@ -733,6 +755,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, },
  	{ .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
  	{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
@@ -43,7 +44,7 @@
  	{ .compatible = "d-link,dsl-2640b-b", .data = &board_96348_D4PW, },
  	{ .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, },
  	{ .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
-@@ -805,6 +827,22 @@ void __init board_bcm963xx_init(void)
+@@ -794,6 +817,22 @@ void __init board_bcm963xx_init(void)
  		val &= MPI_CSBASE_BASE_MASK;
  	}
  	boot_addr = (u8 *)KSEG1ADDR(val);
diff --git a/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch b/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch
index 4c14ea4413..03246b6378 100644
--- a/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch
+++ b/target/linux/bcm63xx/patches-5.4/512-board_BTV2110.patch
@@ -1,39 +1,37 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -208,6 +208,24 @@ static struct board_info __initdata boar
+@@ -206,6 +206,22 @@ static struct board_info __initdata boar
  	.has_ehci0 = 1,
  };
  
-+
 +/* BT Voyager 2110 */
 +static struct board_info __initdata board_V2110 = {
-+	.name				= "V2110",
-+	.expected_cpu_id		= 0x6348,
++	.name = "V2110",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
++	.has_pci = 1,
 +
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
-+
 +
  static struct board_info __initdata board_96348gw = {
  	.name				= "96348GW",
  	.expected_cpu_id		= 0x6348,
-@@ -728,6 +746,7 @@ static const struct board_info __initcon
+@@ -715,6 +731,7 @@ static const struct board_info __initcon
  	&board_spw500v,
  	&board_96348sv,
  	&board_V2500V_BB,
 +	&board_V2110,
- #endif
- 
+ #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -767,6 +786,7 @@ static struct of_device_id const bcm963x
+ 	&board_96358vw,
+@@ -755,6 +772,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96348gw-10", .data = &board_96348gw_10, },
  	{ .compatible = "brcm,bcm96348gw-11", .data = &board_96348gw_11, },
  	{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
diff --git a/target/linux/bcm63xx/patches-5.4/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch b/target/linux/bcm63xx/patches-5.4/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch
index 24815782d1..0035cee7e9 100644
--- a/target/linux/bcm63xx/patches-5.4/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch
+++ b/target/linux/bcm63xx/patches-5.4/513-MIPS-BCM63XX-add-inventel-Livebox-support.patch
@@ -58,10 +58,10 @@ Subject: [PATCH] MIPS: BCM63XX: add inventel Livebox support
  #endif /* __BOARD_COMMON_H */
 --- /dev/null
 +++ b/arch/mips/bcm63xx/boards/board_livebox.c
-@@ -0,0 +1,155 @@
+@@ -0,0 +1,153 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
-+ * License.  See the file "COPYING" in the main directory of this archive
++ * License. See the file "COPYING" in the main directory of this archive
 + * for more details.
 + *
 + * Copyright (C) 2008 Florian Fainelli <florian@openwrt.org>
@@ -90,28 +90,26 @@ Subject: [PATCH] MIPS: BCM63XX: add inventel Livebox support
 + */
 +#ifdef CONFIG_BCM63XX_CPU_6348
 +static struct board_info __initdata board_livebox_blue5g = {
-+	.name				= "Livebox-blue-5g",
-+	.expected_cpu_id		= 0x6348,
++	.name = "Livebox-blue-5g",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_enet0			= 1,
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
++	.has_pccard = 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.ephy_reset_gpio = 6,
++	.ephy_reset_gpio_flags = GPIO_ACTIVE_LOW,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
++		.has_phy = 1,
++		.use_internal_phy = 1,
 +	},
 +
++	.has_enet1 = 1,
 +	.enet1 = {
-+		  .has_phy		= 1,
-+		  .phy_id 		= 31,
++		.has_phy = 1,
++		.phy_id = 31,
 +	},
-+
-+	.ephy_reset_gpio		= 6,
-+	.ephy_reset_gpio_flags		= GPIO_ACTIVE_LOW,
-+
-+	.has_ohci0			= 1,
-+	.has_pccard			= 1,
 +};
 +#endif
 +
@@ -121,7 +119,7 @@ Subject: [PATCH] MIPS: BCM63XX: add inventel Livebox support
 +static const struct board_info __initdata *bcm963xx_boards[] = {
 +#ifdef CONFIG_BCM63XX_CPU_6348
 +	&board_livebox_blue5g
-+#endif
++#endif /* CONFIG_BCM63XX_CPU_6348 */
 +};
 +
 +static struct of_device_id const livebox_boards_dt[] = {
@@ -155,7 +153,7 @@ Subject: [PATCH] MIPS: BCM63XX: add inventel Livebox support
 +		printk(KERN_ERR PFX "unable to fetch mac address\n");
 +		return -ENODEV;
 +	}
-+        mac_addr_used++;
++	mac_addr_used++;
 +
 +	return 0;
 +}
diff --git a/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch b/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch
index acb533d0e8..b653702b49 100644
--- a/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch
+++ b/target/linux/bcm63xx/patches-5.4/514-board_ct536_ct5621.patch
@@ -1,48 +1,45 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -226,6 +226,33 @@ static struct board_info __initdata boar
+@@ -222,6 +222,30 @@ static struct board_info __initdata boar
+ 	},
  };
  
- 
 +static struct board_info __initdata board_ct536_ct5621 = {
-+	.name				= "CT536_CT5621",
-+	.expected_cpu_id		= 0x6348,
++	.name = "CT536_CT5621",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_enet0			= 0,
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
++	.has_pccard = 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
 +
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +
-+	.has_ohci0 = 1,
-+	.has_pccard = 1,
-+	.has_ehci0 = 1,
-+
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM4318,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
++		.type = SPROM_BCM4318,
++		.pci_bus = 0,
++		.pci_dev = 1,
 +	},
 +};
 +
  static struct board_info __initdata board_96348gw = {
  	.name				= "96348GW",
  	.expected_cpu_id		= 0x6348,
-@@ -747,6 +774,7 @@ static const struct board_info __initcon
+@@ -732,6 +756,7 @@ static const struct board_info __initcon
  	&board_96348sv,
  	&board_V2500V_BB,
  	&board_V2110,
 +	&board_ct536_ct5621,
- #endif
- 
+ #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -788,6 +816,8 @@ static struct of_device_id const bcm963x
+ 	&board_96358vw,
+@@ -774,6 +799,8 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96348gw-a", .data = &board_96348gw_a, },
  	{ .compatible = "bt,voyager-2110", .data = &board_V2110, },
  	{ .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, },
diff --git a/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch b/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch
index 9ccb29bddd..1460256e8c 100644
--- a/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch
+++ b/target/linux/bcm63xx/patches-5.4/515-board_DWV-S0_fixes.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -626,6 +626,7 @@ static struct board_info __initdata boar
+@@ -613,6 +613,7 @@ static struct board_info __initdata boar
  	},
  
  	.has_ohci0			= 1,
diff --git a/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch b/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch
index a6de00d36b..fe1a7e2e0c 100644
--- a/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch
+++ b/target/linux/bcm63xx/patches-5.4/516-board_96348A-122.patch
@@ -1,45 +1,44 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -253,6 +253,30 @@ static struct board_info __initdata boar
+@@ -246,6 +246,29 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_96348A_122 = {
-+	.name				= "96348A-122",
-+	.expected_cpu_id		= 0x6348,
-+
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
-+
-+	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
-+	},
++	.name = "96348A-122",
++	.expected_cpu_id = 0x6348,
 +
++	.has_pci = 1,
 +	.has_ohci0 = 1,
 +
++	.has_enet1 = 1,
++	.enet1 = {
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
++	},
++
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM4318,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
++		.type = SPROM_BCM4318,
++		.pci_bus = 0,
++		.pci_dev = 1,
 +	},
 +};
 +
  static struct board_info __initdata board_96348gw = {
  	.name				= "96348GW",
  	.expected_cpu_id		= 0x6348,
-@@ -776,6 +800,7 @@ static const struct board_info __initcon
+@@ -758,6 +781,7 @@ static const struct board_info __initcon
  	&board_V2500V_BB,
  	&board_V2110,
  	&board_ct536_ct5621,
 +	&board_96348A_122,
- #endif
- 
+ #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -818,6 +843,7 @@ static struct of_device_id const bcm963x
+ 	&board_96358vw,
+@@ -801,6 +825,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "bt,voyager-2110", .data = &board_V2110, },
  	{ .compatible = "bt,voyager-2500v-bb", .data = &board_V2500V_BB, },
  	{ .compatible = "comtrend,ct-536plus", .data = &board_ct536_ct5621, },
diff --git a/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch b/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch
index 25e7f9ff0a..980be2952c 100644
--- a/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch
+++ b/target/linux/bcm63xx/patches-5.4/517_board_CPVA502plus.patch
@@ -1,48 +1,49 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -225,6 +225,33 @@ static struct board_info __initdata boar
+@@ -222,6 +222,34 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_CPVA502plus = {
-+	.name				= "CPVA502+",
-+	.expected_cpu_id		= 0x6348,
++	.name = "CPVA502+",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_enet0			= 1,
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
++	.has_pci = 1,
++	.ephy_reset_gpio = 4,
++	.ephy_reset_gpio_flags = GPIO_ACTIVE_LOW,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
++		.has_phy = 1,
++		.use_internal_phy = 1,
 +	},
++
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
++		.has_phy = 1,
++		.phy_id = 0,
 +	},
 +
-+	.ephy_reset_gpio		= 4,
-+	.ephy_reset_gpio_flags		= GPIO_ACTIVE_LOW,
-+
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM4318,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
++		.type = SPROM_BCM4318,
++		.pci_bus = 0,
++		.pci_dev = 1,
 +	},
 +};
- 
++
  static struct board_info __initdata board_ct536_ct5621 = {
- 	.name				= "CT536_CT5621",
-@@ -801,6 +828,7 @@ static const struct board_info __initcon
+ 	.name = "CT536_CT5621",
+ 	.expected_cpu_id = 0x6348,
+@@ -782,6 +810,7 @@ static const struct board_info __initcon
  	&board_V2110,
  	&board_ct536_ct5621,
  	&board_96348A_122,
 +	&board_CPVA502plus,
- #endif
- 
+ #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -853,6 +881,7 @@ static struct of_device_id const bcm963x
+ 	&board_96358vw,
+@@ -835,6 +864,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "t-com,speedport-w-500v", .data = &board_spw500v, },
  	{ .compatible = "tecom,gw6000", .data = &board_gw6000, },
  	{ .compatible = "tecom,gw6200", .data = &board_gw6200, },
diff --git a/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch
index 17087b36a5..7aac2a5d71 100644
--- a/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch
+++ b/target/linux/bcm63xx/patches-5.4/518-bcm63xx-add-support-for-96368MVWG-board.patch
@@ -10,7 +10,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -792,6 +792,58 @@ static struct board_info __initdata boar
+@@ -774,6 +774,52 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
@@ -18,50 +18,44 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
 + */
 +#ifdef CONFIG_BCM63XX_CPU_6368
 +static struct board_info __initdata board_96368mvwg = {
-+	.name				= "96368MVWG",
-+	.expected_cpu_id		= 0x6368,
++	.name = "96368MVWG",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+
-+	.has_usbd			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
++	.has_usbd = 1,
 +	.usbd = {
-+		.use_fullspeed		= 0,
-+		.port_no		= 0,
++		.use_fullspeed = 0,
++		.port_no = 0,
 +	},
 +
-+	.has_enetsw			= 1,
-+
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "port1",
++				.used = 1,
++				.phy_id = 2,
++				.name = "port1",
 +			},
-+
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "port2",
++				.used = 1,
++				.phy_id = 3,
++				.name = "port2",
 +			},
-+
 +			[4] = {
-+				.used	= 1,
-+				.phy_id	= 0x12,
-+				.name	= "port0",
++				.used = 1,
++				.phy_id = 0x12,
++				.name = "port0",
 +			},
-+
 +			[5] = {
-+				.used	= 1,
-+				.phy_id	= 0x11,
-+				.name	= "port3",
++				.used = 1,
++				.phy_id = 0x11,
++				.name = "port3",
 +			},
 +		},
 +	},
-+
-+	.has_ohci0 = 1,
-+	.has_ehci0 = 1,
 +};
 +#endif /* CONFIG_BCM63XX_CPU_6368 */
 +
@@ -69,25 +63,24 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board.
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -843,6 +895,10 @@ static const struct board_info __initcon
+@@ -824,6 +870,9 @@ static const struct board_info __initcon
  	&board_HW553,
  	&board_spw303v,
- #endif
-+
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
 +#ifdef CONFIG_BCM63XX_CPU_6368
 +	&board_96368mvwg,
-+#endif
++#endif /* CONFIG_BCM63XX_CPU_6368 */
  };
  
  static struct of_device_id const bcm963xx_boards_dt[] = {
-@@ -903,6 +959,7 @@ static struct of_device_id const bcm963x
- 	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
- #endif
+@@ -888,6 +937,7 @@ static struct of_device_id const bcm963x
+ #ifdef CONFIG_BCM63XX_CPU_6362
+ #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
 +	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_63268 */
 --- a/arch/mips/bcm63xx/boards/board_common.c
 +++ b/arch/mips/bcm63xx/boards/board_common.c
 @@ -81,12 +81,25 @@ void __init board_early_setup(const stru
diff --git a/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch
index 03bda96dff..f123fa663c 100644
--- a/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch
+++ b/target/linux/bcm63xx/patches-5.4/519-bcm63xx-add-support-for-96368MVNgr-board.patch
@@ -9,65 +9,61 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board.
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -841,6 +841,45 @@ static struct board_info __initdata boar
- 	.has_ohci0 = 1,
- 	.has_ehci0 = 1,
+@@ -817,6 +817,41 @@ static struct board_info __initdata boar
+ 		},
+ 	},
  };
 +
 +static struct board_info __initdata board_96368mvngr = {
-+	.name				= "96368MVNgr",
-+	.expected_cpu_id		= 0x6368,
++	.name = "96368MVNgr",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+	.has_enetsw			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
-+				.phy_id	= 1,
-+				.name	= "port1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "port1",
 +			},
-+
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "port2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "port2",
 +			},
-+
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "port3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "port3",
 +			},
-+
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "port4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "port4",
 +			},
 +		},
 +	},
-+
-+	.has_ohci0 = 1,
-+	.has_ehci0 = 1,
 +};
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -898,6 +937,7 @@ static const struct board_info __initcon
- 
+@@ -872,6 +907,7 @@ static const struct board_info __initcon
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
 +	&board_96368mvngr,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  };
  
-@@ -959,6 +999,7 @@ static struct of_device_id const bcm963x
- 	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
- #endif
+@@ -937,6 +973,7 @@ static struct of_device_id const bcm963x
+ #ifdef CONFIG_BCM63XX_CPU_6362
+ #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
 +	{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
diff --git a/target/linux/bcm63xx/patches-5.4/520-MIPS-BCM63XX-add-96328avng-reference-board.patch b/target/linux/bcm63xx/patches-5.4/520-MIPS-BCM63XX-add-96328avng-reference-board.patch
index e482b20931..6c2c5aa2c9 100644
--- a/target/linux/bcm63xx/patches-5.4/520-MIPS-BCM63XX-add-96328avng-reference-board.patch
+++ b/target/linux/bcm63xx/patches-5.4/520-MIPS-BCM63XX-add-96328avng-reference-board.patch
@@ -9,34 +9,33 @@ Subject: [PATCH] MIPS: BCM63XX: add 96328avng reference board
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -64,6 +64,33 @@ static struct board_info __initdata boar
+@@ -64,6 +64,32 @@ static struct board_info __initdata boar
  		.use_fullspeed		= 0,
  		.port_no		= 0,
  	},
 +
-+	.has_enetsw			= 1,
-+
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
++				.used = 1,
 +				.phy_id = 1,
-+				.name	= "Port 1",
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
diff --git a/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch
index 522d99976f..cdcc1c0aa7 100644
--- a/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch
+++ b/target/linux/bcm63xx/patches-5.4/521-MIPS-BCM63XX-add-963281TAN-reference-board.patch
@@ -9,40 +9,39 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -92,6 +92,40 @@ static struct board_info __initdata boar
+@@ -91,6 +91,39 @@ static struct board_info __initdata boar
  		},
  	},
  };
 +
 +static struct board_info __initdata board_963281TAN = {
-+	.name				= "963281TAN",
-+	.expected_cpu_id		= 0x6328,
++	.name = "963281TAN",
++	.expected_cpu_id = 0x6328,
 +
-+	.has_pci			= 1,
-+
-+	.has_enetsw			= 1,
++	.has_pci = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
++				.used = 1,
 +				.phy_id = 1,
-+				.name	= "Port 1",
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
@@ -50,19 +49,19 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -918,6 +952,7 @@ static const struct board_info __initcon
- #endif
+@@ -889,6 +922,7 @@ static const struct board_info __initcon
+ #endif /* CONFIG_BCM63XX_CPU_3368 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
 +	&board_963281TAN,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6328 */
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
-@@ -974,6 +1009,7 @@ static struct of_device_id const bcm963x
- 	{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
- #endif
+@@ -945,6 +979,7 @@ static struct of_device_id const bcm963x
+ #ifdef CONFIG_BCM63XX_CPU_6318
+ #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
 +	{ .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, },
  	{ .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6328 */
  #ifdef CONFIG_BCM63XX_CPU_6338
diff --git a/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch b/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch
index b91fff0695..25362e3123 100644
--- a/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch
+++ b/target/linux/bcm63xx/patches-5.4/522-board_dsl_274xb_rev_f.patch
@@ -10,51 +10,50 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
 
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -126,6 +126,51 @@ static struct board_info __initdata boar
+@@ -124,6 +124,50 @@ static struct board_info __initdata boar
  		},
  	},
  };
 +
 +static struct board_info __initdata board_dsl_274xb_f1 = {
-+	.name				= "AW4339U",
-+	.expected_cpu_id		= 0x6328,
++	.name = "AW4339U",
++	.expected_cpu_id = 0x6328,
 +
-+	.has_pci			= 1,
++	.has_pci = 1,
 +
-+	.has_caldata			= 1,
++	.has_caldata = 1,
 +	.caldata = {
 +		{
-+			.vendor		= PCI_VENDOR_ID_ATHEROS,
-+			.caldata_offset	= 0x7d1000,
-+			.slot		= 0,
-+			.led_pin	= -1,
-+			.led_active_high	= 1,
++			.vendor = PCI_VENDOR_ID_ATHEROS,
++			.caldata_offset = 0x7d1000,
++			.slot = 0,
++			.led_pin = -1,
++			.led_active_high = 1,
 +		},
 +	},
 +
-+	.has_enetsw			= 1,
-+
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
++				.used = 1,
 +				.phy_id = 1,
-+				.name	= "Port 4",
++				.name = "Port 4",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 3",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 2",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 1",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 1",
 +			},
 +		},
 +	},
@@ -62,19 +61,19 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -953,6 +998,7 @@ static const struct board_info __initcon
+@@ -923,6 +967,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
  	&board_963281TAN,
 +	&board_dsl_274xb_f1,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6328 */
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
-@@ -1011,6 +1057,7 @@ static struct of_device_id const bcm963x
+@@ -981,6 +1026,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6328
  	{ .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, },
  	{ .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },
 +	{ .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6328 */
  #ifdef CONFIG_BCM63XX_CPU_6338
  	{ .compatible = "brcm,bcm96338gw", .data = &board_96338gw, },
diff --git a/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch b/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch
index 3a27db85c1..6e61744189 100644
--- a/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch
+++ b/target/linux/bcm63xx/patches-5.4/523-board_96348w3.patch
@@ -1,39 +1,38 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -568,6 +568,24 @@ static struct board_info __initdata boar
+@@ -555,6 +555,23 @@ static struct board_info __initdata boar
  	.has_ohci0 = 1,
  };
  
 +/* NetGear DG834G v4 */
 +static struct board_info __initdata board_96348W3 = {
-+ 	.name	 			= "96348W3",
-+	.expected_cpu_id		= 0x6348,
++ 	.name = "96348W3",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
 +
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
-+
-+	.has_ohci0	 		= 1,
 +};
 +
  static struct board_info __initdata board_96348_D4PW = {
- 	.name				= "D-4P-W",
- 	.expected_cpu_id		= 0x6348,
-@@ -1028,6 +1046,7 @@ static const struct board_info __initcon
+ 	.name = "D-4P-W",
+ 	.expected_cpu_id = 0x6348,
+@@ -997,6 +1014,7 @@ static const struct board_info __initcon
  	&board_ct536_ct5621,
  	&board_96348A_122,
  	&board_CPVA502plus,
 +	&board_96348W3,
- #endif
- 
+ #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1083,6 +1102,7 @@ static struct of_device_id const bcm963x
+ 	&board_96358vw,
+@@ -1052,6 +1070,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "davolink,dv-201amr", .data = &board_DV201AMR, },
  	{ .compatible = "dynalink,rta1025w", .data = &board_rta1025w_16, },
  	{ .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, },
diff --git a/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch b/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch
index 0cfcc173fe..4a6280dcab 100644
--- a/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch
+++ b/target/linux/bcm63xx/patches-5.4/524-board_CT6373-1.patch
@@ -1,45 +1,45 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -874,6 +874,30 @@ static struct board_info __initdata boar
- 	.num_usbh_ports			= 2,
+@@ -853,6 +853,30 @@ static struct board_info __initdata boar
+ 	},
  };
  
 +static struct board_info __initdata board_ct6373_1 = {
-+	.name				= "CT6373-1",
-+	.expected_cpu_id	= 0x6358,
++	.name = "CT6373-1",
++	.expected_cpu_id = 0x6358,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
-+	.has_enet1			= 1,
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM4318,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
++		.type = SPROM_BCM4318,
++		.pci_bus = 0,
++		.pci_dev = 1,
 +	},
 +};
 +
  static struct board_info __initdata board_HW553 = {
- 	.name                           = "HW553",
- 	.expected_cpu_id                = 0x6358,
-@@ -1058,6 +1082,7 @@ static const struct board_info __initcon
+ 	.name = "HW553",
+ 	.expected_cpu_id = 0x6358,
+@@ -1025,6 +1049,7 @@ static const struct board_info __initcon
  	&board_dsl_274xb_rev_c,
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
 +	&board_ct6373_1,
  	&board_HW553,
  	&board_spw303v,
- #endif
-@@ -1116,6 +1141,7 @@ static struct of_device_id const bcm963x
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
+@@ -1084,6 +1109,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "alcatel,rg100a", .data = &board_96358vw2, },
  	{ .compatible = "brcm,bcm96358vw", .data = &board_96358vw, },
  	{ .compatible = "brcm,bcm96358vw2", .data = &board_96358vw2, },
diff --git a/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch b/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch
index 45e8717be0..afa9cf2002 100644
--- a/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch
+++ b/target/linux/bcm63xx/patches-5.4/525-board_dva-g3810bn-tl-1.patch
@@ -1,48 +1,46 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -937,6 +937,33 @@ static struct board_info __initdata boar
- 		.use_internal_phy 	= 1,
+@@ -915,6 +915,31 @@ static struct board_info __initdata boar
+ 		.use_internal_phy = 1,
  	},
  };
 +
 +/* D-Link DVA-G3810BN/TL */
 +static struct board_info __initdata board_DVAG3810BN = {
-+	.name			= "DVAG3810BN",
-+	.expected_cpu_id	= 0x6358,
++	.name = "DVAG3810BN",
++	.expected_cpu_id = 0x6358,
 +
-+	.has_enet0		= 1,
-+	.has_enet1		= 1,
-+	.has_pci		= 1,
++	.has_pccard = 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
++		.has_phy = 1,
++		.use_internal_phy = 1,
 +	},
 +
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
-+
-+
-+	.has_ohci0		= 1,
-+	.has_pccard		= 1,
-+	.has_ehci0		= 1,
 +};
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
  /*
-@@ -1085,6 +1112,7 @@ static const struct board_info __initcon
+@@ -1052,6 +1077,7 @@ static const struct board_info __initcon
  	&board_ct6373_1,
  	&board_HW553,
  	&board_spw303v,
 +	&board_DVAG3810BN,
- #endif
- 
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6368
-@@ -1144,6 +1172,7 @@ static struct of_device_id const bcm963x
+ 	&board_96368mvwg,
+@@ -1112,6 +1138,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "comtrend,ct-6373", .data = &board_ct6373_1, },
  	{ .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
  	{ .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },
diff --git a/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch b/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch
index b4de7cb078..ed0115470a 100644
--- a/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch
+++ b/target/linux/bcm63xx/patches-5.4/526-board_nb6.patch
@@ -1,29 +1,28 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -966,6 +966,32 @@ static struct board_info __initdata boar
+@@ -942,6 +942,31 @@ static struct board_info __initdata boar
  };
  #endif /* CONFIG_BCM63XX_CPU_6358 */
  
 +#ifdef CONFIG_BCM63XX_CPU_6362
 +static struct board_info __initdata board_nb6 = {
-+	.name				= "NB6",
-+	.expected_cpu_id		= 0x6362,
++	.name = "NB6",
++	.expected_cpu_id = 0x6362,
 +
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 2,
-+
-+	.has_enetsw			= 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[4] = {
-+				.used	= 1,
-+				.phy_id	= 0xff,
++				.used = 1,
++				.phy_id = 0xff,
 +				.bypass_link = 1,
 +				.force_speed = 1000,
 +				.force_duplex_full = 1,
-+				.name	= "RGMII",
++				.name = "RGMII",
 +			},
 +		},
 +	},
@@ -33,24 +32,21 @@
  /*
   * known 6368 boards
   */
-@@ -1115,6 +1141,10 @@ static const struct board_info __initcon
+@@ -1079,6 +1104,9 @@ static const struct board_info __initcon
+ 	&board_spw303v,
  	&board_DVAG3810BN,
- #endif
- 
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
 +#ifdef CONFIG_BCM63XX_CPU_6362
 +	&board_nb6,
-+#endif
-+
++#endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
-@@ -1183,6 +1213,9 @@ static struct of_device_id const bcm963x
- 	{ .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, },
+@@ -1150,6 +1178,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
- #endif
-+#ifdef CONFIG_BCM63XX_CPU_6362
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
+ #ifdef CONFIG_BCM63XX_CPU_6362
 +	{ .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
-+#endif
+ #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
  	{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
- 	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
diff --git a/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch b/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch
index 9e42c40b57..733d745def 100644
--- a/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch
+++ b/target/linux/bcm63xx/patches-5.4/527-board_fast2604.patch
@@ -1,29 +1,29 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -501,6 +501,22 @@ static struct board_info __initdata boar
+@@ -489,6 +489,22 @@ static struct board_info __initdata boar
  	.has_ehci0			= 1,
  };
  
 +static struct board_info __initdata board_FAST2604 = {
-+	.name						= "F@ST2604",
-+	.expected_cpu_id			= 0x6348,
++	.name = "F@ST2604",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_pci					= 1,
-+	.has_ohci0					= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
 +
-+	.has_enet1					= 1,
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy			= 1,
-+		.phy_id				= 0,
-+		.force_speed_100		= 1,
-+		.force_duplex_full		= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
 +
  static struct board_info __initdata board_rta1025w_16 = {
  	.name				= "RTA1025W_16",
  	.expected_cpu_id		= 0x6348,
-@@ -1112,6 +1128,7 @@ static const struct board_info __initcon
+@@ -1077,6 +1093,7 @@ static const struct board_info __initcon
  	&board_96348gw_10,
  	&board_96348gw_11,
  	&board_FAST2404,
@@ -31,7 +31,7 @@
  	&board_DV201AMR,
  	&board_96348gw_a,
  	&board_rta1025w_16,
-@@ -1187,6 +1204,7 @@ static struct of_device_id const bcm963x
+@@ -1151,6 +1168,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "netgear,dg834gt-pn", .data = &board_96348gw_10, },
   	{ .compatible = "netgear,dg834g-v4", .data = &board_96348W3, },
  	{ .compatible = "sagem,fast-2404", .data = &board_FAST2404, },
diff --git a/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch b/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch
index 0cecd9cb6c..209fbde002 100644
--- a/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch
+++ b/target/linux/bcm63xx/patches-5.4/528-board_A4001N1.patch
@@ -1,66 +1,66 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -127,6 +127,49 @@ static struct board_info __initdata boar
+@@ -125,6 +125,49 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_A4001N1 = {
-+	.name					= "963281T_TEF",
-+	.expected_cpu_id			= 0x6328,
++	.name = "963281T_TEF",
++	.expected_cpu_id = 0x6328,
 +
-+	.has_pci				= 1,
-+	.use_fallback_sprom		= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
-+	.num_usbh_ports				= 1,
-+	.has_enetsw				= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "Port 1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43225,
-+		.pci_bus			= 1,
-+		.pci_dev			= 0,
++		.type = SPROM_BCM43225,
++		.pci_bus = 1,
++		.pci_dev = 0,
 +	},
 +};
 +
  static struct board_info __initdata board_dsl_274xb_f1 = {
- 	.name				= "AW4339U",
- 	.expected_cpu_id		= 0x6328,
-@@ -1109,6 +1152,7 @@ static const struct board_info __initcon
+ 	.name = "AW4339U",
+ 	.expected_cpu_id = 0x6328,
+@@ -1074,6 +1117,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
  	&board_963281TAN,
 +	&board_A4001N1,
  	&board_dsl_274xb_f1,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6328 */
  #ifdef CONFIG_BCM63XX_CPU_6338
-@@ -1174,6 +1218,7 @@ static struct of_device_id const bcm963x
- 	{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
- #endif
+@@ -1138,6 +1182,7 @@ static struct of_device_id const bcm963x
+ #ifdef CONFIG_BCM63XX_CPU_6318
+ #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
 +	{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },
  	{ .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, },
diff --git a/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch b/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch
index f2af2c5b2c..d5d93eeb1f 100644
--- a/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch
+++ b/target/linux/bcm63xx/patches-5.4/529-board_AR-5387un.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -93,6 +93,78 @@ static struct board_info __initdata boar
+@@ -92,6 +92,78 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -32,66 +32,66 @@
 +};
 +
 +static struct board_info __initdata board_AR5387un = {
-+	.name					= "96328A-1441N1",
-+	.expected_cpu_id			= 0x6328,
++	.name = "96328A-1441N1",
++	.expected_cpu_id = 0x6328,
 +
-+	.has_pci				= 1,
-+	.use_fallback_sprom		= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
-+	.num_usbh_ports				= 1,
-+	.has_enetsw				= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "Port 1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43225,
-+		.pci_bus			= 1,
-+		.pci_dev			= 0,
-+		.board_fixups			= ar5387un_fixups,
-+		.num_board_fixups		= ARRAY_SIZE(ar5387un_fixups),
++		.type = SPROM_BCM43225,
++		.pci_bus = 1,
++		.pci_dev = 0,
++		.board_fixups = ar5387un_fixups,
++		.num_board_fixups = ARRAY_SIZE(ar5387un_fixups),
 +	},
 +};
 +
  static struct board_info __initdata board_963281TAN = {
- 	.name				= "963281TAN",
- 	.expected_cpu_id		= 0x6328,
-@@ -1151,6 +1223,7 @@ static const struct board_info __initcon
- #endif
+ 	.name = "963281TAN",
+ 	.expected_cpu_id = 0x6328,
+@@ -1116,6 +1188,7 @@ static const struct board_info __initcon
+ #endif /* CONFIG_BCM63XX_CPU_3368 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
 +	&board_AR5387un,
  	&board_963281TAN,
  	&board_A4001N1,
  	&board_dsl_274xb_f1,
-@@ -1221,6 +1294,7 @@ static struct of_device_id const bcm963x
+@@ -1185,6 +1258,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },
  	{ .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, },
  	{ .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },
 +	{ .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, },
  	{ .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6328 */
  #ifdef CONFIG_BCM63XX_CPU_6338
diff --git a/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch b/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch
index dc8efed328..9f4facadbc 100644
--- a/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch
+++ b/target/linux/bcm63xx/patches-5.4/530-board_AR-5381u.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -93,6 +93,60 @@ static struct board_info __initdata boar
+@@ -92,6 +92,60 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -14,66 +14,66 @@
 +};
 +
 +static struct board_info __initdata board_AR5381u = {
-+	.name					= "96328A-1241N",
-+	.expected_cpu_id			= 0x6328,
++	.name = "96328A-1241N",
++	.expected_cpu_id = 0x6328,
 +
-+	.has_pci				= 1,
-+	.use_fallback_sprom			= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
-+	.num_usbh_ports				= 1,
-+	.has_enetsw				= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "Port 1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43225,
-+		.pci_bus			= 1,
-+		.pci_dev			= 0,
-+		.board_fixups			= ar5381u_fixups,
-+		.num_board_fixups		= ARRAY_SIZE(ar5381u_fixups),
++		.type = SPROM_BCM43225,
++		.pci_bus = 1,
++		.pci_dev = 0,
++		.board_fixups = ar5381u_fixups,
++		.num_board_fixups = ARRAY_SIZE(ar5381u_fixups),
 +	},
 +};
 +
  static struct sprom_fixup __initdata ar5387un_fixups[] = {
  	{ .offset = 2, .value = 0x05bb },
  	{ .offset = 65, .value = 0x1204 },
-@@ -1223,6 +1277,7 @@ static const struct board_info __initcon
- #endif
+@@ -1188,6 +1242,7 @@ static const struct board_info __initcon
+ #endif /* CONFIG_BCM63XX_CPU_3368 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
 +	&board_AR5381u,
  	&board_AR5387un,
  	&board_963281TAN,
  	&board_A4001N1,
-@@ -1294,6 +1349,7 @@ static struct of_device_id const bcm963x
+@@ -1258,6 +1313,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },
  	{ .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, },
  	{ .compatible = "brcm,bcm96328avng", .data = &board_96328avng, },
 +	{ .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, },
  	{ .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, },
  	{ .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6328 */
diff --git a/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch b/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch
deleted file mode 100644
index d56df55622..0000000000
--- a/target/linux/bcm63xx/patches-5.4/531-board_rta770bw.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -411,6 +411,20 @@ static struct board_info __initdata boar
- 	.name				= "96345GW2",
- 	.expected_cpu_id		= 0x6345,
- };
-+
-+static struct board_info __initdata board_rta770bw = {
-+	.name				= "RTA770BW",
-+	.expected_cpu_id		= 0x6345,
-+
-+	.has_enet0			= 1,
-+
-+	.enet0 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
-+	},
-+};
- #endif /* CONFIG_BCM63XX_CPU_6345 */
- 
- /*
-@@ -1291,6 +1305,7 @@ static const struct board_info __initcon
- #endif
- #ifdef CONFIG_BCM63XX_CPU_6345
- 	&board_96345gw2,
-+	&board_rta770bw,
- #endif
- #ifdef CONFIG_BCM63XX_CPU_6348
- 	&board_96348r,
-@@ -1361,6 +1376,7 @@ static struct of_device_id const bcm963x
- #endif
- #ifdef CONFIG_BCM63XX_CPU_6345
- 	{ .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },
-+	{ .compatible = "dynalink,rta770bw", .data = &board_rta770bw, },
- #endif
- #ifdef CONFIG_BCM63XX_CPU_6348
- 	{ .compatible = "belkin,f5d7633", .data = &board_96348gw_10, },
diff --git a/target/linux/bcm63xx/patches-5.4/531-board_rta770bw_rta770w.patch b/target/linux/bcm63xx/patches-5.4/531-board_rta770bw_rta770w.patch
new file mode 100644
index 0000000000..aa01f153db
--- /dev/null
+++ b/target/linux/bcm63xx/patches-5.4/531-board_rta770bw_rta770w.patch
@@ -0,0 +1,39 @@
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -406,6 +406,19 @@ static struct board_info __initdata boar
+ 	.name				= "96345GW2",
+ 	.expected_cpu_id		= 0x6345,
+ };
++
++static struct board_info __initdata board_rta770w = {
++	.name = "RTA770BW",
++	.expected_cpu_id = 0x6345,
++
++	.has_enet0 = 1,
++	.enet0 = {
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
++	},
++};
+ #endif /* CONFIG_BCM63XX_CPU_6345 */
+ 
+ /*
+@@ -1256,6 +1269,7 @@ static const struct board_info __initcon
+ #endif /* CONFIG_BCM63XX_CPU_6338 */
+ #ifdef CONFIG_BCM63XX_CPU_6345
+ 	&board_96345gw2,
++	&board_rta770w,
+ #endif /* CONFIG_BCM63XX_CPU_6345 */
+ #ifdef CONFIG_BCM63XX_CPU_6348
+ 	&board_96348r,
+@@ -1325,6 +1339,8 @@ static struct of_device_id const bcm963x
+ #endif /* CONFIG_BCM63XX_CPU_6338 */
+ #ifdef CONFIG_BCM63XX_CPU_6345
+ 	{ .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },
++	{ .compatible = "dynalink,rta770bw", .data = &board_rta770w, },
++	{ .compatible = "dynalink,rta770w", .data = &board_rta770w, },
+ #endif /* CONFIG_BCM63XX_CPU_6345 */
+ #ifdef CONFIG_BCM63XX_CPU_6348
+ 	{ .compatible = "belkin,f5d7633", .data = &board_96348gw_10, },
diff --git a/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch b/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch
index cf55255cd1..890e2e01d5 100644
--- a/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch
+++ b/target/linux/bcm63xx/patches-5.4/532-board_hw556.patch
@@ -8,100 +8,102 @@
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -1123,6 +1124,92 @@ static struct board_info __initdata boar
+@@ -1100,6 +1101,94 @@ static struct board_info __initdata boar
  	},
  };
  
-+static struct board_info __initdata board_HW556_C = {
-+	.name					= "HW556_C",
-+	.expected_cpu_id			= 0x6358,
-+
-+	.has_pci				= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
-+	.num_usbh_ports				= 2,
-+
-+	.has_caldata				= 1,
-+	.caldata = {
-+		{
-+			.vendor			= PCI_VENDOR_ID_RALINK,
-+			.caldata_offset		= 0xeffe00,
-+			.slot			= 1,
-+			.eeprom			= "rt2x00.eeprom",
-+		},
-+	},
-+
-+	.has_enet1				= 1,
-+	.enet1 = {
-+		.has_phy			= 1,
-+		.phy_id				= 0,
-+		.force_speed_100		= 1,
-+		.force_duplex_full		= 1,
-+	},
-+};
 +static struct board_info __initdata board_HW556_A = {
-+	.name					= "HW556_A",
-+	.expected_cpu_id			= 0x6358,
++	.name = "HW556_A",
++	.expected_cpu_id = 0x6358,
 +
-+	.has_pci				= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
-+	.num_usbh_ports				= 2,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_caldata				= 1,
++	.has_caldata = 1,
 +	.caldata = {
 +		{
-+			.vendor			= PCI_VENDOR_ID_ATHEROS,
-+			.caldata_offset		= 0xf7e000,
-+			.slot			= 1,
-+			.endian_check		= 1,
-+			.led_pin		= 2,
-+			.led_active_high	= 1,
++			.vendor = PCI_VENDOR_ID_ATHEROS,
++			.caldata_offset = 0xf7e000,
++			.slot = 1,
++			.endian_check = 1,
++			.led_pin = 2,
++			.led_active_high = 1,
 +		},
 +	},
 +
-+	.has_enet1				= 1,
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy			= 1,
-+		.phy_id				= 0,
-+		.force_speed_100		= 1,
-+		.force_duplex_full		= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
++
 +static struct board_info __initdata board_HW556_B = {
-+	.name					= "HW556_B",
-+	.expected_cpu_id			= 0x6358,
++	.name = "HW556_B",
++	.expected_cpu_id = 0x6358,
 +
-+	.has_pci				= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
-+	.num_usbh_ports				= 2,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_caldata				= 1,
++	.has_caldata = 1,
 +	.caldata = {
 +		{
-+			.vendor			= PCI_VENDOR_ID_ATHEROS,
-+			.caldata_offset		= 0xefe000,
-+			.slot			= 1,
-+			.endian_check		= 1,
-+			.led_pin		= 2,
-+			.led_active_high	= 1,
++			.vendor = PCI_VENDOR_ID_ATHEROS,
++			.caldata_offset = 0xefe000,
++			.slot = 1,
++			.endian_check = 1,
++			.led_pin = 2,
++			.led_active_high = 1,
 +		},
 +	},
 +
-+	.has_enet1				= 1,
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy			= 1,
-+		.phy_id				= 0,
-+		.force_speed_100		= 1,
-+		.force_duplex_full		= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
++	},
++};
++
++static struct board_info __initdata board_HW556_C = {
++	.name = "HW556_C",
++	.expected_cpu_id = 0x6358,
++
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
++
++	.has_caldata = 1,
++	.caldata = {
++		{
++			.vendor = PCI_VENDOR_ID_RALINK,
++			.caldata_offset = 0xeffe00,
++			.slot = 1,
++			.eeprom = "rt2x00.eeprom",
++		},
++	},
++
++	.has_enet1 = 1,
++	.enet1 = {
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
 +
   /* T-Home Speedport W 303V Typ B */
  static struct board_info __initdata board_spw303v = {
- 	.name			= "96358-502V",
-@@ -1341,6 +1428,9 @@ static const struct board_info __initcon
+ 	.name = "96358-502V",
+@@ -1304,6 +1393,9 @@ static const struct board_info __initcon
  	&board_nb4_fxc_r1,
  	&board_ct6373_1,
  	&board_HW553,
@@ -110,8 +112,8 @@
 +	&board_HW556_C,
  	&board_spw303v,
  	&board_DVAG3810BN,
- #endif
-@@ -1413,6 +1503,9 @@ static struct of_device_id const bcm963x
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
+@@ -1377,6 +1469,9 @@ static struct of_device_id const bcm963x
  	{ .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },
  	{ .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, },
  	{ .compatible = "huawei,echolife-hg553", .data = &board_HW553, },
diff --git a/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch b/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch
deleted file mode 100644
index c78e59efd3..0000000000
--- a/target/linux/bcm63xx/patches-5.4/533-board_rta770w.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
-+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -426,6 +426,25 @@ static struct board_info __initdata boar
- 		.force_duplex_full	= 1,
- 	},
- };
-+
-+// Actually this board is the very same as the rta770bw,
-+// where the additional 'b' within the name just
-+// just indicates 'Annex B'. The ADSL Modem itself is able
-+// to handle both Annex A as well as Annex B -
-+// the loaded firmware makes the only difference
-+static struct board_info __initdata board_rta770w = {
-+	.name				= "RTA770W",
-+	.expected_cpu_id		= 0x6345,
-+
-+	.has_enet0			= 1,
-+
-+	.enet0 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
-+	},
-+};
- #endif /* CONFIG_BCM63XX_CPU_6345 */
- 
- /*
-@@ -1393,6 +1412,7 @@ static const struct board_info __initcon
- #ifdef CONFIG_BCM63XX_CPU_6345
- 	&board_96345gw2,
- 	&board_rta770bw,
-+	&board_rta770w,
- #endif
- #ifdef CONFIG_BCM63XX_CPU_6348
- 	&board_96348r,
-@@ -1467,6 +1487,7 @@ static struct of_device_id const bcm963x
- #ifdef CONFIG_BCM63XX_CPU_6345
- 	{ .compatible = "brcm,bcm96345gw2", .data = &board_96345gw2, },
- 	{ .compatible = "dynalink,rta770bw", .data = &board_rta770bw, },
-+	{ .compatible = "dynalink,rta770w", .data = &board_rta770w, },
- #endif
- #ifdef CONFIG_BCM63XX_CPU_6348
- 	{ .compatible = "belkin,f5d7633", .data = &board_96348gw_10, },
diff --git a/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch b/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch
index 358e97480d..8edbc57101 100644
--- a/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch
+++ b/target/linux/bcm63xx/patches-5.4/534-board_fast2704.patch
@@ -12,43 +12,42 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
 ---
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -341,6 +341,43 @@ static struct board_info __initdata boar
+@@ -338,6 +338,42 @@ static struct board_info __initdata boar
  		},
  	},
  };
 +
 +static struct board_info __initdata board_FAST2704V2 = {
-+	.name				= "F@ST2704V2",
-+	.expected_cpu_id		= 0x6328,
++	.name = "F@ST2704V2",
++	.expected_cpu_id = 0x6328,
 +
-+	.has_pci			= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.has_usbd			= 1,
-+
-+	.has_enetsw			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.has_usbd = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
++				.used = 1,
 +				.phy_id = 1,
-+				.name	= "Port 1",
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
@@ -56,19 +55,19 @@ Signed-off-by: Marcin Jurkowski <marcin1j@gmail.com>
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -1402,6 +1439,7 @@ static const struct board_info __initcon
+@@ -1349,6 +1385,7 @@ static const struct board_info __initcon
  	&board_963281TAN,
  	&board_A4001N1,
  	&board_dsl_274xb_f1,
 +	&board_FAST2704V2,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6328 */
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
-@@ -1477,6 +1515,7 @@ static struct of_device_id const bcm963x
+@@ -1422,6 +1459,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, },
  	{ .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, },
  	{ .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, },
 +	{ .compatible = "sagem,fast-2704-v2", .data = &board_FAST2704V2, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6328 */
  #ifdef CONFIG_BCM63XX_CPU_6338
  	{ .compatible = "brcm,bcm96338gw", .data = &board_96338gw, },
diff --git a/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch b/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch
index ff0440772b..ab5b61880f 100644
--- a/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch
+++ b/target/linux/bcm63xx/patches-5.4/535-board_fast2504n.patch
@@ -6,41 +6,37 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
 ---
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1332,6 +1332,41 @@ static struct board_info __initdata boar
+@@ -1288,6 +1288,37 @@ static struct board_info __initdata boar
  		},
  	},
  };
 +
 +static struct board_info __initdata board_fast2504n = {
-+	.name				= "F@ST2504n",
-+	.expected_cpu_id		= 0x6362,
-+
-+	.has_enetsw			= 1,
++	.name = "F@ST2504n",
++	.expected_cpu_id = 0x6362,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
-+				.phy_id	= 1,
-+				.name	= "Port 1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "Port 1",
 +			},
-+
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
-+
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
-+
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
@@ -48,19 +44,19 @@ Signed-off-by: Max Staudt <openwrt.max@enpas.org>
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  
  /*
-@@ -1495,6 +1530,7 @@ static const struct board_info __initcon
- 
+@@ -1438,6 +1469,7 @@ static const struct board_info __initcon
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6362
  	&board_nb6,
 +	&board_fast2504n,
- #endif
- 
+ #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
-@@ -1576,6 +1612,7 @@ static struct of_device_id const bcm963x
+ 	&board_96368mvwg,
+@@ -1520,6 +1552,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6362
 +	{ .compatible = "sagem,fast-2504n", .data = &board_fast2504n, },
  	{ .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
diff --git a/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch b/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch
index c9c532d30e..dee7659d20 100644
--- a/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch
+++ b/target/linux/bcm63xx/patches-5.4/536-board_96318ref.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -50,6 +50,55 @@ static struct board_info __initdata boar
+@@ -50,6 +50,53 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_3368 */
  
  /*
@@ -8,44 +8,42 @@
 + */
 +#ifdef CONFIG_BCM63XX_CPU_6318
 +static struct board_info __initdata board_96318ref = {
-+	.name				= "96318REF",
-+	.expected_cpu_id		= 0x6318,
++	.name = "96318REF",
++	.expected_cpu_id = 0x6318,
 +
-+	.has_pci			= 1,
-+
-+	.has_usbd			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_usbd = 1,
 +	.usbd = {
-+		.use_fullspeed		= 0,
-+		.port_no		= 0,
++		.use_fullspeed = 0,
++		.port_no = 0,
 +	},
 +
-+	.has_enetsw			= 1,
-+
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 1,
-+
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
++				.used = 1,
 +				.phy_id = 1,
-+				.name	= "Port 1",
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
@@ -56,23 +54,21 @@
   * known 6328 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6328
-@@ -1467,6 +1516,9 @@ static const struct board_info __initcon
+@@ -1409,6 +1456,9 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_3368
  	&board_cvg834g,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_3368 */
 +#ifdef CONFIG_BCM63XX_CPU_6318
 +	&board_96318ref,
-+#endif
++#endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
  	&board_AR5381u,
-@@ -1544,6 +1596,9 @@ static struct of_device_id const bcm963x
- #ifdef CONFIG_BCM63XX_CPU_3368
+@@ -1483,6 +1533,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "netgear,cvg834g", .data = &board_cvg834g, },
- #endif
-+#ifdef CONFIG_BCM63XX_CPU_6318
+ #endif /* CONFIG_BCM63XX_CPU_3368 */
+ #ifdef CONFIG_BCM63XX_CPU_6318
 +	{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
-+#endif
+ #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },
- 	{ .compatible = "brcm,bcm963281tan", .data = &board_963281TAN, },
diff --git a/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch b/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch
index f4ff4fd691..337d30114d 100644
--- a/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch
+++ b/target/linux/bcm63xx/patches-5.4/537-board_96318ref_p300.patch
@@ -1,49 +1,47 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -96,6 +96,50 @@ static struct board_info __initdata boar
+@@ -94,6 +94,48 @@ static struct board_info __initdata boar
  		},
  	},
  };
 +
 +static struct board_info __initdata board_96318ref_p300 = {
-+	.name				= "96318REF_P300",
-+	.expected_cpu_id		= 0x6318,
++	.name = "96318REF_P300",
++	.expected_cpu_id = 0x6318,
 +
-+	.has_pci			= 1,
-+
-+	.has_usbd			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_usbd = 1,
 +	.usbd = {
-+		.use_fullspeed		= 0,
-+		.port_no		= 0,
++		.use_fullspeed = 0,
++		.port_no = 0,
 +	},
 +
-+	.has_enetsw			= 1,
-+
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 1,
-+
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
++				.used = 1,
 +				.phy_id = 1,
-+				.name	= "Port 1",
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
@@ -51,19 +49,19 @@
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -1518,6 +1562,7 @@ static const struct board_info __initcon
- #endif
+@@ -1458,6 +1500,7 @@ static const struct board_info __initcon
+ #endif /* CONFIG_BCM63XX_CPU_3368 */
  #ifdef CONFIG_BCM63XX_CPU_6318
  	&board_96318ref,
 +	&board_96318ref_p300,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
-@@ -1598,6 +1643,7 @@ static struct of_device_id const bcm963x
- #endif
+@@ -1534,6 +1577,7 @@ static struct of_device_id const bcm963x
+ #endif /* CONFIG_BCM63XX_CPU_3368 */
  #ifdef CONFIG_BCM63XX_CPU_6318
  	{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
 +	{ .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },
diff --git a/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch b/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch
index d5af2f0d1c..c1125f00ed 100644
--- a/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch
+++ b/target/linux/bcm63xx/patches-5.4/538-board_bcm963269bhr.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1554,6 +1554,50 @@ static struct board_info __initdata boar
+@@ -1492,6 +1492,46 @@ static struct board_info __initdata boar
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
@@ -8,39 +8,35 @@
 + */
 +#ifdef CONFIG_BCM63XX_CPU_63268
 +static struct board_info __initdata board_963269bhr = {
-+	.name				= "963269BHR",
-+	.expected_cpu_id		= 0x63268,
++	.name = "963269BHR",
++	.expected_cpu_id = 0x63268,
 +
-+	.has_pci			= 1,
-+
-+	.has_ehci0			= 1,
-+
-+	.has_enetsw			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
-+				.phy_id	= 1,
-+				.name	= "port1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "port1",
 +			},
-+
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "port2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "port2",
 +			},
-+
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "port3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "port3",
 +			},
-+
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "port4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "port4",
 +			},
 +		},
 +	},
@@ -51,21 +47,21 @@
   * all boards
   */
  static const struct board_info __initconst *bcm963xx_boards[] = {
-@@ -1634,6 +1678,9 @@ static const struct board_info __initcon
+@@ -1568,6 +1608,9 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
 +#ifdef CONFIG_BCM63XX_CPU_63268
 +	&board_963269bhr,
-+#endif
++#endif /* CONFIG_BCM63XX_CPU_63268 */
  };
  
  static struct of_device_id const bcm963xx_boards_dt[] = {
-@@ -1721,6 +1768,7 @@ static struct of_device_id const bcm963x
+@@ -1655,6 +1698,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
 +	{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_63268 */
  #endif /* CONFIG_OF */
  	{ },
diff --git a/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch b/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch
index 85521b44be..cc16adf402 100644
--- a/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch
+++ b/target/linux/bcm63xx/patches-5.4/539-board_AR1004G.patch
@@ -8,39 +8,39 @@ Signed-off-by: Adrian Feliks <mexit@o2.pl>
 ---
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -647,6 +647,21 @@ static struct board_info __initdata boar
+@@ -617,6 +617,21 @@ static struct board_info __initdata boar
  	.has_ehci0 = 1,
  };
  
 +static struct board_info __initdata board_96348gw_10_AR1004G = {
-+	.name				= "AR1004G",
-+	.expected_cpu_id		= 0x6348,
++	.name = "AR1004G",
++	.expected_cpu_id = 0x6348,
 +
-+	.has_enet1			= 1,
-+	.has_pci			= 1,
-+	
++	.has_pci = 1,
++
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +};
 +
- 
  /* BT Voyager 2110 */
  static struct board_info __initdata board_V2110 = {
-@@ -1649,6 +1664,7 @@ static const struct board_info __initcon
+ 	.name = "V2110",
+@@ -1582,6 +1597,7 @@ static const struct board_info __initcon
  	&board_96348A_122,
  	&board_CPVA502plus,
  	&board_96348W3,
 +	&board_96348gw_10_AR1004G,
- #endif
- 
+ #endif /* CONFIG_BCM63XX_CPU_6348 */
  #ifdef CONFIG_BCM63XX_CPU_6358
-@@ -1713,6 +1729,7 @@ static struct of_device_id const bcm963x
+ 	&board_96358vw,
+@@ -1643,6 +1659,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "dynalink,rta770w", .data = &board_rta770w, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6345 */
  #ifdef CONFIG_BCM63XX_CPU_6348
 +	{ .compatible = "asmax,ar-1004g", .data = &board_96348gw_10_AR1004G, },
  	{ .compatible = "belkin,f5d7633", .data = &board_96348gw_10, },
diff --git a/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch b/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch
index da9000ac3e..f582780ed4 100644
--- a/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch
+++ b/target/linux/bcm63xx/patches-5.4/540-board_vw6339gu.patch
@@ -1,50 +1,45 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1610,6 +1610,53 @@ static struct board_info __initdata boar
+@@ -1544,6 +1544,48 @@ static struct board_info __initdata boar
  		},
  	},
  };
 +
 +static struct board_info __initdata board_vw6339gu = {
-+	.name				= "VW6339GU",
-+	.expected_cpu_id		= 0x63268,
++	.name = "VW6339GU",
++	.expected_cpu_id = 0x63268,
 +
-+	.has_ehci0			= 1,
-+	.has_ohci0			= 1,
-+	.num_usbh_ports			= 1,
-+
-+	.has_enetsw			= 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
-+				.phy_id	= 1,
-+				.name	= "LAN2",
++				.used = 1,
++				.phy_id = 1,
++				.name = "LAN2",
 +			},
-+
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "LAN3",
++				.used = 1,
++				.phy_id = 2,
++				.name = "LAN3",
 +			},
-+
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "LAN4",
++				.used = 1,
++				.phy_id = 3,
++				.name = "LAN4",
 +			},
-+
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "LAN1",
++				.used = 1,
++				.phy_id = 4,
++				.name = "LAN1",
 +			},
-+
 +			[4] = {
-+				.used	= 1,
-+				.phy_id	= 7,
-+				.name	= "WAN",
++				.used = 1,
++				.phy_id = 7,
++				.name = "WAN",
 +				.mii_override = 1,
 +				.timing_sel = 1,
 +			},
@@ -54,19 +49,19 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  
  /*
-@@ -1696,6 +1743,7 @@ static const struct board_info __initcon
- #endif
+@@ -1626,6 +1668,7 @@ static const struct board_info __initcon
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
  	&board_963269bhr,
 +	&board_vw6339gu,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_63268 */
  };
  
-@@ -1786,6 +1834,7 @@ static struct of_device_id const bcm963x
- #endif
+@@ -1716,6 +1759,7 @@ static struct of_device_id const bcm963x
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
  	{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
 +	{ .compatible = "inteno,vg50", .data = &board_vw6339gu, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_63268 */
  #endif /* CONFIG_OF */
  	{ },
diff --git a/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch b/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch
index 2cd09b69e2..00c69a907b 100644
--- a/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch
+++ b/target/linux/bcm63xx/patches-5.4/541-board_963268gu_p300.patch
@@ -1,68 +1,61 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1572,6 +1572,72 @@ static struct board_info __initdata boar
+@@ -1510,6 +1510,65 @@ static struct board_info __initdata boar
   * known 63268/63269 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_63268
 +static struct board_info __initdata board_963268bu_p300 = {
-+	.name				= "963268BU_P300",
-+	.expected_cpu_id		= 0x63268,
++	.name = "963268BU_P300",
++	.expected_cpu_id = 0x63268,
 +
-+	.has_ehci0			= 1,
-+	.has_ohci0			= 1,
-+	.num_usbh_ports			= 1,
-+
-+	.has_usbd			= 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_usbd = 1,
 +	.usbd = {
-+		.use_fullspeed		= 0,
-+		.port_no		= 0,
++		.use_fullspeed = 0,
++		.port_no = 0,
 +	},
 +
-+	.has_enetsw			= 1,
-+
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
-+				.phy_id	= 17,
-+				.name	= "FE1",
++				.used = 1,
++				.phy_id = 17,
++				.name = "FE1",
 +			},
-+
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "GbE2",
++				.used = 1,
++				.phy_id = 4,
++				.name = "GbE2",
 +			},
-+
 +			[4] = {
-+				.used	= 1,
-+				.phy_id	= 0,
-+				.name	= "GbE3",
++				.used = 1,
++				.phy_id = 0,
++				.name = "GbE3",
 +				.mii_override = 1,
 +				.timing_sel = 1,
 +			},
-+
 +			[5] = {
-+				.used	= 1,
-+				.phy_id	= 1,
-+				.name	= "GbE1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "GbE1",
 +				.mii_override = 1,
 +				.timing_sel = 1,
 +			},
-+
 +			[6] = {
-+				.used	= 1,
-+				.phy_id	= 24,
-+				.name	= "GbE4",
++				.used = 1,
++				.phy_id = 24,
++				.name = "GbE4",
 +				.mii_override = 1,
 +				.timing_sel = 1,
 +			},
-+
 +			[7] = {
-+				.used	= 1,
-+				.phy_id	= 25,
-+				.name	= "GbE5",
++				.used = 1,
++				.phy_id = 25,
++				.name = "GbE5",
 +				.mii_override = 1,
 +				.timing_sel = 1,
 +			},
@@ -71,21 +64,21 @@
 +};
 +
  static struct board_info __initdata board_963269bhr = {
- 	.name				= "963269BHR",
- 	.expected_cpu_id		= 0x63268,
-@@ -1742,6 +1808,7 @@ static const struct board_info __initcon
+ 	.name = "963269BHR",
+ 	.expected_cpu_id = 0x63268,
+@@ -1667,6 +1726,7 @@ static const struct board_info __initcon
  	&board_96368mvngr,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
 +	&board_963268bu_p300,
  	&board_963269bhr,
  	&board_vw6339gu,
- #endif
-@@ -1833,6 +1900,7 @@ static struct of_device_id const bcm963x
+ #endif /* CONFIG_BCM63XX_CPU_63268 */
+@@ -1758,6 +1818,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
 +	{ .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, },
  	{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
  	{ .compatible = "inteno,vg50", .data = &board_vw6339gu, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_63268 */
diff --git a/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch b/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch
index c08c2c0fc0..168e0c6ef2 100644
--- a/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch
+++ b/target/linux/bcm63xx/patches-5.4/542-board_WAP-5813n.patch
@@ -9,9 +9,9 @@
  #include <asm/addrspace.h>
  #include <bcm63xx_board.h>
  #include <bcm63xx_cpu.h>
-@@ -1566,6 +1568,47 @@ static struct board_info __initdata boar
- 	.has_ohci0 = 1,
- 	.has_ehci0 = 1,
+@@ -1504,6 +1506,47 @@ static struct board_info __initdata boar
+ 		},
+ 	},
  };
 +
 +static struct sprom_fixup __initdata wap5813n_fixups[] = {
@@ -24,15 +24,14 @@
 +};
 +
 +static struct board_info __initdata board_WAP5813n = {
-+	.name				= "96369R-1231N",
-+	.expected_cpu_id		= 0x6368,
++	.name = "96369R-1231N",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[4] = {
@@ -46,30 +45,31 @@
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43222,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
-+		.board_fixups			= wap5813n_fixups,
-+		.num_board_fixups		= ARRAY_SIZE(wap5813n_fixups),
++		.type = SPROM_BCM43222,
++		.pci_bus = 0,
++		.pci_dev = 1,
++		.board_fixups = wap5813n_fixups,
++		.num_board_fixups = ARRAY_SIZE(wap5813n_fixups),
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6368 */
  
  /*
-@@ -1806,6 +1849,7 @@ static const struct board_info __initcon
+@@ -1724,6 +1767,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
 +	&board_WAP5813n,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
  	&board_963268bu_p300,
-@@ -1898,6 +1942,7 @@ static struct of_device_id const bcm963x
+@@ -1816,6 +1860,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6368
  	{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
 +	{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
  	{ .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, },
diff --git a/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch b/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch
index b92f032047..55e4ec02dd 100644
--- a/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch
+++ b/target/linux/bcm63xx/patches-5.4/543-board_VR-3025u.patch
@@ -1,7 +1,7 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1569,6 +1569,59 @@ static struct board_info __initdata boar
- 	.has_ehci0 = 1,
+@@ -1507,6 +1507,59 @@ static struct board_info __initdata boar
+ 	},
  };
  
 +static struct sprom_fixup __initdata vr3025u_fixups[] = {
@@ -14,65 +14,65 @@
 +};
 +
 +static struct board_info __initdata board_VR3025u = {
-+	.name					= "96368M-1541N",
-+	.expected_cpu_id		= 0x6368,
++	.name = "96368M-1541N",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci				= 1,
-+	.use_fallback_sprom			= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
-+	.has_enetsw				= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "port1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "port1",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "port2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "port2",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "port3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "port3",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "port4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "port4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43222,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
-+		.board_fixups			= vr3025u_fixups,
-+		.num_board_fixups		= ARRAY_SIZE(vr3025u_fixups),
++		.type = SPROM_BCM43222,
++		.pci_bus = 0,
++		.pci_dev = 1,
++		.board_fixups = vr3025u_fixups,
++		.num_board_fixups = ARRAY_SIZE(vr3025u_fixups),
 +	},
 +};
 +
  static struct sprom_fixup __initdata wap5813n_fixups[] = {
  	{ .offset = 97, .value = 0xfeed },
  	{ .offset = 98, .value = 0x15d1 },
-@@ -1849,6 +1902,7 @@ static const struct board_info __initcon
+@@ -1767,6 +1820,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
 +	&board_VR3025u,
  	&board_WAP5813n,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
-@@ -1942,6 +1996,7 @@ static struct of_device_id const bcm963x
+@@ -1860,6 +1914,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6368
  	{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
 +	{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
  	{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
diff --git a/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch b/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch
index ec0e13db56..45293c8291 100644
--- a/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch
+++ b/target/linux/bcm63xx/patches-5.4/544-board_VR-3025un.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1622,6 +1622,59 @@ static struct board_info __initdata boar
+@@ -1560,6 +1560,59 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -14,65 +14,65 @@
 +};
 +
 +static struct board_info __initdata board_VR3025un = {
-+	.name					= "96368M-1341N",
-+	.expected_cpu_id		= 0x6368,
++	.name = "96368M-1341N",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci				= 1,
-+	.use_fallback_sprom			= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
-+	.has_enetsw				= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "port1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "port1",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "port2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "port2",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "port3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "port3",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "port4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "port4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43222,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
-+		.board_fixups			= vr3025un_fixups,
-+		.num_board_fixups		= ARRAY_SIZE(vr3025un_fixups),
++		.type = SPROM_BCM43222,
++		.pci_bus = 0,
++		.pci_dev = 1,
++		.board_fixups = vr3025un_fixups,
++		.num_board_fixups = ARRAY_SIZE(vr3025un_fixups),
 +	},
 +};
 +
  static struct sprom_fixup __initdata wap5813n_fixups[] = {
  	{ .offset = 97, .value = 0xfeed },
  	{ .offset = 98, .value = 0x15d1 },
-@@ -1903,6 +1956,7 @@ static const struct board_info __initcon
+@@ -1821,6 +1874,7 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_VR3025u,
 +	&board_VR3025un,
  	&board_WAP5813n,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
-@@ -1997,6 +2051,7 @@ static struct of_device_id const bcm963x
+@@ -1915,6 +1969,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
  	{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
 +	{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
  	{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
diff --git a/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch b/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch
index 6b60a3fa86..ce76703d88 100644
--- a/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch
+++ b/target/linux/bcm63xx/patches-5.4/545-board_P870HW-51a_v2.patch
@@ -1,55 +1,55 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1578,6 +1578,48 @@ static struct sprom_fixup __initdata vr3
+@@ -1516,6 +1516,48 @@ static struct sprom_fixup __initdata vr3
  	{ .offset = 115, .value = 0xfad9 },
  };
  
 +static struct board_info __initdata board_P870HW51A_V2 = {
-+	.name				= "P870HW-51a_v2",
-+	.expected_cpu_id		= 0x6368,
++	.name = "P870HW-51a_v2",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
-+				.phy_id	= 1,
-+				.name	= "port1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "port1",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "port2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "port2",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "port3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "port3",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "port4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "port4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM4318,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
++		.type = SPROM_BCM4318,
++		.pci_bus = 0,
++		.pci_dev = 1,
 +	},
 +};
 +
  static struct board_info __initdata board_VR3025u = {
- 	.name					= "96368M-1541N",
- 	.expected_cpu_id		= 0x6368,
-@@ -1955,6 +1997,7 @@ static const struct board_info __initcon
+ 	.name = "96368M-1541N",
+ 	.expected_cpu_id = 0x6368,
+@@ -1873,6 +1915,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
@@ -57,11 +57,11 @@
  	&board_VR3025u,
  	&board_VR3025un,
  	&board_WAP5813n,
-@@ -2053,6 +2096,7 @@ static struct of_device_id const bcm963x
+@@ -1971,6 +2014,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
  	{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
  	{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
 +	{ .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
  	{ .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, },
diff --git a/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch b/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch
index aaf662a76c..a29f9bd573 100644
--- a/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch
+++ b/target/linux/bcm63xx/patches-5.4/546-board_hw520.patch
@@ -1,43 +1,43 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1264,6 +1264,36 @@ static struct board_info __initdata boar
+@@ -1218,6 +1218,36 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_HW520 = {
-+	.name				= "HW6358GW_B",
-+	.expected_cpu_id		= 0x6358,
++	.name = "HW6358GW_B",
++	.expected_cpu_id = 0x6358,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
-+	.has_enet0			= 1,
++	.has_enet0 = 1,
 +	.enet0 = {
-+		.has_phy		= 1,
-+		.use_internal_phy	= 1,
++		.has_phy = 1,
++		.use_internal_phy = 1,
 +	},
 +
-+	.has_enet1			= 1,
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100	= 1,
-+		.force_duplex_full	= 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM4318,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
++		.type = SPROM_BCM4318,
++		.pci_bus = 0,
++		.pci_dev = 1,
 +	},
 +};
 +
  static struct board_info __initdata board_HW553 = {
- 	.name                           = "HW553",
- 	.expected_cpu_id                = 0x6358,
-@@ -1981,6 +2011,7 @@ static const struct board_info __initcon
+ 	.name = "HW553",
+ 	.expected_cpu_id = 0x6358,
+@@ -1901,6 +1931,7 @@ static const struct board_info __initcon
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
  	&board_ct6373_1,
@@ -45,7 +45,7 @@
  	&board_HW553,
  	&board_HW556_A,
  	&board_HW556_B,
-@@ -2073,6 +2104,7 @@ static struct of_device_id const bcm963x
+@@ -1991,6 +2022,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "d-link,dsl-274xb-c2", .data = &board_dsl_274xb_rev_c, },
  	{ .compatible = "d-link,dsl-2650u", .data = &board_96358vw2, },
  	{ .compatible = "d-link,dva-g3810bn-tl", .data = &board_DVAG3810BN, },
diff --git a/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch b/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch
index 1992e0c6d4..ec5313bb01 100644
--- a/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch
+++ b/target/linux/bcm63xx/patches-5.4/547-board_A4001N.patch
@@ -1,56 +1,56 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -349,6 +349,49 @@ static struct board_info __initdata boar
+@@ -343,6 +343,49 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_A4001N = {
-+	.name				= "96328dg2x2",
-+	.expected_cpu_id		= 0x6328,
++	.name = "96328dg2x2",
++	.expected_cpu_id = 0x6328,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 1,
-+	.has_enetsw			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
-+				.phy_id	= 1,
-+				.name	= "Port 1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43225,
-+		.pci_bus			= 1,
-+		.pci_dev			= 0,
++		.type = SPROM_BCM43225,
++		.pci_bus = 1,
++		.pci_dev = 0,
 +	},
 +};
 +
  static struct board_info __initdata board_A4001N1 = {
- 	.name					= "963281T_TEF",
- 	.expected_cpu_id			= 0x6328,
-@@ -1962,6 +2005,7 @@ static const struct board_info __initcon
+ 	.name = "963281T_TEF",
+ 	.expected_cpu_id = 0x6328,
+@@ -1884,6 +1927,7 @@ static const struct board_info __initcon
  	&board_AR5381u,
  	&board_AR5387un,
  	&board_963281TAN,
@@ -58,9 +58,9 @@
  	&board_A4001N1,
  	&board_dsl_274xb_f1,
  	&board_FAST2704V2,
-@@ -2050,6 +2094,7 @@ static struct of_device_id const bcm963x
+@@ -1968,6 +2012,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
 +	{ .compatible = "adb,a4001n", .data = &board_A4001N, },
  	{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },
diff --git a/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch b/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch
index 7eb52ae863..a7beec0ac9 100644
--- a/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch
+++ b/target/linux/bcm63xx/patches-5.4/548-board_dsl-2751b_e1.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -142,6 +142,74 @@ static struct board_info __initdata boar
+@@ -138,6 +138,72 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -27,67 +27,65 @@
 +};
 +
 +static struct board_info __initdata board_dsl_2751b_d1 = {
-+	.name				= "AW5200B",
-+	.expected_cpu_id		= 0x6318,
++	.name = "AW5200B",
++	.expected_cpu_id = 0x6318,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
-+
-+	.has_enetsw			= 1,
-+
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
++				.used = 1,
 +				.phy_id = 1,
-+				.name	= "Port 1",
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43217,
-+		.pci_bus			= 1,
-+		.pci_dev			= 0,
-+		.board_fixups			= dsl2751b_e1_fixups,
-+		.num_board_fixups		= ARRAY_SIZE(dsl2751b_e1_fixups),
++		.type = SPROM_BCM43217,
++		.pci_bus = 1,
++		.pci_dev = 0,
++		.board_fixups = dsl2751b_e1_fixups,
++		.num_board_fixups = ARRAY_SIZE(dsl2751b_e1_fixups),
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -1999,6 +2067,7 @@ static const struct board_info __initcon
+@@ -1921,6 +1987,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6318
  	&board_96318ref,
  	&board_96318ref_p300,
 +	&board_dsl_2751b_d1,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
-@@ -2092,6 +2161,7 @@ static struct of_device_id const bcm963x
+@@ -2010,6 +2077,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6318
  	{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
  	{ .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, },
 +	{ .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	{ .compatible = "adb,a4001n", .data = &board_A4001N, },
diff --git a/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch b/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch
index 936aab115b..a09cac1d53 100644
--- a/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch
+++ b/target/linux/bcm63xx/patches-5.4/549-board_DGND3700v1_3800B.patch
@@ -1,28 +1,28 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1710,6 +1710,30 @@ static struct board_info __initdata boar
- 	.has_ehci0 = 1,
+@@ -1646,6 +1646,30 @@ static struct board_info __initdata boar
+ 	},
  };
  
 +static struct board_info __initdata board_DGND3700v1_3800B = {
-+	.name				= "DGND3700v1_3800B",
-+	.expected_cpu_id		= 0x6368,
++	.name = "DGND3700v1_3800B",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 2,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[5] = {
-+				.used  = 1,
-+				.phy_id  = 0xff,
++				.used = 1,
++				.phy_id = 0xff,
 +				.bypass_link = 1,
 +				.force_speed = 1000,
 +				.force_duplex_full = 1,
-+				.name  = "RGMII",
++				.name = "RGMII",
 +			},
 +		},
 +	},
@@ -31,7 +31,7 @@
  static struct sprom_fixup __initdata vr3025u_fixups[] = {
  	{ .offset = 97, .value = 0xfeb3 },
  	{ .offset = 98, .value = 0x1618 },
-@@ -2141,6 +2165,7 @@ static const struct board_info __initcon
+@@ -2057,6 +2081,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6368
  	&board_96368mvwg,
  	&board_96368mvngr,
@@ -39,11 +39,11 @@
  	&board_P870HW51A_V2,
  	&board_VR3025u,
  	&board_VR3025un,
-@@ -2243,6 +2268,7 @@ static struct of_device_id const bcm963x
+@@ -2159,6 +2184,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
  	{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
  	{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
 +	{ .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, },
  	{ .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
diff --git a/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch b/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch
index 267143cf94..dc81ea6b73 100644
--- a/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch
+++ b/target/linux/bcm63xx/patches-5.4/550-board_homehub2a.patch
@@ -1,38 +1,38 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1375,6 +1375,31 @@ static struct board_info __initdata boar
+@@ -1327,6 +1327,31 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_homehub2a = {
-+	.name				= "HOMEHUB2A",
-+	.expected_cpu_id		= 0x6358,
++	.name = "HOMEHUB2A",
++	.expected_cpu_id = 0x6358,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 2,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_enet1			= 1,
++	.has_enet1 = 1,
 +	.enet1 = {
-+		.has_phy		= 1,
-+		.phy_id			= 0,
-+		.force_speed_100        = 1,
-+		.force_duplex_full      = 1,
++		.has_phy = 1,
++		.phy_id = 0,
++		.force_speed_100 = 1,
++		.force_duplex_full = 1,
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 			= SPROM_BCM4322,
-+		.pci_bus		= 0,
-+		.pci_dev		= 1,
++		.type = SPROM_BCM4322,
++		.pci_bus = 0,
++		.pci_dev = 1,
 +	},
 +};
 +
  static struct board_info __initdata board_HW520 = {
- 	.name				= "HW6358GW_B",
- 	.expected_cpu_id		= 0x6358,
-@@ -2148,6 +2173,7 @@ static const struct board_info __initcon
+ 	.name = "HW6358GW_B",
+ 	.expected_cpu_id = 0x6358,
+@@ -2066,6 +2091,7 @@ static const struct board_info __initcon
  	&board_nb4_ser_r0,
  	&board_nb4_fxc_r1,
  	&board_ct6373_1,
@@ -40,11 +40,11 @@
  	&board_HW520,
  	&board_HW553,
  	&board_HW556_A,
-@@ -2257,6 +2283,7 @@ static struct of_device_id const bcm963x
+@@ -2173,6 +2199,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "sfr,neufbox-4-foxconn-r1", .data = &board_nb4_fxc_r1, },
  	{ .compatible = "t-com,speedport-w-303v", .data = &board_spw303v, },
  	{ .compatible = "telsey,cpva642", .data = &board_CPVA642, },
 +	{ .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6362
  	{ .compatible = "sagem,fast-2504n", .data = &board_fast2504n, },
diff --git a/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch b/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch
index d1b865134a..24a7e08f83 100644
--- a/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch
+++ b/target/linux/bcm63xx/patches-5.4/551-board_HG655b.patch
@@ -1,50 +1,50 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1759,6 +1759,52 @@ static struct board_info __initdata boar
+@@ -1695,6 +1695,52 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_HG655b = {
-+	.name				= "HW65x",
-+	.expected_cpu_id		= 0x6368,
++	.name = "HW65x",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 2,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_caldata			= 1,
++	.has_caldata = 1,
 +	.caldata = {
 +		{
-+			.vendor			= PCI_VENDOR_ID_RALINK,
-+			.caldata_offset		= 0x7c0000,
-+			.slot			= 1,
-+			.eeprom			= "rt2x00.eeprom",
++			.vendor = PCI_VENDOR_ID_RALINK,
++			.caldata_offset = 0x7c0000,
++			.slot = 1,
++			.eeprom = "rt2x00.eeprom",
 +		},
 +	},
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "port1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "port1",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "port2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "port2",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "port3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "port3",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "port4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "port4",
 +			},
 +		},
 +	},
@@ -53,7 +53,7 @@
  static struct sprom_fixup __initdata vr3025u_fixups[] = {
  	{ .offset = 97, .value = 0xfeb3 },
  	{ .offset = 98, .value = 0x1618 },
-@@ -2192,6 +2238,7 @@ static const struct board_info __initcon
+@@ -2108,6 +2154,7 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_DGND3700v1_3800B,
@@ -61,11 +61,11 @@
  	&board_P870HW51A_V2,
  	&board_VR3025u,
  	&board_VR3025un,
-@@ -2295,6 +2342,7 @@ static struct of_device_id const bcm963x
+@@ -2211,6 +2258,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
  	{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
  	{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
 +	{ .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, },
  	{ .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, },
  	{ .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
diff --git a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch b/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch
index 59f57bc8dc..5cf5cfafd2 100644
--- a/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch
+++ b/target/linux/bcm63xx/patches-5.4/552-board_fast2704n.patch
@@ -1,64 +1,68 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -210,6 +210,45 @@ static struct board_info __initdata boar
- 		.num_board_fixups		= ARRAY_SIZE(dsl2751b_e1_fixups),
+@@ -204,6 +204,49 @@ static struct board_info __initdata boar
+ 		.num_board_fixups = ARRAY_SIZE(dsl2751b_e1_fixups),
  	},
  };
 +
 +static struct board_info __initdata board_FAST2704N = {
-+	.name				= "F@ST2704N",
-+	.expected_cpu_id		= 0x6318,
++	.name = "F@ST2704N",
++	.expected_cpu_id = 0x6318,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
-+
-+	.has_enetsw			= 1,
-+
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
++				.used = 1,
 +				.phy_id = 1,
-+				.name	= "Port 1",
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
++
++	.use_fallback_sprom = 1,
++	.fallback_sprom = {
++		.type = SPROM_BCM43217,
++		.pci_bus = 1,
++		.pci_dev = 0,
++	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_6318 */
  
  /*
-@@ -2163,6 +2202,7 @@ static const struct board_info __initcon
+@@ -2083,6 +2126,7 @@ static const struct board_info __initcon
  	&board_96318ref,
  	&board_96318ref_p300,
  	&board_dsl_2751b_d1,
 +	&board_FAST2704N,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
-@@ -2260,6 +2300,7 @@ static struct of_device_id const bcm963x
+@@ -2176,6 +2220,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
  	{ .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, },
  	{ .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, },
 +	{ .compatible = "sagem,fast-2704n", .data = &board_FAST2704N, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	{ .compatible = "adb,a4001n", .data = &board_A4001N, },
diff --git a/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch b/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch
index 1455b748ce..5b9973932b 100644
--- a/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch
+++ b/target/linux/bcm63xx/patches-5.4/553-board_VR-3026e.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1992,6 +1992,59 @@ static struct board_info __initdata boar
+@@ -1932,6 +1932,59 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -14,61 +14,61 @@
 +};
 +
 +static struct board_info __initdata board_VR3026e = {
-+	.name					= "96368MT-1341N1",
-+	.expected_cpu_id		= 0x6368,
++	.name = "96368MT-1341N1",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci				= 1,
-+	.use_fallback_sprom			= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
-+	.has_enetsw				= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "port1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "port1",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "port2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "port2",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "port3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "port3",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "port4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "port4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type				= SPROM_BCM43222,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
-+		.board_fixups			= vr3026e_fixups,
-+		.num_board_fixups		= ARRAY_SIZE(vr3026e_fixups),
++		.type = SPROM_BCM43222,
++		.pci_bus = 0,
++		.pci_dev = 1,
++		.board_fixups = vr3026e_fixups,
++		.num_board_fixups = ARRAY_SIZE(vr3026e_fixups),
 +	},
 +};
 +
  static struct sprom_fixup __initdata wap5813n_fixups[] = {
  	{ .offset = 97, .value = 0xfeed },
  	{ .offset = 98, .value = 0x15d1 },
-@@ -2282,6 +2335,7 @@ static const struct board_info __initcon
+@@ -2202,6 +2255,7 @@ static const struct board_info __initcon
  	&board_P870HW51A_V2,
  	&board_VR3025u,
  	&board_VR3025un,
 +	&board_VR3026e,
  	&board_WAP5813n,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
-@@ -2382,6 +2436,7 @@ static struct of_device_id const bcm963x
+@@ -2302,6 +2356,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm96368mvwg", .data = &board_96368mvwg, },
  	{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
  	{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
diff --git a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch
index 8c9cc3944f..fb99620823 100644
--- a/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch
+++ b/target/linux/bcm63xx/patches-5.4/554-board_R5010UNv2.patch
@@ -1,69 +1,69 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -623,6 +623,50 @@ static struct board_info __initdata boar
+@@ -617,6 +617,50 @@ static struct board_info __initdata boar
  		},
  	},
  };
 +
 +static struct board_info __initdata board_R5010UNV2 = {
-+	.name					= "96328ang",
-+	.expected_cpu_id			= 0x6328,
++	.name = "96328ang",
++	.expected_cpu_id = 0x6328,
 +
-+	.has_pci				= 1,
-+	.use_fallback_sprom			= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
-+	.num_usbh_ports				= 1,
-+	.has_enetsw				= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "Port 1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43217,
-+		.pci_bus			= 1,
-+		.pci_dev			= 0,
++		.type = SPROM_BCM43217,
++		.pci_bus = 1,
++		.pci_dev = 0,
 +	},
 +};
 +
  #endif /* CONFIG_BCM63XX_CPU_6328 */
  
  /*
-@@ -2266,6 +2310,7 @@ static const struct board_info __initcon
+@@ -2190,6 +2234,7 @@ static const struct board_info __initcon
  	&board_A4001N1,
  	&board_dsl_274xb_f1,
  	&board_FAST2704V2,
 +	&board_R5010UNV2,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6328 */
  #ifdef CONFIG_BCM63XX_CPU_6338
  	&board_96338gw,
-@@ -2364,6 +2409,7 @@ static struct of_device_id const bcm963x
+@@ -2284,6 +2329,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "comtrend,ar-5381u", .data = &board_AR5381u, },
  	{ .compatible = "comtrend,ar-5387un", .data = &board_AR5387un, },
  	{ .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, },
 +	{ .compatible = "nucom,r5010un-v2", .data = &board_R5010UNV2, },
  	{ .compatible = "sagem,fast-2704-v2", .data = &board_FAST2704V2, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6328 */
  #ifdef CONFIG_BCM63XX_CPU_6338
diff --git a/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch b/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch
index 31c83972cc..13b26fc35e 100644
--- a/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch
+++ b/target/linux/bcm63xx/patches-5.4/555-board_HG622.patch
@@ -1,50 +1,50 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1888,6 +1888,52 @@ static struct board_info __initdata boar
+@@ -1828,6 +1828,52 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_HG622 = {
-+	.name				= "96368MVWG_hg622",
-+	.expected_cpu_id		= 0x6368,
++	.name = "96368MVWG_hg622",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 2,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_caldata			= 1,
++	.has_caldata = 1,
 +	.caldata = {
 +		{
-+			.vendor			= PCI_VENDOR_ID_RALINK,
-+			.caldata_offset		= 0xfa0000,
-+			.slot			= 1,
-+			.eeprom			= "rt2x00.eeprom",
++			.vendor = PCI_VENDOR_ID_RALINK,
++			.caldata_offset = 0xfa0000,
++			.slot = 1,
++			.eeprom = "rt2x00.eeprom",
 +		},
 +	},
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "port1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "port1",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "port2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "port2",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "port3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "port3",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "port4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "port4",
 +			},
 +		},
 +	},
@@ -53,7 +53,7 @@
  static struct sprom_fixup __initdata vr3025u_fixups[] = {
  	{ .offset = 97, .value = 0xfeb3 },
  	{ .offset = 98, .value = 0x1618 },
-@@ -2376,6 +2422,7 @@ static const struct board_info __initcon
+@@ -2296,6 +2342,7 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_DGND3700v1_3800B,
@@ -61,7 +61,7 @@
  	&board_HG655b,
  	&board_P870HW51A_V2,
  	&board_VR3025u,
-@@ -2484,6 +2531,7 @@ static struct of_device_id const bcm963x
+@@ -2404,6 +2451,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
  	{ .compatible = "comtrend,vr-3026e", .data = &board_VR3026e, },
  	{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
diff --git a/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch b/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch
index 6981b2ae16..c42cc61936 100644
--- a/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch
+++ b/target/linux/bcm63xx/patches-5.4/556-board_EVG2000.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1842,6 +1842,42 @@ static struct board_info __initdata boar
+@@ -1782,6 +1782,43 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -9,15 +9,15 @@
 +};
 +
 +static struct board_info __initdata board_EVG2000 = {
-+	.name				= "96369PVG",
-+	.expected_cpu_id		= 0x6368,
++	.name = "96369PVG",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 2,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[5] = {
@@ -30,20 +30,21 @@
 +			},
 +		},
 +	},
-+	.use_fallback_sprom	= 1,
++
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type			= SPROM_BCM4322,
-+		.pci_bus		= 0,
-+		.pci_dev		= 1,
-+		.board_fixups		= EVG2000_fixups,
-+		.num_board_fixups	= ARRAY_SIZE(EVG2000_fixups),
++		.type = SPROM_BCM4322,
++		.pci_bus = 0,
++		.pci_dev = 1,
++		.board_fixups = EVG2000_fixups,
++		.num_board_fixups = ARRAY_SIZE(EVG2000_fixups),
 +	},
 +};
 +
  static struct board_info __initdata board_HG655b = {
- 	.name				= "HW65x",
- 	.expected_cpu_id		= 0x6368,
-@@ -2422,6 +2458,7 @@ static const struct board_info __initcon
+ 	.name = "HW65x",
+ 	.expected_cpu_id = 0x6368,
+@@ -2342,6 +2379,7 @@ static const struct board_info __initcon
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_DGND3700v1_3800B,
@@ -51,11 +52,11 @@
  	&board_HG622,
  	&board_HG655b,
  	&board_P870HW51A_V2,
-@@ -2534,6 +2571,7 @@ static struct of_device_id const bcm963x
+@@ -2454,6 +2492,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "huawei,echolife-hg622", .data = &board_HG622, },
  	{ .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, },
  	{ .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, },
 +	{ .compatible = "netgear,evg2000", .data = &board_EVG2000, },
  	{ .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
diff --git a/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch b/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch
index fbf58fe33a..10db0ab410 100644
--- a/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch
+++ b/target/linux/bcm63xx/patches-5.4/557-board_AV4202N.patch
@@ -1,68 +1,66 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1732,6 +1732,51 @@ static struct board_info __initdata boar
+@@ -1682,6 +1682,49 @@ static struct board_info __initdata boar
   * known 6368 boards
   */
  #ifdef CONFIG_BCM63XX_CPU_6368
 +static struct board_info __initdata board_AV4202N = {
-+	.name				= "96368_Swiss_S1",
-+	.expected_cpu_id		= 0x6368,
++	.name = "96368_Swiss_S1",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 2,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
-+				.phy_id	= 1,
-+				.name	= "port1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "port1",
 +			},
-+
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "port2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "port2",
 +			},
-+
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "port3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "port3",
 +			},
-+
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "port4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "port4",
 +			},
 +		},
 +	},
-+	.use_fallback_sprom	= 1,
-+	.fallback_sprom = {
-+		.pci_bus		= 0,
-+		.pci_dev		= 1,
-+	},
 +
++	.use_fallback_sprom = 1,
++	.fallback_sprom = {
++		.type = SPROM_BCM4322,
++		.pci_bus = 0,
++		.pci_dev = 1,
++	},
 +};
 +
  static struct board_info __initdata board_96368mvwg = {
- 	.name				= "96368MVWG",
- 	.expected_cpu_id		= 0x6368,
-@@ -2455,6 +2500,7 @@ static const struct board_info __initcon
- #endif
- 
+ 	.name = "96368MVWG",
+ 	.expected_cpu_id = 0x6368,
+@@ -2376,6 +2419,7 @@ static const struct board_info __initcon
+ 	&board_fast2504n,
+ #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
 +	&board_AV4202N,
  	&board_96368mvwg,
  	&board_96368mvngr,
  	&board_DGND3700v1_3800B,
-@@ -2562,6 +2608,7 @@ static struct of_device_id const bcm963x
+@@ -2483,6 +2527,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
 +	{ .compatible = "adb,av4202n", .data = &board_AV4202N, },
  	{ .compatible = "brcm,bcm96368mvngr", .data = &board_96368mvngr, },
diff --git a/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch b/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch
index b89ac7fd49..d5be26bc18 100644
--- a/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch
+++ b/target/linux/bcm63xx/patches-5.4/558-board_VH4032N.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2216,6 +2216,106 @@ static struct board_info __initdata boar
+@@ -2155,6 +2155,106 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -60,54 +60,54 @@
 +};
 +
 +static struct board_info __initdata board_VH4032N = {
-+	.name				= "VH4032N",
-+	.expected_cpu_id		= 0x6368,
++	.name = "VH4032N",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 2,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used   = 1,
++				.used = 1,
 +				.phy_id = 1,
-+				.name   = "LAN4",
++				.name = "LAN4",
 +			},
 +			[1] = {
-+				.used   = 1,
++				.used = 1,
 +				.phy_id = 2,
-+				.name   = "LAN3",
++				.name = "LAN3",
 +			},
 +			[2] = {
-+				.used   = 1,
++				.used = 1,
 +				.phy_id = 3,
-+				.name   = "LAN2",
++				.name = "LAN2",
 +			},
 +			[3] = {
-+				.used   = 1,
++				.used = 1,
 +				.phy_id = 4,
-+				.name   = "LAN1",
++				.name = "LAN1",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43222,
-+		.pci_bus			= 0,
-+		.pci_dev			= 1,
-+		.board_fixups			= vh4032n_fixups,
-+		.num_board_fixups		= ARRAY_SIZE(vh4032n_fixups),
++		.type = SPROM_BCM43222,
++		.pci_bus = 0,
++		.pci_dev = 1,
++		.board_fixups = vh4032n_fixups,
++		.num_board_fixups = ARRAY_SIZE(vh4032n_fixups),
 +	},
 +};
 +
  static struct sprom_fixup __initdata wap5813n_fixups[] = {
  	{ .offset = 97, .value = 0xfeed },
  	{ .offset = 98, .value = 0x15d1 },
-@@ -2508,6 +2608,7 @@ static const struct board_info __initcon
+@@ -2427,6 +2527,7 @@ static const struct board_info __initcon
  	&board_HG622,
  	&board_HG655b,
  	&board_P870HW51A_V2,
@@ -115,11 +115,11 @@
  	&board_VR3025u,
  	&board_VR3025un,
  	&board_VR3026e,
-@@ -2619,6 +2720,7 @@ static struct of_device_id const bcm963x
+@@ -2538,6 +2639,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "huawei,echolife-hg655b", .data = &board_HG655b, },
  	{ .compatible = "netgear,dgnd3700-v1", .data = &board_DGND3700v1_3800B, },
  	{ .compatible = "netgear,evg2000", .data = &board_EVG2000, },
 +	{ .compatible = "observa,vh4032n", .data = &board_VH4032N, },
  	{ .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6368 */
  #ifdef CONFIG_BCM63XX_CPU_63268
diff --git a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch b/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch
index 9c42c6ea84..2de40e7cb7 100644
--- a/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch
+++ b/target/linux/bcm63xx/patches-5.4/559-board_R1000H.patch
@@ -1,36 +1,36 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2066,6 +2066,29 @@ static struct board_info __initdata boar
+@@ -2005,6 +2005,29 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_R1000H = {
-+	.name				= "R1000H",
-+	.expected_cpu_id		= 0x6368,
++	.name = "R1000H",
++	.expected_cpu_id = 0x6368,
 +
-+	.has_pci			= 1,
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[5] = {
-+				.used  = 1,
-+				.phy_id  = 0xff,
++				.used = 1,
++				.phy_id = 0xff,
 +				.bypass_link = 1,
 +				.force_speed = 1000,
 +				.force_duplex_full = 1,
-+				.name  = "RGMII",
++				.name = "RGMII",
 +			},
 +		},
 +	},
 +};
 +
  static struct board_info __initdata board_VR3025u = {
- 	.name					= "96368M-1541N",
- 	.expected_cpu_id		= 0x6368,
-@@ -2608,6 +2631,7 @@ static const struct board_info __initcon
+ 	.name = "96368M-1541N",
+ 	.expected_cpu_id = 0x6368,
+@@ -2527,6 +2550,7 @@ static const struct board_info __initcon
  	&board_HG622,
  	&board_HG655b,
  	&board_P870HW51A_V2,
@@ -38,9 +38,9 @@
  	&board_VH4032N,
  	&board_VR3025u,
  	&board_VR3025un,
-@@ -2709,6 +2733,7 @@ static struct of_device_id const bcm963x
+@@ -2628,6 +2652,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
 +	{ .compatible = "actiontec,r1000h", .data = &board_R1000H, },
  	{ .compatible = "adb,av4202n", .data = &board_AV4202N, },
diff --git a/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch b/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch
index e7fe6f69ac..38ef022e2a 100644
--- a/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch
+++ b/target/linux/bcm63xx/patches-5.4/560-board_AR-5315u.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -143,6 +143,67 @@ static struct board_info __initdata boar
+@@ -139,6 +139,65 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -19,68 +19,66 @@
 +};
 +
 +static struct board_info __initdata board_AR5315u = {
-+	.name				= "96318A-1441N1",
-+	.expected_cpu_id		= 0x6318,
++	.name = "96318A-1441N1",
++	.expected_cpu_id = 0x6318,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 1,
-+
-+	.has_enetsw			= 1,
-+
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
++				.used = 1,
 +				.phy_id = 1,
-+				.name	= "LAN4",
++				.name = "LAN4",
 +			},
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "LAN3",
++				.used = 1,
++				.phy_id = 2,
++				.name = "LAN3",
 +			},
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "LAN2",
++				.used = 1,
++				.phy_id = 3,
++				.name = "LAN2",
 +			},
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "LAN1",
++				.used = 1,
++				.phy_id = 4,
++				.name = "LAN1",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43217,
-+		.pci_bus			= 1,
-+		.pci_dev			= 0,
-+		.board_fixups			= ar5315u_fixups,
-+		.num_board_fixups		= ARRAY_SIZE(ar5315u_fixups),
++		.type = SPROM_BCM43217,
++		.pci_bus = 1,
++		.pci_dev = 0,
++		.board_fixups = ar5315u_fixups,
++		.num_board_fixups = ARRAY_SIZE(ar5315u_fixups),
 +	},
 +};
 +
  static struct sprom_fixup __initdata dsl2751b_e1_fixups[] = {
  	{ .offset = 96, .value = 0x2046 },
  	{ .offset = 97, .value = 0xfe9d },
-@@ -2548,6 +2609,7 @@ static const struct board_info __initcon
+@@ -2471,6 +2530,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_6318
  	&board_96318ref,
  	&board_96318ref_p300,
 +	&board_AR5315u,
  	&board_dsl_2751b_d1,
  	&board_FAST2704N,
- #endif
-@@ -2653,6 +2715,7 @@ static struct of_device_id const bcm963x
+ #endif /* CONFIG_BCM63XX_CPU_6318 */
+@@ -2572,6 +2632,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6318
  	{ .compatible = "brcm,bcm96318ref", .data = &board_96318ref, },
  	{ .compatible = "brcm,bcm96318ref-p300", .data = &board_96318ref_p300, },
 +	{ .compatible = "comtrend,ar-5315u", .data = &board_AR5315u, },
  	{ .compatible = "d-link,dsl-275xb-d1", .data = &board_dsl_2751b_d1, },
  	{ .compatible = "sagem,fast-2704n", .data = &board_FAST2704N, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6318 */
diff --git a/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch b/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch
index b50954a156..ea972ff451 100644
--- a/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch
+++ b/target/linux/bcm63xx/patches-5.4/561-board_AD1018.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -357,6 +357,73 @@ static struct board_info __initdata boar
+@@ -352,6 +352,71 @@ static struct board_info __initdata boar
  	},
  };
  
@@ -25,69 +25,67 @@
 +};
 +
 +static struct board_info __initdata board_AD1018 = {
-+	.name					= "96328avngr",
-+	.expected_cpu_id			= 0x6328,
++	.name = "96328avngr",
++	.expected_cpu_id = 0x6328,
 +
-+	.has_pci				= 1,
-+	.use_fallback_sprom			= 1,
-+
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
-+	.num_usbh_ports				= 1,
-+
-+	.has_enetsw				= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "FIBRE",
++				.used = 1,
++				.phy_id = 1,
++				.name = "FIBRE",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "LAN3",
++				.used = 1,
++				.phy_id = 2,
++				.name = "LAN3",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "LAN2",
++				.used = 1,
++				.phy_id = 3,
++				.name = "LAN2",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "LAN1",
++				.used = 1,
++				.phy_id = 4,
++				.name = "LAN1",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43217,
-+		.pci_bus			= 1,
-+		.pci_dev			= 0,
-+		.board_fixups			= ad1018_fixups,
-+		.num_board_fixups		= ARRAY_SIZE(ad1018_fixups),
++		.type = SPROM_BCM43217,
++		.pci_bus = 1,
++		.pci_dev = 0,
++		.board_fixups = ad1018_fixups,
++		.num_board_fixups = ARRAY_SIZE(ad1018_fixups),
 +	},
 +};
 +
  static struct sprom_fixup __initdata ar5381u_fixups[] = {
  	{ .offset = 97, .value = 0xfee5 },
  	{ .offset = 98, .value = 0x157c },
-@@ -2615,6 +2682,7 @@ static const struct board_info __initcon
- #endif
+@@ -2536,6 +2601,7 @@ static const struct board_info __initcon
+ #endif /* CONFIG_BCM63XX_CPU_6318 */
  #ifdef CONFIG_BCM63XX_CPU_6328
  	&board_96328avng,
 +	&board_AD1018,
  	&board_AR5381u,
  	&board_AR5387un,
  	&board_963281TAN,
-@@ -2729,6 +2797,8 @@ static struct of_device_id const bcm963x
+@@ -2646,6 +2712,8 @@ static struct of_device_id const bcm963x
  	{ .compatible = "d-link,dsl-274xb-f1", .data = &board_dsl_274xb_f1, },
  	{ .compatible = "nucom,r5010un-v2", .data = &board_R5010UNV2, },
  	{ .compatible = "sagem,fast-2704-v2", .data = &board_FAST2704V2, },
 +	{ .compatible = "sercomm,ad1018", .data = &board_AD1018, },
 +	{ .compatible = "sercomm,ad1018-nor", .data = &board_AD1018, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6328 */
  #ifdef CONFIG_BCM63XX_CPU_6338
  	{ .compatible = "brcm,bcm96338gw", .data = &board_96338gw, },
diff --git a/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch b/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch
index 8bae6c378b..0912c41dd2 100644
--- a/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch
+++ b/target/linux/bcm63xx/patches-5.4/562-board_sr102.patch
@@ -1,68 +1,61 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2664,6 +2664,49 @@ static struct board_info __initdata boar
+@@ -2583,6 +2583,42 @@ static struct board_info __initdata boar
  		},
  	},
  };
 +
 +static struct board_info __initdata board_BSKYB_63168 = {
-+	.name				= "BSKYB_63168",
-+	.expected_cpu_id		= 0x63268,
++	.name = "BSKYB_63168",
++	.expected_cpu_id = 0x63268,
 +
-+	.has_pci			= 1,
-+	.use_fallback_sprom		= 0,
-+
-+	.has_ehci0			= 1,
-+	.has_ohci0			= 1,
-+	.num_usbh_ports			= 2,
-+
-+	.has_enetsw			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
-+				.phy_id	= 1,
-+				.name	= "Port 1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "Port 1",
 +			},
-+
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
-+
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
-+
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
-+
 +		},
 +	},
 +};
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  
  /*
-@@ -2772,6 +2815,7 @@ static const struct board_info __initcon
+@@ -2687,6 +2723,7 @@ static const struct board_info __initcon
  	&board_963268bu_p300,
  	&board_963269bhr,
  	&board_vw6339gu,
 +	&board_BSKYB_63168,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_63268 */
  };
  
-@@ -2885,6 +2929,7 @@ static struct of_device_id const bcm963x
+@@ -2800,6 +2837,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, },
  	{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
  	{ .compatible = "inteno,vg50", .data = &board_vw6339gu, },
 +	{ .compatible = "sky,sr102", .data = &board_BSKYB_63168, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_63268 */
  #endif /* CONFIG_OF */
  	{ },
diff --git a/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch b/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch
index 925b150415..8ac3f5051c 100644
--- a/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch
+++ b/target/linux/bcm63xx/patches-5.4/563-board-VR-3032u.patch
@@ -1,63 +1,60 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2618,6 +2618,44 @@ static struct board_info __initdata boar
+@@ -2542,6 +2542,41 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_VR3032u = {
-+	.name				= "963168M-1841N1",
-+	.expected_cpu_id	= 0x63268,
++	.name = "963168M-1841N1",
++	.expected_cpu_id = 0x63268,
 +
-+	.has_ehci0			= 1,
-+	.has_ohci0			= 1,
-+	.num_usbh_ports		= 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used	= 1,
-+				.phy_id	= 1,
-+				.name	= "LAN2",
++				.used = 1,
++				.phy_id = 1,
++				.name = "LAN2",
 +			},
-+
 +			[1] = {
-+				.used	= 1,
-+				.phy_id	= 2,
-+				.name	= "LAN3",
++				.used = 1,
++				.phy_id = 2,
++				.name = "LAN3",
 +			},
-+
 +			[2] = {
-+				.used	= 1,
-+				.phy_id	= 3,
-+				.name	= "LAN4",
++				.used = 1,
++				.phy_id = 3,
++				.name = "LAN4",
 +			},
-+
 +			[3] = {
-+				.used	= 1,
-+				.phy_id	= 4,
-+				.name	= "LAN1",
++				.used = 1,
++				.phy_id = 4,
++				.name = "LAN1",
 +			},
 +		},
 +	},
 +};
 +
  static struct board_info __initdata board_vw6339gu = {
- 	.name				= "VW6339GU",
- 	.expected_cpu_id		= 0x63268,
-@@ -2814,6 +2852,7 @@ static const struct board_info __initcon
+ 	.name = "VW6339GU",
+ 	.expected_cpu_id = 0x63268,
+@@ -2722,6 +2757,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_63268
  	&board_963268bu_p300,
  	&board_963269bhr,
 +	&board_VR3032u,
  	&board_vw6339gu,
  	&board_BSKYB_63168,
- #endif
-@@ -2928,6 +2967,7 @@ static struct of_device_id const bcm963x
+ #endif /* CONFIG_BCM63XX_CPU_63268 */
+@@ -2836,6 +2872,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_63268
  	{ .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, },
  	{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
 +	{ .compatible = "comtrend,vr-3032u", .data = &board_VR3032u, },
  	{ .compatible = "inteno,vg50", .data = &board_vw6339gu, },
  	{ .compatible = "sky,sr102", .data = &board_BSKYB_63168, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_63268 */
diff --git a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch b/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch
index 2a39c733eb..559f00c87a 100644
--- a/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch
+++ b/target/linux/bcm63xx/patches-5.4/564-board-DGND3700v2.patch
@@ -1,50 +1,49 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1820,6 +1820,31 @@ static struct board_info __initdata boar
+@@ -1770,6 +1770,30 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_dgnd3700v2 = {
-+	.name				= "96362ADVN2xh",
-+	.expected_cpu_id		= 0x6362,
++	.name = "96362ADVN2xh",
++	.expected_cpu_id = 0x6362,
 +
-+	.has_pci			= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_ohci0			= 1,
-+	.has_ehci0			= 1,
-+	.num_usbh_ports			= 2,
-+
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[4] = {
-+				.used	= 1,
-+				.phy_id	= 0xff,
++				.used = 1,
++				.phy_id = 0xff,
 +				.bypass_link = 1,
 +				.force_speed = 1000,
 +				.force_duplex_full = 1,
-+				.name	= "RGMII",
++				.name = "RGMII",
 +			},
 +		},
 +	},
 +};
 +
  static struct board_info __initdata board_fast2504n = {
- 	.name				= "F@ST2504n",
- 	.expected_cpu_id		= 0x6362,
-@@ -2830,6 +2855,7 @@ static const struct board_info __initcon
- 
+ 	.name = "F@ST2504n",
+ 	.expected_cpu_id = 0x6362,
+@@ -2736,6 +2760,7 @@ static const struct board_info __initcon
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6362
  	&board_nb6,
 +	&board_dgnd3700v2,
  	&board_fast2504n,
- #endif
- 
-@@ -2945,6 +2971,7 @@ static struct of_device_id const bcm963x
+ #endif /* CONFIG_BCM63XX_CPU_6362 */
+ #ifdef CONFIG_BCM63XX_CPU_6368
+@@ -2850,6 +2875,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6362
 +	{ .compatible = "netgear,dgnd3700-v2", .data = &board_dgnd3700v2, },
  	{ .compatible = "sagem,fast-2504n", .data = &board_fast2504n, },
  	{ .compatible = "sfr,neufbox-6-sercomm-r0", .data = &board_nb6, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6362 */
diff --git a/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch b/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch
index 7d39125cee..fa0cd6aef0 100644
--- a/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch
+++ b/target/linux/bcm63xx/patches-5.4/565-board-VG-8050.patch
@@ -1,18 +1,18 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2643,6 +2643,31 @@ static struct board_info __initdata boar
+@@ -2566,6 +2566,31 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_VG8050 = {
-+	.name				= "963169P-1861N5",
-+	.expected_cpu_id		= 0x63268,
++	.name = "963169P-1861N5",
++	.expected_cpu_id = 0x63268,
 +
-+	.has_ehci0			= 1,
-+	.has_ohci0			= 1,
-+	.num_usbh_ports			= 2,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 2,
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[6] = {
@@ -30,9 +30,9 @@
 +};
 +
  static struct board_info __initdata board_VR3032u = {
- 	.name				= "963168M-1841N1",
- 	.expected_cpu_id	= 0x63268,
-@@ -2878,6 +2903,7 @@ static const struct board_info __initcon
+ 	.name = "963168M-1841N1",
+ 	.expected_cpu_id = 0x63268,
+@@ -2782,6 +2807,7 @@ static const struct board_info __initcon
  #ifdef CONFIG_BCM63XX_CPU_63268
  	&board_963268bu_p300,
  	&board_963269bhr,
@@ -40,7 +40,7 @@
  	&board_VR3032u,
  	&board_vw6339gu,
  	&board_BSKYB_63168,
-@@ -2994,6 +3020,7 @@ static struct of_device_id const bcm963x
+@@ -2898,6 +2924,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_63268
  	{ .compatible = "brcm,bcm963268bu-p300", .data = &board_963268bu_p300, },
  	{ .compatible = "brcm,bcm963269bhr", .data = &board_963269bhr, },
diff --git a/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch b/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch
index cbcd2ade96..10414fe41c 100644
--- a/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch
+++ b/target/linux/bcm63xx/patches-5.4/566-board-HG253s-v2.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -1879,6 +1879,37 @@ static struct board_info __initdata boar
+@@ -1824,6 +1824,37 @@ static struct board_info __initdata boar
  		},
  	},
  };
@@ -9,8 +9,8 @@
 +	.name = "hg253s",
 +	.expected_cpu_id = 0x6362,
 +
-+	.has_ehci0 = 1,
 +	.has_ohci0 = 1,
++	.has_ehci0 = 1,
 +	.num_usbh_ports = 1,
 +
 +	.has_enetsw = 1,
@@ -28,7 +28,7 @@
 +
 +			[5] = {
 +				.used = 1,
-+				.phy_id	= 24,
++				.phy_id = 24,
 +				.timing_sel = 1,
 +				.name = "WAN",
 +			},
@@ -38,17 +38,17 @@
  #endif /* CONFIG_BCM63XX_CPU_6362 */
  
  /*
-@@ -2882,6 +2913,7 @@ static const struct board_info __initcon
+@@ -2787,6 +2818,7 @@ static const struct board_info __initcon
  	&board_nb6,
  	&board_dgnd3700v2,
  	&board_fast2504n,
 +	&board_hg253s_v2,
- #endif
- 
+ #endif /* CONFIG_BCM63XX_CPU_6362 */
  #ifdef CONFIG_BCM63XX_CPU_6368
-@@ -2997,6 +3029,7 @@ static struct of_device_id const bcm963x
+ 	&board_AV4202N,
+@@ -2901,6 +2933,7 @@ static struct of_device_id const bcm963x
  	{ .compatible = "bt,home-hub-2-a", .data = &board_homehub2a, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_6358 */
  #ifdef CONFIG_BCM63XX_CPU_6362
 +	{ .compatible = "huawei,hg253s-v2", .data = &board_hg253s_v2, },
  	{ .compatible = "netgear,dgnd3700-v2", .data = &board_dgnd3700v2, },
diff --git a/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch b/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch
index 3976527b37..dec14545fe 100644
--- a/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch
+++ b/target/linux/bcm63xx/patches-5.4/567-board-adb_pdg-a4001n-a-000-1a1-ax.patch
@@ -1,56 +1,56 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -627,6 +627,49 @@ static struct board_info __initdata boar
+@@ -619,6 +619,49 @@ static struct board_info __initdata boar
  	},
  };
  
 +static struct board_info __initdata board_PDG_A4001N_A_000_1A1_AX = {
-+	.name					= "96328avng",
-+	.expected_cpu_id			= 0x6328,
++	.name = "96328avng",
++	.expected_cpu_id = 0x6328,
 +
-+	.has_pci				= 1,
-+	.use_fallback_sprom		= 1,
-+	.has_ohci0				= 1,
-+	.has_ehci0				= 1,
-+	.num_usbh_ports				= 1,
-+	.has_enetsw				= 1,
++	.has_pci = 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[0] = {
-+				.used		= 1,
-+				.phy_id		= 1,
-+				.name		= "Port 1",
++				.used = 1,
++				.phy_id = 1,
++				.name = "Port 1",
 +			},
 +			[1] = {
-+				.used		= 1,
-+				.phy_id		= 2,
-+				.name		= "Port 2",
++				.used = 1,
++				.phy_id = 2,
++				.name = "Port 2",
 +			},
 +			[2] = {
-+				.used		= 1,
-+				.phy_id		= 3,
-+				.name		= "Port 3",
++				.used = 1,
++				.phy_id = 3,
++				.name = "Port 3",
 +			},
 +			[3] = {
-+				.used		= 1,
-+				.phy_id		= 4,
-+				.name		= "Port 4",
++				.used = 1,
++				.phy_id = 4,
++				.name = "Port 4",
 +			},
 +		},
 +	},
 +
++	.use_fallback_sprom = 1,
 +	.fallback_sprom = {
-+		.type 				= SPROM_BCM43225,
-+		.pci_bus			= 1,
-+		.pci_dev			= 0,
++		.type = SPROM_BCM43225,
++		.pci_bus = 1,
++		.pci_dev = 0,
 +	},
 +};
 +
  static struct board_info __initdata board_A4001N1 = {
- 	.name					= "963281T_TEF",
- 	.expected_cpu_id			= 0x6328,
-@@ -2849,6 +2892,7 @@ static const struct board_info __initcon
+ 	.name = "963281T_TEF",
+ 	.expected_cpu_id = 0x6328,
+@@ -2757,6 +2800,7 @@ static const struct board_info __initcon
  	&board_AR5387un,
  	&board_963281TAN,
  	&board_A4001N,
@@ -58,7 +58,7 @@
  	&board_A4001N1,
  	&board_dsl_274xb_f1,
  	&board_FAST2704V2,
-@@ -2957,6 +3001,7 @@ static struct of_device_id const bcm963x
+@@ -2861,6 +2905,7 @@ static struct of_device_id const bcm963x
  #ifdef CONFIG_BCM63XX_CPU_6328
  	{ .compatible = "adb,a4001n", .data = &board_A4001N, },
  	{ .compatible = "adb,a4001n1", .data = &board_A4001N1, },
diff --git a/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch b/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch
index eaa28a9778..5bcb50672d 100644
--- a/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch
+++ b/target/linux/bcm63xx/patches-5.4/568-board-H500s.patch
@@ -1,27 +1,26 @@
 --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
 +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -2869,6 +2869,37 @@ static struct board_info __initdata boar
+@@ -2777,6 +2777,36 @@ static struct board_info __initdata boar
  		},
  	},
  };
 +
 +static struct board_info __initdata board_H500s = {
-+	.name				= "BXK00C-1.6",
-+	.expected_cpu_id		= 0x63268,
++	.name = "BXK00C-1.6",
++	.expected_cpu_id = 0x63268,
 +
-+	.has_ehci0			= 1,
-+	.has_ohci0			= 1,
-+	.num_usbh_ports			= 1,
++	.has_ohci0 = 1,
++	.has_ehci0 = 1,
++	.num_usbh_ports = 1,
 +
-+	.has_enetsw			= 1,
++	.has_enetsw = 1,
 +	.enetsw = {
 +		.used_ports = {
 +			[3] = {
-+				.used   = 1,
++				.used = 1,
 +				.phy_id = 12,
-+				.name   = "WAN",
++				.name = "WAN",
 +			},
-+
 +			[4] = {
 +				.used = 1,
 +				.phy_id = 0,
@@ -38,20 +37,20 @@
  #endif /* CONFIG_BCM63XX_CPU_63268 */
  
  /*
-@@ -2983,6 +3014,7 @@ static const struct board_info __initcon
+@@ -2887,6 +2917,7 @@ static const struct board_info __initcon
  	&board_VR3032u,
  	&board_vw6339gu,
  	&board_BSKYB_63168,
 +	&board_H500s,
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_63268 */
  };
  
-@@ -3101,6 +3133,8 @@ static struct of_device_id const bcm963x
+@@ -3005,6 +3036,8 @@ static struct of_device_id const bcm963x
  	{ .compatible = "comtrend,vg-8050", .data = &board_VG8050, },
  	{ .compatible = "comtrend,vr-3032u", .data = &board_VR3032u, },
  	{ .compatible = "inteno,vg50", .data = &board_vw6339gu, },
 +	{ .compatible = "sercomm,h500-s-lowi", .data = &board_H500s, },
 +	{ .compatible = "sercomm,h500-s-vfes", .data = &board_H500s, },
  	{ .compatible = "sky,sr102", .data = &board_BSKYB_63168, },
- #endif
+ #endif /* CONFIG_BCM63XX_CPU_63268 */
  #endif /* CONFIG_OF */
diff --git a/target/linux/cns3xxx/config-4.19 b/target/linux/cns3xxx/config-4.19
index b92b1e2aef..9b9aea461b 100644
--- a/target/linux/cns3xxx/config-4.19
+++ b/target/linux/cns3xxx/config-4.19
@@ -118,7 +118,6 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14
index 8739cf911b..d412f4da7b 100644
--- a/target/linux/generic/config-4.14
+++ b/target/linux/generic/config-4.14
@@ -1574,7 +1574,7 @@ CONFIG_GENERIC_NET_UTILS=y
 # CONFIG_GPIO_SCH311X is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19
index b03c7e1597..26ee2faf4c 100644
--- a/target/linux/generic/config-4.19
+++ b/target/linux/generic/config-4.19
@@ -1673,7 +1673,7 @@ CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 # CONFIG_GPIO_SCH311X is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
index 2f0d9003f3..f749ef3ee3 100644
--- a/target/linux/generic/config-5.4
+++ b/target/linux/generic/config-5.4
@@ -1800,7 +1800,7 @@ CONFIG_GPIOLIB_FASTPATH_LIMIT=512
 # CONFIG_GPIO_SCH311X is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SYSCON is not set
-# CONFIG_GPIO_SYSFS is not set
+CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_TS4900 is not set
 # CONFIG_GPIO_TS5500 is not set
diff --git a/target/linux/imx6/config-4.19 b/target/linux/imx6/config-4.19
index 9ba1d02b93..3b9b20ace1 100644
--- a/target/linux/imx6/config-4.19
+++ b/target/linux/imx6/config-4.19
@@ -233,7 +233,6 @@ CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_MXC=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
diff --git a/target/linux/imx6/config-5.4 b/target/linux/imx6/config-5.4
index bb8a80de74..fa397829f2 100644
--- a/target/linux/imx6/config-5.4
+++ b/target/linux/imx6/config-5.4
@@ -238,7 +238,6 @@ CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_MXC=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
diff --git a/target/linux/ipq40xx/config-4.19 b/target/linux/ipq40xx/config-4.19
index 0459372941..797943f04d 100644
--- a/target/linux/ipq40xx/config-4.19
+++ b/target/linux/ipq40xx/config-4.19
@@ -199,7 +199,6 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_74X164=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_WATCHDOG=y
 CONFIG_GPIO_WATCHDOG_ARCH_INITCALL=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
diff --git a/target/linux/ipq40xx/config-5.4 b/target/linux/ipq40xx/config-5.4
index 7900c9c04c..671f2b41f5 100644
--- a/target/linux/ipq40xx/config-5.4
+++ b/target/linux/ipq40xx/config-5.4
@@ -58,14 +58,11 @@ CONFIG_ARM_GIC=y
 CONFIG_ARM_HAS_SG_CHAIN=y
 CONFIG_ARM_L1_CACHE_SHIFT=6
 CONFIG_ARM_L1_CACHE_SHIFT_6=y
-# CONFIG_ARM_LPAE is not set
 CONFIG_ARM_PATCH_IDIV=y
 CONFIG_ARM_PATCH_PHYS_VIRT=y
 # CONFIG_ARM_QCOM_CPUFREQ_HW is not set
 # CONFIG_ARM_SMMU is not set
-# CONFIG_ARM_SP805_WATCHDOG is not set
 CONFIG_ARM_THUMB=y
-# CONFIG_ARM_THUMBEE is not set
 CONFIG_ARM_UNWIND=y
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_AT803X_PHY=y
@@ -88,8 +85,6 @@ CONFIG_CPUFREQ_DT_PLATDEV=y
 CONFIG_CPU_32v6K=y
 CONFIG_CPU_32v7=y
 CONFIG_CPU_ABRT_EV7=y
-# CONFIG_CPU_BIG_ENDIAN is not set
-# CONFIG_CPU_BPREDICT_DISABLE is not set
 CONFIG_CPU_CACHE_V7=y
 CONFIG_CPU_CACHE_VIPT=y
 CONFIG_CPU_COPY_V6=y
@@ -107,8 +102,6 @@ CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_GOV_USERSPACE is not set
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_HAS_ASID=y
-# CONFIG_CPU_ICACHE_DISABLE is not set
-# CONFIG_CPU_ICACHE_MISMATCH_WORKAROUND is not set
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
@@ -170,7 +163,6 @@ CONFIG_CRYPTO_ZSTD=y
 CONFIG_DCACHE_WORD_ACCESS=y
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
 CONFIG_DEBUG_MISC=y
-# CONFIG_DEBUG_USER is not set
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
 CONFIG_DMA_OF=y
@@ -214,7 +206,6 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_74X164=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_WATCHDOG=y
 CONFIG_GPIO_WATCHDOG_ARCH_INITCALL=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
@@ -271,6 +262,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
@@ -474,6 +467,7 @@ CONFIG_RFS_ACCEL=y
 CONFIG_RPS=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_I2C_AND_SPI=y
+CONFIG_RTC_MC146818_LIB=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
 # CONFIG_SDM_CAMCC_845 is not set
 # CONFIG_SDM_DISPCC_845 is not set
@@ -483,7 +477,6 @@ CONFIG_RWSEM_SPIN_ON_OWNER=y
 # CONFIG_SDM_LPASSCC_845 is not set
 # CONFIG_SDM_VIDEOCC_845 is not set
 CONFIG_SERIAL_8250_FSL=y
-# CONFIG_SERIAL_AMBA_PL011 is not set
 CONFIG_SERIAL_MCTRL_GPIO=y
 CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
@@ -513,7 +506,6 @@ CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_OF=y
-# CONFIG_THUMB2_KERNEL is not set
 CONFIG_TICK_CPU_ACCOUNTING=y
 CONFIG_TIMER_OF=y
 CONFIG_TIMER_PROBE=y
@@ -527,7 +519,6 @@ CONFIG_UBIFS_FS_ZSTD=y
 CONFIG_UEVENT_HELPER_PATH=""
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNWINDER_ARM=y
-# CONFIG_UNWINDER_FRAME_POINTER is not set
 CONFIG_USB=y
 CONFIG_USB_COMMON=y
 CONFIG_USB_SUPPORT=y
diff --git a/target/linux/ipq806x/config-4.19 b/target/linux/ipq806x/config-4.19
index bdbfca1501..f61883a6db 100644
--- a/target/linux/ipq806x/config-4.19
+++ b/target/linux/ipq806x/config-4.19
@@ -180,7 +180,6 @@ CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
diff --git a/target/linux/ipq806x/config-5.4 b/target/linux/ipq806x/config-5.4
index 794ce95042..263d153dde 100644
--- a/target/linux/ipq806x/config-5.4
+++ b/target/linux/ipq806x/config-5.4
@@ -186,7 +186,6 @@ CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_GRO_CELLS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
index 6c3410bf35..a23f3da469 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts
@@ -28,46 +28,16 @@
 	status = "okay";
 };
 
-&gsbi4 {
-	qcom,mode = <GSBI_PROT_I2C_UART>;
-	status = "okay";
+/*
+* The i2c device on gsbi4 should not be enabled.
+* On ipq806x designs gsbi4 i2c is meant for exclusive
+* RPM usage. Turning this on in kernel manifests as
+* i2c failure for the RPM.
+*/
 
-	serial@16340000 {
-		status = "okay";
-	};
-
-	/*
-	* The i2c device on gsbi4 should not be enabled.
-	* On ipq806x designs gsbi4 i2c is meant for exclusive
-	* RPM usage. Turning this on in kernel manifests as
-	* i2c failure for the RPM.
-	*/
-};
-
-&gsbi5 {
-	qcom,mode = <GSBI_PROT_SPI>;
-	status = "okay";
-
-	spi4: spi@1a280000 {
-		status = "okay";
-		spi-max-frequency = <50000000>;
-
-		pinctrl-0 = <&spi_pins>;
-		pinctrl-names = "default";
-
-		cs-gpios = <&qcom_pinmux 20 0>;
-
-		m25p80@0 {
-			compatible = "s25fl256s1";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			spi-max-frequency = <50000000>;
-			reg = <0>;
-
-			partitions {
-				compatible = "qcom,smem";
-			};
-		};
+&flash {
+	partitions {
+		compatible = "qcom,smem";
 	};
 };
 
@@ -156,11 +126,3 @@
 		full-duplex;
 	};
 };
-
-&sata_phy {
-	status = "okay";
-};
-
-&sata {
-	status = "okay";
-};
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
index 41a2bf116e..59c06dbccc 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts
@@ -36,54 +36,17 @@
 	};
 };
 
-&gsbi4 {
-	qcom,mode = <GSBI_PROT_I2C_UART>;
-	status = "okay";
-	serial@16340000 {
-		status = "okay";
+/*
+* The i2c device on gsbi4 should not be enabled.
+* On ipq806x designs gsbi4 i2c is meant for exclusive
+* RPM usage. Turning this on in kernel manifests as
+* i2c failure for the RPM.
+*/
+
+&flash {
+	partitions {
+		compatible = "qcom,smem";
 	};
-
-	/*
-	* The i2c device on gsbi4 should not be enabled.
-	* On ipq806x designs gsbi4 i2c is meant for exclusive
-	* RPM usage. Turning this on in kernel manifests as
-	* i2c failure for the RPM.
-	*/
-};
-
-&gsbi5 {
-	qcom,mode = <GSBI_PROT_SPI>;
-	status = "okay";
-
-	spi4: spi@1a280000 {
-		status = "okay";
-		spi-max-frequency = <50000000>;
-
-		pinctrl-0 = <&spi_pins>;
-		pinctrl-names = "default";
-
-		cs-gpios = <&qcom_pinmux 20 0>;
-
-		m25p80@0 {
-			compatible = "s25fl256s1";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			spi-max-frequency = <50000000>;
-			reg = <0>;
-
-			partitions {
-				compatible = "qcom,smem";
-			};
-		};
-	};
-};
-
-&sata_phy {
-	status = "okay";
-};
-
-&sata {
-	status = "okay";
 };
 
 &usb3_0 {
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts
index 1f68f826cb..8e8d942fbd 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-db149.dts
@@ -38,61 +38,41 @@
 	};
 };
 
-&gsbi5 {
-	qcom,mode = <GSBI_PROT_SPI>;
-	status = "okay";
+&gsbi4 {
+	status = "disabled";
+};
 
-	spi4: spi@1a280000 {
-		status = "okay";
-		spi-max-frequency = <50000000>;
+&gsbi4_serial {
+	status = "disabled";
+};
 
-		pinctrl-0 = <&spi_pins>;
-		pinctrl-names = "default";
+&flash {
+	m25p,fast-read;
 
-		cs-gpios = <&qcom_pinmux 20 0>;
-
-		m25p80@0 {
-			compatible = "s25fl256s1";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			spi-max-frequency = <50000000>;
-			reg = <0>;
-			m25p,fast-read;
-
-			partition@0 {
-				label = "lowlevel_init";
-				reg = <0x0 0x1b0000>;
-			};
-
-			partition@1 {
-				label = "u-boot";
-				reg = <0x1b0000 0x80000>;
-			};
-
-			partition@2 {
-				label = "u-boot-env";
-				reg = <0x230000 0x40000>;
-			};
-
-			partition@3 {
-				label = "caldata";
-				reg = <0x270000 0x40000>;
-			};
-
-			partition@4 {
-				label = "firmware";
-				reg = <0x2b0000 0x1d50000>;
-			};
-		};
+	partition@0 {
+		label = "lowlevel_init";
+		reg = <0x0 0x1b0000>;
 	};
-};
 
-&sata_phy {
-	status = "okay";
-};
+	partition@1 {
+		label = "u-boot";
+		reg = <0x1b0000 0x80000>;
+	};
 
-&sata {
-	status = "okay";
+	partition@2 {
+		label = "u-boot-env";
+		reg = <0x230000 0x40000>;
+	};
+
+	partition@3 {
+		label = "caldata";
+		reg = <0x270000 0x40000>;
+	};
+
+	partition@4 {
+		label = "firmware";
+		reg = <0x2b0000 0x1d50000>;
+	};
 };
 
 &usb3_0 {
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
index 49b34a32c6..c1fb3b5534 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts
@@ -133,26 +133,19 @@
 	};
 };
 
-&gsbi4 {
-	qcom,mode = <GSBI_PROT_I2C_UART>;
-	status = "okay";
-	serial@16340000 {
-		status = "okay";
+/*
+* The i2c device on gsbi4 should not be enabled.
+* On ipq806x designs gsbi4 i2c is meant for exclusive
+* RPM usage. Turning this on in kernel manifests as
+* i2c failure for the RPM.
+*/
+
+&gsbi5 {
+	status = "disabled";
+
+	spi@1a280000 {
+		status = "disabled";
 	};
-	/*
-		* The i2c device on gsbi4 should not be enabled.
-		* On ipq806x designs gsbi4 i2c is meant for exclusive
-		* RPM usage. Turning this on in kernel manifests as
-		* i2c failure for the RPM.
-		*/
-};
-
-&sata_phy {
-	status = "okay";
-};
-
-&sata {
-	status = "okay";
 };
 
 &usb3_0 {
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
deleted file mode 100644
index 40cae75746..0000000000
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "qcom-ipq8064.dtsi"
-
-/ {
-	aliases {
-		serial0 = &gsbi4_serial;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-};
-
-&CPU_SPC {
-	status = "okay";
-};
-
-&pcie0 {
-	phy-tx0-term-offset = <7>;
-};
-
-&pcie1 {
-	phy-tx0-term-offset = <7>;
-};
-
-&pcie2 {
-	phy-tx0-term-offset = <7>;
-};
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi
index 3a2bb6aebc..5d762046af 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi
@@ -26,6 +26,10 @@
 	phy-tx0-term-offset = <0>;
 };
 
+&sata {
+	ports-implemented = <0x1>;
+};
+
 &ss_phy_0 {
 	rx_eq = <2>;
 	tx_deamp_3_5db = <32>;
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
index 6dc1f92751..c4d2187ef6 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wpq864.dts
@@ -336,39 +336,21 @@
 	};
 };
 
-&gsbi4 {
-	status = "okay";
-	qcom,mode = <GSBI_PROT_I2C_UART>;
-};
-
 &gsbi4_serial {
-	status = "okay";
-
 	pinctrl-0 = <&uart0_pins>;
 	pinctrl-names = "default";
 };
 
-&gsbi5 {
-	status = "okay";
+&flash {
+	compatible = "jedec,spi-nor";
+};
 
-	qcom,mode = <GSBI_PROT_SPI>;
+&sata_phy {
+	status = "disabled";
+};
 
-	spi@1a280000 {
-		status = "okay";
-
-		pinctrl-0 = <&spi_pins>;
-		pinctrl-names = "default";
-
-		cs-gpios = <&qcom_pinmux 20 GPIO_ACTIVE_HIGH>;
-
-		s25fl256s1@0 {
-			compatible = "jedec,spi-nor";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			reg = <0>;
-			spi-max-frequency = <50000000>;
-		};
-	};
+&sata {
+	status = "disabled";
 };
 
 &ss_phy_0 {		/* USB3 port 0 SS phy */
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064.dtsi
deleted file mode 100644
index 38d77b6c0b..0000000000
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064.dtsi
+++ /dev/null
@@ -1,1578 +0,0 @@
-/dts-v1/;
-
-#include <dt-bindings/clock/qcom,gcc-ipq806x.h>
-#include <dt-bindings/mfd/qcom-rpm.h>
-#include <dt-bindings/clock/qcom,rpmcc.h>
-#include <dt-bindings/clock/qcom,lcc-ipq806x.h>
-#include <dt-bindings/soc/qcom,gsbi.h>
-#include <dt-bindings/reset/qcom,gcc-ipq806x.h>
-#include <dt-bindings/interrupt-controller/arm-gic.h>
-#include <dt-bindings/gpio/gpio.h>
-
-/ {
-	model = "Qualcomm IPQ8064";
-	compatible = "qcom,ipq8064";
-	interrupt-parent = <&intc>;
-
-	#address-cells = <1>;
-	#size-cells = <1>;
-	memory { device_type = "memory"; reg = <0 0>; };
-
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpu0: cpu@0 {
-			compatible = "qcom,krait";
-			enable-method = "qcom,kpss-acc-v1";
-			device_type = "cpu";
-			reg = <0>;
-			next-level-cache = <&L2>;
-			qcom,acc = <&acpu0_aux>;
-			qcom,saw = <&saw0>;
-			clocks = <&kraitcc 0>, <&kraitcc 4>;
-			clock-names = "cpu", "l2";
-			clock-latency = <100000>;
-			cpu-supply = <&smb208_s2a>;
-			operating-points-v2 = <&opp_table0>;
-			voltage-tolerance = <5>;
-			cooling-min-state = <0>;
-			cooling-max-state = <10>;
-			#cooling-cells = <2>;
-			cpu-idle-states = <&CPU_SPC>;
-		};
-
-		cpu1: cpu@1 {
-			compatible = "qcom,krait";
-			enable-method = "qcom,kpss-acc-v1";
-			device_type = "cpu";
-			reg = <1>;
-			next-level-cache = <&L2>;
-			qcom,acc = <&acpu1_aux>;
-			qcom,saw = <&saw1>;
-			clocks = <&kraitcc 1>, <&kraitcc 4>;
-			clock-names = "cpu", "l2";
-			clock-latency = <100000>;
-			cpu-supply = <&smb208_s2b>;
-			operating-points-v2 = <&opp_table0>;
-			voltage-tolerance = <5>;
-			cooling-min-state = <0>;
-			cooling-max-state = <10>;
-			#cooling-cells = <2>;
-			cpu-idle-states = <&CPU_SPC>;
-		};
-
-		L2: l2-cache {
-			compatible = "cache";
-			cache-level = <2>;
-			qcom,saw = <&saw_l2>;
-		};
-
-		qcom,l2 {
-			qcom,l2-rates = <384000000 1000000000 1200000000>;
-			qcom,l2-cpufreq = <384000000 600000000 1200000000>;
-			qcom,l2-volt = <1100000 1100000 1150000>;
-			qcom,l2-supply = <&smb208_s1a>;
-		};
-
-		idle-states {
-			CPU_SPC: spc {
-				compatible = "qcom,idle-state-spc",
-						"arm,idle-state";
-				status = "disabled";
-				entry-latency-us = <400>;
-				exit-latency-us = <900>;
-				min-residency-us = <3000>;
-			};
-		};
-	};
-
-	opp_table0: opp_table0 {
-		compatible = "operating-points-v2-qcom-cpu";
-		nvmem-cells = <&speedbin_efuse>;
-
-		opp-384000000 {
-			opp-hz = /bits/ 64 <384000000>;
-			opp-microvolt-speed0-pvs0-v0 = <1000000>;
-			opp-microvolt-speed0-pvs1-v0 = <925000>;
-			opp-microvolt-speed0-pvs2-v0 = <875000>;
-			opp-microvolt-speed0-pvs3-v0 = <800000>;
-			opp-supported-hw = <0x1>;
-			clock-latency-ns = <100000>;
-		};
-
-		opp-600000000 {
-			opp-hz = /bits/ 64 <600000000>;
-			opp-microvolt-speed0-pvs0-v0 = <1050000>;
-			opp-microvolt-speed0-pvs1-v0 = <975000>;
-			opp-microvolt-speed0-pvs2-v0 = <925000>;
-			opp-microvolt-speed0-pvs3-v0 = <850000>;
-			opp-supported-hw = <0x1>;
-			clock-latency-ns = <100000>;
-		};
-
-		opp-800000000 {
-			opp-hz = /bits/ 64 <800000000>;
-			opp-microvolt-speed0-pvs0-v0 = <1100000>;
-			opp-microvolt-speed0-pvs1-v0 = <1025000>;
-			opp-microvolt-speed0-pvs2-v0 = <995000>;
-			opp-microvolt-speed0-pvs3-v0 = <900000>;
-			opp-supported-hw = <0x1>;
-			clock-latency-ns = <100000>;
-		};
-
-		opp-1000000000 {
-			opp-hz = /bits/ 64 <1000000000>;
-			opp-microvolt-speed0-pvs0-v0 = <1150000>;
-			opp-microvolt-speed0-pvs1-v0 = <1075000>;
-			opp-microvolt-speed0-pvs2-v0 = <1025000>;
-			opp-microvolt-speed0-pvs3-v0 = <950000>;
-			opp-supported-hw = <0x1>;
-			clock-latency-ns = <100000>;
-		};
-
-		opp-1200000000 {
-			opp-hz = /bits/ 64 <1200000000>;
-			opp-microvolt-speed0-pvs0-v0 = <1200000>;
-			opp-microvolt-speed0-pvs1-v0 = <1125000>;
-			opp-microvolt-speed0-pvs2-v0 = <1075000>;
-			opp-microvolt-speed0-pvs3-v0 = <1000000>;
-			opp-supported-hw = <0x1>;
-			clock-latency-ns = <100000>;
-		};
-
-		opp-1400000000 {
-			opp-hz = /bits/ 64 <1400000000>;
-			opp-microvolt-speed0-pvs0-v0 = <1250000>;
-			opp-microvolt-speed0-pvs1-v0 = <1175000>;
-			opp-microvolt-speed0-pvs2-v0 = <1125000>;
-			opp-microvolt-speed0-pvs3-v0 = <1050000>;
-			opp-supported-hw = <0x1>;
-			clock-latency-ns = <100000>;
-		};
-
-	};
-
-	thermal-zones {
-		tsens_tz_sensor0 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 0>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-
-		tsens_tz_sensor1 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 1>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-
-		tsens_tz_sensor2 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 2>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-
-		tsens_tz_sensor3 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 3>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-
-		tsens_tz_sensor4 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 4>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-
-		tsens_tz_sensor5 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 5>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-
-		tsens_tz_sensor6 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 6>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-
-		tsens_tz_sensor7 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 7>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-
-		tsens_tz_sensor8 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 8>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-
-		tsens_tz_sensor9 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 9>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-
-		tsens_tz_sensor10 {
-			polling-delay-passive = <0>;
-			polling-delay = <0>;
-			thermal-sensors = <&tsens 10>;
-
-			trips {
-				cpu-critical-hi {
-					temperature = <125000>;
-					hysteresis = <2000>;
-					type = "critical_high";
-				};
-
-				cpu-config-hi {
-					temperature = <105000>;
-					hysteresis = <2000>;
-					type = "configurable_hi";
-				};
-
-				cpu-config-lo {
-					temperature = <95000>;
-					hysteresis = <2000>;
-					type = "configurable_lo";
-				};
-
-				cpu-critical-low {
-					temperature = <0>;
-					hysteresis = <2000>;
-					type = "critical_low";
-				};
-			};
-		};
-	};
-
-	cpu-pmu {
-		compatible = "qcom,krait-pmu";
-		interrupts = <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) |
-					  IRQ_TYPE_LEVEL_HIGH)>;
-	};
-
-	reserved-memory {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-
-		nss@40000000 {
-			reg = <0x40000000 0x1000000>;
-			no-map;
-		};
-
-		smem: smem@41000000 {
-			reg = <0x41000000 0x200000>;
-			no-map;
-		};
-	};
-
-	clocks {
-		cxo_board {
-			compatible = "fixed-clock";
-			#clock-cells = <0>;
-			clock-frequency = <25000000>;
-		};
-
-		pxo_board {
-			compatible = "fixed-clock";
-			#clock-cells = <0>;
-			clock-frequency = <25000000>;
-		};
-
-		sleep_clk: sleep_clk {
-			compatible = "fixed-clock";
-			clock-frequency = <32768>;
-			#clock-cells = <0>;
-		};
-	};
-
-	fab-scaling {
-		compatible = "qcom,fab-scaling";
-		clocks = <&rpmcc RPM_APPS_FABRIC_A_CLK>, <&rpmcc RPM_EBI1_A_CLK>;
-		clock-names = "apps-fab-clk", "ddr-fab-clk";
-		fab_freq_high = <533000000>;
-		fab_freq_nominal = <400000000>;
-		cpu_freq_threshold = <1000000000>;
-	};
-
-	firmware {
-		scm {
-			compatible = "qcom,scm-ipq806x";
-		};
-	};
-
-	soc: soc {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-		compatible = "simple-bus";
-
-		lpass@28100000 {
-			compatible = "qcom,lpass-cpu";
-			status = "disabled";
-			clocks = <&lcc AHBIX_CLK>,
-					<&lcc MI2S_OSR_CLK>,
-					<&lcc MI2S_BIT_CLK>;
-			clock-names = "ahbix-clk",
-					"mi2s-osr-clk",
-					"mi2s-bit-clk";
-			interrupts = <GIC_SPI 85 IRQ_TYPE_EDGE_RISING>;
-			interrupt-names = "lpass-irq-lpaif";
-			reg = <0x28100000 0x10000>;
-			reg-names = "lpass-lpaif";
-		};
-
-		qfprom: qfprom@700000 {
-			compatible = "qcom,qfprom", "syscon";
-			reg = <0x700000 0x1000>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			status = "okay";
-			tsens_calib: calib@400 {
-				reg = <0x400 0xb>;
-			};
-			tsens_backup: backup@410 {
-				reg = <0x410 0xb>;
-			};
-			speedbin_efuse: speedbin@0c0 {
-				reg = <0x0c0 0x4>;
-			};
-		};
-
-		rpm: rpm@108000 {
-			compatible = "qcom,rpm-ipq8064";
-			reg = <0x108000 0x1000>;
-			qcom,ipc = <&l2cc 0x8 2>;
-
-			interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>,
-					 <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>,
-					 <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "ack",
-					  "err",
-					  "wakeup";
-
-			clocks = <&gcc RPM_MSG_RAM_H_CLK>;
-			clock-names = "ram";
-
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			rpmcc: clock-controller {
-				compatible	= "qcom,rpmcc-ipq806x", "qcom,rpmcc";
-				#clock-cells = <1>;
-			};
-
-			regulators {
-				compatible = "qcom,rpm-smb208-regulators";
-
-				smb208_s1a: s1a {
-					regulator-min-microvolt = <1050000>;
-					regulator-max-microvolt = <1150000>;
-
-					qcom,switch-mode-frequency = <1200000>;
-
-				};
-
-				smb208_s1b: s1b {
-					regulator-min-microvolt = <1050000>;
-					regulator-max-microvolt = <1150000>;
-
-					qcom,switch-mode-frequency = <1200000>;
-				};
-
-				smb208_s2a: s2a {
-					regulator-min-microvolt = < 800000>;
-					regulator-max-microvolt = <1250000>;
-
-					qcom,switch-mode-frequency = <1200000>;
-				};
-
-				smb208_s2b: s2b {
-					regulator-min-microvolt = < 800000>;
-					regulator-max-microvolt = <1250000>;
-
-					qcom,switch-mode-frequency = <1200000>;
-				};
-			};
-		};
-
-		rng@1a500000 {
-			compatible = "qcom,prng";
-			reg = <0x1a500000 0x200>;
-			clocks = <&gcc PRNG_CLK>;
-			clock-names = "core";
-		};
-
-		qcom_pinmux: pinmux@800000 {
-			compatible = "qcom,ipq8064-pinctrl";
-			reg = <0x800000 0x4000>;
-
-			gpio-controller;
-			#gpio-cells = <2>;
-			interrupt-controller;
-			#interrupt-cells = <2>;
-			interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
-
-			pcie0_pins: pcie0_pinmux {
-				mux {
-					pins = "gpio3";
-					function = "pcie1_rst";
-					drive-strength = <12>;
-					bias-disable;
-				};
-			};
-
-			pcie1_pins: pcie1_pinmux {
-				mux {
-					pins = "gpio48";
-					function = "pcie2_rst";
-					drive-strength = <12>;
-					bias-disable;
-				};
-			};
-
-			pcie2_pins: pcie2_pinmux {
-				mux {
-					pins = "gpio63";
-					function = "pcie3_rst";
-					drive-strength = <12>;
-					bias-disable;
-					output-low;
-				};
-			};
-
-			i2c4_pins: i2c4_pinmux {
-				mux {
-					pins = "gpio12", "gpio13";
-					function = "gsbi4";
-					drive-strength = <12>;
-					bias-disable;
-				};
-			};
-
-			spi_pins: spi_pins {
-				mux {
-					pins = "gpio18", "gpio19", "gpio21";
-					function = "gsbi5";
-					drive-strength = <10>;
-					bias-none;
-				};
-			};
-
-			nand_pins: nand_pins {
-				disable {
-					pins = "gpio34", "gpio35", "gpio36",
-					       "gpio37", "gpio38";
-					function = "nand";
-					drive-strength = <10>;
-					bias-disable;
-				};
-
-				pullups {
-					pins = "gpio39";
-					function = "nand";
-					drive-strength = <10>;
-					bias-pull-up;
-				};
-
-				hold {
-					pins = "gpio40", "gpio41", "gpio42",
-					       "gpio43", "gpio44", "gpio45",
-					       "gpio46", "gpio47";
-					function = "nand";
-					drive-strength = <10>;
-					bias-bus-hold;
-				};
-			};
-
-			mdio0_pins: mdio0_pins {
-				mux {
-					pins = "gpio0", "gpio1";
-					function = "mdio";
-					drive-strength = <8>;
-					bias-disable;
-				};
-			};
-
-			rgmii2_pins: rgmii2_pins {
-				mux {
-					pins = "gpio27", "gpio28", "gpio29",
-					       "gpio30", "gpio31", "gpio32",
-					       "gpio51", "gpio52", "gpio59",
-					       "gpio60", "gpio61", "gpio62";
-					function = "rgmii2";
-					drive-strength = <8>;
-					bias-disable;
-				};
-			};
-
-			leds_pins: leds_pins {
-				mux {
-					pins = "gpio7", "gpio8", "gpio9",
-						   "gpio26", "gpio53";
-					function = "gpio";
-					drive-strength = <2>;
-					bias-pull-down;
-					output-low;
-				};
-			};
-
-			buttons_pins: buttons_pins {
-				mux {
-					pins = "gpio54";
-					drive-strength = <2>;
-					bias-pull-up;
-				};
-			};
-		};
-
-		intc: interrupt-controller@2000000 {
-			compatible = "qcom,msm-qgic2";
-			interrupt-controller;
-			#interrupt-cells = <3>;
-			reg = <0x02000000 0x1000>,
-				  <0x02002000 0x1000>;
-		};
-
-		timer@200a000 {
-			compatible = "qcom,kpss-timer", "qcom,msm-timer";
-			interrupts = <GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(2) |
-						 IRQ_TYPE_EDGE_RISING)>,
-					 <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(2) |
-						 IRQ_TYPE_EDGE_RISING)>,
-					 <GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(2) |
-						 IRQ_TYPE_EDGE_RISING)>,
-					 <GIC_PPI 4 (GIC_CPU_MASK_SIMPLE(2) |
-						 IRQ_TYPE_EDGE_RISING)>,
-					 <GIC_PPI 5 (GIC_CPU_MASK_SIMPLE(2) |
-						 IRQ_TYPE_EDGE_RISING)>;
-			reg = <0x0200a000 0x100>;
-			clock-frequency = <25000000>,
-					  <32768>;
-			clocks = <&sleep_clk>;
-			clock-names = "sleep";
-			cpu-offset = <0x80000>;
-		};
-
-		acpu0_aux: clock-controller@2088000 {
-			compatible = "qcom,kpss-acc-v1";
-			reg = <0x02088000 0x1000>, <0x02008000 0x1000>;
-			clock-output-names = "acpu0_aux";
-		};
-
-		acpu1_aux: clock-controller@2098000 {
-			compatible = "qcom,kpss-acc-v1";
-			reg = <0x02098000 0x1000>, <0x02008000 0x1000>;
-			clock-output-names = "acpu1_aux";
-		};
-
-		l2cc: clock-controller@2011000 {
-			compatible = "qcom,kpss-gcc", "syscon";
-			reg = <0x2011000 0x1000>;
-			clock-output-names = "acpu_l2_aux";
-		};
-
-		kraitcc: clock-controller {
-			compatible = "qcom,krait-cc-v1";
-			#clock-cells = <1>;
-		};
-
-		saw0: regulator@2089000 {
-			compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon";
-			reg = <0x02089000 0x1000>, <0x02009000 0x1000>;
-			regulator;
-		};
-
-		saw1: regulator@2099000 {
-			compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon";
-			reg = <0x02099000 0x1000>, <0x02009000 0x1000>;
-			regulator;
-		};
-
-		saw_l2: regulator@02012000 {
-			compatible = "qcom,saw2", "syscon";
-			reg = <0x02012000 0x1000>;
-			regulator;
-		};
-
-		sic_non_secure: sic-non-secure@12100000 {
-			compatible = "syscon";
-			reg = <0x12100000 0x10000>;
-		};
-
-		gsbi2: gsbi@12480000 {
-			compatible = "qcom,gsbi-v1.0.0";
-			cell-index = <2>;
-			reg = <0x12480000 0x100>;
-			clocks = <&gcc GSBI2_H_CLK>;
-			clock-names = "iface";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges;
-			status = "disabled";
-
-			syscon-tcsr = <&tcsr>;
-
-			gsbi2_serial: serial@12490000 {
-				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
-				reg = <0x12490000 0x1000>,
-					  <0x12480000 0x1000>;
-				interrupts = <GIC_SPI 195 IRQ_TYPE_LEVEL_HIGH>;
-				clocks = <&gcc GSBI2_UART_CLK>, <&gcc GSBI2_H_CLK>;
-				clock-names = "core", "iface";
-				status = "disabled";
-			};
-
-			i2c@124a0000 {
-				compatible = "qcom,i2c-qup-v1.1.1";
-				reg = <0x124a0000 0x1000>;
-				interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>;
-
-				clocks = <&gcc GSBI2_QUP_CLK>, <&gcc GSBI2_H_CLK>;
-				clock-names = "core", "iface";
-				status = "disabled";
-
-				#address-cells = <1>;
-				#size-cells = <0>;
-			};
-
-		};
-
-		gsbi4: gsbi@16300000 {
-			compatible = "qcom,gsbi-v1.0.0";
-			cell-index = <4>;
-			reg = <0x16300000 0x100>;
-			clocks = <&gcc GSBI4_H_CLK>;
-			clock-names = "iface";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges;
-			status = "disabled";
-
-			syscon-tcsr = <&tcsr>;
-
-			gsbi4_serial: serial@16340000 {
-				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
-				reg = <0x16340000 0x1000>,
-					  <0x16300000 0x1000>;
-				interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>;
-				clocks = <&gcc GSBI4_UART_CLK>, <&gcc GSBI4_H_CLK>;
-				clock-names = "core", "iface";
-				status = "disabled";
-			};
-
-			i2c@16380000 {
-				compatible = "qcom,i2c-qup-v1.1.1";
-				reg = <0x16380000 0x1000>;
-				interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_HIGH>;
-
-				clocks = <&gcc GSBI4_QUP_CLK>, <&gcc GSBI4_H_CLK>;
-				clock-names = "core", "iface";
-				status = "disabled";
-
-				#address-cells = <1>;
-				#size-cells = <0>;
-			};
-		};
-
-		gsbi5: gsbi@1a200000 {
-			compatible = "qcom,gsbi-v1.0.0";
-			cell-index = <5>;
-			reg = <0x1a200000 0x100>;
-			clocks = <&gcc GSBI5_H_CLK>;
-			clock-names = "iface";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges;
-			status = "disabled";
-
-			syscon-tcsr = <&tcsr>;
-
-			gsbi5_serial: serial@1a240000 {
-				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
-				reg = <0x1a240000 0x1000>,
-					  <0x1a200000 0x1000>;
-				interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_HIGH>;
-				clocks = <&gcc GSBI5_UART_CLK>, <&gcc GSBI5_H_CLK>;
-				clock-names = "core", "iface";
-				status = "disabled";
-			};
-
-			i2c@1a280000 {
-				compatible = "qcom,i2c-qup-v1.1.1";
-				reg = <0x1a280000 0x1000>;
-				interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
-
-				clocks = <&gcc GSBI5_QUP_CLK>, <&gcc GSBI5_H_CLK>;
-				clock-names = "core", "iface";
-				status = "disabled";
-
-				#address-cells = <1>;
-				#size-cells = <0>;
-			};
-
-			spi@1a280000 {
-				compatible = "qcom,spi-qup-v1.1.1";
-				reg = <0x1a280000 0x1000>;
-				interrupts = <GIC_SPI 155 IRQ_TYPE_LEVEL_HIGH>;
-
-				clocks = <&gcc GSBI5_QUP_CLK>, <&gcc GSBI5_H_CLK>;
-				clock-names = "core", "iface";
-				status = "disabled";
-
-				#address-cells = <1>;
-				#size-cells = <0>;
-			};
-		};
-
-		gsbi7: gsbi@16600000 {
-			status = "disabled";
-			compatible = "qcom,gsbi-v1.0.0";
-			cell-index = <7>;
-			reg = <0x16600000 0x100>;
-			clocks = <&gcc GSBI7_H_CLK>;
-			clock-names = "iface";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges;
-			syscon-tcsr = <&tcsr>;
-
-			gsbi7_serial: serial@16640000 {
-				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
-				reg = <0x16640000 0x1000>,
-					  <0x16600000 0x1000>;
-				interrupts = <GIC_SPI 158 IRQ_TYPE_LEVEL_HIGH>;
-				clocks = <&gcc GSBI7_UART_CLK>, <&gcc GSBI7_H_CLK>;
-				clock-names = "core", "iface";
-				status = "disabled";
-			};
-		};
-
-		sata_phy: sata-phy@1b400000 {
-			compatible = "qcom,ipq806x-sata-phy";
-			reg = <0x1b400000 0x200>;
-
-			clocks = <&gcc SATA_PHY_CFG_CLK>;
-			clock-names = "cfg";
-
-			#phy-cells = <0>;
-			status = "disabled";
-		};
-
-		sata: sata@29000000 {
-			compatible = "qcom,ipq806x-ahci", "generic-ahci";
-			reg = <0x29000000 0x180>;
-
-			ports-implemented = <0x1>;
-
-			interrupts = <GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>;
-
-			clocks = <&gcc SFAB_SATA_S_H_CLK>,
-				 <&gcc SATA_H_CLK>,
-				 <&gcc SATA_A_CLK>,
-				 <&gcc SATA_RXOOB_CLK>,
-				 <&gcc SATA_PMALIVE_CLK>;
-			clock-names = "slave_face", "iface", "core",
-					"rxoob", "pmalive";
-
-			assigned-clocks = <&gcc SATA_RXOOB_CLK>, <&gcc SATA_PMALIVE_CLK>;
-			assigned-clock-rates = <100000000>, <100000000>;
-
-			phys = <&sata_phy>;
-			phy-names = "sata-phy";
-			status = "disabled";
-		};
-
-		qcom,ssbi@500000 {
-			compatible = "qcom,ssbi";
-			reg = <0x00500000 0x1000>;
-			qcom,controller-type = "pmic-arbiter";
-		};
-
-		gcc: clock-controller@900000 {
-			compatible = "qcom,gcc-ipq8064";
-			reg = <0x00900000 0x4000>;
-			#clock-cells = <1>;
-			#reset-cells = <1>;
-			#power-domain-cells = <1>;
-		};
-
-		tsens: thermal-sensor@900000 {
-			compatible = "qcom,ipq8064-tsens";
-			reg = <0x900000 0x3680>;
-			nvmem-cells = <&tsens_calib>, <&tsens_backup>;
-			nvmem-cell-names = "calib", "calib_backup";
-			interrupts = <GIC_SPI 178 IRQ_TYPE_LEVEL_HIGH>;
-			#thermal-sensor-cells = <1>;
-		};
-
-		tcsr: syscon@1a400000 {
-			compatible = "qcom,tcsr-ipq8064", "syscon";
-			reg = <0x1a400000 0x100>;
-		};
-
-		lcc: clock-controller@28000000 {
-			compatible = "qcom,lcc-ipq8064";
-			reg = <0x28000000 0x1000>;
-			#clock-cells = <1>;
-			#reset-cells = <1>;
-		};
-
-		sfpb_mutex_block: syscon@1200600 {
-			compatible = "syscon";
-			reg = <0x01200600 0x100>;
-		};
-
-		hs_phy_0: hs_phy_0 {
-			compatible = "qcom,dwc3-hs-usb-phy";
-			regmap = <&usb3_0>;
-			clocks = <&gcc USB30_0_UTMI_CLK>;
-			clock-names = "ref";
-			#phy-cells = <0>;
-		};
-
-		ss_phy_0: ss_phy_0 {
-			compatible = "qcom,dwc3-ss-usb-phy";
-			regmap = <&usb3_0>;
-			clocks = <&gcc USB30_0_MASTER_CLK>;
-			clock-names = "ref";
-			#phy-cells = <0>;
-		};
-
-		usb3_0: usb3@110f8800 {
-			compatible = "qcom,dwc3", "syscon";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			reg = <0x110f8800 0x8000>;
-			clocks = <&gcc USB30_0_MASTER_CLK>;
-			clock-names = "core";
-
-			ranges;
-
-			resets = <&gcc USB30_0_MASTER_RESET>;
-			reset-names = "master";
-
-			status = "disabled";
-
-			dwc3_0: dwc3@11000000 {
-				compatible = "snps,dwc3";
-				reg = <0x11000000 0xcd00>;
-				interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
-				phys = <&hs_phy_0>, <&ss_phy_0>;
-				phy-names = "usb2-phy", "usb3-phy";
-				dr_mode = "host";
-				snps,dis_u3_susphy_quirk;
-			};
-		};
-
-		hs_phy_1: hs_phy_1 {
-			compatible = "qcom,dwc3-hs-usb-phy";
-			regmap = <&usb3_1>;
-			clocks = <&gcc USB30_1_UTMI_CLK>;
-			clock-names = "ref";
-			#phy-cells = <0>;
-		};
-
-		ss_phy_1: ss_phy_1 {
-			compatible = "qcom,dwc3-ss-usb-phy";
-			regmap = <&usb3_1>;
-			clocks = <&gcc USB30_1_MASTER_CLK>;
-			clock-names = "ref";
-			#phy-cells = <0>;
-		};
-
-		usb3_1: usb3@100f8800 {
-			compatible = "qcom,dwc3", "syscon";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			reg = <0x100f8800 0x8000>;
-			clocks = <&gcc USB30_1_MASTER_CLK>;
-			clock-names = "core";
-
-			ranges;
-
-			resets = <&gcc USB30_1_MASTER_RESET>;
-			reset-names = "master";
-
-			status = "disabled";
-
-			dwc3_1: dwc3@10000000 {
-				compatible = "snps,dwc3";
-				reg = <0x10000000 0xcd00>;
-				interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>;
-				phys = <&hs_phy_1>, <&ss_phy_1>;
-				phy-names = "usb2-phy", "usb3-phy";
-				dr_mode = "host";
-				snps,dis_u3_susphy_quirk;
-			};
-		};
-
-		pcie0: pci@1b500000 {
-			compatible = "qcom,pcie-ipq8064";
-			reg = <0x1b500000 0x1000
-				   0x1b502000 0x80
-				   0x1b600000 0x100
-				   0x0ff00000 0x100000>;
-			reg-names = "dbi", "elbi", "parf", "config";
-			device_type = "pci";
-			linux,pci-domain = <0>;
-			bus-range = <0x00 0xff>;
-			num-lanes = <1>;
-			#address-cells = <3>;
-			#size-cells = <2>;
-
-			ranges = <0x81000000 0 0x0fe00000 0x0fe00000 0 0x00100000   /* downstream I/O */
-				  0x82000000 0 0x08000000 0x08000000 0 0x07e00000>; /* non-prefetchable memory */
-
-			interrupts = <GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "msi";
-			#interrupt-cells = <1>;
-			interrupt-map-mask = <0 0 0 0x7>;
-			interrupt-map = <0 0 0 1 &intc 0 36 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
-					<0 0 0 2 &intc 0 37 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
-					<0 0 0 3 &intc 0 38 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
-					<0 0 0 4 &intc 0 39 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
-
-			clocks = <&gcc PCIE_A_CLK>,
-				 <&gcc PCIE_H_CLK>,
-				 <&gcc PCIE_PHY_CLK>,
-				 <&gcc PCIE_AUX_CLK>,
-				 <&gcc PCIE_ALT_REF_CLK>;
-			clock-names = "core", "iface", "phy", "aux", "ref";
-
-			assigned-clocks = <&gcc PCIE_ALT_REF_CLK>;
-			assigned-clock-rates = <100000000>;
-
-			resets = <&gcc PCIE_ACLK_RESET>,
-				 <&gcc PCIE_HCLK_RESET>,
-				 <&gcc PCIE_POR_RESET>,
-				 <&gcc PCIE_PCI_RESET>,
-				 <&gcc PCIE_PHY_RESET>,
-				 <&gcc PCIE_EXT_RESET>;
-			reset-names = "axi", "ahb", "por", "pci", "phy", "ext";
-
-			pinctrl-0 = <&pcie0_pins>;
-			pinctrl-names = "default";
-
-			perst-gpios = <&qcom_pinmux 3 GPIO_ACTIVE_LOW>;
-
-			status = "disabled";
-		};
-
-		pcie1: pci@1b700000 {
-			compatible = "qcom,pcie-ipq8064";
-			reg = <0x1b700000 0x1000
-				   0x1b702000 0x80
-				   0x1b800000 0x100
-				   0x31f00000 0x100000>;
-			reg-names = "dbi", "elbi", "parf", "config";
-			device_type = "pci";
-			linux,pci-domain = <1>;
-			bus-range = <0x00 0xff>;
-			num-lanes = <1>;
-			#address-cells = <3>;
-			#size-cells = <2>;
-
-			ranges = <0x81000000 0 0x31e00000 0x31e00000 0 0x00100000   /* downstream I/O */
-				  0x82000000 0 0x2e000000 0x2e000000 0 0x03e00000>; /* non-prefetchable memory */
-
-			interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "msi";
-			#interrupt-cells = <1>;
-			interrupt-map-mask = <0 0 0 0x7>;
-			interrupt-map = <0 0 0 1 &intc 0 58 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
-					<0 0 0 2 &intc 0 59 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
-					<0 0 0 3 &intc 0 60 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
-					<0 0 0 4 &intc 0 61 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
-
-			clocks = <&gcc PCIE_1_A_CLK>,
-				 <&gcc PCIE_1_H_CLK>,
-				 <&gcc PCIE_1_PHY_CLK>,
-				 <&gcc PCIE_1_AUX_CLK>,
-				 <&gcc PCIE_1_ALT_REF_CLK>;
-			clock-names = "core", "iface", "phy", "aux", "ref";
-
-			assigned-clocks = <&gcc PCIE_1_ALT_REF_CLK>;
-			assigned-clock-rates = <100000000>;
-
-			resets = <&gcc PCIE_1_ACLK_RESET>,
-				 <&gcc PCIE_1_HCLK_RESET>,
-				 <&gcc PCIE_1_POR_RESET>,
-				 <&gcc PCIE_1_PCI_RESET>,
-				 <&gcc PCIE_1_PHY_RESET>,
-				 <&gcc PCIE_1_EXT_RESET>;
-			reset-names = "axi", "ahb", "por", "pci", "phy", "ext";
-
-			pinctrl-0 = <&pcie1_pins>;
-			pinctrl-names = "default";
-
-			perst-gpios = <&qcom_pinmux 48 GPIO_ACTIVE_LOW>;
-
-			status = "disabled";
-		};
-
-		pcie2: pci@1b900000 {
-			compatible = "qcom,pcie-ipq8064";
-			reg = <0x1b900000 0x1000
-				   0x1b902000 0x80
-				   0x1ba00000 0x100
-				   0x35f00000 0x100000>;
-			reg-names = "dbi", "elbi", "parf", "config";
-			device_type = "pci";
-			linux,pci-domain = <2>;
-			bus-range = <0x00 0xff>;
-			num-lanes = <1>;
-			#address-cells = <3>;
-			#size-cells = <2>;
-
-			ranges = <0x81000000 0 0x35e00000 0x35e00000 0 0x00100000   /* downstream I/O */
-				  0x82000000 0 0x32000000 0x32000000 0 0x03e00000>; /* non-prefetchable memory */
-
-			interrupts = <GIC_SPI 71 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "msi";
-			#interrupt-cells = <1>;
-			interrupt-map-mask = <0 0 0 0x7>;
-			interrupt-map = <0 0 0 1 &intc 0 72 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
-					<0 0 0 2 &intc 0 73 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
-					<0 0 0 3 &intc 0 74 IRQ_TYPE_LEVEL_HIGH>, /* int_c */
-					<0 0 0 4 &intc 0 75 IRQ_TYPE_LEVEL_HIGH>; /* int_d */
-
-			clocks = <&gcc PCIE_2_A_CLK>,
-				 <&gcc PCIE_2_H_CLK>,
-				 <&gcc PCIE_2_PHY_CLK>,
-				 <&gcc PCIE_2_AUX_CLK>,
-				 <&gcc PCIE_2_ALT_REF_CLK>;
-			clock-names = "core", "iface", "phy", "aux", "ref";
-
-			assigned-clocks = <&gcc PCIE_2_ALT_REF_CLK>;
-			assigned-clock-rates = <100000000>;
-
-			resets = <&gcc PCIE_2_ACLK_RESET>,
-				 <&gcc PCIE_2_HCLK_RESET>,
-				 <&gcc PCIE_2_POR_RESET>,
-				 <&gcc PCIE_2_PCI_RESET>,
-				 <&gcc PCIE_2_PHY_RESET>,
-				 <&gcc PCIE_2_EXT_RESET>;
-			reset-names = "axi", "ahb", "por", "pci", "phy", "ext";
-
-			pinctrl-0 = <&pcie2_pins>;
-			pinctrl-names = "default";
-
-			perst-gpios = <&qcom_pinmux 63 GPIO_ACTIVE_LOW>;
-
-			status = "disabled";
-		};
-
-		adm_dma: dma@18300000 {
-			compatible = "qcom,adm";
-			reg = <0x18300000 0x100000>;
-			interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
-			#dma-cells = <1>;
-
-			clocks = <&gcc ADM0_CLK>, <&gcc ADM0_PBUS_CLK>;
-			clock-names = "core", "iface";
-
-			resets = <&gcc ADM0_RESET>,
-				 <&gcc ADM0_PBUS_RESET>,
-				 <&gcc ADM0_C0_RESET>,
-				 <&gcc ADM0_C1_RESET>,
-				 <&gcc ADM0_C2_RESET>;
-			reset-names = "clk", "pbus", "c0", "c1", "c2";
-			qcom,ee = <0>;
-
-			status = "disabled";
-		};
-
-		nand_controller: nand-controller@1ac00000 {
-			compatible = "qcom,ipq806x-nand";
-			reg = <0x1ac00000 0x800>;
-
-			clocks = <&gcc EBI2_CLK>,
-				 <&gcc EBI2_AON_CLK>;
-			clock-names = "core", "aon";
-
-			dmas = <&adm_dma 3>;
-			dma-names = "rxtx";
-			qcom,cmd-crci = <15>;
-			qcom,data-crci = <3>;
-
-			status = "disabled";
-
-			#address-cells = <1>;
-			#size-cells = <0>;
-		};
-
-		nss_common: syscon@03000000 {
-			compatible = "syscon";
-			reg = <0x03000000 0x0000FFFF>;
-		};
-
-		qsgmii_csr: syscon@1bb00000 {
-			compatible = "syscon";
-			reg = <0x1bb00000 0x000001FF>;
-		};
-
-		stmmac_axi_setup: stmmac-axi-config {
-			snps,wr_osr_lmt = <7>;
-			snps,rd_osr_lmt = <7>;
-			snps,blen = <16 0 0 0 0 0 0>;
-		};
-
-		mdio0: mdio@37000000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			compatible = "qcom,ipq8064-mdio", "syscon";
-			reg = <0x37000000 0x200000>;
-			resets = <&gcc GMAC_CORE1_RESET>;
-			reset-names = "stmmaceth";
-			clocks = <&gcc GMAC_CORE1_CLK>;
-			clock-names = "stmmaceth";
-
-			status = "disabled";
-		};
-
-		gmac0: ethernet@37000000 {
-			device_type = "network";
-			compatible = "qcom,ipq806x-gmac";
-			reg = <0x37000000 0x200000>;
-			interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "macirq";
-
-			snps,axi-config = <&stmmac_axi_setup>;
-			snps,pbl = <32>;
-			snps,aal = <1>;
-
-			qcom,nss-common = <&nss_common>;
-			qcom,qsgmii-csr = <&qsgmii_csr>;
-
-			clocks = <&gcc GMAC_CORE1_CLK>;
-			clock-names = "stmmaceth";
-
-			resets = <&gcc GMAC_CORE1_RESET>;
-			reset-names = "stmmaceth";
-
-			status = "disabled";
-		};
-
-		gmac1: ethernet@37200000 {
-			device_type = "network";
-			compatible = "qcom,ipq806x-gmac";
-			reg = <0x37200000 0x200000>;
-			interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "macirq";
-
-			snps,axi-config = <&stmmac_axi_setup>;
-			snps,pbl = <32>;
-			snps,aal = <1>;
-
-			qcom,nss-common = <&nss_common>;
-			qcom,qsgmii-csr = <&qsgmii_csr>;
-
-			clocks = <&gcc GMAC_CORE2_CLK>;
-			clock-names = "stmmaceth";
-
-			resets = <&gcc GMAC_CORE2_RESET>;
-			reset-names = "stmmaceth";
-
-			status = "disabled";
-		};
-
-		gmac2: ethernet@37400000 {
-			device_type = "network";
-			compatible = "qcom,ipq806x-gmac", "snps,dwmac";
-			reg = <0x37400000 0x200000>;
-			interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "macirq";
-
-			snps,axi-config = <&stmmac_axi_setup>;
-			snps,pbl = <32>;
-			snps,aal = <1>;
-
-			qcom,nss-common = <&nss_common>;
-			qcom,qsgmii-csr = <&qsgmii_csr>;
-
-			clocks = <&gcc GMAC_CORE3_CLK>;
-			clock-names = "stmmaceth";
-
-			resets = <&gcc GMAC_CORE3_RESET>;
-			reset-names = "stmmaceth";
-
-			status = "disabled";
-		};
-
-		gmac3: ethernet@37600000 {
-			device_type = "network";
-			compatible = "qcom,ipq806x-gmac", "snps,dwmac";
-			reg = <0x37600000 0x200000>;
-			interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "macirq";
-
-			snps,axi-config = <&stmmac_axi_setup>;
-			snps,pbl = <32>;
-			snps,aal = <1>;
-
-			qcom,nss-common = <&nss_common>;
-			qcom,qsgmii-csr = <&qsgmii_csr>;
-
-			clocks = <&gcc GMAC_CORE4_CLK>;
-			clock-names = "stmmaceth";
-
-			resets = <&gcc GMAC_CORE4_RESET>;
-			reset-names = "stmmaceth";
-
-			status = "disabled";
-		};
-
-		/* Temporary fixed regulator */
-		vsdcc_fixed: vsdcc-regulator {
-			compatible = "regulator-fixed";
-			regulator-name = "SDCC Power";
-			regulator-min-microvolt = <3300000>;
-			regulator-max-microvolt = <3300000>;
-			regulator-always-on;
-		};
-
-		sdcc1bam: dma@12402000 {
-			compatible = "qcom,bam-v1.3.0";
-			reg = <0x12402000 0x8000>;
-			interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&gcc SDC1_H_CLK>;
-			clock-names = "bam_clk";
-			#dma-cells = <1>;
-			qcom,ee = <0>;
-		};
-
-		sdcc3bam: dma@12182000 {
-			compatible = "qcom,bam-v1.3.0";
-			reg = <0x12182000 0x8000>;
-			interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&gcc SDC3_H_CLK>;
-			clock-names = "bam_clk";
-			#dma-cells = <1>;
-			qcom,ee = <0>;
-		};
-
-		amba: amba {
-			compatible = "arm,amba-bus";
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges;
-			sdcc1: sdcc@12400000 {
-				status          = "disabled";
-				compatible      = "arm,pl18x", "arm,primecell";
-				arm,primecell-periphid = <0x00051180>;
-				reg             = <0x12400000 0x2000>;
-				interrupts      = <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>;
-				interrupt-names = "cmd_irq";
-				clocks          = <&gcc SDC1_CLK>, <&gcc SDC1_H_CLK>;
-				clock-names     = "mclk", "apb_pclk";
-				bus-width       = <8>;
-				max-frequency   = <96000000>;
-				non-removable;
-				cap-sd-highspeed;
-				cap-mmc-highspeed;
-				vmmc-supply = <&vsdcc_fixed>;
-				dmas = <&sdcc1bam 2>, <&sdcc1bam 1>;
-				dma-names = "tx", "rx";
-			};
-
-			sdcc3: sdcc@12180000 {
-				compatible      = "arm,pl18x", "arm,primecell";
-				arm,primecell-periphid = <0x00051180>;
-				status          = "disabled";
-				reg             = <0x12180000 0x2000>;
-				interrupts      = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
-				interrupt-names = "cmd_irq";
-				clocks          = <&gcc SDC3_CLK>, <&gcc SDC3_H_CLK>;
-				clock-names     = "mclk", "apb_pclk";
-				bus-width       = <8>;
-				cap-sd-highspeed;
-				cap-mmc-highspeed;
-				max-frequency   = <192000000>;
-				#mmc-ddr-1_8v;
-				sd-uhs-sdr104;
-				sd-uhs-ddr50;
-				vqmmc-supply = <&vsdcc_fixed>;
-				dmas = <&sdcc3bam 2>, <&sdcc3bam 1>;
-				dma-names = "tx", "rx";
-			};
-		};
-	};
-
-	sfpb_mutex: sfpb-mutex {
-		compatible = "qcom,sfpb-mutex";
-		syscon = <&sfpb_mutex_block 4 4>;
-
-		#hwlock-cells = <1>;
-	};
-
-	smem {
-		compatible = "qcom,smem";
-		memory-region = <&smem>;
-		hwlocks = <&sfpb_mutex 3>;
-	};
-};
diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi
index a478c3c764..fad39cf008 100644
--- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi
+++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi
@@ -31,6 +31,10 @@
 	phy-tx0-term-offset = <0>;
 };
 
+&sata {
+	ports-implemented = <0x1>;
+};
+
 &smb208_s2a {
 	regulator-min-microvolt = <775000>;
 	regulator-max-microvolt = <1275000>;
diff --git a/target/linux/ipq806x/patches-5.4/080-ARM-dts-qcom-add-gpio-ranges-property.patch b/target/linux/ipq806x/patches-5.4/080-v5.7-ARM-dts-qcom-add-gpio-ranges-property.patch
similarity index 99%
rename from target/linux/ipq806x/patches-5.4/080-ARM-dts-qcom-add-gpio-ranges-property.patch
rename to target/linux/ipq806x/patches-5.4/080-v5.7-ARM-dts-qcom-add-gpio-ranges-property.patch
index 1e572a91a5..0dc9debbfd 100644
--- a/target/linux/ipq806x/patches-5.4/080-ARM-dts-qcom-add-gpio-ranges-property.patch
+++ b/target/linux/ipq806x/patches-5.4/080-v5.7-ARM-dts-qcom-add-gpio-ranges-property.patch
@@ -60,7 +60,7 @@ will be executed twice with the same parameters for the same pinctrl.
 
 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
 +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
-@@ -671,6 +671,7 @@
+@@ -119,6 +119,7 @@
  			reg = <0x800000 0x4000>;
  
  			gpio-controller;
diff --git a/target/linux/ipq806x/patches-5.4/081-v5.8-ARM-dts-qcom-add-scm-definition-to-ipq806x.patch b/target/linux/ipq806x/patches-5.4/081-v5.8-ARM-dts-qcom-add-scm-definition-to-ipq806x.patch
new file mode 100644
index 0000000000..f5483ac734
--- /dev/null
+++ b/target/linux/ipq806x/patches-5.4/081-v5.8-ARM-dts-qcom-add-scm-definition-to-ipq806x.patch
@@ -0,0 +1,29 @@
+From 51befb888f62b1a62434fb4b82328d698a30f9de Mon Sep 17 00:00:00 2001
+From: Ansuel Smith <ansuelsmth@gmail.com>
+Date: Thu, 19 Mar 2020 23:44:24 +0100
+Subject: ARM: dts: qcom: add scm definition to ipq806x
+
+Add missing scm definition for ipq806x soc
+
+Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
+Link: https://lore.kernel.org/r/20200319224424.18473-1-ansuelsmth@gmail.com
+Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
+---
+ arch/arm/boot/dts/qcom-ipq8064.dtsi | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
++++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
+@@ -93,6 +93,12 @@
+ 		};
+ 	};
+ 
++	firmware {
++		scm {
++			compatible = "qcom,scm-ipq806x", "qcom,scm";
++		};
++	};
++
+ 	soc: soc {
+ 		#address-cells = <1>;
+ 		#size-cells = <1>;
diff --git a/target/linux/ipq806x/patches-5.4/082-ipq8064-dtsi-tweaks.patch b/target/linux/ipq806x/patches-5.4/082-ipq8064-dtsi-tweaks.patch
new file mode 100644
index 0000000000..568ca5bb88
--- /dev/null
+++ b/target/linux/ipq806x/patches-5.4/082-ipq8064-dtsi-tweaks.patch
@@ -0,0 +1,130 @@
+--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
++++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
+@@ -20,7 +20,7 @@
+ 		#address-cells = <1>;
+ 		#size-cells = <0>;
+ 
+-		cpu@0 {
++		cpu0: cpu@0 {
+ 			compatible = "qcom,krait";
+ 			enable-method = "qcom,kpss-acc-v1";
+ 			device_type = "cpu";
+@@ -30,7 +30,7 @@
+ 			qcom,saw = <&saw0>;
+ 		};
+ 
+-		cpu@1 {
++		cpu1: cpu@1 {
+ 			compatible = "qcom,krait";
+ 			enable-method = "qcom,kpss-acc-v1";
+ 			device_type = "cpu";
+@@ -67,7 +67,7 @@
+ 			no-map;
+ 		};
+ 
+-		smem@41000000 {
++		smem: smem@41000000 {
+ 			reg = <0x41000000 0x200000>;
+ 			no-map;
+ 		};
+@@ -155,6 +155,7 @@
+ 					function = "pcie3_rst";
+ 					drive-strength = <12>;
+ 					bias-disable;
++					output-low;
+ 				};
+ 			};
+ 
+@@ -219,21 +220,23 @@
+ 		acc0: clock-controller@2088000 {
+ 			compatible = "qcom,kpss-acc-v1";
+ 			reg = <0x02088000 0x1000>, <0x02008000 0x1000>;
++			clock-output-names = "acpu0_aux";
+ 		};
+ 
+ 		acc1: clock-controller@2098000 {
+ 			compatible = "qcom,kpss-acc-v1";
+ 			reg = <0x02098000 0x1000>, <0x02008000 0x1000>;
++			clock-output-names = "acpu1_aux";
+ 		};
+ 
+ 		saw0: regulator@2089000 {
+-			compatible = "qcom,saw2";
++			compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon";
+ 			reg = <0x02089000 0x1000>, <0x02009000 0x1000>;
+ 			regulator;
+ 		};
+ 
+ 		saw1: regulator@2099000 {
+-			compatible = "qcom,saw2";
++			compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon";
+ 			reg = <0x02099000 0x1000>, <0x02009000 0x1000>;
+ 			regulator;
+ 		};
+@@ -251,7 +254,7 @@
+ 
+ 			syscon-tcsr = <&tcsr>;
+ 
+-			serial@12490000 {
++			gsbi2_serial: serial@12490000 {
+ 				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
+ 				reg = <0x12490000 0x1000>,
+ 				      <0x12480000 0x1000>;
+@@ -326,7 +329,7 @@
+ 
+ 			syscon-tcsr = <&tcsr>;
+ 
+-			serial@1a240000 {
++			gsbi5_serial: serial@1a240000 {
+ 				compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
+ 				reg = <0x1a240000 0x1000>,
+ 				      <0x1a200000 0x1000>;
+@@ -397,7 +400,7 @@
+ 			status = "disabled";
+ 		};
+ 
+-		sata@29000000 {
++		sata: sata@29000000 {
+ 			compatible = "qcom,ipq806x-ahci", "generic-ahci";
+ 			reg = <0x29000000 0x180>;
+ 
+@@ -430,6 +433,7 @@
+ 			reg = <0x00900000 0x4000>;
+ 			#clock-cells = <1>;
+ 			#reset-cells = <1>;
++			#power-domain-cells = <1>;
+ 		};
+ 
+ 		tcsr: syscon@1a400000 {
+@@ -625,13 +629,13 @@
+ 			qcom,ee = <0>;
+ 		};
+ 
+-		amba {
+-			compatible = "simple-bus";
++		amba: amba {
++			compatible = "arm,amba-bus";
+ 			#address-cells = <1>;
+ 			#size-cells = <1>;
+ 			ranges;
+ 
+-			sdcc@12400000 {
++			sdcc1: sdcc@12400000 {
+ 				status          = "disabled";
+ 				compatible      = "arm,pl18x", "arm,primecell";
+ 				arm,primecell-periphid = <0x00051180>;
+@@ -645,13 +649,12 @@
+ 				non-removable;
+ 				cap-sd-highspeed;
+ 				cap-mmc-highspeed;
+-				mmc-ddr-1_8v;
+ 				vmmc-supply = <&vsdcc_fixed>;
+ 				dmas = <&sdcc1bam 2>, <&sdcc1bam 1>;
+ 				dma-names = "tx", "rx";
+ 			};
+ 
+-			sdcc@12180000 {
++			sdcc3: sdcc@12180000 {
+ 				compatible      = "arm,pl18x", "arm,primecell";
+ 				arm,primecell-periphid = <0x00051180>;
+ 				status          = "disabled";
diff --git a/target/linux/ipq806x/patches-5.4/083-ipq8064-dtsi-additions.patch b/target/linux/ipq806x/patches-5.4/083-ipq8064-dtsi-additions.patch
new file mode 100644
index 0000000000..bd3c972f5c
--- /dev/null
+++ b/target/linux/ipq806x/patches-5.4/083-ipq8064-dtsi-additions.patch
@@ -0,0 +1,992 @@
+--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
++++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
+@@ -8,6 +8,8 @@
+ #include <dt-bindings/reset/qcom,gcc-ipq806x.h>
+ #include <dt-bindings/soc/qcom,gsbi.h>
+ #include <dt-bindings/interrupt-controller/arm-gic.h>
++#include <dt-bindings/mfd/qcom-rpm.h>
++#include <dt-bindings/clock/qcom,rpmcc.h>
+ 
+ / {
+ 	#address-cells = <1>;
+@@ -28,6 +30,16 @@
+ 			next-level-cache = <&L2>;
+ 			qcom,acc = <&acc0>;
+ 			qcom,saw = <&saw0>;
++			clocks = <&kraitcc 0>, <&kraitcc 4>;
++			clock-names = "cpu", "l2";
++			clock-latency = <100000>;
++			cpu-supply = <&smb208_s2a>;
++			operating-points-v2 = <&opp_table0>;
++			voltage-tolerance = <5>;
++			cooling-min-state = <0>;
++			cooling-max-state = <10>;
++			#cooling-cells = <2>;
++			cpu-idle-states = <&CPU_SPC>;
+ 		};
+ 
+ 		cpu1: cpu@1 {
+@@ -38,11 +50,458 @@
+ 			next-level-cache = <&L2>;
+ 			qcom,acc = <&acc1>;
+ 			qcom,saw = <&saw1>;
++			clocks = <&kraitcc 1>, <&kraitcc 4>;
++			clock-names = "cpu", "l2";
++			clock-latency = <100000>;
++			cpu-supply = <&smb208_s2b>;
++			operating-points-v2 = <&opp_table0>;
++			voltage-tolerance = <5>;
++			cooling-min-state = <0>;
++			cooling-max-state = <10>;
++			#cooling-cells = <2>;
++			cpu-idle-states = <&CPU_SPC>;
+ 		};
+ 
+ 		L2: l2-cache {
+ 			compatible = "cache";
+ 			cache-level = <2>;
++			qcom,saw = <&saw_l2>;
++		};
++
++		qcom,l2 {
++			qcom,l2-rates = <384000000 1000000000 1200000000>;
++			qcom,l2-cpufreq = <384000000 600000000 1200000000>;
++			qcom,l2-volt = <1100000 1100000 1150000>;
++			qcom,l2-supply = <&smb208_s1a>;
++		};
++
++		idle-states {
++			CPU_SPC: spc {
++				compatible = "qcom,idle-state-spc", "arm,idle-state";
++				status = "disabled";
++				entry-latency-us = <400>;
++				exit-latency-us = <900>;
++				min-residency-us = <3000>;
++			};
++		};
++	};
++
++	opp_table0: opp_table0 {
++		compatible = "operating-points-v2-qcom-cpu";
++		nvmem-cells = <&speedbin_efuse>;
++
++		opp-384000000 {
++			opp-hz = /bits/ 64 <384000000>;
++			opp-microvolt-speed0-pvs0-v0 = <1000000>;
++			opp-microvolt-speed0-pvs1-v0 = <925000>;
++			opp-microvolt-speed0-pvs2-v0 = <875000>;
++			opp-microvolt-speed0-pvs3-v0 = <800000>;
++			opp-supported-hw = <0x1>;
++			clock-latency-ns = <100000>;
++		};
++
++		opp-600000000 {
++			opp-hz = /bits/ 64 <600000000>;
++			opp-microvolt-speed0-pvs0-v0 = <1050000>;
++			opp-microvolt-speed0-pvs1-v0 = <975000>;
++			opp-microvolt-speed0-pvs2-v0 = <925000>;
++			opp-microvolt-speed0-pvs3-v0 = <850000>;
++			opp-supported-hw = <0x1>;
++			clock-latency-ns = <100000>;
++		};
++
++		opp-800000000 {
++			opp-hz = /bits/ 64 <800000000>;
++			opp-microvolt-speed0-pvs0-v0 = <1100000>;
++			opp-microvolt-speed0-pvs1-v0 = <1025000>;
++			opp-microvolt-speed0-pvs2-v0 = <995000>;
++			opp-microvolt-speed0-pvs3-v0 = <900000>;
++			opp-supported-hw = <0x1>;
++			clock-latency-ns = <100000>;
++		};
++
++		opp-1000000000 {
++			opp-hz = /bits/ 64 <1000000000>;
++			opp-microvolt-speed0-pvs0-v0 = <1150000>;
++			opp-microvolt-speed0-pvs1-v0 = <1075000>;
++			opp-microvolt-speed0-pvs2-v0 = <1025000>;
++			opp-microvolt-speed0-pvs3-v0 = <950000>;
++			opp-supported-hw = <0x1>;
++			clock-latency-ns = <100000>;
++		};
++
++		opp-1200000000 {
++			opp-hz = /bits/ 64 <1200000000>;
++			opp-microvolt-speed0-pvs0-v0 = <1200000>;
++			opp-microvolt-speed0-pvs1-v0 = <1125000>;
++			opp-microvolt-speed0-pvs2-v0 = <1075000>;
++			opp-microvolt-speed0-pvs3-v0 = <1000000>;
++			opp-supported-hw = <0x1>;
++			clock-latency-ns = <100000>;
++		};
++
++		opp-1400000000 {
++			opp-hz = /bits/ 64 <1400000000>;
++			opp-microvolt-speed0-pvs0-v0 = <1250000>;
++			opp-microvolt-speed0-pvs1-v0 = <1175000>;
++			opp-microvolt-speed0-pvs2-v0 = <1125000>;
++			opp-microvolt-speed0-pvs3-v0 = <1050000>;
++			opp-supported-hw = <0x1>;
++			clock-latency-ns = <100000>;
++		};
++	};
++
++	thermal-zones {
++		tsens_tz_sensor0 {
++			polling-delay-passive = <0>;
++			polling-delay = <0>;
++			thermal-sensors = <&tsens 0>;
++
++			trips {
++				cpu-critical-hi {
++					temperature = <125000>;
++					hysteresis = <2000>;
++					type = "critical_high";
++				};
++
++				cpu-config-hi {
++					temperature = <105000>;
++					hysteresis = <2000>;
++					type = "configurable_hi";
++				};
++
++				cpu-config-lo {
++					temperature = <95000>;
++					hysteresis = <2000>;
++					type = "configurable_lo";
++				};
++
++				cpu-critical-low {
++					temperature = <0>;
++					hysteresis = <2000>;
++					type = "critical_low";
++				};
++			};
++		};
++
++		tsens_tz_sensor1 {
++			polling-delay-passive = <0>;
++			polling-delay = <0>;
++			thermal-sensors = <&tsens 1>;
++
++			trips {
++				cpu-critical-hi {
++					temperature = <125000>;
++					hysteresis = <2000>;
++					type = "critical_high";
++				};
++
++				cpu-config-hi {
++					temperature = <105000>;
++					hysteresis = <2000>;
++					type = "configurable_hi";
++				};
++
++				cpu-config-lo {
++					temperature = <95000>;
++					hysteresis = <2000>;
++					type = "configurable_lo";
++				};
++
++				cpu-critical-low {
++					temperature = <0>;
++					hysteresis = <2000>;
++					type = "critical_low";
++				};
++			};
++		};
++
++		tsens_tz_sensor2 {
++			polling-delay-passive = <0>;
++			polling-delay = <0>;
++			thermal-sensors = <&tsens 2>;
++
++			trips {
++				cpu-critical-hi {
++					temperature = <125000>;
++					hysteresis = <2000>;
++					type = "critical_high";
++				};
++
++				cpu-config-hi {
++					temperature = <105000>;
++					hysteresis = <2000>;
++					type = "configurable_hi";
++				};
++
++				cpu-config-lo {
++					temperature = <95000>;
++					hysteresis = <2000>;
++					type = "configurable_lo";
++				};
++
++				cpu-critical-low {
++					temperature = <0>;
++					hysteresis = <2000>;
++					type = "critical_low";
++				};
++			};
++		};
++
++		tsens_tz_sensor3 {
++			polling-delay-passive = <0>;
++			polling-delay = <0>;
++			thermal-sensors = <&tsens 3>;
++
++			trips {
++				cpu-critical-hi {
++					temperature = <125000>;
++					hysteresis = <2000>;
++					type = "critical_high";
++				};
++
++				cpu-config-hi {
++					temperature = <105000>;
++					hysteresis = <2000>;
++					type = "configurable_hi";
++				};
++
++				cpu-config-lo {
++					temperature = <95000>;
++					hysteresis = <2000>;
++					type = "configurable_lo";
++				};
++
++				cpu-critical-low {
++					temperature = <0>;
++					hysteresis = <2000>;
++					type = "critical_low";
++				};
++			};
++		};
++
++		tsens_tz_sensor4 {
++			polling-delay-passive = <0>;
++			polling-delay = <0>;
++			thermal-sensors = <&tsens 4>;
++
++			trips {
++				cpu-critical-hi {
++					temperature = <125000>;
++					hysteresis = <2000>;
++					type = "critical_high";
++				};
++
++				cpu-config-hi {
++					temperature = <105000>;
++					hysteresis = <2000>;
++					type = "configurable_hi";
++				};
++
++				cpu-config-lo {
++					temperature = <95000>;
++					hysteresis = <2000>;
++					type = "configurable_lo";
++				};
++
++				cpu-critical-low {
++					temperature = <0>;
++					hysteresis = <2000>;
++					type = "critical_low";
++				};
++			};
++		};
++
++		tsens_tz_sensor5 {
++			polling-delay-passive = <0>;
++			polling-delay = <0>;
++			thermal-sensors = <&tsens 5>;
++
++			trips {
++				cpu-critical-hi {
++					temperature = <125000>;
++					hysteresis = <2000>;
++					type = "critical_high";
++				};
++
++				cpu-config-hi {
++					temperature = <105000>;
++					hysteresis = <2000>;
++					type = "configurable_hi";
++				};
++
++				cpu-config-lo {
++					temperature = <95000>;
++					hysteresis = <2000>;
++					type = "configurable_lo";
++				};
++
++				cpu-critical-low {
++					temperature = <0>;
++					hysteresis = <2000>;
++					type = "critical_low";
++				};
++			};
++		};
++
++		tsens_tz_sensor6 {
++			polling-delay-passive = <0>;
++			polling-delay = <0>;
++			thermal-sensors = <&tsens 6>;
++
++			trips {
++				cpu-critical-hi {
++					temperature = <125000>;
++					hysteresis = <2000>;
++					type = "critical_high";
++				};
++
++				cpu-config-hi {
++					temperature = <105000>;
++					hysteresis = <2000>;
++					type = "configurable_hi";
++				};
++
++				cpu-config-lo {
++					temperature = <95000>;
++					hysteresis = <2000>;
++					type = "configurable_lo";
++				};
++
++				cpu-critical-low {
++					temperature = <0>;
++					hysteresis = <2000>;
++					type = "critical_low";
++				};
++			};
++		};
++
++		tsens_tz_sensor7 {
++			polling-delay-passive = <0>;
++			polling-delay = <0>;
++			thermal-sensors = <&tsens 7>;
++
++			trips {
++				cpu-critical-hi {
++					temperature = <125000>;
++					hysteresis = <2000>;
++					type = "critical_high";
++				};
++
++				cpu-config-hi {
++					temperature = <105000>;
++					hysteresis = <2000>;
++					type = "configurable_hi";
++				};
++
++				cpu-config-lo {
++					temperature = <95000>;
++					hysteresis = <2000>;
++					type = "configurable_lo";
++				};
++
++				cpu-critical-low {
++					temperature = <0>;
++					hysteresis = <2000>;
++					type = "critical_low";
++				};
++			};
++		};
++
++		tsens_tz_sensor8 {
++			polling-delay-passive = <0>;
++			polling-delay = <0>;
++			thermal-sensors = <&tsens 8>;
++
++			trips {
++				cpu-critical-hi {
++					temperature = <125000>;
++					hysteresis = <2000>;
++					type = "critical_high";
++				};
++
++				cpu-config-hi {
++					temperature = <105000>;
++					hysteresis = <2000>;
++					type = "configurable_hi";
++				};
++
++				cpu-config-lo {
++					temperature = <95000>;
++					hysteresis = <2000>;
++					type = "configurable_lo";
++				};
++
++				cpu-critical-low {
++					temperature = <0>;
++					hysteresis = <2000>;
++					type = "critical_low";
++				};
++			};
++		};
++
++		tsens_tz_sensor9 {
++			polling-delay-passive = <0>;
++			polling-delay = <0>;
++			thermal-sensors = <&tsens 9>;
++
++			trips {
++				cpu-critical-hi {
++					temperature = <125000>;
++					hysteresis = <2000>;
++					type = "critical_high";
++				};
++
++				cpu-config-hi {
++					temperature = <105000>;
++					hysteresis = <2000>;
++					type = "configurable_hi";
++				};
++
++				cpu-config-lo {
++					temperature = <95000>;
++					hysteresis = <2000>;
++					type = "configurable_lo";
++				};
++
++				cpu-critical-low {
++					temperature = <0>;
++					hysteresis = <2000>;
++					type = "critical_low";
++				};
++			};
++		};
++
++		tsens_tz_sensor10 {
++			polling-delay-passive = <0>;
++			polling-delay = <0>;
++			thermal-sensors = <&tsens 10>;
++
++			trips {
++				cpu-critical-hi {
++					temperature = <125000>;
++					hysteresis = <2000>;
++					type = "critical_high";
++				};
++
++				cpu-config-hi {
++					temperature = <105000>;
++					hysteresis = <2000>;
++					type = "configurable_hi";
++				};
++
++				cpu-config-lo {
++					temperature = <95000>;
++					hysteresis = <2000>;
++					type = "configurable_lo";
++				};
++
++				cpu-critical-low {
++					temperature = <0>;
++					hysteresis = <2000>;
++					type = "critical_low";
++				};
++			};
+ 		};
+ 	};
+ 
+@@ -93,6 +552,15 @@
+ 		};
+ 	};
+ 
++	fab-scaling {
++		compatible = "qcom,fab-scaling";
++		clocks = <&rpmcc RPM_APPS_FABRIC_A_CLK>, <&rpmcc RPM_EBI1_A_CLK>;
++		clock-names = "apps-fab-clk", "ddr-fab-clk";
++		fab_freq_high = <533000000>;
++		fab_freq_nominal = <400000000>;
++		cpu_freq_threshold = <1000000000>;
++	};
++
+ 	firmware {
+ 		scm {
+ 			compatible = "qcom,scm-ipq806x", "qcom,scm";
+@@ -120,6 +588,84 @@
+ 			reg-names = "lpass-lpaif";
+ 		};
+ 
++		qfprom: qfprom@700000 {
++			compatible = "qcom,qfprom", "syscon";
++			reg = <0x700000 0x1000>;
++			#address-cells = <1>;
++			#size-cells = <1>;
++			status = "okay";
++			tsens_calib: calib@400 {
++				reg = <0x400 0xb>;
++			};
++			tsens_backup: backup@410 {
++				reg = <0x410 0xb>;
++			};
++			speedbin_efuse: speedbin@0c0 {
++				reg = <0x0c0 0x4>;
++			};
++		};
++
++		rpm: rpm@108000 {
++			compatible = "qcom,rpm-ipq8064";
++			reg = <0x108000 0x1000>;
++			qcom,ipc = <&l2cc 0x8 2>;
++
++			interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>,
++					 <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>,
++					 <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
++			interrupt-names = "ack", "err", "wakeup";
++
++			clocks = <&gcc RPM_MSG_RAM_H_CLK>;
++			clock-names = "ram";
++
++			#address-cells = <1>;
++			#size-cells = <0>;
++
++			rpmcc: clock-controller {
++				compatible = "qcom,rpmcc-ipq806x", "qcom,rpmcc";
++				#clock-cells = <1>;
++			};
++
++			regulators {
++				compatible = "qcom,rpm-smb208-regulators";
++
++				smb208_s1a: s1a {
++					regulator-min-microvolt = <1050000>;
++					regulator-max-microvolt = <1150000>;
++
++					qcom,switch-mode-frequency = <1200000>;
++				};
++
++				smb208_s1b: s1b {
++					regulator-min-microvolt = <1050000>;
++					regulator-max-microvolt = <1150000>;
++
++					qcom,switch-mode-frequency = <1200000>;
++				};
++
++				smb208_s2a: s2a {
++					regulator-min-microvolt = < 800000>;
++					regulator-max-microvolt = <1250000>;
++
++					qcom,switch-mode-frequency = <1200000>;
++				};
++
++				smb208_s2b: s2b {
++					regulator-min-microvolt = < 800000>;
++					regulator-max-microvolt = <1250000>;
++
++					qcom,switch-mode-frequency = <1200000>;
++				};
++			};
++		};
++
++		rng@1a500000 {
++			compatible = "qcom,prng";
++			reg = <0x1a500000 0x200>;
++			clocks = <&gcc PRNG_CLK>;
++			clock-names = "core";
++		};
++
+ 		qcom_pinmux: pinmux@800000 {
+ 			compatible = "qcom,ipq8064-pinctrl";
+ 			reg = <0x800000 0x4000>;
+@@ -159,6 +705,15 @@
+ 				};
+ 			};
+ 
++			i2c4_pins: i2c4_pinmux {
++				mux {
++					pins = "gpio12", "gpio13";
++					function = "gsbi4";
++					drive-strength = <12>;
++					bias-disable;
++				};
++			};
++
+ 			spi_pins: spi_pins {
+ 				mux {
+ 					pins = "gpio18", "gpio19", "gpio21";
+@@ -168,6 +723,53 @@
+ 				};
+ 			};
+ 
++			nand_pins: nand_pins {
++				disable {
++					pins = "gpio34", "gpio35", "gpio36",
++					       "gpio37", "gpio38";
++					function = "nand";
++					drive-strength = <10>;
++					bias-disable;
++				};
++
++				pullups {
++					pins = "gpio39";
++					function = "nand";
++					drive-strength = <10>;
++					bias-pull-up;
++				};
++
++				hold {
++					pins = "gpio40", "gpio41", "gpio42",
++					       "gpio43", "gpio44", "gpio45",
++					       "gpio46", "gpio47";
++					function = "nand";
++					drive-strength = <10>;
++					bias-bus-hold;
++				};
++			};
++
++			mdio0_pins: mdio0_pins {
++				mux {
++					pins = "gpio0", "gpio1";
++					function = "mdio";
++					drive-strength = <8>;
++					bias-disable;
++				};
++			};
++
++			rgmii2_pins: rgmii2_pins {
++				mux {
++					pins = "gpio27", "gpio28", "gpio29",
++					       "gpio30", "gpio31", "gpio32",
++					       "gpio51", "gpio52", "gpio59",
++					       "gpio60", "gpio61", "gpio62";
++					function = "rgmii2";
++					drive-strength = <8>;
++					bias-disable;
++				};
++			};
++
+ 			leds_pins: leds_pins {
+ 				mux {
+ 					pins = "gpio7", "gpio8", "gpio9",
+@@ -229,6 +831,17 @@
+ 			clock-output-names = "acpu1_aux";
+ 		};
+ 
++		l2cc: clock-controller@2011000 {
++			compatible = "qcom,kpss-gcc", "syscon";
++			reg = <0x2011000 0x1000>;
++			clock-output-names = "acpu_l2_aux";
++		};
++
++		kraitcc: clock-controller {
++			compatible = "qcom,krait-cc-v1";
++			#clock-cells = <1>;
++		};
++
+ 		saw0: regulator@2089000 {
+ 			compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon";
+ 			reg = <0x02089000 0x1000>, <0x02009000 0x1000>;
+@@ -241,6 +854,17 @@
+ 			regulator;
+ 		};
+ 
++		saw_l2: regulator@02012000 {
++			compatible = "qcom,saw2", "syscon";
++			reg = <0x02012000 0x1000>;
++			regulator;
++		};
++
++		sic_non_secure: sic-non-secure@12100000 {
++			compatible = "syscon";
++			reg = <0x12100000 0x10000>;
++		};
++
+ 		gsbi2: gsbi@12480000 {
+ 			compatible = "qcom,gsbi-v1.0.0";
+ 			cell-index = <2>;
+@@ -436,6 +1060,15 @@
+ 			#power-domain-cells = <1>;
+ 		};
+ 
++		tsens: thermal-sensor@900000 {
++			compatible = "qcom,ipq8064-tsens";
++			reg = <0x900000 0x3680>;
++			nvmem-cells = <&tsens_calib>, <&tsens_backup>;
++			nvmem-cell-names = "calib", "calib_backup";
++			interrupts = <GIC_SPI 178 IRQ_TYPE_LEVEL_HIGH>;
++			#thermal-sensor-cells = <1>;
++		};
++
+ 		tcsr: syscon@1a400000 {
+ 			compatible = "qcom,tcsr-ipq8064", "syscon";
+ 			reg = <0x1a400000 0x100>;
+@@ -448,6 +1081,95 @@
+ 			#reset-cells = <1>;
+ 		};
+ 
++		sfpb_mutex_block: syscon@1200600 {
++			compatible = "syscon";
++			reg = <0x01200600 0x100>;
++		};
++
++		hs_phy_0: hs_phy_0 {
++			compatible = "qcom,dwc3-hs-usb-phy";
++			regmap = <&usb3_0>;
++			clocks = <&gcc USB30_0_UTMI_CLK>;
++			clock-names = "ref";
++			#phy-cells = <0>;
++		};
++
++		ss_phy_0: ss_phy_0 {
++			compatible = "qcom,dwc3-ss-usb-phy";
++			regmap = <&usb3_0>;
++			clocks = <&gcc USB30_0_MASTER_CLK>;
++			clock-names = "ref";
++			#phy-cells = <0>;
++		};
++
++		usb3_0: usb3@110f8800 {
++			compatible = "qcom,dwc3", "syscon";
++			#address-cells = <1>;
++			#size-cells = <1>;
++			reg = <0x110f8800 0x8000>;
++			clocks = <&gcc USB30_0_MASTER_CLK>;
++			clock-names = "core";
++
++			ranges;
++
++			resets = <&gcc USB30_0_MASTER_RESET>;
++			reset-names = "master";
++
++			status = "disabled";
++
++			dwc3_0: dwc3@11000000 {
++				compatible = "snps,dwc3";
++				reg = <0x11000000 0xcd00>;
++				interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
++				phys = <&hs_phy_0>, <&ss_phy_0>;
++				phy-names = "usb2-phy", "usb3-phy";
++				dr_mode = "host";
++				snps,dis_u3_susphy_quirk;
++			};
++		};
++
++		hs_phy_1: hs_phy_1 {
++			compatible = "qcom,dwc3-hs-usb-phy";
++			regmap = <&usb3_1>;
++			clocks = <&gcc USB30_1_UTMI_CLK>;
++			clock-names = "ref";
++			#phy-cells = <0>;
++		};
++
++		ss_phy_1: ss_phy_1 {
++			compatible = "qcom,dwc3-ss-usb-phy";
++			regmap = <&usb3_1>;
++			clocks = <&gcc USB30_1_MASTER_CLK>;
++			clock-names = "ref";
++			#phy-cells = <0>;
++		};
++
++		usb3_1: usb3@100f8800 {
++			compatible = "qcom,dwc3", "syscon";
++			#address-cells = <1>;
++			#size-cells = <1>;
++			reg = <0x100f8800 0x8000>;
++			clocks = <&gcc USB30_1_MASTER_CLK>;
++			clock-names = "core";
++
++			ranges;
++
++			resets = <&gcc USB30_1_MASTER_RESET>;
++			reset-names = "master";
++
++			status = "disabled";
++
++			dwc3_1: dwc3@10000000 {
++				compatible = "snps,dwc3";
++				reg = <0x10000000 0xcd00>;
++				interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>;
++				phys = <&hs_phy_1>, <&ss_phy_1>;
++				phy-names = "usb2-phy", "usb3-phy";
++				dr_mode = "host";
++				snps,dis_u3_susphy_quirk;
++			};
++		};
++
+ 		pcie0: pci@1b500000 {
+ 			compatible = "qcom,pcie-ipq8064";
+ 			reg = <0x1b500000 0x1000
+@@ -601,6 +1323,167 @@
+ 			perst-gpio = <&qcom_pinmux 63 GPIO_ACTIVE_LOW>;
+ 		};
+ 
++		adm_dma: dma@18300000 {
++			compatible = "qcom,adm";
++			reg = <0x18300000 0x100000>;
++			interrupts = <GIC_SPI 170 IRQ_TYPE_LEVEL_HIGH>;
++			#dma-cells = <1>;
++
++			clocks = <&gcc ADM0_CLK>, <&gcc ADM0_PBUS_CLK>;
++			clock-names = "core", "iface";
++
++			resets = <&gcc ADM0_RESET>,
++				 <&gcc ADM0_PBUS_RESET>,
++				 <&gcc ADM0_C0_RESET>,
++				 <&gcc ADM0_C1_RESET>,
++				 <&gcc ADM0_C2_RESET>;
++			reset-names = "clk", "pbus", "c0", "c1", "c2";
++			qcom,ee = <0>;
++
++			status = "disabled";
++		};
++
++		nand_controller: nand-controller@1ac00000 {
++			compatible = "qcom,ipq806x-nand";
++			reg = <0x1ac00000 0x800>;
++
++			clocks = <&gcc EBI2_CLK>,
++				 <&gcc EBI2_AON_CLK>;
++			clock-names = "core", "aon";
++
++			dmas = <&adm_dma 3>;
++			dma-names = "rxtx";
++			qcom,cmd-crci = <15>;
++			qcom,data-crci = <3>;
++
++			status = "disabled";
++
++			#address-cells = <1>;
++			#size-cells = <0>;
++		};
++
++		nss_common: syscon@03000000 {
++			compatible = "syscon";
++			reg = <0x03000000 0x0000FFFF>;
++		};
++
++		qsgmii_csr: syscon@1bb00000 {
++			compatible = "syscon";
++			reg = <0x1bb00000 0x000001FF>;
++		};
++
++		stmmac_axi_setup: stmmac-axi-config {
++			snps,wr_osr_lmt = <7>;
++			snps,rd_osr_lmt = <7>;
++			snps,blen = <16 0 0 0 0 0 0>;
++		};
++
++		mdio0: mdio@37000000 {
++			#address-cells = <1>;
++			#size-cells = <0>;
++
++			compatible = "qcom,ipq8064-mdio", "syscon";
++			reg = <0x37000000 0x200000>;
++			resets = <&gcc GMAC_CORE1_RESET>;
++			reset-names = "stmmaceth";
++			clocks = <&gcc GMAC_CORE1_CLK>;
++			clock-names = "stmmaceth";
++
++			status = "disabled";
++		};
++
++		gmac0: ethernet@37000000 {
++			device_type = "network";
++			compatible = "qcom,ipq806x-gmac";
++			reg = <0x37000000 0x200000>;
++			interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>;
++			interrupt-names = "macirq";
++
++			snps,axi-config = <&stmmac_axi_setup>;
++			snps,pbl = <32>;
++			snps,aal = <1>;
++
++			qcom,nss-common = <&nss_common>;
++			qcom,qsgmii-csr = <&qsgmii_csr>;
++
++			clocks = <&gcc GMAC_CORE1_CLK>;
++			clock-names = "stmmaceth";
++
++			resets = <&gcc GMAC_CORE1_RESET>;
++			reset-names = "stmmaceth";
++
++			status = "disabled";
++		};
++
++		gmac1: ethernet@37200000 {
++			device_type = "network";
++			compatible = "qcom,ipq806x-gmac";
++			reg = <0x37200000 0x200000>;
++			interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>;
++			interrupt-names = "macirq";
++
++			snps,axi-config = <&stmmac_axi_setup>;
++			snps,pbl = <32>;
++			snps,aal = <1>;
++
++			qcom,nss-common = <&nss_common>;
++			qcom,qsgmii-csr = <&qsgmii_csr>;
++
++			clocks = <&gcc GMAC_CORE2_CLK>;
++			clock-names = "stmmaceth";
++
++			resets = <&gcc GMAC_CORE2_RESET>;
++			reset-names = "stmmaceth";
++
++			status = "disabled";
++		};
++
++		gmac2: ethernet@37400000 {
++			device_type = "network";
++			compatible = "qcom,ipq806x-gmac", "snps,dwmac";
++			reg = <0x37400000 0x200000>;
++			interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
++			interrupt-names = "macirq";
++
++			snps,axi-config = <&stmmac_axi_setup>;
++			snps,pbl = <32>;
++			snps,aal = <1>;
++
++			qcom,nss-common = <&nss_common>;
++			qcom,qsgmii-csr = <&qsgmii_csr>;
++
++			clocks = <&gcc GMAC_CORE3_CLK>;
++			clock-names = "stmmaceth";
++
++			resets = <&gcc GMAC_CORE3_RESET>;
++			reset-names = "stmmaceth";
++
++			status = "disabled";
++		};
++
++		gmac3: ethernet@37600000 {
++			device_type = "network";
++			compatible = "qcom,ipq806x-gmac", "snps,dwmac";
++			reg = <0x37600000 0x200000>;
++			interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>;
++			interrupt-names = "macirq";
++
++			snps,axi-config = <&stmmac_axi_setup>;
++			snps,pbl = <32>;
++			snps,aal = <1>;
++
++			qcom,nss-common = <&nss_common>;
++			qcom,qsgmii-csr = <&qsgmii_csr>;
++
++			clocks = <&gcc GMAC_CORE4_CLK>;
++			clock-names = "stmmaceth";
++
++			resets = <&gcc GMAC_CORE4_RESET>;
++			reset-names = "stmmaceth";
++
++			status = "disabled";
++		};
++
+ 		vsdcc_fixed: vsdcc-regulator {
+ 			compatible = "regulator-fixed";
+ 			regulator-name = "SDCC Power";
+@@ -676,4 +1559,17 @@
+ 			};
+ 		};
+ 	};
++
++	sfpb_mutex: sfpb-mutex {
++		compatible = "qcom,sfpb-mutex";
++		syscon = <&sfpb_mutex_block 4 4>;
++
++		#hwlock-cells = <1>;
++	};
++
++	smem {
++		compatible = "qcom,smem";
++		memory-region = <&smem>;
++		hwlocks = <&sfpb_mutex 3>;
++	};
+ };
diff --git a/target/linux/ipq806x/patches-5.4/084-ipq8064-v1.0-dtsi-cleanup.patch b/target/linux/ipq806x/patches-5.4/084-ipq8064-v1.0-dtsi-cleanup.patch
new file mode 100644
index 0000000000..e5ea8e6393
--- /dev/null
+++ b/target/linux/ipq806x/patches-5.4/084-ipq8064-v1.0-dtsi-cleanup.patch
@@ -0,0 +1,89 @@
+This uses upstream qcom-ipq8064-v1.0.dtsi and modifies it by patches
+instead of keeping a local version.
+We drop partitions, LEDs and keys from the file as we will implement
+them differently anyway.
+
+--- a/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
++++ b/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
+@@ -42,16 +42,6 @@
+ 					#size-cells = <1>;
+ 					spi-max-frequency = <50000000>;
+ 					reg = <0>;
+-
+-					partition@0 {
+-						label = "rootfs";
+-						reg = <0x0 0x1000000>;
+-					};
+-
+-					partition@1 {
+-						label = "scratch";
+-						reg = <0x1000000 0x1000000>;
+-					};
+ 				};
+ 			};
+ 		};
+@@ -64,64 +54,5 @@
+ 			ports-implemented = <0x1>;
+ 			status = "ok";
+ 		};
+-
+-		gpio_keys {
+-			compatible = "gpio-keys";
+-			pinctrl-0 = <&buttons_pins>;
+-			pinctrl-names = "default";
+-
+-			button@1 {
+-				label = "reset";
+-				linux,code = <KEY_RESTART>;
+-				gpios = <&qcom_pinmux 54 GPIO_ACTIVE_LOW>;
+-				linux,input-type = <1>;
+-				debounce-interval = <60>;
+-			};
+-			button@2 {
+-				label = "wps";
+-				linux,code = <KEY_WPS_BUTTON>;
+-				gpios = <&qcom_pinmux 65 GPIO_ACTIVE_LOW>;
+-				linux,input-type = <1>;
+-				debounce-interval = <60>;
+-			};
+-		};
+-
+-		leds {
+-			compatible = "gpio-leds";
+-			pinctrl-0 = <&leds_pins>;
+-			pinctrl-names = "default";
+-
+-			led@7 {
+-				label = "led_usb1";
+-				gpios = <&qcom_pinmux 7 GPIO_ACTIVE_HIGH>;
+-				linux,default-trigger = "usbdev";
+-				default-state = "off";
+-			};
+-
+-			led@8 {
+-				label = "led_usb3";
+-				gpios = <&qcom_pinmux 8 GPIO_ACTIVE_HIGH>;
+-				linux,default-trigger = "usbdev";
+-				default-state = "off";
+-			};
+-
+-			led@9 {
+-				label = "status_led_fail";
+-				gpios = <&qcom_pinmux 9 GPIO_ACTIVE_HIGH>;
+-				default-state = "off";
+-			};
+-
+-			led@26 {
+-				label = "sata_led";
+-				gpios = <&qcom_pinmux 26 GPIO_ACTIVE_HIGH>;
+-				default-state = "off";
+-			};
+-
+-			led@53 {
+-				label = "status_led_pass";
+-				gpios = <&qcom_pinmux 53 GPIO_ACTIVE_HIGH>;
+-				default-state = "off";
+-			};
+-		};
+ 	};
+ };
diff --git a/target/linux/ipq806x/patches-5.4/085-ipq8064-v1.0-dtsi-additions.patch b/target/linux/ipq806x/patches-5.4/085-ipq8064-v1.0-dtsi-additions.patch
new file mode 100644
index 0000000000..9837fb156d
--- /dev/null
+++ b/target/linux/ipq806x/patches-5.4/085-ipq8064-v1.0-dtsi-additions.patch
@@ -0,0 +1,26 @@
+This uses upstream qcom-ipq8064-v1.0.dtsi and modifies it by patches
+instead of keeping a local version. This patch adds our local adjustments
+for the (local) additional contents of qcom-ipq8064.dtsi
+
+--- a/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
++++ b/arch/arm/boot/dts/qcom-ipq8064-v1.0.dtsi
+@@ -56,3 +56,19 @@
+ 		};
+ 	};
+ };
++
++&CPU_SPC {
++	status = "okay";
++};
++
++&pcie0 {
++	phy-tx0-term-offset = <7>;
++};
++
++&pcie1 {
++	phy-tx0-term-offset = <7>;
++};
++
++&pcie2 {
++	phy-tx0-term-offset = <7>;
++};
diff --git a/target/linux/ipq807x/config-default b/target/linux/ipq807x/config-default
index e526128483..1f60ccfecb 100644
--- a/target/linux/ipq807x/config-default
+++ b/target/linux/ipq807x/config-default
@@ -272,7 +272,6 @@ CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
diff --git a/target/linux/kirkwood/config-5.4 b/target/linux/kirkwood/config-5.4
index 61efa07d91..a39137a29f 100644
--- a/target/linux/kirkwood/config-5.4
+++ b/target/linux/kirkwood/config-5.4
@@ -140,7 +140,6 @@ CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GLOB=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_MVEBU=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_GRO_CELLS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDIRQS_SW_RESEND=y
diff --git a/target/linux/lantiq/config-4.19 b/target/linux/lantiq/config-4.19
index 3d603dbd68..7510e357a2 100644
--- a/target/linux/lantiq/config-4.19
+++ b/target/linux/lantiq/config-4.19
@@ -67,7 +67,6 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_MM_LANTIQ=y
 CONFIG_GPIO_STP_XWAY=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
diff --git a/target/linux/lantiq/config-5.4 b/target/linux/lantiq/config-5.4
index a1c259b002..a8975864c8 100644
--- a/target/linux/lantiq/config-5.4
+++ b/target/linux/lantiq/config-5.4
@@ -76,7 +76,6 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_MM_LANTIQ=y
 CONFIG_GPIO_STP_XWAY=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
diff --git a/target/linux/layerscape/armv8_64b/config-5.4 b/target/linux/layerscape/armv8_64b/config-5.4
index a8025dac23..40bf4a9c5c 100644
--- a/target/linux/layerscape/armv8_64b/config-5.4
+++ b/target/linux/layerscape/armv8_64b/config-5.4
@@ -420,7 +420,6 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
 CONFIG_GPIO_MPC8XXX=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
diff --git a/target/linux/mediatek/mt7622/base-files/etc/board.d/02_network b/target/linux/mediatek/mt7622/base-files/etc/board.d/02_network
index eed01a9293..426d9937bf 100755
--- a/target/linux/mediatek/mt7622/base-files/etc/board.d/02_network
+++ b/target/linux/mediatek/mt7622/base-files/etc/board.d/02_network
@@ -13,6 +13,9 @@ mediatek_setup_interfaces()
 	bananapi,bpi-r64)
 		ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3" wan
 		;;
+	mediatek,mt7622-rfb1)
+		ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" wan
+		;;
 	*)
 		ucidef_add_switch "switch0" \
 				  "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6u@eth0" "5u@eth1"
diff --git a/target/linux/mediatek/mt7623/config-4.19 b/target/linux/mediatek/mt7623/config-4.19
index 994768bb64..56ae95cc31 100644
--- a/target/linux/mediatek/mt7623/config-4.19
+++ b/target/linux/mediatek/mt7623/config-4.19
@@ -207,7 +207,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
diff --git a/target/linux/mediatek/mt7623/config-5.4 b/target/linux/mediatek/mt7623/config-5.4
index 83ff7b3111..dc93a65566 100644
--- a/target/linux/mediatek/mt7623/config-5.4
+++ b/target/linux/mediatek/mt7623/config-5.4
@@ -216,7 +216,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
diff --git a/target/linux/mediatek/mt7629/config-4.19 b/target/linux/mediatek/mt7629/config-4.19
index 7bf014d151..e36b00d485 100644
--- a/target/linux/mediatek/mt7629/config-4.19
+++ b/target/linux/mediatek/mt7629/config-4.19
@@ -141,7 +141,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 # CONFIG_HARDENED_USERCOPY is not set
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
diff --git a/target/linux/mediatek/mt7629/config-5.4 b/target/linux/mediatek/mt7629/config-5.4
index 1dbf1787cb..a291b9a263 100644
--- a/target/linux/mediatek/mt7629/config-5.4
+++ b/target/linux/mediatek/mt7629/config-5.4
@@ -150,7 +150,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_STRNCPY_FROM_USER=y
 CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 # CONFIG_HARDENED_USERCOPY is not set
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
diff --git a/target/linux/mediatek/patches-5.4/0005-dts-mt7622-add-gsw.patch b/target/linux/mediatek/patches-5.4/0005-dts-mt7622-add-gsw.patch
index 872854fd8c..906b661538 100644
--- a/target/linux/mediatek/patches-5.4/0005-dts-mt7622-add-gsw.patch
+++ b/target/linux/mediatek/patches-5.4/0005-dts-mt7622-add-gsw.patch
@@ -63,17 +63,15 @@
   *
   * SPDX-License-Identifier: (GPL-2.0 OR MIT)
   */
-@@ -14,8 +13,8 @@
+@@ -14,7 +13,7 @@
  #include "mt6380.dtsi"
  
  / {
 -	model = "MediaTek MT7622 RFB1 board";
--	compatible = "mediatek,mt7622-rfb1", "mediatek,mt7622";
 +	model = "MT7622_MT7531 RFB";
-+	compatible = "bananapi,bpi-r64", "mediatek,mt7622";
+ 	compatible = "mediatek,mt7622-rfb1", "mediatek,mt7622";
  
  	aliases {
- 		serial0 = &uart0;
 @@ -23,7 +22,7 @@
  
  	chosen {
@@ -83,7 +81,7 @@
  	};
  
  	cpus {
-@@ -40,23 +39,45 @@
+@@ -40,23 +39,38 @@
  
  	gpio-keys {
  		compatible = "gpio-keys";
@@ -93,24 +91,17 @@
  			label = "factory";
  			linux,code = <BTN_0>;
 -			gpios = <&pio 0 0>;
-+			gpios = <&pio 0 GPIO_ACTIVE_HIGH>;
++			gpios = <&pio 0 GPIO_ACTIVE_LOW>;
  		};
  
  		wps {
  			label = "wps";
  			linux,code = <KEY_WPS_BUTTON>;
 -			gpios = <&pio 102 0>;
-+			gpios = <&pio 102 GPIO_ACTIVE_HIGH>;
++			gpios = <&pio 102 GPIO_ACTIVE_LOW>;
 +		};
 +	};
 +
-+	gsw: gsw@0 {
-+                compatible = "mediatek,mt753x";
-+                mediatek,ethsys = <&ethsys>;
-+                #address-cells = <1>;
-+                #size-cells = <0>;
-+        };
-+
 +	leds {
 +		compatible = "gpio-leds";
 +
@@ -133,7 +124,7 @@
  	};
  
  	reg_1p8v: regulator-1p8v {
-@@ -101,27 +122,67 @@
+@@ -101,23 +115,82 @@
  };
  
  &eth {
@@ -169,48 +160,61 @@
 +	mdio: mdio-bus {
  		#address-cells = <1>;
  		#size-cells = <0>;
--
+ 
 -		phy5: ethernet-phy@5 {
 -			reg = <5>;
 -			phy-mode = "sgmii";
--		};
++		switch@0 {
++			compatible = "mediatek,mt7531";
++			reg = <0>;
++			reset-gpios = <&pio 54 0>;
++
++			ports {
++				#address-cells = <1>;
++				#size-cells = <0>;
++
++				port@0 {
++					reg = <0>;
++					label = "lan1";
++				};
++
++				port@1 {
++					reg = <1>;
++					label = "lan2";
++				};
++
++				port@2 {
++					reg = <2>;
++					label = "lan3";
++				};
++
++				port@3 {
++					reg = <3>;
++					label = "lan4";
++				};
++
++				port@4 {
++					reg = <4>;
++					label = "wan";
++				};
++
++				port@6 {
++					reg = <6>;
++					label = "cpu";
++					ethernet = <&gmac0>;
++					phy-mode = "2500base-x";
++
++					fixed-link {
++						speed = <2500>;
++						full-duplex;
++						pause;
++					};
++				};
++			};
+ 		};
  	};
  };
- 
-+&gsw {
-+        mediatek,mdio = <&mdio>;
-+        mediatek,portmap = "llllw";
-+        mediatek,mdio_master_pinmux = <0>;
-+        reset-gpios = <&pio 54 0>;
-+        interrupt-parent = <&pio>;
-+        interrupts = <53 IRQ_TYPE_LEVEL_HIGH>;
-+        status = "okay";
-+
-+        port5: port@5 {
-+                compatible = "mediatek,mt753x-port";
-+                reg = <5>;
-+                phy-mode = "rgmii";
-+                fixed-link {
-+                        speed = <1000>;
-+                        full-duplex;
-+                };
-+        };
-+
-+        port6: port@6 {
-+                compatible = "mediatek,mt753x-port";
-+                reg = <6>;
-+                phy-mode = "sgmii";
-+                fixed-link {
-+                        speed = <2500>;
-+                        full-duplex;
-+                };
-+        };
-+};    
-+
- &i2c1 {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&i2c1_pins>;
-@@ -185,15 +246,28 @@
+@@ -185,15 +258,28 @@
  
  &pcie {
  	pinctrl-names = "default";
@@ -240,7 +244,7 @@
  	/* eMMC is shared pin with parallel NAND */
  	emmc_pins_default: emmc-pins-default {
  		mux {
-@@ -460,11 +534,11 @@
+@@ -460,11 +546,11 @@
  };
  
  &sata {
diff --git a/target/linux/mediatek/patches-5.4/0308-dts-mt7622-add-snand-support.patch b/target/linux/mediatek/patches-5.4/0308-dts-mt7622-add-snand-support.patch
index 4e10319508..378ccb8338 100644
--- a/target/linux/mediatek/patches-5.4/0308-dts-mt7622-add-snand-support.patch
+++ b/target/linux/mediatek/patches-5.4/0308-dts-mt7622-add-snand-support.patch
@@ -22,7 +22,7 @@
  			     "mediatek,mt8173-nor";
 --- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
 +++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
-@@ -108,7 +108,7 @@
+@@ -101,7 +101,7 @@
  };
  
  &bch {
@@ -31,7 +31,7 @@
  };
  
  &btif {
-@@ -541,6 +541,62 @@
+@@ -553,6 +553,62 @@
  	status = "disable";
  };
  
diff --git a/target/linux/mediatek/patches-5.4/0310-dts-add-wmac-support-for-mt7622-rfb1.patch b/target/linux/mediatek/patches-5.4/0310-dts-add-wmac-support-for-mt7622-rfb1.patch
index 3ebe45c6e4..b545ea809d 100644
--- a/target/linux/mediatek/patches-5.4/0310-dts-add-wmac-support-for-mt7622-rfb1.patch
+++ b/target/linux/mediatek/patches-5.4/0310-dts-add-wmac-support-for-mt7622-rfb1.patch
@@ -20,7 +20,7 @@
  			     "syscon";
 --- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
 +++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
-@@ -579,7 +579,7 @@
+@@ -591,7 +591,7 @@
  				reg = <0x140000 0x0080000>;
  			};
  
@@ -29,7 +29,7 @@
  				label = "Factory";
  				reg = <0x1c0000 0x0040000>;
  			};
-@@ -636,3 +636,8 @@
+@@ -648,3 +648,8 @@
  	pinctrl-0 = <&watchdog_pins>;
  	status = "okay";
  };
diff --git a/target/linux/mediatek/patches-5.4/0991-dt-bindings-PCI-Mediatek-Update-PCIe-binding.patch b/target/linux/mediatek/patches-5.4/0991-dt-bindings-PCI-Mediatek-Update-PCIe-binding.patch
index 02e4c130ea..e32042301f 100644
--- a/target/linux/mediatek/patches-5.4/0991-dt-bindings-PCI-Mediatek-Update-PCIe-binding.patch
+++ b/target/linux/mediatek/patches-5.4/0991-dt-bindings-PCI-Mediatek-Update-PCIe-binding.patch
@@ -382,7 +382,8 @@ Signed-off-by: chuanjia.liu <Chuanjia.Liu@mediatek.com>
  			};
  		};
 +	};
-+
+ 
+-		pcie1: pcie@1,0 {
 +	pcie1: pcie@1a145000 {
 +		compatible = "mediatek,mt7622-pcie";
 +		device_type = "pci";
@@ -407,8 +408,7 @@ Signed-off-by: chuanjia.liu <Chuanjia.Liu@mediatek.com>
 +		bus-range = <0x00 0xff>;
 +		ranges = <0x82000000 0 0x28000000  0 0x28000000  0 0x8000000>;
 +		status = "disabled";
- 
--		pcie1: pcie@1,0 {
++
 +		slot1: pcie@1,0 {
  			reg = <0x0800 0 0 0 0>;
  			#address-cells = <3>;
diff --git a/target/linux/mediatek/patches-5.4/0993-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch b/target/linux/mediatek/patches-5.4/0993-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch
index 48713ecc64..bc0f7b1a6c 100644
--- a/target/linux/mediatek/patches-5.4/0993-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch
+++ b/target/linux/mediatek/patches-5.4/0993-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch
@@ -389,7 +389,7 @@ Signed-off-by: chuanjia.liu <Chuanjia.Liu@mediatek.com>
  					<0 0 0 2 &pcie_intc1 1>,
 --- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
 +++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
-@@ -244,18 +244,16 @@
+@@ -256,18 +256,16 @@
  	};
  };
  
diff --git a/target/linux/mpc85xx/config-4.19 b/target/linux/mpc85xx/config-4.19
index 67f4134d25..e999417d1e 100644
--- a/target/linux/mpc85xx/config-4.19
+++ b/target/linux/mpc85xx/config-4.19
@@ -118,7 +118,6 @@ CONFIG_GIANFAR=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_MPC8XXX=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
diff --git a/target/linux/mpc85xx/config-5.4 b/target/linux/mpc85xx/config-5.4
index 340d5ece99..8e01def3f9 100644
--- a/target/linux/mpc85xx/config-5.4
+++ b/target/linux/mpc85xx/config-5.4
@@ -118,7 +118,6 @@ CONFIG_GIANFAR=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_MPC8XXX=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
diff --git a/target/linux/mvebu/config-4.19 b/target/linux/mvebu/config-4.19
index 3de6296a8d..f2083f4f16 100644
--- a/target/linux/mvebu/config-4.19
+++ b/target/linux/mvebu/config-4.19
@@ -215,7 +215,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=y
 CONFIG_GPIO_MVEBU=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
diff --git a/target/linux/mvebu/config-5.4 b/target/linux/mvebu/config-5.4
index 9739ee62ae..a13cb8d9e5 100644
--- a/target/linux/mvebu/config-5.4
+++ b/target/linux/mvebu/config-5.4
@@ -217,7 +217,6 @@ CONFIG_GPIO_GENERIC_PLATFORM=y
 CONFIG_GPIO_MVEBU=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
diff --git a/target/linux/mxs/config-5.4 b/target/linux/mxs/config-5.4
index 7232234b97..6fa7412cd3 100644
--- a/target/linux/mxs/config-5.4
+++ b/target/linux/mxs/config-5.4
@@ -121,7 +121,6 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
 CONFIG_GPIO_MXS=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
diff --git a/target/linux/octeon/config-4.19 b/target/linux/octeon/config-4.19
index 5b8a21318e..1eb148e757 100644
--- a/target/linux/octeon/config-4.19
+++ b/target/linux/octeon/config-4.19
@@ -97,7 +97,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_OCTEON=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
diff --git a/target/linux/octeon/config-5.4 b/target/linux/octeon/config-5.4
index e157b5072f..a0644243ce 100644
--- a/target/linux/octeon/config-5.4
+++ b/target/linux/octeon/config-5.4
@@ -102,7 +102,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_OCTEON=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
diff --git a/target/linux/omap/config-4.19 b/target/linux/omap/config-4.19
index 88ecc1880b..9004dd0ba6 100644
--- a/target/linux/omap/config-4.19
+++ b/target/linux/omap/config-4.19
@@ -283,7 +283,6 @@ CONFIG_GPIO_PALMAS=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_PCF857X=y
-CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_TPS65218 is not set
 CONFIG_GPIO_TPS65910=y
 CONFIG_GPIO_TWL4030=y
diff --git a/target/linux/omap/config-5.4 b/target/linux/omap/config-5.4
index fd46a90ccb..1a24943806 100644
--- a/target/linux/omap/config-5.4
+++ b/target/linux/omap/config-5.4
@@ -285,7 +285,6 @@ CONFIG_GPIO_PALMAS=y
 CONFIG_GPIO_PCA953X=y
 CONFIG_GPIO_PCA953X_IRQ=y
 CONFIG_GPIO_PCF857X=y
-CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_TPS65218 is not set
 CONFIG_GPIO_TPS65910=y
 CONFIG_GPIO_TWL4030=y
diff --git a/target/linux/pistachio/config-4.14 b/target/linux/pistachio/config-4.14
index bcb9ff4683..8b24b68a05 100644
--- a/target/linux/pistachio/config-4.14
+++ b/target/linux/pistachio/config-4.14
@@ -112,7 +112,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
-CONFIG_GPIO_SYSFS=y
 # CONFIG_GRO_CELLS is not set
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDWARE_WATCHPOINTS=y
diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile
index 864cfa543d..c3d118b2ab 100644
--- a/target/linux/ramips/Makefile
+++ b/target/linux/ramips/Makefile
@@ -12,7 +12,7 @@ BOARDNAME:=MediaTek Ralink MIPS
 SUBTARGETS:=mt7620 mt7621 mt76x8 rt288x rt305x rt3883
 FEATURES:=squashfs gpio
 
-KERNEL_PATCHVER:=4.14
+KERNEL_PATCHVER:=5.4
 KERNEL_TESTING_PATCHVER:=5.4
 
 define Target/Description
diff --git a/target/linux/ramips/dts/mt7620n_netgear_jwnr2010-v5.dts b/target/linux/ramips/dts/mt7620n_netgear_jwnr2010-v5.dts
new file mode 100644
index 0000000000..fb84c00203
--- /dev/null
+++ b/target/linux/ramips/dts/mt7620n_netgear_jwnr2010-v5.dts
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include "mt7620n_netgear_n300.dtsi"
+
+/ {
+	compatible = "netgear,jwnr2010-v5", "ralink,mt7620n-soc";
+	model = "Netgear JWNR2010 v5";
+
+	aliases {
+		led-boot = &led_power;
+		led-failsafe = &led_power;
+		led-running = &led_power;
+		led-upgrade = &led_power;
+		label-mac-device = &ethernet;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_power: power {
+			label = "jwnr2010-v5:green:power";
+			gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
+		};
+
+		wan {
+			label = "jwnr2010-v5:green:wan";
+			gpios = <&gpio0 19 GPIO_ACTIVE_HIGH>;
+		};
+
+		wlan {
+			label = "jwnr2010-v5:green:wlan";
+			gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
+			linux,default-trigger = "phy0radio";
+		};
+
+		lan1 {
+			label = "jwnr2010-v5:green:lan1";
+			gpios = <&gpio2 3 GPIO_ACTIVE_LOW>;
+		};
+
+		lan2 {
+			label = "jwnr2010-v5:green:lan2";
+			gpios = <&gpio2 2 GPIO_ACTIVE_LOW>;
+		};
+
+		lan3 {
+			label = "jwnr2010-v5:green:lan3";
+			gpios = <&gpio2 1 GPIO_ACTIVE_LOW>;
+		};
+
+		lan4 {
+			label = "jwnr2010-v5:green:lan4";
+			gpios = <&gpio2 0 GPIO_ACTIVE_LOW>;
+		};
+	};
+};
diff --git a/target/linux/ramips/dts/mt7620n_netgear_n300.dtsi b/target/linux/ramips/dts/mt7620n_netgear_n300.dtsi
new file mode 100644
index 0000000000..6f5be57ec7
--- /dev/null
+++ b/target/linux/ramips/dts/mt7620n_netgear_n300.dtsi
@@ -0,0 +1,83 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "mt7620n.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+/ {
+	keys {
+		compatible = "gpio-keys";
+
+		reset {
+			label = "reset";
+			gpios = <&gpio0 20 GPIO_ACTIVE_LOW>;
+			linux,code = <KEY_RESTART>;
+		};
+	};
+};
+
+&gpio2 {
+	status = "okay";
+};
+
+&gpio3 {
+	status = "okay";
+};
+
+&spi0 {
+	status = "okay";
+
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <30000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "u-boot";
+				reg = <0x0 0x20000>;
+				read-only;
+			};
+
+			partition@20000 {
+				compatible = "denx,uimage";
+				label = "firmware";
+				reg = <0x20000 0x3c0000>;
+			};
+
+			partition@3e0000 {
+				label = "nvram";
+				reg = <0x3e0000 0x10000>;
+				read-only;
+			};
+
+			factory: partition@3f0000 {
+				label = "factory";
+				reg = <0x3f0000 0x10000>;
+				read-only;
+			};
+		};
+	};
+};
+
+&ethernet {
+	mtd-mac-address = <&factory 0x4>;
+
+	mediatek,portmap = "llllw";
+};
+
+&wmac {
+	ralink,mtd-eeprom = <&factory 0x0>;
+};
+
+&state_default {
+	default {
+		groups = "pa", "ephy", "wled";
+		function = "gpio";
+	};
+};
diff --git a/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi b/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi
index 61c5d7b7c4..9bd1da4443 100644
--- a/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi
+++ b/target/linux/ramips/dts/mt7628an_jotale_js76x8.dtsi
@@ -62,7 +62,6 @@
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <40000000>;
-		m25p,chunked-io = <32>;
 
 		partitions {
 			compatible = "fixed-partitions";
diff --git a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts
index b3bd0aeae2..1042defb3f 100644
--- a/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts
+++ b/target/linux/ramips/dts/mt7628an_mediatek_linkit-smart-7688.dts
@@ -149,7 +149,7 @@
 };
 
 &ethernet {
-	mtd-mac-address = <&factory 0x28>;
+	mtd-mac-address = <&factory 0x2e>;
 };
 
 &sdhci {
diff --git a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
index 1757d06763..04187a8353 100644
--- a/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
+++ b/target/linux/ramips/dts/mt7628an_onion_omega2.dtsi
@@ -151,7 +151,7 @@
 };
 
 &ethernet {
-	mtd-mac-address = <&factory 0x28>;
+	mtd-mac-address = <&factory 0x2e>;
 };
 
 &sdhci {
diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts
index b33c2ecae8..9731008aea 100644
--- a/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts
+++ b/target/linux/ramips/dts/mt7628an_tplink_tl-wr841n-v14.dts
@@ -65,7 +65,6 @@
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <10000000>;
-		m25p,chunked-io = <32>;
 
 		partitions {
 			compatible = "fixed-partitions";
diff --git a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts
index 41634c6002..91661bb2b0 100644
--- a/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts
+++ b/target/linux/ramips/dts/mt7628an_wiznet_wizfi630s.dts
@@ -28,7 +28,7 @@
 
 		led_run: run {
 			label = "wizfi630s:green:run";
-			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
 		};
 
 		ledwps {
@@ -61,47 +61,29 @@
 
 		wps {
 			label = "wps";
-			gpios = <&gpio 32 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio 41 GPIO_ACTIVE_LOW>;
 			linux,code = <KEY_WPS_BUTTON>;
 		};
 
 		scm1 {
 			label = "SCM1";
-			gpios = <&gpio 5 GPIO_ACTIVE_LOW>;
+			gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
 			linux,code = <BTN_1>;
+			linux,input-type = <EV_SW>;
 		};
 
 		scm2 {
 			label = "SCM2";
 			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
 			linux,code = <BTN_2>;
+			linux,input-type = <EV_SW>;
 		};
 	};
 };
 
 &state_default {
 	gpio {
-		groups = "gpio";
-		function = "gpio";
-	};
-
-	i2s {
-		groups = "i2s";
-		function = "gpio";
-	};
-
-	wdt {
-		groups = "wdt";
-		function = "gpio";
-	};
-
-	i2c {
-		groups = "i2c";
-		function = "gpio";
-	};
-
-	refclk {
-		groups = "refclk";
+		groups = "gpio", "i2s", "i2c", "wdt", "refclk", "p1led_an", "p2led_an";
 		function = "gpio";
 	};
 };
@@ -116,7 +98,6 @@
 		compatible = "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <40000000>;
-		m25p,chunked-io = <31>;
 
 		partitions {
 			compatible = "fixed-partitions";
@@ -150,11 +131,11 @@
 	};
 };
 
-&i2c {
+&uart1 {
 	status = "okay";
 };
 
-&uart1 {
+&uart2 {
 	status = "okay";
 };
 
@@ -163,7 +144,7 @@
 };
 
 &ethernet {
-	mtd-mac-address = <&factory 0x28>;
+	mtd-mac-address = <&factory 0x2e>;
 };
 
 &esw {
diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile
index d72d937ab8..c0890e6bb3 100644
--- a/target/linux/ramips/image/Makefile
+++ b/target/linux/ramips/image/Makefile
@@ -12,7 +12,7 @@ DEVICE_VARS += NETGEAR_BOARD_ID NETGEAR_HW_ID
 DEVICE_VARS += BUFFALO_TAG_PLATFORM BUFFALO_TAG_VERSION BUFFALO_TAG_MINOR
 DEVICE_VARS += SEAMA_SIGNATURE SEAMA_MTDBLOCK
 DEVICE_VARS += SERCOMM_HWNAME SERCOMM_HWID SERCOMM_HWVER SERCOMM_SWVER
-DEVICE_VARS += JCG_MAXSIZE
+DEVICE_VARS += SERCOMM_PAD JCG_MAXSIZE
 
 loadaddr-y := 0x80000000
 loadaddr-$(CONFIG_TARGET_ramips_rt288x) := 0x88000000
@@ -176,6 +176,18 @@ define Device/Default
   IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata | check-size
 endef
 
+define Device/netgear_sercomm_nor
+  BLOCKSIZE := 64k
+  DEVICE_VENDOR := NETGEAR
+  IMAGES += factory.img
+  IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \
+	pad-rootfs
+  IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size
+  IMAGE/factory.img := pad-extra $$$$(SERCOMM_PAD) | $$(IMAGE/default) | \
+	pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | \
+	zip $$$$(SERCOMM_HWNAME).bin | sercom-seal
+endef
+
 define Device/seama
   SEAMA_MTDBLOCK := 2
   IMAGES += factory.bin
diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk
index 52c555e9a3..915d5fdaf3 100644
--- a/target/linux/ramips/image/mt7620.mk
+++ b/target/linux/ramips/image/mt7620.mk
@@ -696,6 +696,22 @@ define Device/netgear_ex6130
 endef
 TARGET_DEVICES += netgear_ex6130
 
+define Device/netgear_jwnr2010-v5
+  $(Device/netgear_sercomm_nor)
+  SOC := mt7620n
+  BLOCKSIZE := 4k
+  IMAGE_SIZE := 3840k
+  DEVICE_MODEL := JWNR2010
+  DEVICE_VARIANT := v5
+  SERCOMM_HWNAME := N300
+  SERCOMM_HWID := ASW
+  SERCOMM_HWVER := A001
+  SERCOMM_SWVER := 0x0040
+  SERCOMM_PAD := 128k
+  DEFAULT := n
+endef
+TARGET_DEVICES += netgear_jwnr2010-v5
+
 define Device/netgear_wn3000rp-v3
   SOC := mt7620a
   IMAGE_SIZE := 7872k
diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk
index 5096a59f1a..742659585a 100644
--- a/target/linux/ramips/image/mt7621.mk
+++ b/target/linux/ramips/image/mt7621.mk
@@ -827,22 +827,16 @@ endef
 TARGET_DEVICES += netgear_wac124
 
 define Device/netgear_wndr3700-v5
+  $(Device/netgear_sercomm_nor)
   $(Device/uimage-lzma-loader)
-  BLOCKSIZE := 64k
   IMAGE_SIZE := 15232k
+  DEVICE_MODEL := WNDR3700
+  DEVICE_VARIANT := v5
+  SERCOMM_HWNAME := WNDR3700v5
   SERCOMM_HWID := AYB
   SERCOMM_HWVER := A001
   SERCOMM_SWVER := 0x1054
-  IMAGES += factory.img
-  IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \
-	pad-rootfs
-  IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size
-  IMAGE/factory.img := pad-extra 320k | $$(IMAGE/default) | \
-	pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | zip WNDR3700v5.bin | \
-	sercom-seal
-  DEVICE_VENDOR := NETGEAR
-  DEVICE_MODEL := WNDR3700
-  DEVICE_VARIANT := v5
+  SERCOMM_PAD := 320k
   DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \
 	kmod-usb-ledtrig-usbport wpad-basic
   SUPPORTED_DEVICES += wndr3700v5
diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk
index d170eaa065..908e2df529 100644
--- a/target/linux/ramips/image/mt76x8.mk
+++ b/target/linux/ramips/image/mt76x8.mk
@@ -216,20 +216,8 @@ define Device/mercury_mac1200r-v2
 endef
 TARGET_DEVICES += mercury_mac1200r-v2
 
-define Device/netgear_r6xxx
-  BLOCKSIZE := 64k
-  DEVICE_VENDOR := NETGEAR
-  IMAGES += factory.img
-  IMAGE/default := append-kernel | pad-to $$$$(BLOCKSIZE) | append-rootfs | \
-	pad-rootfs
-  IMAGE/sysupgrade.bin := $$(IMAGE/default) | append-metadata | check-size
-  IMAGE/factory.img := pad-extra 576k | $$(IMAGE/default) | \
-	pad-to $$$$(BLOCKSIZE) | sercom-footer | pad-to 128 | \
-	zip $$$$(SERCOMM_HWNAME).bin | sercom-seal
-endef
-
 define Device/netgear_r6020
-  $(Device/netgear_r6xxx)
+  $(Device/netgear_sercomm_nor)
   IMAGE_SIZE := 7104k
   DEVICE_MODEL := R6020
   DEVICE_PACKAGES := kmod-mt76x2
@@ -237,11 +225,12 @@ define Device/netgear_r6020
   SERCOMM_HWID := CFR
   SERCOMM_HWVER := A001
   SERCOMM_SWVER := 0x0040
+  SERCOMM_PAD := 576k
 endef
 TARGET_DEVICES += netgear_r6020
 
 define Device/netgear_r6080
-  $(Device/netgear_r6xxx)
+  $(Device/netgear_sercomm_nor)
   IMAGE_SIZE := 7552k
   DEVICE_MODEL := R6080
   DEVICE_PACKAGES := kmod-mt76x2
@@ -249,11 +238,12 @@ define Device/netgear_r6080
   SERCOMM_HWID := CFR
   SERCOMM_HWVER := A001
   SERCOMM_SWVER := 0x0040
+  SERCOMM_PAD := 576k
 endef
 TARGET_DEVICES += netgear_r6080
 
 define Device/netgear_r6120
-  $(Device/netgear_r6xxx)
+  $(Device/netgear_sercomm_nor)
   IMAGE_SIZE := 15744k
   DEVICE_MODEL := R6120
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci
@@ -261,6 +251,7 @@ define Device/netgear_r6120
   SERCOMM_HWID := CGQ
   SERCOMM_HWVER := A001
   SERCOMM_SWVER := 0x0040
+  SERCOMM_PAD := 576k
 endef
 TARGET_DEVICES += netgear_r6120
 
@@ -658,6 +649,7 @@ define Device/wiznet_wizfi630s
   IMAGE_SIZE := 32448k
   DEVICE_VENDOR := WIZnet
   DEVICE_MODEL := WizFi630S
+  SUPPORTED_DEVICES += wizfi630s
 endef
 TARGET_DEVICES += wiznet_wizfi630s
 
diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds
index 2b2ac6b46b..90d1596783 100755
--- a/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds
@@ -165,6 +165,13 @@ netgear,ex6130)
 	ucidef_set_led_netdev "wlan5g" "ROUTER (green)" "$boardname:green:router" "wlan0"
 	ucidef_set_led_netdev "wlan2g" "DEVICE (green)" "$boardname:green:device" "wlan1"
 	;;
+netgear,jwnr2010-v5)
+	ucidef_set_led_switch "lan1" "lan1" "$boardname:green:lan1" "switch0" "0x08"
+	ucidef_set_led_switch "lan2" "lan2" "$boardname:green:lan2" "switch0" "0x04"
+	ucidef_set_led_switch "lan3" "lan3" "$boardname:green:lan3" "switch0" "0x02"
+	ucidef_set_led_switch "lan4" "lan4" "$boardname:green:lan4" "switch0" "0x01"
+	ucidef_set_led_switch "wan" "wan" "$boardname:green:wan" "switch0" "0x10"
+	;;
 phicomm,psg1208)
 	set_wifi_led "$boardname:white:wlan2g"
 	;;
diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network
index f85b7cfed1..bcf122c427 100755
--- a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network
@@ -108,6 +108,7 @@ ramips_setup_interfaces()
 			"0:lan" "6@eth0"
 		;;
 	dlink,dir-810l|\
+	netgear,jwnr2010-v5|\
 	trendnet,tew-810dr|\
 	zbtlink,zbt-we2026)
 		ucidef_add_switch "switch0" \
@@ -240,6 +241,7 @@ ramips_setup_macs()
 	edimax,ew-7478apc|\
 	fon,fon2601|\
 	head-weblink,hdrm200|\
+	netgear,jwnr2010-v5|\
 	nexx,wt3020-4m|\
 	nexx,wt3020-8m|\
 	phicomm,psg1208|\
diff --git a/target/linux/ramips/mt7620/config-4.14 b/target/linux/ramips/mt7620/config-4.14
index 635b3c67f8..0022bc12c9 100644
--- a/target/linux/ramips/mt7620/config-4.14
+++ b/target/linux/ramips/mt7620/config-4.14
@@ -76,7 +76,6 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 # CONFIG_GPIO_MT7621 is not set
 CONFIG_GPIO_RALINK=y
-CONFIG_GPIO_SYSFS=y
 # CONFIG_GRO_CELLS is not set
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDWARE_WATCHPOINTS=y
diff --git a/target/linux/ramips/mt7620/config-5.4 b/target/linux/ramips/mt7620/config-5.4
index edeff27472..d1170ce036 100644
--- a/target/linux/ramips/mt7620/config-5.4
+++ b/target/linux/ramips/mt7620/config-5.4
@@ -89,7 +89,6 @@ CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 # CONFIG_GPIO_MT7621 is not set
 CONFIG_GPIO_RALINK=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
diff --git a/target/linux/ramips/mt7620/target.mk b/target/linux/ramips/mt7620/target.mk
index ff890c5540..56ceaee37f 100644
--- a/target/linux/ramips/mt7620/target.mk
+++ b/target/linux/ramips/mt7620/target.mk
@@ -9,8 +9,6 @@ CPU_TYPE:=24kc
 
 DEFAULT_PACKAGES += kmod-rt2800-soc wpad-basic swconfig
 
-KERNEL_PATCHVER:=5.4
-
 define Target/Description
 	Build firmware images for Ralink MT7620 based boards.
 endef
diff --git a/target/linux/ramips/mt7621/config-5.4 b/target/linux/ramips/mt7621/config-5.4
index b2c3ad5ba8..b4c8ab1f1c 100644
--- a/target/linux/ramips/mt7621/config-5.4
+++ b/target/linux/ramips/mt7621/config-5.4
@@ -106,7 +106,6 @@ CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_MT7621=y
 # CONFIG_GPIO_RALINK is not set
-CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_WATCHDOG=y
 # CONFIG_GPIO_WATCHDOG_ARCH_INITCALL is not set
 CONFIG_HANDLE_DOMAIN_IRQ=y
diff --git a/target/linux/ramips/mt7621/target.mk b/target/linux/ramips/mt7621/target.mk
index f0933be00b..0368f205c0 100644
--- a/target/linux/ramips/mt7621/target.mk
+++ b/target/linux/ramips/mt7621/target.mk
@@ -7,7 +7,6 @@ BOARDNAME:=MT7621 based boards
 FEATURES+=nand ramdisk rtc usb minor
 CPU_TYPE:=24kc
 
-KERNEL_PATCHVER:=5.4
 DEFAULT_PACKAGES += kmod-crypto-hw-eip93
 
 define Target/Description
diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
index 83437ea364..5a5ba587d5 100755
--- a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
@@ -188,19 +188,12 @@ ramips_setup_macs()
 	totolink,lr1200)
 		wan_mac=$(mtd_get_mac_binary factory 0x2e)
 		;;
-	mediatek,linkit-smart-7688|\
-	onion,omega2|\
-	onion,omega2p)
-		wan_mac=$(mtd_get_mac_binary factory 0x4)
-		lan_mac=$(mtd_get_mac_binary factory 0x2e)
-		;;
 	mercury,mac1200r-v2)
 		wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory_info 0xd)" 1)
 		;;
 	rakwireless,rak633|\
 	unielec,u7628-01-16m|\
-	wavlink,wl-wn575a3|\
-	wiznet,wizfi630s)
+	wavlink,wl-wn575a3)
 		wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x28)" 1)
 		;;
 	tplink,archer-c20-v4|\
@@ -225,6 +218,10 @@ ramips_setup_macs()
 	zbtlink,zbt-we1226)
 		wan_mac=$(macaddr_add "$(mtd_get_mac_binary factory 0x2e)" 1)
 		;;
+	wiznet,wizfi630s)
+		label_mac=$(mtd_get_mac_binary factory 0x4)
+		wan_mac=$(mtd_get_mac_binary factory 0x28)
+		;;
 	xiaomi,mir4a-100m)
 		wan_mac=$(mtd_get_mac_binary factory 0x4)
 		;;
diff --git a/target/linux/ramips/mt76x8/config-5.4 b/target/linux/ramips/mt76x8/config-5.4
index cdc357e212..ec21b3722b 100644
--- a/target/linux/ramips/mt76x8/config-5.4
+++ b/target/linux/ramips/mt76x8/config-5.4
@@ -89,7 +89,6 @@ CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_MT7621=y
 # CONFIG_GPIO_RALINK is not set
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
diff --git a/target/linux/ramips/mt76x8/target.mk b/target/linux/ramips/mt76x8/target.mk
index 4ecc19ff62..e13a12cf58 100644
--- a/target/linux/ramips/mt76x8/target.mk
+++ b/target/linux/ramips/mt76x8/target.mk
@@ -8,7 +8,6 @@ FEATURES+=usb ramdisk
 CPU_TYPE:=24kc
 
 DEFAULT_PACKAGES += kmod-mt7603 wpad-basic swconfig
-KERNEL_PATCHVER:=5.4
 
 define Target/Description
 	Build firmware images for Ralink MT76x8 based boards.
diff --git a/target/linux/ramips/rt288x/config-4.14 b/target/linux/ramips/rt288x/config-4.14
index 44b20edad6..30c0a64cf8 100644
--- a/target/linux/ramips/rt288x/config-4.14
+++ b/target/linux/ramips/rt288x/config-4.14
@@ -66,7 +66,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_RALINK=y
-CONFIG_GPIO_SYSFS=y
 # CONFIG_GRO_CELLS is not set
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDWARE_WATCHPOINTS=y
diff --git a/target/linux/ramips/rt288x/config-5.4 b/target/linux/ramips/rt288x/config-5.4
index a999726d84..6c0725aed9 100644
--- a/target/linux/ramips/rt288x/config-5.4
+++ b/target/linux/ramips/rt288x/config-5.4
@@ -77,7 +77,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_RALINK=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
diff --git a/target/linux/ramips/rt288x/target.mk b/target/linux/ramips/rt288x/target.mk
index 57b0ee2251..917f150f24 100644
--- a/target/linux/ramips/rt288x/target.mk
+++ b/target/linux/ramips/rt288x/target.mk
@@ -9,6 +9,8 @@ CPU_TYPE:=24kc
 
 DEFAULT_PACKAGES += kmod-rt2800-soc wpad-mini swconfig
 
+KERNEL_PATCHVER:=4.14
+
 define Target/Description
 	Build firmware images for Ralink RT288x based boards.
 endef
diff --git a/target/linux/ramips/rt305x/config-4.14 b/target/linux/ramips/rt305x/config-4.14
index 75ca7f9469..a826bad38e 100644
--- a/target/linux/ramips/rt305x/config-4.14
+++ b/target/linux/ramips/rt305x/config-4.14
@@ -59,7 +59,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_RALINK=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
diff --git a/target/linux/ramips/rt305x/config-5.4 b/target/linux/ramips/rt305x/config-5.4
index 82b842e6b5..3f93a9db88 100644
--- a/target/linux/ramips/rt305x/config-5.4
+++ b/target/linux/ramips/rt305x/config-5.4
@@ -81,7 +81,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_RALINK=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
diff --git a/target/linux/ramips/rt3883/config-4.14 b/target/linux/ramips/rt3883/config-4.14
index 2eda81f160..83b9fdb6f3 100644
--- a/target/linux/ramips/rt3883/config-4.14
+++ b/target/linux/ramips/rt3883/config-4.14
@@ -70,7 +70,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_RALINK=y
-CONFIG_GPIO_SYSFS=y
 # CONFIG_GRO_CELLS is not set
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDWARE_WATCHPOINTS=y
diff --git a/target/linux/ramips/rt3883/config-5.4 b/target/linux/ramips/rt3883/config-5.4
index 356a57104d..09d51fdbdd 100644
--- a/target/linux/ramips/rt3883/config-5.4
+++ b/target/linux/ramips/rt3883/config-5.4
@@ -81,7 +81,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_RALINK=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
diff --git a/target/linux/rb532/config-4.14 b/target/linux/rb532/config-4.14
index a02dc03bb3..257b4e2d6c 100644
--- a/target/linux/rb532/config-4.14
+++ b/target/linux/rb532/config-4.14
@@ -60,7 +60,6 @@ CONFIG_GENERIC_SMP_IDLE_THREAD=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GLOB=y
 CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HARDWARE_WATCHPOINTS=y
 CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
diff --git a/target/linux/sunxi/config-4.19 b/target/linux/sunxi/config-4.19
index 9f3930303b..57063d3e0b 100644
--- a/target/linux/sunxi/config-4.19
+++ b/target/linux/sunxi/config-4.19
@@ -226,7 +226,6 @@ CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GLOB=y
 CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
diff --git a/target/linux/sunxi/config-5.4 b/target/linux/sunxi/config-5.4
index 1e54e980a3..9b884d5cae 100644
--- a/target/linux/sunxi/config-5.4
+++ b/target/linux/sunxi/config-5.4
@@ -227,7 +227,6 @@ CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GLOB=y
 CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
 CONFIG_HARDIRQS_SW_RESEND=y
diff --git a/target/linux/tegra/config-4.19 b/target/linux/tegra/config-4.19
index ea2177a865..84e3ada8ba 100644
--- a/target/linux/tegra/config-4.19
+++ b/target/linux/tegra/config-4.19
@@ -242,7 +242,6 @@ CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GLOB=y
 CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_TEGRA=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
diff --git a/target/linux/tegra/config-5.4 b/target/linux/tegra/config-5.4
index 5313e39894..e7722b9bc6 100644
--- a/target/linux/tegra/config-5.4
+++ b/target/linux/tegra/config-5.4
@@ -257,7 +257,6 @@ CONFIG_GENERIC_STRNLEN_USER=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GLOB=y
 CONFIG_GPIOLIB=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_TEGRA=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
diff --git a/target/linux/x86/64/config-4.19 b/target/linux/x86/64/config-4.19
index 2e1ba17fca..91bd7deb68 100644
--- a/target/linux/x86/64/config-4.19
+++ b/target/linux/x86/64/config-4.19
@@ -221,7 +221,6 @@ CONFIG_GPIO_ICH=y
 # CONFIG_GPIO_IT87 is not set
 CONFIG_GPIO_LYNXPOINT=y
 CONFIG_GPIO_SCH=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
diff --git a/target/linux/x86/64/config-5.4 b/target/linux/x86/64/config-5.4
index e466771df3..51e82f189d 100644
--- a/target/linux/x86/64/config-5.4
+++ b/target/linux/x86/64/config-5.4
@@ -195,7 +195,6 @@ CONFIG_GPIO_ICH=y
 # CONFIG_GPIO_IT87 is not set
 CONFIG_GPIO_LYNXPOINT=y
 CONFIG_GPIO_SCH=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
diff --git a/target/linux/x86/geode/config-4.19 b/target/linux/x86/geode/config-4.19
index 1f8627aa6a..316111aa0e 100644
--- a/target/linux/x86/geode/config-4.19
+++ b/target/linux/x86/geode/config-4.19
@@ -46,7 +46,6 @@ CONFIG_GEOS=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_ACPI=y
 CONFIG_GPIO_CS5535=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
 # CONFIG_HPET is not set
diff --git a/target/linux/x86/geode/config-5.4 b/target/linux/x86/geode/config-5.4
index 1f8627aa6a..316111aa0e 100644
--- a/target/linux/x86/geode/config-5.4
+++ b/target/linux/x86/geode/config-5.4
@@ -46,7 +46,6 @@ CONFIG_GEOS=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_ACPI=y
 CONFIG_GPIO_CS5535=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
 # CONFIG_HPET is not set
diff --git a/target/linux/zynq/config-4.19 b/target/linux/zynq/config-4.19
index 9b5b16331d..6122dcfd52 100644
--- a/target/linux/zynq/config-4.19
+++ b/target/linux/zynq/config-4.19
@@ -250,7 +250,6 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_ZYNQ=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
diff --git a/target/linux/zynq/config-5.4 b/target/linux/zynq/config-5.4
index f201f526b4..ccd2a75663 100644
--- a/target/linux/zynq/config-5.4
+++ b/target/linux/zynq/config-5.4
@@ -264,7 +264,6 @@ CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_GENERIC=y
 CONFIG_GPIO_GENERIC_PLATFORM=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_ZYNQ=y
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDEN_BRANCH_PREDICTOR=y
diff --git a/toolchain/glibc/common.mk b/toolchain/glibc/common.mk
index 9a9c4a5343..6b3f15b129 100644
--- a/toolchain/glibc/common.mk
+++ b/toolchain/glibc/common.mk
@@ -12,8 +12,8 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=6f3459f9859a7b506c64fa1823769ab631072c6e
-PKG_MIRROR_HASH:=01ed0c8131bdc32c9abd3aaaebc4fcffb2d496c2b8c363a0e845ac09d874a2ff
+PKG_SOURCE_VERSION:=6fdf971c9dbf7dac9bea552113fe4694015bbc4d
+PKG_MIRROR_HASH:=80998023c237bd0eaa38554e18536d8f66223e97fc5ade015a2d2aadf587d1f0
 PKG_SOURCE_URL:=https://sourceware.org/git/glibc.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
 
diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile
index ee0ef3a6fd..4fcda7e439 100644
--- a/tools/firmware-utils/Makefile
+++ b/tools/firmware-utils/Makefile
@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME := firmware-utils
-PKG_RELEASE := 1
+PKG_RELEASE := 2
 
 include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/kernel.mk
diff --git a/tools/firmware-utils/src/addpattern.c b/tools/firmware-utils/src/addpattern.c
index 9bc4865335..9791527878 100644
--- a/tools/firmware-utils/src/addpattern.c
+++ b/tools/firmware-utils/src/addpattern.c
@@ -296,7 +296,7 @@ int main(int argc, char **argv)
 		return EXIT_FAILURE;
 	}
 
-	ptm = localtime(&t);
+	ptm = gmtime(&t);
 
 	if (3 != sscanf(version, "v%d.%d.%d", &v0, &v1, &v2)) {
 		fprintf(stderr, "bad version string \"%s\"\n", version);
diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
index a5f3ced16d..0af1fe4c6e 100644
--- a/tools/firmware-utils/src/tplink-safeloader.c
+++ b/tools/firmware-utils/src/tplink-safeloader.c
@@ -2079,7 +2079,7 @@ static struct image_partition_entry make_soft_version(uint32_t rev) {
 	else if (time(&t) == (time_t)(-1))
 		error(1, errno, "time");
 
-	struct tm *tm = localtime(&t);
+	struct tm *tm = gmtime(&t);
 
 	s->magic = htonl(0x0000000c);
 	s->zero = 0;