[openwrt/openwrt] bmips: split base-files into subtargets

LEDE Commits lede-commits at lists.infradead.org
Mon Feb 22 18:26:51 EST 2021


adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/020e51facf5fad9d9499c1be946646201b27e269

commit 020e51facf5fad9d9499c1be946646201b27e269
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Mon Feb 22 19:02:35 2021 +0100

    bmips: split base-files into subtargets
    
    Like done for several targets already, splitting base-files into
    subtarget will provide smaller images due to more specific
    distribution of files per subtarget and allow to use default cases
    more effectively.
    
    Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 .../bmips/{ => generic}/base-files/etc/board.d/01_leds   |  0
 .../{ => generic}/base-files/etc/uci-defaults/09_fix_crc |  0
 .../bmips/generic/base-files/lib/upgrade/platform.sh     | 16 ++++++++++++++++
 .../bmips/{ => nand}/base-files/etc/board.d/01_leds      |  0
 .../bmips/{ => nand}/base-files/lib/upgrade/platform.sh  |  9 +++------
 5 files changed, 19 insertions(+), 6 deletions(-)

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%
copy from target/linux/bmips/base-files/etc/board.d/01_leds
copy 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 0000000000..d731bb74d5
--- /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/base-files/etc/board.d/01_leds b/target/linux/bmips/nand/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/nand/base-files/etc/board.d/01_leds
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 972303743d..05e6db1836 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
 }



More information about the lede-commits mailing list