local machine=$(platform_machine)
case "$machine" in
+ "dlink,dir-885l") echo "seama wrgac42_dlink.2015_dir885l"; return;;
"netgear,r6250v1") echo "chk U12H245T00_NETGEAR"; return;;
"netgear,r6300v2") echo "chk U12H240T00_NETGEAR"; return;;
+ "netgear,r7000") echo "chk U12H270T00_NETGEAR"; return;;
"netgear,r8000") echo "chk U12H315T00_NETGEAR"; return;;
+ "netgear,r8500") echo "chk U12H334T00_NETGEAR"; return;;
esac
}
echo "chk"
return
;;
+ "5ea3a417")
+ echo "seama"
+ return
+ ;;
esac
magic=$(get_magic_long_at "$1" 14)
platform_check_image() {
[ "$#" -gt 1 ] && return 1
- [ "$(platform_flash_type)" = "nand" ] && {
- echo "Firmware upgrade on NAND devices is not implemented."
- return 1
- }
-
local file_type=$(platform_identify "$1")
local magic
local error=0
error=1
}
- if ! otrx -c "$1" -o "$header_len"; then
+ if ! otrx check "$1" -o "$header_len"; then
echo "No valid TRX firmware in the CHK image"
error=1
fi
error=1
}
- if ! otrx -c "$1" -o 32; then
+ if ! otrx check "$1" -o 32; then
echo "No valid TRX firmware in the CyberTAN image"
error=1
fi
;;
+ "seama")
+ local img_signature=$(oseama info "$1" | grep "Meta entry:.*signature=" | sed "s/.*=//")
+ local dev_signature=$(platform_expected_image)
+ echo "Found Seama image with device signature: $img_signature"
+
+ [ -n "$dev_signature" -a "seama $img_signature" != "$dev_signature" ] && {
+ echo "Firmware signature doesn't match device signature ($dev_signature)"
+ error=1
+ }
+
+ $(oseama info "$1" -e 0 | grep -q "Meta entry:.*type=firmware") || {
+ echo "Seama container doesn't have firmware entity"
+ error=1
+ }
+ ;;
"trx")
- if ! otrx -c "$1"; then
+ if ! otrx check "$1"; then
echo "Invalid (corrupted?) TRX firmware"
error=1
fi
return $error
}
-platform_extract_trx_from_chk() {
- local header_len=$((0x$(get_magic_long_at "$1" 4)))
-
- dd if="$1" of="$2" bs=$header_len skip=1
-}
-
-platform_extract_trx_from_cybertan() {
- dd if="$1" of="$2" bs=32 skip=1
-}
-
platform_pre_upgrade() {
+ export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /usr/bin/oseama /bin/sed"
+
local file_type=$(platform_identify "$1")
local dir="/tmp/sysupgrade-bcm53xx"
local trx="$1"
+ local offset
[ "$(platform_flash_type)" != "nand" ] && return
- # Extract trx
+ # Find trx offset
case "$file_type" in
- "chk") trx="/tmp/$1.trx"; platform_extract_trx_from_chk "$1" "$trx";;
- "cybertan") trx="/tmp/$1.trx"; platform_extract_trx_from_cybertan "$1" "$trx";;
+ "chk") offset=$((0x$(get_magic_long_at "$1" 4)));;
+ "cybertan") offset=32;;
+ "seama") return;;
esac
# Extract partitions from trx
rm -fR $dir
mkdir -p $dir
- otrx -e "$trx" \
+ otrx extract "$trx" \
+ ${offset:+-o $offset} \
-1 $dir/kernel \
-2 $dir/root
+ [ $? -ne 0 ] && {
+ echo "Failed to extract TRX partitions."
+ return
+ }
# Firmwares without UBI image should be flashed "normally"
local root_type=$(identify $dir/root)
- [ "$root_type" != "ubi" ] && return
+ [ "$root_type" != "ubi" ] && {
+ echo "Provided firmware doesn't use UBI for rootfs."
+ return
+ }
+
+ # Prepare TRX file with just a kernel that will replace current one
+ local linux_length=$(grep "\"linux\"" /proc/mtd | sed "s/mtd[0-9]*:[ \t]*\([^ \t]*\).*/\1/")
+ [ -z "$linux_length" ] && {
+ echo "Unable to find \"linux\" partition size"
+ exit 1
+ }
+ linux_length=$((0x$linux_length))
+ local kernel_length=$(wc -c $dir/kernel | cut -d ' ' -f 1)
+ [ $kernel_length -gt $linux_length ] && {
+ echo "New kernel doesn't fit \"linux\" partition."
+ return
+ }
+ rm -f /tmp/null.bin
+ rm -f /tmp/kernel.trx
+ touch /tmp/null.bin
+ otrx create /tmp/kernel.trx \
+ -f $dir/kernel -b $(($linux_length + 28)) \
+ -f /tmp/null.bin
+ [ $? -ne 0 ] && {
+ echo "Failed to create simple TRX with new kernel."
+ return
+ }
+
+ # Prepare UBI image (drop unwanted extra blocks)
+ local ubi_length=0
+ while [ "$(dd if=$dir/root skip=$ubi_length bs=1 count=4 2>/dev/null)" = "UBI#" ]; do
+ ubi_length=$(($ubi_length + 131072))
+ done
+ dd if=$dir/root of=/tmp/root.ubi bs=131072 count=$((ubi_length / 131072)) 2>/dev/null
+ [ $? -ne 0 ] && {
+ echo "Failed to prepare new UBI image."
+ return
+ }
+
+ # Flash
+ mtd write /tmp/kernel.trx firmware
+ nand_do_upgrade /tmp/root.ubi
+}
+
+platform_trx_from_chk_cmd() {
+ local header_len=$((0x$(get_magic_long_at "$1" 4)))
+
+ echo -n dd bs=$header_len skip=1
+}
+
+platform_trx_from_cybertan_cmd() {
+ echo -n dd bs=32 skip=1
+}
+
+platform_img_from_seama() {
+ local dir="/tmp/sysupgrade-bcm53xx"
+ local offset=$(oseama info "$1" -e 0 | grep "Entity offset:" | sed "s/.*:\s*//")
+ local size=$(oseama info "$1" -e 0 | grep "Entity size:" | sed "s/.*:\s*//")
+
+ # Busybox doesn't support required iflag-s
+ # echo -n dd iflag=skip_bytes,count_bytes skip=$offset count=$size
+
+ rm -fR $dir
+ mkdir -p $dir
+ dd if="$1" of=$dir/image-noheader.bin bs=$offset skip=1
+ dd if=$dir/image-noheader.bin of=$dir/image-entity.bin bs=$size count=1
- echo "Provided firmware contains kernel and UBI image, but flashing it is unsupported yet"
- exit 1
+ echo -n $dir/image-entity.bin
}
platform_do_upgrade() {
local file_type=$(platform_identify "$1")
local trx="$1"
+ local cmd=
[ "$(platform_flash_type)" == "nand" ] && {
- echo "Flashing firmware without UBI for rootfs. All erase counters will be lost."
+ echo "Writing whole image to NAND flash. All erase counters will be lost."
}
case "$file_type" in
- "chk") trx="/tmp/$1.trx"; platform_extract_trx_from_chk "$1" "$trx";;
- "cybertan") trx="/tmp/$1.trx"; platform_extract_trx_from_cybertan "$1" "$trx";;
+ "chk") cmd=$(platform_trx_from_chk_cmd "$trx");;
+ "cybertan") cmd=$(platform_trx_from_cybertan_cmd "$trx");;
+ "seama") trx=$(platform_img_from_seama "$trx");;
esac
- shift
- default_do_upgrade "$trx" "$@"
+ default_do_upgrade "$trx" "$cmd"
}
projects / openwrt / staging / wigyori.git / blobdiff