diff options
Diffstat (limited to 'target/linux/bcm63xx/base-files')
-rwxr-xr-x | target/linux/bcm63xx/base-files/etc/board.d/01_leds | 3 | ||||
-rwxr-xr-x | target/linux/bcm63xx/base-files/etc/board.d/02_network | 4 | ||||
-rw-r--r-- | target/linux/bcm63xx/base-files/lib/upgrade/platform.sh | 60 |
3 files changed, 65 insertions, 2 deletions
diff --git a/target/linux/bcm63xx/base-files/etc/board.d/01_leds b/target/linux/bcm63xx/base-files/etc/board.d/01_leds index dd1c565bb9..3f73d914f9 100755 --- a/target/linux/bcm63xx/base-files/etc/board.d/01_leds +++ b/target/linux/bcm63xx/base-files/etc/board.d/01_leds @@ -30,6 +30,9 @@ bt,home-hub-2-a) comtrend,ar-5315u) ucidef_set_led_usbdev "usb" "USB" "AR-5315u:green:usb" "1-1" ;; +comtrend,vr-3032u) + ucidef_set_led_usbdev "usb" "USB" "vr-3032u:green:usb" "1-1" + ;; huawei,echolife-hg553) ucidef_set_led_netdev "lan" "LAN" "HW553:blue:lan" "eth0" ucidef_set_led_usbdev "usb1" "USB1" "HW553:red:hspa" "1-1" diff --git a/target/linux/bcm63xx/base-files/etc/board.d/02_network b/target/linux/bcm63xx/base-files/etc/board.d/02_network index 7fa1514b4f..7203b1c3fc 100755 --- a/target/linux/bcm63xx/base-files/etc/board.d/02_network +++ b/target/linux/bcm63xx/base-files/etc/board.d/02_network @@ -99,6 +99,10 @@ sagem,fast-2704n) ucidef_add_switch "switch0" \ "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "8t@eth0" ;; +comtrend,vr-3032u) + ucidef_add_switch "switch0" \ + "0:lan:2" "1:lan:3" "2:lan:4" "3:lan:1" "8t@eth0" + ;; comtrend,wap-5813n) ucidef_add_switch "switch0" \ "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5t@eth0" diff --git a/target/linux/bcm63xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm63xx/base-files/lib/upgrade/platform.sh index 5c9e2c25f7..0debff28bb 100644 --- a/target/linux/bcm63xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/bcm63xx/base-files/lib/upgrade/platform.sh @@ -1,9 +1,19 @@ PART_NAME=linux +REQUIRE_IMAGE_METADATA=0 + platform_check_image() { [ "$#" -gt 1 ] && return 1 + + case "$(board_name)" in + comtrend,vr-3032u) + # NAND sysupgrade + return 0 + ;; + esac + case "$(get_magic_word "$1")" in 3600|3700|3800) - # 6348GW-11 boards use openwrt-96348GW-11-squashfs-cfe.bin files + # CFE tag versions return 0 ;; *) @@ -13,4 +23,50 @@ platform_check_image() { esac } -# use default for platform_do_upgrade() +cfe_jffs2_upgrade_tar() { + local tar_file="$1" + local kernel_mtd="$(find_mtd_index $CI_KERNPART)" + + if [ -z "$kernel_mtd" ]; then + echo "$CI_KERNPART partition not found" + return 1 + fi + + local board_dir=$(tar tf $tar_file | grep -m 1 '^sysupgrade-.*/$') + board_dir=${board_dir%/} + + local kernel_length=$(tar xf $tar_file ${board_dir}/kernel -O | wc -c 2> /dev/null) + local rootfs_length=$(tar xf $tar_file ${board_dir}/root -O | wc -c 2> /dev/null) + + if [ "$kernel_length" = 0 ]; then + echo "kernel cannot be empty" + return 1 + fi + + flash_erase -j /dev/mtd${kernel_mtd} 0 0 + tar xf $tar_file ${board_dir}/kernel -O | nandwrite /dev/mtd${kernel_mtd} - + + local rootfs_type="$(identify_tar "$tar_file" ${board_dir}/root)" + + nand_upgrade_prepare_ubi "$rootfs_length" "$rootfs_type" "0" "0" + + local ubidev="$( nand_find_ubi "$CI_UBIPART" )" + + local root_ubivol="$(nand_find_volume $ubidev $CI_ROOTPART)" + tar xf $tar_file ${board_dir}/root -O | \ + ubiupdatevol /dev/$root_ubivol -s $rootfs_length - + + nand_do_upgrade_success +} + +platform_do_upgrade() { + case "$(board_name)" in + comtrend,vr-3032u) + REQUIRE_IMAGE_METADATA=1 + cfe_jffs2_upgrade_tar "$1" + ;; + *) + default_do_upgrade "$1" + ;; + esac +} |