From 47680abea77b838c1eb4c2569a931e938bc9173e Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Thu, 24 Jan 2019 14:40:52 +0800 Subject: [PATCH] ipq40xx: EA6350 v3 dualboot support --- .../base-files/etc/init.d/zlinksys_recovery | 34 +++++++ .../ipq40xx/base-files/lib/upgrade/linksys.sh | 95 +++++++++++++++++++ .../base-files/lib/upgrade/platform.sh | 4 +- target/linux/ipq40xx/image/Makefile | 18 ++-- 4 files changed, 144 insertions(+), 7 deletions(-) create mode 100755 target/linux/ipq40xx/base-files/etc/init.d/zlinksys_recovery create mode 100644 target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh diff --git a/target/linux/ipq40xx/base-files/etc/init.d/zlinksys_recovery b/target/linux/ipq40xx/base-files/etc/init.d/zlinksys_recovery new file mode 100755 index 000000000..ac6533e3f --- /dev/null +++ b/target/linux/ipq40xx/base-files/etc/init.d/zlinksys_recovery @@ -0,0 +1,34 @@ +#!/bin/sh /etc/rc.common +# +# This script sets auto_recovery to "yes" and resets the boot counter to 0. +# As a golden rule, this should be the latest script to run at boot. For a +# developer snapshot, it is fine to set auto_recovery here. But for a stable +# release, this script must in fact turn off auto_recovery. +# +# Why? Because the custom sysupgrade script for the device will turn on +# auto_recovery to "yes". And it's the job of this script to set the +# boot boot_count to 0 and then disable auto_recovery, as that condition +# means that the stable release went well. +# +# I have to repeat: this script should be changed for stable releases. + +START=99 +boot() { + . /lib/functions.sh + + case $(board_name) in + linksys,ea6350v3) + # make sure auto_recovery in uboot is always on + IS_AUTO_RECOVERY="$(fw_printenv -n auto_recovery)" + if [ "$IS_AUTO_RECOVERY" != "yes" ] ; then + fw_setenv auto_recovery yes + echo "Linksys EA6350v3: fw_setenv: auto_recovery has been set to yes" + fi + # reset the boot counter + fw_setenv boot_count 0 + mtd resetbc s_env + echo "Linksys EA6350v3: boot counter has been reset" + echo "Linksys EA6350v3: boot_part=$(fw_printenv -n boot_part)" + ;; + esac +} diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh b/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh new file mode 100644 index 000000000..9772d68f3 --- /dev/null +++ b/target/linux/ipq40xx/base-files/lib/upgrade/linksys.sh @@ -0,0 +1,95 @@ +linksys_get_target_firmware() { + cur_boot_part=$(/usr/sbin/fw_printenv -n boot_part) + target_firmware="" + if [ "$cur_boot_part" = "1" ]; then + # current primary boot - update alt boot + target_firmware="alt_kernel" + fw_setenv boot_part 2 + # In the Linksys EA6350v3, it is enough to set the boot_part as the boot command line is + # bootcmd=if test $boot_part = 1; then run bootpart1; else run bootpart2; fi + # - You probably want to use that if your device's uboot does not eval bootcmd + #fw_setenv bootcmd "run altnandboot" + elif [ "$cur_boot_part" = "2" ]; then + # current alt boot - update primary boot + target_firmware="kernel" + fw_setenv boot_part 1 + #fw_setenv bootcmd "run nandboot" + fi + + # re-enable recovery so we get back if the new firmware is broken + fw_setenv auto_recovery yes + # see /etc/init.d/zlinksys_recovery + + echo "$target_firmware" +} + +linksys_get_root_magic() { + (get_image "$@" | dd skip=786432 bs=4 count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2>/dev/null +} + +platform_do_upgrade_linksys() { + local magic_long="$(get_magic_long "$1")" + + mkdir -p /var/lock + local part_label="$(linksys_get_target_firmware)" + touch /var/lock/fw_printenv.lock + + if [ ! -n "$part_label" ]; then + echo "cannot find target partition" + exit 1 + fi + + local target_mtd=$(find_mtd_part $part_label) + + [ "$magic_long" = "73797375" ] && { + CI_KERNPART="$part_label" + if [ "$part_label" = "kernel" ]; then + CI_UBIPART="rootfs" + else + CI_UBIPART="alt_rootfs" + fi + + # remove "squashfs" vol (in case we are flashing over a stock image, which is also UBI) + + local mtdnum="$( find_mtd_index "$CI_UBIPART" )" + if [ ! "$mtdnum" ]; then + echo "cannot find ubi mtd partition $CI_UBIPART" + return 1 + fi + + local ubidev="$( nand_find_ubi "$CI_UBIPART" )" + if [ ! "$ubidev" ]; then + ubiattach -m "$mtdnum" + sync + ubidev="$( nand_find_ubi "$CI_UBIPART" )" + fi + + if [ "$ubidev" ]; then + local squash_ubivol="$( nand_find_volume $ubidev squashfs )" + # kill volume + [ "$squash_ubivol" ] && ubirmvol /dev/$ubidev -N squashfs || true + fi + + # complete std upgrade + nand_upgrade_tar "$1" + } + [ "$magic_long" = "27051956" ] && { + # This magic is for a uImage (which is a sysupgrade image) + # check firmwares' rootfs types + local oldroot="$(linksys_get_root_magic $target_mtd)" + local newroot="$(linksys_get_root_magic "$1")" + + if [ "$newroot" = "55424923" -a "$oldroot" = "55424923" ]; then + # we're upgrading from a firmware with UBI to one with UBI + # erase everything to be safe + # - Is that really needed? Won't remove (or comment) the if, because it may be needed in a future device. + #mtd erase $part_label + #get_image "$1" | mtd -n write - $part_label + echo "writing \"$1\" UBI image to \"$part_label\" (UBI)..." + get_image "$1" | mtd write - $part_label + else + echo "writing \"$1\" image to \"$part_label\"" + get_image "$1" | mtd write - $part_label + fi + } +} diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh index 6ee3243b2..39758f540 100644 --- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh @@ -164,7 +164,6 @@ platform_do_upgrade() { ;; asus,rt-ac1300uhp |\ asus,rt-acrh17|\ - linksys,ea6350v3 |\ asus,rt-ac58u) local magic=$(get_magic_long "$1") CI_UBIPART="UBI_DEV" @@ -176,6 +175,9 @@ platform_do_upgrade() { asus_nand_upgrade_tar 20951040 "$1" fi ;; + linksys,ea6350v3) + platform_do_upgrade_linksys "$ARGV" + ;; openmesh,a42 |\ openmesh,a62) PART_NAME="inactive" diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile index 13ad98a8a..a9b7b9bb1 100644 --- a/target/linux/ipq40xx/image/Makefile +++ b/target/linux/ipq40xx/image/Makefile @@ -26,6 +26,12 @@ define Device/FitImageLzma KERNEL_NAME := Image endef +define Device/FitzImage + KERNEL_SUFFIX := -fit-zImage.itb + KERNEL = kernel-bin | fit none $$(DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL_NAME := zImage +endef + define Device/UbiFit KERNEL_IN_UBI := 1 IMAGES := nand-factory.ubi nand-sysupgrade.bin @@ -231,16 +237,16 @@ endef TARGET_DEVICES += qcom_ap-dk01.1-c1 define Device/linksys_ea6350v3 + $(call Device/FitzImage) DEVICE_TITLE := Linksys EA6350v3 - BOARD_NAME := ea6350v3 DEVICE_DTS := qcom-ipq4018-ea6350v3 - DTB_SIZE := 65536 BLOCKSIZE := 128k - IMAGE_SIZE := 20439364 - FILESYSTEMS := squashfs + PAGESIZE := 2048 + KERNEL_SIZE := 3145728 + IMAGE_SIZE := 38797312 + UBINIZE_OPTS := -E 5 IMAGES := sysupgrade.bin - $(call Device/FitImage) - DEVICE_PACKAGES := ath10k-firmware-qca4019 ipq-wifi-linksys_ea6350v3 + DEVICE_PACKAGES := ath10k-firmware-qca4019 ipq-wifi-linksys_ea6350v3 uboot-envtools endef TARGET_DEVICES += linksys_ea6350v3