Skip to content
Snippets Groups Projects
Select Git revision
  • 78b2775eecd2ba9182b47c255c0229ee81c8c7da
  • experimental default protected
  • v2023.2.5-ffs
  • nrb/ex400-remove-wps
  • nrb/airmax-test
  • v2023.2.4-ffs
  • nrb/ar9344-reset-sequence
  • autinerd/experimental-openwrt-24.10
  • v2023.2.3-ffs
  • v2023.2.2-ffs
  • v2023.2-ffs
  • v2023.1-ffs
  • v2022.1.4-ffs
  • feature/addMikrotikwAP
  • v2022.1.3-ffs
  • v2021.1.2-ffs
  • v2022.1.1-ffs
  • master protected
  • v2021.1.1-ffs
  • nrb/gluon-master-cpe510
  • v2021.1-ffs
  • experimental-2025-07-19
  • experimental-2025-07-19-base
  • experimental-2025-07-17
  • experimental-2025-07-17-base
  • experimental-2025-07-12
  • experimental-2025-07-12-base
  • experimental-2025-07-04
  • experimental-2025-07-04-base
  • experimental-2025-07-01
  • experimental-2025-07-01-base
  • experimental-2025-06-25
  • experimental-2025-06-25-base
  • experimental-2025-06-24
  • experimental-2025-06-24-base
  • experimental-2025-06-22
  • experimental-2025-06-22-base
  • v2023.2.5-ffs0.1
  • experimental-2025-06-08
  • experimental-2025-06-08-base
  • experimental-2025-06-06
41 results

brcm2708-bcm2709

