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>
(backported from 2a926b1a0ad38d49198e0b272aa3283a618dd603)

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 c218efa49bddbfe37898804e73ed83cc4c3ea3c9..8ba57bdf060bc950174d6b88595ccaaf3ce00967 100755 (executable)
--- 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 5d33feb91601a7b7e0932d6af9627101266c8270..cb5e5c759db1fbd68a781f6c10e1c36d93d9ffd4 100644 (file)
--- 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 ced8ce197ae41fe608fa15f94196dc140ab1c2c0..fa0aa380149995ec1c5302c6dc08b9dcdb39a7df 100755 (executable)
--- 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|\