diff --git a/package/base-files/files/bin/board_detect b/package/base-files/files/bin/board_detect
index 840bd0178d..94f45bec53 100755
--- a/package/base-files/files/bin/board_detect
+++ b/package/base-files/files/bin/board_detect
@@ -6,7 +6,7 @@ CFG=$1
 
 [ -d "/etc/board.d/" -a ! -s "$CFG" ] && {
 	for a in $(ls /etc/board.d/*); do
-		[ -x $a ] || continue;
+		[ -s $a ] || continue;
 		$(. $a)
 	done
 }
diff --git a/package/base-files/files/etc/board.d/99-default_network b/package/base-files/files/etc/board.d/99-default_network
old mode 100755
new mode 100644
index d70aa352b9..49d2a3b354
--- a/package/base-files/files/etc/board.d/99-default_network
+++ b/package/base-files/files/etc/board.d/99-default_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2013-2015 OpenWrt.org
 #
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 026f8ebbf8..70c699962b 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -561,7 +561,7 @@ $(eval $(call KernelPackage,usb-serial))
 
 define AddDepends/usb-serial
   SUBMENU:=$(USB_MENU)
-  DEPENDS+=kmod-usb-serial $(1)
+  DEPENDS+=+kmod-usb-serial $(1)
 endef
 
 
@@ -1650,6 +1650,10 @@ endef
 
 $(eval $(call KernelPackage,usbmon))
 
+XHCI_MODULES := xhci-pci xhci-plat-hcd
+XHCI_FILES := $(wildcard $(patsubst %,$(LINUX_DIR)/drivers/usb/host/%.ko,$(XHCI_MODULES)))
+XHCI_AUTOLOAD := $(patsubst $(LINUX_DIR)/drivers/usb/host/%.ko,%,$(XHCI_FILES))
+
 define KernelPackage/usb3
   TITLE:=Support for USB3 controllers
   DEPENDS:= \
@@ -1663,9 +1667,8 @@ define KernelPackage/usb3
 	CONFIG_USB_XHCI_PCI \
 	CONFIG_USB_XHCI_PLATFORM
   FILES:= \
-	$(LINUX_DIR)/drivers/usb/host/xhci-pci.ko \
-	$(LINUX_DIR)/drivers/usb/host/xhci-plat-hcd.ko
-  AUTOLOAD:=$(call AutoLoad,54,xhci-pci xhci-plat-hcd,1)
+	$(XHCI_FILES)
+  AUTOLOAD:=$(call AutoLoad,54,$(XHCI_AUTOLOAD),1)
   $(call AddDepends/usb)
 endef
 
diff --git a/target/linux/apm821xx/base-files/etc/board.d/01_leds b/target/linux/apm821xx/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index 8433490825..3dc41d90d8
--- a/target/linux/apm821xx/base-files/etc/board.d/01_leds
+++ b/target/linux/apm821xx/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/uci-defaults.sh
 
diff --git a/target/linux/apm821xx/base-files/etc/board.d/02_network b/target/linux/apm821xx/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 69bc038bd4..f289e4ec74
--- a/target/linux/apm821xx/base-files/etc/board.d/02_network
+++ b/target/linux/apm821xx/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/system.sh
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/apm821xx/config-5.4 b/target/linux/apm821xx/config-5.4
index 0f59e9f8ff..2b9594c3d4 100644
--- a/target/linux/apm821xx/config-5.4
+++ b/target/linux/apm821xx/config-5.4
@@ -264,7 +264,6 @@ CONFIG_PHYLIB=y
 CONFIG_PHYSICAL_START=0x00000000
 CONFIG_PHYS_64BIT=y
 CONFIG_PHYS_ADDR_T_64BIT=y
-CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_PM=y
 CONFIG_PM_AUTOSLEEP=y
 CONFIG_PM_SLEEP=y
diff --git a/target/linux/arc770/base-files/etc/board.d/02_network b/target/linux/arc770/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 7f1d619076..f326f48763
--- a/target/linux/arc770/base-files/etc/board.d/02_network
+++ b/target/linux/arc770/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2015 OpenWrt.org
 #
diff --git a/target/linux/archs38/base-files/etc/board.d/02_network b/target/linux/archs38/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index dcf33788c5..7fcd0e51d6
--- a/target/linux/archs38/base-files/etc/board.d/02_network
+++ b/target/linux/archs38/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2016 OpenWrt.org
 #
diff --git a/target/linux/armvirt/base-files/etc/board.d/00_model b/target/linux/armvirt/base-files/etc/board.d/00_model
old mode 100755
new mode 100644
index 6ba51b8a42..bfaa45f59c
--- a/target/linux/armvirt/base-files/etc/board.d/00_model
+++ b/target/linux/armvirt/base-files/etc/board.d/00_model
@@ -1,4 +1,3 @@
-#!/bin/sh
 # Copyright (C) 2015 OpenWrt.org
 # Copyright (C) 2016 Yousong Zhou <yszhou4tech@gmail.com>
 
diff --git a/target/linux/at91/base-files/etc/board.d/02_network b/target/linux/at91/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 306dfe375e..3e11f40b32
--- a/target/linux/at91/base-files/etc/board.d/02_network
+++ b/target/linux/at91/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2014-2015 OpenWrt.org
 #
diff --git a/target/linux/at91/image/sam9x.mk b/target/linux/at91/image/sam9x.mk
index bbe410fbfb..1a036e493f 100644
--- a/target/linux/at91/image/sam9x.mk
+++ b/target/linux/at91/image/sam9x.mk
@@ -116,8 +116,8 @@ define Device/calamp_lmu5000
   $(Device/production)
   DEVICE_VENDOR := CalAmp
   DEVICE_MODEL := LMU5000
-  DEVICE_PACKAGES := kmod-rtc-pcf2123 kmod-usb-acm kmod-usb-serial \
-    kmod-usb-serial-option kmod-usb-serial-sierrawireless kmod-gpio-mcp23s08
+  DEVICE_PACKAGES := kmod-rtc-pcf2123 kmod-usb-acm \
+	kmod-usb-serial-option kmod-usb-serial-sierrawireless kmod-gpio-mcp23s08
 endef
 TARGET_DEVICES += calamp_lmu5000
 
diff --git a/target/linux/ath25/base-files/etc/board.d/01_leds b/target/linux/ath25/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index e6ab4a76b1..b417d8acef
--- a/target/linux/ath25/base-files/etc/board.d/01_leds
+++ b/target/linux/ath25/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 # Copyright 2012-2015 OpenWrt.org
 #
 
diff --git a/target/linux/ath25/base-files/etc/board.d/02_network b/target/linux/ath25/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index b2977f7b94..618ffddae8
--- a/target/linux/ath25/base-files/etc/board.d/02_network
+++ b/target/linux/ath25/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/uci-defaults.sh
 
diff --git a/target/linux/ath79/generic/base-files/etc/board.d/01_leds b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index ffd48ba606..b10934d783
--- a/target/linux/ath79/generic/base-files/etc/board.d/01_leds
+++ b/target/linux/ath79/generic/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/uci-defaults.sh
 
diff --git a/target/linux/ath79/generic/base-files/etc/board.d/02_network b/target/linux/ath79/generic/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 93b8f648c1..9b4b097ceb
--- a/target/linux/ath79/generic/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/generic/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/system.sh
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/ath79/generic/base-files/etc/board.d/03_gpio_switches b/target/linux/ath79/generic/base-files/etc/board.d/03_gpio_switches
old mode 100755
new mode 100644
index b3e0d0dd31..cd21932bfd
--- a/target/linux/ath79/generic/base-files/etc/board.d/03_gpio_switches
+++ b/target/linux/ath79/generic/base-files/etc/board.d/03_gpio_switches
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2018 OpenWrt.org
 #
diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk
index 0058d74f77..be6aa06b55 100644
--- a/target/linux/ath79/image/generic-tp-link.mk
+++ b/target/linux/ath79/image/generic-tp-link.mk
@@ -492,7 +492,7 @@ define Device/tplink_tl-mr6400-v1
   DEVICE_MODEL := TL-MR6400
   DEVICE_VARIANT := v1
   TPLINK_HWID := 0x64000001
-  DEVICE_PACKAGES := kmod-usb2 kmod-usb-net-rndis kmod-usb-serial \
+  DEVICE_PACKAGES := kmod-usb2 kmod-usb-net-rndis \
 	kmod-usb-serial-option adb-enablemodem
   SUPPORTED_DEVICES += tl-mr6400
 endef
diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk
index 5d5300fbb4..9fd9aa4f3a 100644
--- a/target/linux/ath79/image/generic.mk
+++ b/target/linux/ath79/image/generic.mk
@@ -1126,7 +1126,7 @@ define Device/etactica_eg200
   DEVICE_VENDOR := eTactica
   DEVICE_MODEL := EG200
   DEVICE_PACKAGES := kmod-usb-chipidea2 kmod-ledtrig-oneshot \
-	kmod-usb-serial kmod-usb-serial-ftdi kmod-usb-storage kmod-fs-ext4
+	kmod-usb-serial-ftdi kmod-usb-storage kmod-fs-ext4
   IMAGE_SIZE := 16000k
   SUPPORTED_DEVICES += rme-eg200
 endef
@@ -2243,7 +2243,7 @@ define Device/zbtlink_zbt-wd323
   DEVICE_MODEL := WD323
   IMAGE_SIZE := 16000k
   DEVICE_PACKAGES := kmod-usb2 kmod-i2c-gpio kmod-rtc-pcf8563 \
-	kmod-usb-serial kmod-usb-serial-cp210x uqmi
+	kmod-usb-serial-cp210x uqmi
 endef
 TARGET_DEVICES += zbtlink_zbt-wd323
 
diff --git a/target/linux/ath79/mikrotik/base-files/etc/board.d/01_leds b/target/linux/ath79/mikrotik/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index 0d3209c2e3..39e527e824
--- a/target/linux/ath79/mikrotik/base-files/etc/board.d/01_leds
+++ b/target/linux/ath79/mikrotik/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/uci-defaults.sh
 
diff --git a/target/linux/ath79/mikrotik/base-files/etc/board.d/02_network b/target/linux/ath79/mikrotik/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 584acc0feb..d229523ad5
--- a/target/linux/ath79/mikrotik/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/mikrotik/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/system.sh
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/ath79/nand/base-files/etc/board.d/01_leds b/target/linux/ath79/nand/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index 8eda666a81..fc74554763
--- a/target/linux/ath79/nand/base-files/etc/board.d/01_leds
+++ b/target/linux/ath79/nand/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/uci-defaults.sh
 
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
old mode 100755
new mode 100644
index 910df517aa..7402fc067a
--- a/target/linux/ath79/nand/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/nand/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/system.sh
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/ath79/tiny/base-files/etc/board.d/01_leds b/target/linux/ath79/tiny/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index f0b4acf066..72df8b3dea
--- a/target/linux/ath79/tiny/base-files/etc/board.d/01_leds
+++ b/target/linux/ath79/tiny/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/uci-defaults.sh
 
diff --git a/target/linux/ath79/tiny/base-files/etc/board.d/02_network b/target/linux/ath79/tiny/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index cca6352023..45335c7c89
--- a/target/linux/ath79/tiny/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/tiny/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/system.sh
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/bcm27xx/base-files/etc/board.d/02_network b/target/linux/bcm27xx/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 665504a3fc..f279941e1e
--- a/target/linux/bcm27xx/base-files/etc/board.d/02_network
+++ b/target/linux/bcm27xx/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 # Copyright (C) 2014-2016 OpenWrt.org
 # Copyright (C) 2017 LEDE project
 
diff --git a/target/linux/bcm47xx/base-files/etc/board.d/01_network b/target/linux/bcm47xx/base-files/etc/board.d/01_network
old mode 100755
new mode 100644
index 242055f2a4..c3b43b5d37
--- a/target/linux/bcm47xx/base-files/etc/board.d/01_network
+++ b/target/linux/bcm47xx/base-files/etc/board.d/01_network
@@ -1,4 +1,3 @@
-#!/bin/sh /etc/rc.common
 # Copyright (C) 2006-2015 OpenWrt.org
 
 . /lib/functions/system.sh
diff --git a/target/linux/bcm4908/base-files/etc/board.d/02_network b/target/linux/bcm4908/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index d16554d569..3ab22a9076
--- a/target/linux/bcm4908/base-files/etc/board.d/02_network
+++ b/target/linux/bcm4908/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 # SPDX-License-Identifier: GPL-2.0 OR BSD-2-Clause
 
 . /lib/functions/system.sh
diff --git a/target/linux/bcm53xx/base-files/etc/board.d/01_leds b/target/linux/bcm53xx/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index 80f799d9d7..aba526b9c3
--- a/target/linux/bcm53xx/base-files/etc/board.d/01_leds
+++ b/target/linux/bcm53xx/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/uci-defaults.sh
 
diff --git a/target/linux/bcm53xx/base-files/etc/board.d/02_network b/target/linux/bcm53xx/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 231566cfa0..e37ae20340
--- a/target/linux/bcm53xx/base-files/etc/board.d/02_network
+++ b/target/linux/bcm53xx/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2011 OpenWrt.org
 #
diff --git a/target/linux/bcm63xx/base-files/etc/board.d/01_leds b/target/linux/bcm63xx/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index fe8a54f5d8..33c70981de
--- a/target/linux/bcm63xx/base-files/etc/board.d/01_leds
+++ b/target/linux/bcm63xx/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2013-2015 OpenWrt.org
 #
diff --git a/target/linux/bcm63xx/base-files/etc/board.d/02_network b/target/linux/bcm63xx/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index cca607fce1..c594a9265f
--- a/target/linux/bcm63xx/base-files/etc/board.d/02_network
+++ b/target/linux/bcm63xx/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2012-2015 OpenWrt.org
 #
diff --git a/target/linux/bmips/generic/base-files/etc/board.d/01_leds b/target/linux/bmips/generic/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index 2f8d64a21e..3461eca10c
--- a/target/linux/bmips/generic/base-files/etc/board.d/01_leds
+++ b/target/linux/bmips/generic/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 . /lib/functions/leds.sh
diff --git a/target/linux/bmips/nand/base-files/etc/board.d/01_leds b/target/linux/bmips/nand/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index 2f8d64a21e..3461eca10c
--- a/target/linux/bmips/nand/base-files/etc/board.d/01_leds
+++ b/target/linux/bmips/nand/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 . /lib/functions/leds.sh
diff --git a/target/linux/gemini/base-files/etc/board.d/02_network b/target/linux/gemini/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index f371956a66..58eb9ed40c
--- a/target/linux/gemini/base-files/etc/board.d/02_network
+++ b/target/linux/gemini/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/uci-defaults.sh
 
diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10
index 2510da5dc7..a458f4b68d 100644
--- a/target/linux/generic/config-5.10
+++ b/target/linux/generic/config-5.10
@@ -4398,7 +4398,6 @@ CONFIG_PINMUX=y
 # CONFIG_PLATFORM_MHU is not set
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_PLIP is not set
-CONFIG_PLUGIN_HOSTCC=""
 # CONFIG_PLX_DMA is not set
 # CONFIG_PLX_HERMES is not set
 # CONFIG_PM is not set
diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
index 3ea65c4b4f..c732f136c8 100644
--- a/target/linux/generic/config-5.4
+++ b/target/linux/generic/config-5.4
@@ -4064,7 +4064,6 @@ CONFIG_PINMUX=y
 # CONFIG_PLATFORM_MHU is not set
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_PLIP is not set
-CONFIG_PLUGIN_HOSTCC=""
 # CONFIG_PLX_HERMES is not set
 # CONFIG_PM is not set
 # CONFIG_PMBUS is not set
diff --git a/target/linux/generic/config-filter b/target/linux/generic/config-filter
index 7d634b56cf..719487be5f 100644
--- a/target/linux/generic/config-filter
+++ b/target/linux/generic/config-filter
@@ -3,9 +3,10 @@
 # CONFIG_ARCH_(ENABLE|HAS|HAVE|INLINE|SUPPORTS|USE|WANT|STACKWALK)_.* is not set
 # CONFIG_AS_.* is not set
 # CONFIG_CC_(CAN|HAS|IS|VERSION)_.* is not set
-# CONFIG_LD_.* is not set
 # CONFIG_GCC_VERSION is not set
-# CONFIG_INLINE_.* is not set
 # CONFIG_HAVE_(?!(ARCH_TIMER|TCM|SMP)).* is not set
+# CONFIG_INLINE_.* is not set
+# CONFIG_LD_.* is not set
+CONFIG_PLUGIN_HOSTCC=".*"
 # CONFIG_SET_FS is not set
 # CONFIG_TASKS_.* is not set
diff --git a/target/linux/imx6/base-files/etc/board.d/02_network b/target/linux/imx6/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 60df86e189..1668b86008
--- a/target/linux/imx6/base-files/etc/board.d/02_network
+++ b/target/linux/imx6/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2013-2015 OpenWrt.org
 #
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/01_leds b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index 3e0f3ab258..75418a37c7
--- a/target/linux/ipq40xx/base-files/etc/board.d/01_leds
+++ b/target/linux/ipq40xx/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2015 OpenWrt.org
 #
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 74f9673809..5198aedb7a
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (c) 2015 The Linux Foundation. All rights reserved.
 # Copyright (c) 2011-2015 OpenWrt.org
diff --git a/target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches b/target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches
old mode 100755
new mode 100644
index c255707f91..9029eb3a82
--- a/target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches
+++ b/target/linux/ipq40xx/base-files/etc/board.d/03_gpio_switches
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/uci-defaults.sh
 
diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile
index a7710cfe05..5851b29875 100644
--- a/target/linux/ipq40xx/image/Makefile
+++ b/target/linux/ipq40xx/image/Makefile
@@ -6,6 +6,7 @@ define Device/Default
 	KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
 	KERNEL_LOADADDR := 0x80208000
 	DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1)))
+	DEVICE_DTS_CONFIG := config@1
 	IMAGES := sysupgrade.bin
 	IMAGE/sysupgrade.bin = sysupgrade-tar | append-metadata
 	IMAGE/sysupgrade.bin/squashfs :=
diff --git a/target/linux/ipq806x/base-files/etc/board.d/01_leds b/target/linux/ipq806x/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index 284f9e2c1d..74b94a29b4
--- a/target/linux/ipq806x/base-files/etc/board.d/01_leds
+++ b/target/linux/ipq806x/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2015 OpenWrt.org
 #
diff --git a/target/linux/ipq806x/base-files/etc/board.d/02_network b/target/linux/ipq806x/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index ddef4b7ac6..81edc569a7
--- a/target/linux/ipq806x/base-files/etc/board.d/02_network
+++ b/target/linux/ipq806x/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (c) 2015 The Linux Foundation. All rights reserved.
 # Copyright (c) 2011-2015 OpenWrt.org
diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
index cb4058f4a1..6c091be335 100644
--- a/target/linux/ipq806x/image/Makefile
+++ b/target/linux/ipq806x/image/Makefile
@@ -28,6 +28,7 @@ define Device/Default
 	KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
 	KERNEL_LOADADDR = 0x42208000
 	DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1)))
+	DEVICE_DTS_CONFIG := config@1
 	IMAGES := sysupgrade.bin
 	IMAGE/sysupgrade.bin = sysupgrade-tar | append-metadata
 	IMAGE/sysupgrade.bin/squashfs :=
diff --git a/target/linux/kirkwood/base-files/etc/board.d/01_leds b/target/linux/kirkwood/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index 3f7fe71c0a..c9c96e30da
--- a/target/linux/kirkwood/base-files/etc/board.d/01_leds
+++ b/target/linux/kirkwood/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2012-2015 OpenWrt.org
 #
diff --git a/target/linux/kirkwood/base-files/etc/board.d/02_network b/target/linux/kirkwood/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index c3d31affda..0578691144
--- a/target/linux/kirkwood/base-files/etc/board.d/02_network
+++ b/target/linux/kirkwood/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2012-2015 OpenWrt.org
 #
diff --git a/target/linux/kirkwood/base-files/etc/board.d/03_gpio_switches b/target/linux/kirkwood/base-files/etc/board.d/03_gpio_switches
old mode 100755
new mode 100644
index 046f8d4d20..c6c03d0b38
--- a/target/linux/kirkwood/base-files/etc/board.d/03_gpio_switches
+++ b/target/linux/kirkwood/base-files/etc/board.d/03_gpio_switches
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/uci-defaults.sh
 
diff --git a/target/linux/kirkwood/base-files/etc/board.d/05_compat-version b/target/linux/kirkwood/base-files/etc/board.d/05_compat-version
old mode 100755
new mode 100644
index 29d1debe58..267730b1b8
--- a/target/linux/kirkwood/base-files/etc/board.d/05_compat-version
+++ b/target/linux/kirkwood/base-files/etc/board.d/05_compat-version
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2020 OpenWrt.org
 #
diff --git a/target/linux/lantiq/ase/base-files/etc/board.d/01_leds b/target/linux/lantiq/ase/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index 3e58463c91..9495a62db5
--- a/target/linux/lantiq/ase/base-files/etc/board.d/01_leds
+++ b/target/linux/lantiq/ase/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2011-2015 OpenWrt.org
 #
diff --git a/target/linux/lantiq/ase/base-files/etc/board.d/02_network b/target/linux/lantiq/ase/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index deddba2408..a088c62aa0
--- a/target/linux/lantiq/ase/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/ase/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2011-2015 OpenWrt.org
 #
diff --git a/target/linux/lantiq/falcon/base-files/etc/board.d/02_network b/target/linux/lantiq/falcon/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 7998efc2a0..be214df529
--- a/target/linux/lantiq/falcon/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/falcon/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2011-2015 OpenWrt.org
 #
diff --git a/target/linux/lantiq/xrx200/base-files/etc/board.d/01_leds b/target/linux/lantiq/xrx200/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index 6fd8151a4f..a011b6c584
--- a/target/linux/lantiq/xrx200/base-files/etc/board.d/01_leds
+++ b/target/linux/lantiq/xrx200/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2011-2015 OpenWrt.org
 #
diff --git a/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network b/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index f7af17995f..77d93d016b
--- a/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/xrx200/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2011-2015 OpenWrt.org
 #
diff --git a/target/linux/lantiq/xway/base-files/etc/board.d/01_leds b/target/linux/lantiq/xway/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index 872634aa61..dccac8c475
--- a/target/linux/lantiq/xway/base-files/etc/board.d/01_leds
+++ b/target/linux/lantiq/xway/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2011-2015 OpenWrt.org
 #
diff --git a/target/linux/lantiq/xway/base-files/etc/board.d/02_network b/target/linux/lantiq/xway/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 9813b62c1b..d924b0053c
--- a/target/linux/lantiq/xway/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/xway/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2011-2015 OpenWrt.org
 #
diff --git a/target/linux/lantiq/xway_legacy/base-files/etc/board.d/01_leds b/target/linux/lantiq/xway_legacy/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index d82187de15..a6b85fe26c
--- a/target/linux/lantiq/xway_legacy/base-files/etc/board.d/01_leds
+++ b/target/linux/lantiq/xway_legacy/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2011-2015 OpenWrt.org
 #
diff --git a/target/linux/lantiq/xway_legacy/base-files/etc/board.d/02_network b/target/linux/lantiq/xway_legacy/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index c29beb832d..7bea7e18cf
--- a/target/linux/lantiq/xway_legacy/base-files/etc/board.d/02_network
+++ b/target/linux/lantiq/xway_legacy/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2011-2015 OpenWrt.org
 #
diff --git a/target/linux/layerscape/base-files/etc/board.d/01_led b/target/linux/layerscape/base-files/etc/board.d/01_led
old mode 100755
new mode 100644
index b9b62a07e0..7fddfa0824
--- a/target/linux/layerscape/base-files/etc/board.d/01_led
+++ b/target/linux/layerscape/base-files/etc/board.d/01_led
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2015 OpenWrt.org
 #
diff --git a/target/linux/layerscape/base-files/etc/board.d/02_network b/target/linux/layerscape/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index c50b4a346a..b46f0b0621
--- a/target/linux/layerscape/base-files/etc/board.d/02_network
+++ b/target/linux/layerscape/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/system.sh
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/layerscape/base-files/etc/board.d/03_gpio_switches b/target/linux/layerscape/base-files/etc/board.d/03_gpio_switches
old mode 100755
new mode 100644
index 7f9da08668..df3b759916
--- a/target/linux/layerscape/base-files/etc/board.d/03_gpio_switches
+++ b/target/linux/layerscape/base-files/etc/board.d/03_gpio_switches
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2015 OpenWrt.org
 #
diff --git a/target/linux/malta/base-files/etc/board.d/00_model b/target/linux/malta/base-files/etc/board.d/00_model
old mode 100755
new mode 100644
index 7a834058f3..d4d08b2259
--- a/target/linux/malta/base-files/etc/board.d/00_model
+++ b/target/linux/malta/base-files/etc/board.d/00_model
@@ -1,4 +1,3 @@
-#!/bin/sh
 # Copyright (C) 2015 OpenWrt.org
 
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/malta/base-files/etc/board.d/02_network b/target/linux/malta/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 8f01108938..4a711c253e
--- a/target/linux/malta/base-files/etc/board.d/02_network
+++ b/target/linux/malta/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/uci-defaults.sh
 
diff --git a/target/linux/mediatek/mt7622/base-files/etc/board.d/01_leds b/target/linux/mediatek/mt7622/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index 1e81648d16..65a81df8da
--- a/target/linux/mediatek/mt7622/base-files/etc/board.d/01_leds
+++ b/target/linux/mediatek/mt7622/base-files/etc/board.d/01_leds
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 . /lib/functions/leds.sh
 . /lib/functions/uci-defaults.sh
 
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
old mode 100755
new mode 100644
index f0d28c9312..f537ccdb80
--- a/target/linux/mediatek/mt7622/base-files/etc/board.d/02_network
+++ b/target/linux/mediatek/mt7622/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions.sh
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/mediatek/mt7623/base-files/etc/board.d/02_network b/target/linux/mediatek/mt7623/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 391b1ddc07..2006248530
--- a/target/linux/mediatek/mt7623/base-files/etc/board.d/02_network
+++ b/target/linux/mediatek/mt7623/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions.sh
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/mediatek/mt7629/base-files/etc/board.d/02_network b/target/linux/mediatek/mt7629/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 24c66de788..c39417abbc
--- a/target/linux/mediatek/mt7629/base-files/etc/board.d/02_network
+++ b/target/linux/mediatek/mt7629/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions.sh
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/mediatek/patches-5.10/112-dts-fix-bpi64-lan-names.patch b/target/linux/mediatek/patches-5.10/112-dts-fix-bpi64-lan-names.patch
index d061a9139d..6ce85efde9 100644
--- a/target/linux/mediatek/patches-5.10/112-dts-fix-bpi64-lan-names.patch
+++ b/target/linux/mediatek/patches-5.10/112-dts-fix-bpi64-lan-names.patch
@@ -8,7 +8,7 @@
  	};
  
  	chosen {
-@@ -160,22 +162,22 @@
+@@ -160,22 +161,22 @@
  
  				port@1 {
  					reg = <1>;
diff --git a/target/linux/mediatek/patches-5.10/113-dts-fix-bpi64-leds-and-buttons.patch b/target/linux/mediatek/patches-5.10/113-dts-fix-bpi64-leds-and-buttons.patch
index baf0d4ef64..f88dbc7195 100644
--- a/target/linux/mediatek/patches-5.10/113-dts-fix-bpi64-leds-and-buttons.patch
+++ b/target/linux/mediatek/patches-5.10/113-dts-fix-bpi64-leds-and-buttons.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
 +++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
-@@ -20,6 +20,10 @@
+@@ -19,6 +19,10 @@
  	aliases {
  		serial0 = &uart0;
  		ethernet0 = &gmac0;
@@ -11,7 +11,7 @@
  	};
  
  	chosen {
-@@ -43,8 +47,8 @@
+@@ -42,8 +46,8 @@
  		compatible = "gpio-keys";
  
  		factory {
@@ -22,7 +22,7 @@
  			gpios = <&pio 0 GPIO_ACTIVE_HIGH>;
  		};
  
-@@ -58,17 +62,25 @@
+@@ -57,17 +61,25 @@
  	leds {
  		compatible = "gpio-leds";
  
diff --git a/target/linux/mediatek/patches-5.10/114-dts-bpi64-disable-rtc.patch b/target/linux/mediatek/patches-5.10/114-dts-bpi64-disable-rtc.patch
new file mode 100644
index 0000000000..261579bf37
--- /dev/null
+++ b/target/linux/mediatek/patches-5.10/114-dts-bpi64-disable-rtc.patch
@@ -0,0 +1,21 @@
+--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
++++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
+@@ -559,12 +559,16 @@
+ 	status = "okay";
+ };
+ 
++&rtc {
++	status = "disabled";
++};
++
+ &sata {
+-	status = "disable";
++	status = "disabled";
+ };
+ 
+ &sata_phy {
+-	status = "disable";
++	status = "disabled";
+ };
+ 
+ &spi0 {
diff --git a/target/linux/mediatek/patches-5.10/602-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch b/target/linux/mediatek/patches-5.10/602-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch
index f771b1866f..5e0114328c 100644
--- a/target/linux/mediatek/patches-5.10/602-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch
+++ b/target/linux/mediatek/patches-5.10/602-arm64-dts-mediatek-Split-PCIe-node-for-MT2712-MT7622.patch
@@ -253,7 +253,7 @@ Signed-off-by: chuanjia.liu <Chuanjia.Liu@mediatek.com>
  				#interrupt-cells = <1>;
 --- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
 +++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
-@@ -271,18 +271,16 @@
+@@ -270,18 +270,16 @@
  	};
  };
  
diff --git a/target/linux/mpc85xx/base-files/etc/board.d/02_network b/target/linux/mpc85xx/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index aa33a4af96..03153b73d0
--- a/target/linux/mpc85xx/base-files/etc/board.d/02_network
+++ b/target/linux/mpc85xx/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 # Copyright (C) 2014-2015 OpenWrt.org
 
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/mvebu/cortexa53/base-files/etc/board.d/01_leds b/target/linux/mvebu/cortexa53/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index 42f4deb88a..4dce204f14
--- a/target/linux/mvebu/cortexa53/base-files/etc/board.d/01_leds
+++ b/target/linux/mvebu/cortexa53/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 # SPDX-License-Identifier: GPL-2.0-only
 
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/mvebu/cortexa53/base-files/etc/board.d/02_network b/target/linux/mvebu/cortexa53/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index c945251e4e..7da9de58c7
--- a/target/linux/mvebu/cortexa53/base-files/etc/board.d/02_network
+++ b/target/linux/mvebu/cortexa53/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2014-2016 OpenWrt.org
 # Copyright (C) 2016 LEDE-Project.org
diff --git a/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network b/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 9ab3c8174d..dbffd00223
--- a/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network
+++ b/target/linux/mvebu/cortexa72/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2014-2016 OpenWrt.org
 # Copyright (C) 2016 LEDE-Project.org
diff --git a/target/linux/mvebu/cortexa9/base-files/etc/board.d/01_leds b/target/linux/mvebu/cortexa9/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index 5a2ca3fa85..381596d85d
--- a/target/linux/mvebu/cortexa9/base-files/etc/board.d/01_leds
+++ b/target/linux/mvebu/cortexa9/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2014-2016 OpenWrt.org
 # Copyright (C) 2016 LEDE-Project.org
diff --git a/target/linux/mvebu/cortexa9/base-files/etc/board.d/02_network b/target/linux/mvebu/cortexa9/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index a8974efaa8..ad61dbea43
--- a/target/linux/mvebu/cortexa9/base-files/etc/board.d/02_network
+++ b/target/linux/mvebu/cortexa9/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2014-2016 OpenWrt.org
 # Copyright (C) 2016 LEDE-Project.org
diff --git a/target/linux/mvebu/cortexa9/base-files/etc/board.d/05_compat-version b/target/linux/mvebu/cortexa9/base-files/etc/board.d/05_compat-version
old mode 100755
new mode 100644
index 9304b84e7f..737ba54480
--- a/target/linux/mvebu/cortexa9/base-files/etc/board.d/05_compat-version
+++ b/target/linux/mvebu/cortexa9/base-files/etc/board.d/05_compat-version
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2020 OpenWrt.org
 #
diff --git a/target/linux/mxs/base-files/etc/board.d/02_network b/target/linux/mxs/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 95f6534788..7822f8076c
--- a/target/linux/mxs/base-files/etc/board.d/02_network
+++ b/target/linux/mxs/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 # Copyright (C) 2013-2015 OpenWrt.org
 
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/octeon/base-files/etc/board.d/01_network b/target/linux/octeon/base-files/etc/board.d/01_network
old mode 100755
new mode 100644
index 749d99be1d..e62d3c28bf
--- a/target/linux/octeon/base-files/etc/board.d/01_network
+++ b/target/linux/octeon/base-files/etc/board.d/01_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2014-2015 OpenWrt.org
 #
diff --git a/target/linux/octeontx/base-files/etc/board.d/02_network b/target/linux/octeontx/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 743e0f2ed7..1397dffa5e
--- a/target/linux/octeontx/base-files/etc/board.d/02_network
+++ b/target/linux/octeontx/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2018 OpenWrt.org
 #
diff --git a/target/linux/oxnas/base-files/etc/board.d/02_network b/target/linux/oxnas/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 9ba2deb7b4..747034c3dd
--- a/target/linux/oxnas/base-files/etc/board.d/02_network
+++ b/target/linux/oxnas/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/uci-defaults.sh
 . /lib/functions/system.sh
diff --git a/target/linux/oxnas/config-5.10 b/target/linux/oxnas/config-5.10
index 78436e69ca..9fc3119469 100644
--- a/target/linux/oxnas/config-5.10
+++ b/target/linux/oxnas/config-5.10
@@ -278,7 +278,6 @@ CONFIG_PHY_OXNAS=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_OXNAS=y
 # CONFIG_PINCTRL_SINGLE is not set
-CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_PM=y
 CONFIG_PM_CLK=y
 # CONFIG_PM_DEBUG is not set
diff --git a/target/linux/oxnas/config-5.4 b/target/linux/oxnas/config-5.4
index ed6f03d388..11f35e295a 100644
--- a/target/linux/oxnas/config-5.4
+++ b/target/linux/oxnas/config-5.4
@@ -275,7 +275,6 @@ CONFIG_PHY_OXNAS=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_OXNAS=y
 # CONFIG_PINCTRL_SINGLE is not set
-CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_PM=y
 CONFIG_PM_CLK=y
 # CONFIG_PM_DEBUG is not set
diff --git a/target/linux/pistachio/base-files/etc/board.d/02_network b/target/linux/pistachio/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 8de2c8c38d..35ae56394c
--- a/target/linux/pistachio/base-files/etc/board.d/02_network
+++ b/target/linux/pistachio/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 # SPDX-License-Identifier: GPL-2.0-only
 #
 # Copyright (C) 2017 OpenWrt.org
diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk
index f8905ad2b7..327df51e58 100644
--- a/target/linux/ramips/image/mt7620.mk
+++ b/target/linux/ramips/image/mt7620.mk
@@ -442,7 +442,7 @@ define Device/head-weblink_hdrm200
   DEVICE_VENDOR := Head Weblink
   DEVICE_MODEL := HDRM2000
   DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 \
-	uqmi kmod-usb-serial kmod-usb-serial-option
+	uqmi kmod-usb-serial-option
 endef
 TARGET_DEVICES += head-weblink_hdrm200
 
@@ -1031,7 +1031,7 @@ define Device/tplink_archer-mr200
   TPLINK_HWREV := 0x4a
   IMAGES := sysupgrade.bin
   DEVICE_PACKAGES := kmod-mt76x0e kmod-usb2 kmod-usb-net-rndis \
-	kmod-usb-serial kmod-usb-serial-option adb-enablemodem
+	kmod-usb-serial-option adb-enablemodem
   DEVICE_MODEL := Archer MR200
   SUPPORTED_DEVICES += mr200
 endef
@@ -1218,7 +1218,7 @@ define Device/zbtlink_zbt-we826-e
   DEVICE_VENDOR := Zbtlink
   DEVICE_MODEL := ZBT-WE826-E
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-sdhci-mt7620 uqmi \
-	kmod-usb-serial kmod-usb-serial-option
+	kmod-usb-serial-option
 endef
 TARGET_DEVICES += zbtlink_zbt-we826-e
 
diff --git a/target/linux/ramips/image/mt76x8.mk b/target/linux/ramips/image/mt76x8.mk
index 7ba2acacb8..d5a9684dba 100644
--- a/target/linux/ramips/image/mt76x8.mk
+++ b/target/linux/ramips/image/mt76x8.mk
@@ -527,7 +527,7 @@ define Device/tplink_tl-mr6400-v4
   TPLINK_HWREV := 0x4
   TPLINK_HWREVADD := 0x4
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport \
-	kmod-usb-serial kmod-usb-serial-option kmod-usb-net-qmi-wwan uqmi
+	kmod-usb-serial-option kmod-usb-net-qmi-wwan uqmi
   IMAGES := sysupgrade.bin tftp-recovery.bin
   IMAGE/tftp-recovery.bin := pad-extra 128k | $$(IMAGE/factory.bin)
 endef
@@ -543,7 +543,7 @@ define Device/tplink_tl-mr6400-v5
   TPLINK_HWREV := 0x5
   TPLINK_HWREVADD := 0x5
   DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-usb-ledtrig-usbport \
-	kmod-usb-serial kmod-usb-serial-option kmod-usb-net-qmi-wwan uqmi
+	kmod-usb-serial-option kmod-usb-net-qmi-wwan uqmi
   IMAGES := sysupgrade.bin tftp-recovery.bin
   IMAGE/tftp-recovery.bin := pad-extra 128k | $$(IMAGE/factory.bin)
 endef
diff --git a/target/linux/ramips/image/rt305x.mk b/target/linux/ramips/image/rt305x.mk
index c2ae7fab6a..30c9b0154a 100644
--- a/target/linux/ramips/image/rt305x.mk
+++ b/target/linux/ramips/image/rt305x.mk
@@ -472,7 +472,7 @@ define Device/dlink_dwr-512-b
   DEVICE_VENDOR := D-Link
   DEVICE_MODEL := DWR-512
   DEVICE_VARIANT := B
-  DEVICE_PACKAGES := jboot-tools kmod-usb2 kmod-spi-dev kmod-usb-serial \
+  DEVICE_PACKAGES := jboot-tools kmod-usb2 kmod-spi-dev \
 	kmod-usb-serial-option kmod-usb-net-cdc-ether comgt-ncm
   DLINK_ROM_ID := DLK6E2412001
   DLINK_FAMILY_MEMBER := 0x6E24
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
old mode 100755
new mode 100644
index 292f310d51..40d322685a
--- a/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/mt7620/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/leds.sh
 . /lib/functions/uci-defaults.sh
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
old mode 100755
new mode 100644
index e614de5010..2d5c9c02dd
--- a/target/linux/ramips/mt7620/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt7620/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions.sh
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/ramips/mt7620/base-files/etc/board.d/03_gpio_switches b/target/linux/ramips/mt7620/base-files/etc/board.d/03_gpio_switches
old mode 100755
new mode 100644
index 959991598c..969e9eba63
--- a/target/linux/ramips/mt7620/base-files/etc/board.d/03_gpio_switches
+++ b/target/linux/ramips/mt7620/base-files/etc/board.d/03_gpio_switches
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/uci-defaults.sh
 
diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index 5fa9ad3fe8..6743b7e6c3
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/leds.sh
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 89e679be7c..934276a042
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions.sh
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches b/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches
old mode 100755
new mode 100644
index 82bbdd24f6..8a96e93226
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/03_gpio_switches
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/uci-defaults.sh
 
diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/05_compat-version b/target/linux/ramips/mt7621/base-files/etc/board.d/05_compat-version
old mode 100755
new mode 100644
index d79092f76f..45bef9385b
--- a/target/linux/ramips/mt7621/base-files/etc/board.d/05_compat-version
+++ b/target/linux/ramips/mt7621/base-files/etc/board.d/05_compat-version
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2020 OpenWrt.org
 #
diff --git a/target/linux/ramips/mt7621/config-5.4 b/target/linux/ramips/mt7621/config-5.4
index 36785604a4..5a2d10329d 100644
--- a/target/linux/ramips/mt7621/config-5.4
+++ b/target/linux/ramips/mt7621/config-5.4
@@ -207,7 +207,6 @@ CONFIG_PINCTRL=y
 CONFIG_PINCTRL_RT2880=y
 # CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PINCTRL_SX150X=y
-CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_SUPPLY=y
diff --git a/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds b/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index 47b73e01a2..fdef158ea8
--- a/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/leds.sh
 . /lib/functions/uci-defaults.sh
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
old mode 100755
new mode 100644
index b741b4f9b4..5ce44d0e9b
--- a/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/mt76x8/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions.sh
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/ramips/rt288x/base-files/etc/board.d/01_leds b/target/linux/ramips/rt288x/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index b62ad76110..f9434023bb
--- a/target/linux/ramips/rt288x/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/rt288x/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/leds.sh
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/ramips/rt288x/base-files/etc/board.d/02_network b/target/linux/ramips/rt288x/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 134ac879cd..dd433dd7d6
--- a/target/linux/ramips/rt288x/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/rt288x/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions.sh
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/ramips/rt305x/base-files/etc/board.d/01_leds b/target/linux/ramips/rt305x/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index d29328e4b0..bc91b81a70
--- a/target/linux/ramips/rt305x/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/rt305x/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/leds.sh
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/ramips/rt305x/base-files/etc/board.d/02_network b/target/linux/ramips/rt305x/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index c3e39e76d0..db200de9fa
--- a/target/linux/ramips/rt305x/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/rt305x/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions.sh
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/ramips/rt3883/base-files/etc/board.d/01_leds b/target/linux/ramips/rt3883/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index 6e8497aff6..ecae088d88
--- a/target/linux/ramips/rt3883/base-files/etc/board.d/01_leds
+++ b/target/linux/ramips/rt3883/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/leds.sh
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/ramips/rt3883/base-files/etc/board.d/02_network b/target/linux/ramips/rt3883/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index f26199611e..519afe6329
--- a/target/linux/ramips/rt3883/base-files/etc/board.d/02_network
+++ b/target/linux/ramips/rt3883/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions.sh
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/realtek/base-files/etc/board.d/01_leds b/target/linux/realtek/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index 699ab817dd..4091645c8e
--- a/target/linux/realtek/base-files/etc/board.d/01_leds
+++ b/target/linux/realtek/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/uci-defaults.sh
 
diff --git a/target/linux/realtek/base-files/etc/board.d/02_network b/target/linux/realtek/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 2568fd2e0e..1e199db589
--- a/target/linux/realtek/base-files/etc/board.d/02_network
+++ b/target/linux/realtek/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions.sh
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds b/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index 77655d426a..bfecd0874c
--- a/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
+++ b/target/linux/rockchip/armv8/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/leds.sh
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index d8acaabe27..95ed81cdf8
--- a/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
+++ b/target/linux/rockchip/armv8/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/uci-defaults.sh
 . /lib/functions/system.sh
diff --git a/target/linux/rockchip/armv8/config-5.4 b/target/linux/rockchip/armv8/config-5.4
index 831bd0b240..74e779ead4 100644
--- a/target/linux/rockchip/armv8/config-5.4
+++ b/target/linux/rockchip/armv8/config-5.4
@@ -437,7 +437,6 @@ CONFIG_PINCTRL_ROCKCHIP=y
 # CONFIG_PINCTRL_SINGLE is not set
 CONFIG_PL330_DMA=y
 CONFIG_PLATFORM_MHU=y
-CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_PM=y
 CONFIG_PM_CLK=y
 CONFIG_PM_DEVFREQ=y
diff --git a/target/linux/sunxi/base-files/etc/board.d/01_leds b/target/linux/sunxi/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index 32fa00f8a2..45153b44dc
--- a/target/linux/sunxi/base-files/etc/board.d/01_leds
+++ b/target/linux/sunxi/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 
 . /lib/functions/uci-defaults.sh
 
diff --git a/target/linux/sunxi/base-files/etc/board.d/02_network b/target/linux/sunxi/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 08d31caadc..5b59333b1f
--- a/target/linux/sunxi/base-files/etc/board.d/02_network
+++ b/target/linux/sunxi/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright (C) 2013-2015 OpenWrt.org
 #
diff --git a/target/linux/x86/base-files/etc/board.d/01_leds b/target/linux/x86/base-files/etc/board.d/01_leds
old mode 100755
new mode 100644
index e9133e8877..79e1191080
--- a/target/linux/x86/base-files/etc/board.d/01_leds
+++ b/target/linux/x86/base-files/etc/board.d/01_leds
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright © 2017 OpenWrt.org
 #
diff --git a/target/linux/x86/base-files/etc/board.d/02_network b/target/linux/x86/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index 05a68967bc..8d10c637e8
--- a/target/linux/x86/base-files/etc/board.d/02_network
+++ b/target/linux/x86/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 #
 # Copyright © 2017 OpenWrt.org
 #
diff --git a/target/linux/zynq/base-files/etc/board.d/02_network b/target/linux/zynq/base-files/etc/board.d/02_network
old mode 100755
new mode 100644
index b3670cf37b..159b457682
--- a/target/linux/zynq/base-files/etc/board.d/02_network
+++ b/target/linux/zynq/base-files/etc/board.d/02_network
@@ -1,4 +1,3 @@
-#!/bin/sh
 # Copyright (C) 2015 OpenWrt.org
 
 . /lib/functions/uci-defaults.sh
diff --git a/target/linux/zynq/config-5.4 b/target/linux/zynq/config-5.4
index 08deed7858..ee53e2ae0a 100644
--- a/target/linux/zynq/config-5.4
+++ b/target/linux/zynq/config-5.4
@@ -498,7 +498,6 @@ CONFIG_PL310_ERRATA_769419=y
 CONFIG_PL330_DMA=y
 # CONFIG_PL353_SMC is not set
 CONFIG_PLAT_VERSATILE=y
-CONFIG_PLUGIN_HOSTCC="g++"
 CONFIG_PM=y
 CONFIG_PMBUS=y
 CONFIG_PM_CLK=y