Blame
  • 0019-ipq40xx-Change-name-for-openmesh.sh-to-vendor-free-name.patch 10.21 KiB
    From: Sven Eckelmann <sven@narfation.org>
    Date: Sat, 21 Nov 2020 22:27:11 +0100
    Subject: ipq40xx: Change name for openmesh.sh to vendor-free name
    
    Other vendors are using functionality similar to the ones OpenMesh used to
    implement two areas on the flash to store the default image and a fallback
    image. So just change the name to dualboot_datachk.sh to avoid duplicated
    code just to have the same script for different vendors.
    
    Signed-off-by: Sven Eckelmann <sven@narfation.org>
    Origin: backport, https://github.com/openwrt/openwrt/commit/8a891bfaa01d9592ea86c6b0cbbd5c04688c09f8
    
    diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/dualboot_datachk.sh b/target/linux/ipq40xx/base-files/lib/upgrade/dualboot_datachk.sh
    new file mode 100644
    index 0000000000000000000000000000000000000000..807a85d43ccd57642b52e7c1a7f92295cb6cd036
    --- /dev/null
    +++ b/target/linux/ipq40xx/base-files/lib/upgrade/dualboot_datachk.sh
    @@ -0,0 +1,106 @@
    +# The U-Boot loader with the datachk patchset for dualbooting requires image
    +# sizes and checksums to be provided in the U-Boot environment.
    +# The devices come with 2 main partitions - while one is active
    +# sysupgrade will flash the other. The boot order is changed to boot the
    +# newly flashed partition. If the new partition can't be booted due to
    +# upgrade failures the previously used partition is loaded.
    +
    +platform_do_upgrade_dualboot_datachk() {
    +	local tar_file="$1"
    +	local restore_backup
    +	local primary_kernel_mtd
    +
    +	local setenv_script="/tmp/fw_env_upgrade"
    +
    +	local kernel_mtd="$(find_mtd_index $PART_NAME)"
    +	local kernel_offset="$(cat /sys/class/mtd/mtd${kernel_mtd}/offset)"
    +	local total_size="$(cat /sys/class/mtd/mtd${kernel_mtd}/size)"
    +
    +	# detect to which flash region the new image is written to.
    +	#
    +	# 1. check what is the mtd index for the first flash region on this
    +	#    device
    +	# 2. check if the target partition ("inactive") has the mtd index of
    +	#    the first flash region
    +	#
    +	#    - when it is: the new bootseq will be 1,2 and the first region is
    +	#      modified
    +	#    - when it isnt: bootseq will be 2,1 and the second region is
    +	#      modified
    +	#
    +	# The detection has to be done via the hardcoded mtd partition because
    +	# the current boot might be done with the fallback region. Let us
    +	# assume that the current bootseq is 1,2. The bootloader detected that
    +	# the image in flash region 1 is corrupt and thus switches to flash
    +	# region 2. The bootseq in the u-boot-env is now still the same and
    +	# the sysupgrade code can now only rely on the actual mtd indexes and
    +	# not the bootseq variable to detect the currently booted flash
    +	# region/image.
    +	#
    +	# In the above example, an implementation which uses bootseq ("1,2") to
    +	# detect the currently booted image would assume that region 1 is booted
    +	# and then overwrite the variables for the wrong flash region (aka the
    +	# one which isn't modified). This could result in a device which doesn't
    +	# boot anymore to Linux until it was reflashed with ap51-flash.
    +	local next_boot_part="1"
    +	case "$(board_name)" in
    +	openmesh,a42)
    +		primary_kernel_mtd=8
    +		;;
    +	openmesh,a62)
    +		primary_kernel_mtd=10
    +		;;
    +	*)
    +		echo "failed to detect primary kernel mtd partition for board"
    +		return 1
    +		;;
    +	esac
    +	[ "$kernel_mtd" = "$primary_kernel_mtd" ] || next_boot_part="2"
    +
    +	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)
    +	local rootfs_length=$(tar xf $tar_file ${board_dir}/root -O | wc -c)
    +	# rootfs without EOF marker
    +	rootfs_length=$((rootfs_length-4))
    +
    +	local kernel_md5=$(tar xf $tar_file ${board_dir}/kernel -O | md5sum); kernel_md5="${kernel_md5%% *}"
    +	# md5 checksum of rootfs with EOF marker
    +	local rootfs_md5=$(tar xf $tar_file ${board_dir}/root -O | dd bs=1 count=$rootfs_length | md5sum); rootfs_md5="${rootfs_md5%% *}"
    +
    +	#
    +	# add tar support to get_image() to use default_do_upgrade() instead?
    +	#
    +
    +	# take care of restoring a saved config
    +	[ -n "$UPGRADE_BACKUP" ] && restore_backup="${MTD_CONFIG_ARGS} -j ${UPGRADE_BACKUP}"
    +
    +	mtd -q erase inactive
    +	tar xf $tar_file ${board_dir}/root -O | mtd -n -p $kernel_length $restore_backup write - $PART_NAME
    +	tar xf $tar_file ${board_dir}/kernel -O | mtd -n write - $PART_NAME
    +
    +	# prepare new u-boot env
    +	if [ "$next_boot_part" = "1" ]; then
    +		echo "bootseq 1,2" > $setenv_script
    +	else
    +		echo "bootseq 2,1" > $setenv_script
    +	fi
    +
    +	printf "kernel_size_%i 0x%08x\n" $next_boot_part $kernel_length >> $setenv_script
    +	printf "vmlinux_start_addr 0x%08x\n" ${kernel_offset} >> $setenv_script
    +	printf "vmlinux_size 0x%08x\n" ${kernel_length} >> $setenv_script
    +	printf "vmlinux_checksum %s\n" ${kernel_md5} >> $setenv_script
    +
    +	printf "rootfs_size_%i 0x%08x\n" $next_boot_part $((total_size-kernel_length)) >> $setenv_script
    +	printf "rootfs_start_addr 0x%08x\n" $((kernel_offset+kernel_length)) >> $setenv_script
    +	printf "rootfs_size 0x%08x\n" ${rootfs_length} >> $setenv_script
    +	printf "rootfs_checksum %s\n" ${rootfs_md5} >> $setenv_script
    +
    +	# store u-boot env changes
    +	mkdir -p /var/lock
    +	fw_setenv -s $setenv_script || {
    +		echo "failed to update U-Boot environment"
    +		return 1
    +	}
    +}
    diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh b/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh
    deleted file mode 100644
    index 8e02186eb81b17d56d0cb8ceba95dbe506e2984b..0000000000000000000000000000000000000000
    --- a/target/linux/ipq40xx/base-files/lib/upgrade/openmesh.sh
    +++ /dev/null
    @@ -1,106 +0,0 @@
    -# The U-Boot loader of the OpenMesh devices requires image sizes and
    -# checksums to be provided in the U-Boot environment.
    -# The OpenMesh devices come with 2 main partitions - while one is active
    -# sysupgrade will flash the other. The boot order is changed to boot the
    -# newly flashed partition. If the new partition can't be booted due to
    -# upgrade failures the previously used partition is loaded.
    -
    -platform_do_upgrade_openmesh() {
    -	local tar_file="$1"
    -	local restore_backup
    -	local primary_kernel_mtd
    -
    -	local setenv_script="/tmp/fw_env_upgrade"
    -
    -	local kernel_mtd="$(find_mtd_index $PART_NAME)"
    -	local kernel_offset="$(cat /sys/class/mtd/mtd${kernel_mtd}/offset)"
    -	local total_size="$(cat /sys/class/mtd/mtd${kernel_mtd}/size)"
    -
    -	# detect to which flash region the new image is written to.
    -	#
    -	# 1. check what is the mtd index for the first flash region on this
    -	#    device
    -	# 2. check if the target partition ("inactive") has the mtd index of
    -	#    the first flash region
    -	#
    -	#    - when it is: the new bootseq will be 1,2 and the first region is
    -	#      modified
    -	#    - when it isnt: bootseq will be 2,1 and the second region is
    -	#      modified
    -	#
    -	# The detection has to be done via the hardcoded mtd partition because
    -	# the current boot might be done with the fallback region. Let us
    -	# assume that the current bootseq is 1,2. The bootloader detected that
    -	# the image in flash region 1 is corrupt and thus switches to flash
    -	# region 2. The bootseq in the u-boot-env is now still the same and
    -	# the sysupgrade code can now only rely on the actual mtd indexes and
    -	# not the bootseq variable to detect the currently booted flash
    -	# region/image.
    -	#
    -	# In the above example, an implementation which uses bootseq ("1,2") to
    -	# detect the currently booted image would assume that region 1 is booted
    -	# and then overwrite the variables for the wrong flash region (aka the
    -	# one which isn't modified). This could result in a device which doesn't
    -	# boot anymore to Linux until it was reflashed with ap51-flash.
    -	local next_boot_part="1"
    -	case "$(board_name)" in
    -	openmesh,a42)
    -		primary_kernel_mtd=8
    -		;;
    -	openmesh,a62)
    -		primary_kernel_mtd=10
    -		;;
    -	*)
    -		echo "failed to detect primary kernel mtd partition for board"
    -		return 1
    -		;;
    -	esac
    -	[ "$kernel_mtd" = "$primary_kernel_mtd" ] || next_boot_part="2"
    -
    -	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)
    -	local rootfs_length=$(tar xf $tar_file ${board_dir}/root -O | wc -c)
    -	# rootfs without EOF marker
    -	rootfs_length=$((rootfs_length-4))
    -
    -	local kernel_md5=$(tar xf $tar_file ${board_dir}/kernel -O | md5sum); kernel_md5="${kernel_md5%% *}"
    -	# md5 checksum of rootfs with EOF marker
    -	local rootfs_md5=$(tar xf $tar_file ${board_dir}/root -O | dd bs=1 count=$rootfs_length | md5sum); rootfs_md5="${rootfs_md5%% *}"
    -
    -	#
    -	# add tar support to get_image() to use default_do_upgrade() instead?
    -	#
    -
    -	# take care of restoring a saved config
    -	[ -n "$UPGRADE_BACKUP" ] && restore_backup="${MTD_CONFIG_ARGS} -j ${UPGRADE_BACKUP}"
    -
    -	mtd -q erase inactive
    -	tar xf $tar_file ${board_dir}/root -O | mtd -n -p $kernel_length $restore_backup write - $PART_NAME
    -	tar xf $tar_file ${board_dir}/kernel -O | mtd -n write - $PART_NAME
    -
    -	# prepare new u-boot env
    -	if [ "$next_boot_part" = "1" ]; then
    -		echo "bootseq 1,2" > $setenv_script
    -	else
    -		echo "bootseq 2,1" > $setenv_script
    -	fi
    -
    -	printf "kernel_size_%i 0x%08x\n" $next_boot_part $kernel_length >> $setenv_script
    -	printf "vmlinux_start_addr 0x%08x\n" ${kernel_offset} >> $setenv_script
    -	printf "vmlinux_size 0x%08x\n" ${kernel_length} >> $setenv_script
    -	printf "vmlinux_checksum %s\n" ${kernel_md5} >> $setenv_script
    -
    -	printf "rootfs_size_%i 0x%08x\n" $next_boot_part $((total_size-kernel_length)) >> $setenv_script
    -	printf "rootfs_start_addr 0x%08x\n" $((kernel_offset+kernel_length)) >> $setenv_script
    -	printf "rootfs_size 0x%08x\n" ${rootfs_length} >> $setenv_script
    -	printf "rootfs_checksum %s\n" ${rootfs_md5} >> $setenv_script
    -
    -	# store u-boot env changes
    -	mkdir -p /var/lock
    -	fw_setenv -s $setenv_script || {
    -		echo "failed to update U-Boot environment"
    -		return 1
    -	}
    -}
    diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
    index 7253139497a8a8b9fab49cef3fce5eabe98d8002..66e23b77a7bb0a484e88a11eed9d526e4fc04b50 100644
    --- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
    +++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
    @@ -75,7 +75,7 @@ platform_do_upgrade() {
     	openmesh,a42 |\
     	openmesh,a62)
     		PART_NAME="inactive"
    -		platform_do_upgrade_openmesh "$1"
    +		platform_do_upgrade_dualboot_datachk "$1"
     		;;
     	zyxel,nbg6617)
     		zyxel_do_upgrade "$1"