KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ar71xx: sysupgrade for the ALL0315N

Browse source 
Signed-off-by: Daniel Golle <dgolle@allnet.de>

SVN-Revision: 33285
This commit is contained in:
Gabor Juhos 2012-08-27 14:55:36 +00:00
parent abffa4ecfb
commit 4079f3163f
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
target/linux/ar71xx/base-files/lib/upgrade/allnet.sh
View file

@ -1,10 +1,8 @@
# The U-Boot loader of the ALL0258N requires image sizes and checksums to be # The U-Boot loader of the some Allnet devices requires image sizes and
# provided in the U-Boot environment. # checksums to be provided in the U-Boot environment.
# In case the check fails during boot, a failsafe-system is started to provide # In case the check fails during boot, a failsafe-system is started to provide
# a minimal web-interface for flashing a new firmware. # a minimal web-interface for flashing a new firmware.
CI_FLADDR=0x9f050000
# make sure we got uboot-envtools and fw_env.config copied over to the ramfs # make sure we got uboot-envtools and fw_env.config copied over to the ramfs
platform_add_ramfs_ubootenv() { platform_add_ramfs_ubootenv() {
[ -e /usr/sbin/fw_printenv ] && install_bin /usr/sbin/fw_printenv /usr/sbin/fw_setenv [ -e /usr/sbin/fw_printenv ] && install_bin /usr/sbin/fw_printenv /usr/sbin/fw_setenv
@ -70,7 +68,7 @@ platform_get_offset() {
done done
} }
platform_check_image_all0258n() { platform_check_image_allnet() {
local fw_printenv=/usr/sbin/fw_printenv local fw_printenv=/usr/sbin/fw_printenv
[ ! -n "$fw_printenv" -o ! -x "$fw_printenv" ] && { [ ! -n "$fw_printenv" -o ! -x "$fw_printenv" ] && {
echo "Please install uboot-envtools!" echo "Please install uboot-envtools!"
@ -110,14 +108,14 @@ platform_check_image_all0258n() {
return 0 return 0
} }
platform_do_upgrade_all0258n() { platform_do_upgrade_allnet() {
local firmware_base_addr=$( printf "%d" "$CI_FLADDR" ) local firmware_base_addr=$( printf "%d" "$1" )
local vmlinux_blockoffset=$( platform_get_offset "$1" uImage ) local vmlinux_blockoffset=$( platform_get_offset "$2" uImage )
if [ ! -n "$vmlinux_blockoffset" ]; then if [ ! -n "$vmlinux_blockoffset" ]; then
echo "can't determine uImage offset" echo "can't determine uImage offset"
return 1 return 1
fi fi
local rootfs_blockoffset=$( platform_get_offset "$1" rootfs $(( $vmlinux_blockoffset + 1 )) ) local rootfs_blockoffset=$( platform_get_offset "$2" rootfs $(( $vmlinux_blockoffset + 1 )) )
local vmlinux_offset=$(( $vmlinux_blockoffset * $CI_BLKSZ )) local vmlinux_offset=$(( $vmlinux_blockoffset * $CI_BLKSZ ))
local vmlinux_addr=$(( $firmware_base_addr + $vmlinux_offset )) local vmlinux_addr=$(( $firmware_base_addr + $vmlinux_offset ))
local vmlinux_hexaddr=0x$( printf "%08x" "$vmlinux_addr" ) local vmlinux_hexaddr=0x$( printf "%08x" "$vmlinux_addr" )
@ -131,7 +129,7 @@ platform_do_upgrade_all0258n() {
local vmlinux_blockcount=$(( $rootfs_blockoffset - $vmlinux_blockoffset )) local vmlinux_blockcount=$(( $rootfs_blockoffset - $vmlinux_blockoffset ))
local vmlinux_size=$(( $rootfs_offset - $vmlinux_offset )) local vmlinux_size=$(( $rootfs_offset - $vmlinux_offset ))
local vmlinux_hexsize=0x$( printf "%08x" "$vmlinux_size" ) local vmlinux_hexsize=0x$( printf "%08x" "$vmlinux_size" )
local data_blockoffset=$( platform_get_offset "$1" rootfs-data $(( $rootfs_blockoffset + 1 )) ) local data_blockoffset=$( platform_get_offset "$2" rootfs-data $(( $rootfs_blockoffset + 1 )) )
if [ ! -n "$data_blockoffset" ]; then if [ ! -n "$data_blockoffset" ]; then
echo "can't determine rootfs size" echo "can't determine rootfs size"
return 1 return 1
@ -141,8 +139,8 @@ platform_do_upgrade_all0258n() {
local rootfs_size=$(( $data_offset - $rootfs_offset )) local rootfs_size=$(( $data_offset - $rootfs_offset ))
local rootfs_hexsize=0x$( printf "%08x" "$rootfs_size" ) local rootfs_hexsize=0x$( printf "%08x" "$rootfs_size" )
local rootfs_md5=$( dd if="$1" bs=$CI_BLKSZ skip=$rootfs_blockoffset count=$rootfs_blockcount 2>/dev/null | md5sum -); rootfs_md5="${rootfs_md5%% *}" local rootfs_md5=$( dd if="$2" bs=$CI_BLKSZ skip=$rootfs_blockoffset count=$rootfs_blockcount 2>/dev/null | md5sum -); rootfs_md5="${rootfs_md5%% *}"
local vmlinux_md5=$( dd if="$1" bs=$CI_BLKSZ skip=$vmlinux_blockoffset count=$vmlinux_blockcount 2>/dev/null | md5sum -); vmlinux_md5="${vmlinux_md5%% *}" local vmlinux_md5=$( dd if="$2" bs=$CI_BLKSZ skip=$vmlinux_blockoffset count=$vmlinux_blockcount 2>/dev/null | md5sum -); vmlinux_md5="${vmlinux_md5%% *}"
# this needs a recent version of uboot-envtools! # this needs a recent version of uboot-envtools!
cat >/tmp/fw_env_upgrade <<EOF cat >/tmp/fw_env_upgrade <<EOF
vmlinux_start_addr $vmlinux_hexaddr vmlinux_start_addr $vmlinux_hexaddr
@ -157,5 +155,6 @@ EOF
echo "failed to update U-Boot environment" echo "failed to update U-Boot environment"
return 1 return 1
} }
shift
default_do_upgrade "$@" default_do_upgrade "$@"
} }

8
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
View file

@ -73,8 +73,9 @@ platform_check_image() {
[ "$ARGC" -gt 1 ] && return 1 [ "$ARGC" -gt 1 ] && return 1
case "$board" in case "$board" in
all0315n | \
all0258n ) all0258n )
platform_check_image_all0258n "$1" && return 0 platform_check_image_allnet "$1" && return 0
return 1 return 1
;; ;;
alfa-ap96 | \ alfa-ap96 | \
@ -232,7 +233,10 @@ platform_do_upgrade() {
platform_do_upgrade_combined "$ARGV" platform_do_upgrade_combined "$ARGV"
;; ;;
all0258n ) all0258n )
platform_do_upgrade_all0258n "$ARGV" platform_do_upgrade_allnet "0x9f050000" "$ARGV"
;;
all0315n )
platform_do_upgrade_allnet "0x9f080000" "$ARGV"
;; ;;
om2p | \ om2p | \
om2p-lc) om2p-lc)