diff --git a/target/linux/bmips/base-files/etc/board.d/01_leds b/target/linux/bmips/generic/base-files/etc/board.d/01_leds
similarity index 100%
rename from target/linux/bmips/base-files/etc/board.d/01_leds
rename to target/linux/bmips/generic/base-files/etc/board.d/01_leds
diff --git a/target/linux/bmips/base-files/etc/uci-defaults/09_fix_crc b/target/linux/bmips/generic/base-files/etc/uci-defaults/09_fix_crc
similarity index 100%
rename from target/linux/bmips/base-files/etc/uci-defaults/09_fix_crc
rename to target/linux/bmips/generic/base-files/etc/uci-defaults/09_fix_crc
diff --git a/target/linux/bmips/generic/base-files/lib/upgrade/platform.sh b/target/linux/bmips/generic/base-files/lib/upgrade/platform.sh
new file mode 100644
index 00000000000..d731bb74d5a
--- /dev/null
+++ b/target/linux/bmips/generic/base-files/lib/upgrade/platform.sh
@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+PART_NAME=firmware
+REQUIRE_IMAGE_METADATA=1
+
+platform_check_image() {
+	return 0
+}
+
+platform_do_upgrade() {
+	case "$(board_name)" in
+		*)
+			default_do_upgrade "$1"
+			;;
+	esac
+}
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
new file mode 100755
index 00000000000..2f8d64a21ee
--- /dev/null
+++ b/target/linux/bmips/nand/base-files/etc/board.d/01_leds
@@ -0,0 +1,17 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+. /lib/functions/leds.sh
+. /lib/functions/uci-defaults.sh
+
+board_config_update
+
+led_usb="$(get_dt_led usb)"
+[ -n "$led_usb" ] && ucidef_set_led_usbdev "usb" "usb" "$led_usb" "1-1"
+
+led_usb2="$(get_dt_led usb2)"
+[ -n "$led_usb2" ] && ucidef_set_led_usbdev "usb2" "usb2" "$led_usb2" "2-1"
+
+board_config_flush
+
+exit 0
diff --git a/target/linux/bmips/base-files/lib/upgrade/platform.sh b/target/linux/bmips/nand/base-files/lib/upgrade/platform.sh
similarity index 92%
rename from target/linux/bmips/base-files/lib/upgrade/platform.sh
rename to target/linux/bmips/nand/base-files/lib/upgrade/platform.sh
index 972303743dd..05e6db1836d 100644
--- a/target/linux/bmips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bmips/nand/base-files/lib/upgrade/platform.sh
@@ -45,15 +45,12 @@ cfe_jffs2_nand_upgrade() {
 
 platform_do_upgrade() {
 	case "$(board_name)" in
-		comtrend,ar-5315u|\
-		comtrend,ar-5387un|\
-		comtrend,vr-3025u|\
-		huawei,hg556a-b)
-			default_do_upgrade "$1"
-			;;
 		comtrend,vr-3032u|\
 		netgear,dgnd3700-v2)
 			cfe_jffs2_nand_upgrade "$1"
 			;;
+		*)
+			nand_do_upgrade "$1"
+			;;
 	esac
 }