From: Christian Lamparter <chunkeey@gmail.com>
Date: Fri, 21 Sep 2018 22:38:38 +0000 (+0200)
Subject: apm821xx: remove wd, mybooklive-duo leftovers
X-Git-Tag: v19.07.0-rc1~2466
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2a926b1a0ad38d49198e0b272aa3283a618dd603;p=openwrt%2Fstaging%2Fpepe2k.git

apm821xx: remove wd, mybooklive-duo leftovers

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@gmail.com>
---

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|\