[OpenWrt-Devel] [PATCH 2/5] apm821xx: remove wd, mybooklive-duo leftovers

Christian Lamparter chunkeey at gmail.com
Fri Sep 21 18:38:38 EDT 2018


The unification of the My Book Live Single and duo image in
commit 9b47aa93c76b ("apm821xx: unify My Book Live Single + Duo images")
made the wd,mybooklive-duo obsolete in most places and can
be removed.

Signed-off-by: Christian Lamparter <chunkeey at gmail.com>
---
 target/linux/apm821xx/base-files/etc/board.d/01_leds        | 3 +--
 target/linux/apm821xx/base-files/lib/preinit/79_move_config | 3 +--
 target/linux/apm821xx/base-files/lib/upgrade/platform.sh    | 6 ++----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/target/linux/apm821xx/base-files/etc/board.d/01_leds b/target/linux/apm821xx/base-files/etc/board.d/01_leds
index c218efa49b..8ba57bdf06 100755
--- a/target/linux/apm821xx/base-files/etc/board.d/01_leds
+++ b/target/linux/apm821xx/base-files/etc/board.d/01_leds
@@ -23,8 +23,7 @@ meraki,mx60)
 	ucidef_set_led_switch "lan4" "LAN4" "mx60:green:lan4" "switch0" "0x02"
 	;;
 
-wd,mybooklive|\
-wd,mybooklive-duo)
+wd,mybooklive)
 	ucidef_set_led_ide "sata" "SATA" "mbl:blue:power"
 	;;
 
diff --git a/target/linux/apm821xx/base-files/lib/preinit/79_move_config b/target/linux/apm821xx/base-files/lib/preinit/79_move_config
index 5d33feb916..cb5e5c759d 100644
--- a/target/linux/apm821xx/base-files/lib/preinit/79_move_config
+++ b/target/linux/apm821xx/base-files/lib/preinit/79_move_config
@@ -6,8 +6,7 @@ move_config() {
 	. /lib/functions.sh
 
 	case "$(board_name)" in
-	wd,mybooklive|\
-	wd,mybooklive-duo)
+	wd,mybooklive)
 		if [ -b $BOOTPART ]; then
 			mkdir -p /boot
 			mount -t ext4 -o rw,noatime $BOOTPART /boot
diff --git a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh
index ced8ce197a..fa0aa38014 100755
--- a/target/linux/apm821xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/apm821xx/base-files/lib/upgrade/platform.sh
@@ -7,8 +7,7 @@ platform_check_image() {
 	local board=$(board_name)
 
 	case "$board" in
-	wd,mybooklive|\
-	wd,mybooklive-duo)
+	wd,mybooklive)
 		mbl_do_platform_check "$1"
 		return $?;
 		;;
@@ -22,8 +21,7 @@ platform_do_upgrade() {
 	local board=$(board_name)
 
 	case "$board" in
-	wd,mybooklive|\
-	wd,mybooklive-duo)
+	wd,mybooklive)
 		mbl_do_upgrade "$ARGV"
 		;;
 	meraki,mr24|\
-- 
2.19.0


_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list