domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ar71xx: add support for Cisco Meraki Z1 Cloud Managed Teleworker Gateway

Browse Source 
This patch adds support for Cisco's Z1.
Detailed instructions for the flashing the device can
be found in the OpenWrt wiki:
<https://wiki.openwrt.org/toh/meraki/z1>

Signed-off-by: Chris Blake <chrisrblake93@gmail.com>
This commit is contained in:
Chris Blake
2016-09-20 07:14:29 -05:00
committed by John Crispin
parent b1f39d3d7e
commit 68d649f5cd
16 changed files with 293 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
target/linux/ar71xx/base-files/lib/upgrade/merakinand.sh
View File

@@ -1,6 +1,6 @@
#!/bin/sh
#
# Copyright (C) 2015 Chris Blake <chrisrblake93@gmail.com>
# Copyright (C) 2015-2016 Chris Blake <chrisrblake93@gmail.com>
#
# Custom upgrade script for Meraki NAND devices (ex. MR18)
# Based on dir825.sh and stock nand functions
@@ -14,34 +14,52 @@ get_magic_at() {
dd bs=1 count=2 skip=$pos if=$mtddev 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
}
mr18_is_caldata_valid() {
local mtddev=$1
meraki_is_caldata_valid() {
local board=$1
local mtddev=$2
local magic
magic=$(get_magic_at $mtddev 4096)
[ "$magic" != "0202" ] && return 0
case "$board" in
"mr18")
magic=$(get_magic_at $mtddev 4096)
[ "$magic" != "0202" ] && return 0
magic=$(get_magic_at $mtddev 20480)
[ "$magic" != "0202" ] && return 0
magic=$(get_magic_at $mtddev 20480)
[ "$magic" != "0202" ] && return 0
magic=$(get_magic_at $mtddev 36864)
[ "$magic" != "0202" ] && return 0
magic=$(get_magic_at $mtddev 36864)
[ "$magic" != "0202" ] && return 0
return 1
return 1
;;
"z1")
magic=$(get_magic_at $mtddev 4096)
[ "$magic" != "0202" ] && return 0
magic=$(get_magic_at $mtddev 86016)
[ "$magic" != "a55a" ] && return 0
return 1
;;
*)
return 1
;;
esac
}
merakinand_copy_caldata() {
local cal_src=$1
local cal_dst=$2
local ubidev=$( nand_find_ubi $CI_UBIPART )
local ubidev="$(nand_find_ubi $CI_UBIPART)"
local board_name="$(cat /tmp/sysinfo/board_name)"
local rootfs_size="$(ubinfo /dev/ubi0 -N rootfs_data | grep "Size" | awk '{ print $6 }')"
# Setup partitions using board name, in case of future platforms
case "$board_name" in
"mr18")
"mr18"|\
"z1")
# Src is MTD
mtd_src=$(find_mtd_chardev $cal_src)
mtd_src="$(find_mtd_chardev $cal_src)"
[ -n "$mtd_src" ] || {
echo "no mtd device found for partition $cal_src"
exit 1
@@ -56,12 +74,12 @@ merakinand_copy_caldata() {
exit 1
}
mr18_is_caldata_valid "$mtd_src" && {
meraki_is_caldata_valid "$board_name" "$mtd_src" && {
echo "no valid calibration data found in $cal_src"
exit 1
}
mr18_is_caldata_valid "/dev/$mtd_dst" && {
meraki_is_caldata_valid "$board_name" "/dev/$mtd_dst" && {
echo "Copying calibration data from $cal_src to $cal_dst..."
dd if="$mtd_src" of=/tmp/caldata.tmp 2>/dev/null
ubiupdatevol "/dev/$mtd_dst" /tmp/caldata.tmp
@@ -89,6 +107,11 @@ merakinand_do_kernel_check() {
echo "pass" && return 0
}
;;
"z1")
[ "$image_magic_word" == "4d495053" ] && {
echo "pass" && return 0
}
;;
esac
exit 1
@@ -102,7 +125,8 @@ merakinand_do_platform_check() {
local kernel_magic="$(merakinand_do_kernel_check $1 $2)"
case "$board_name" in
"mr18")
"mr18"|\
"z1")
[ "$control_length" = 0 -o "$file_type" != "squashfs" -o "$kernel_magic" != "pass" ] && {
echo "Invalid sysupgrade file for $board_name"
return 1
@@ -128,6 +152,11 @@ merakinand_do_upgrade() {
merakinand_copy_caldata "odm-caldata" "caldata"
nand_do_upgrade $1
;;
"z1")
# Check and create UBI caldata if it's invalid
merakinand_copy_caldata "origcaldata" "caldata"
nand_do_upgrade $1
;;
*)
echo "Unsupported device $board_name";
exit 1

6
target/linux/ar71xx/base-files/lib/upgrade/platform.sh
View File

@@ -472,7 +472,8 @@ platform_check_image() {
}
return 0
;;
mr18)
mr18 | \
z1 )
merakinand_do_platform_check $board $1
return $?;
;;
@@ -543,7 +544,8 @@ platform_pre_upgrade() {
wndr4300 )
nand_do_upgrade "$1"
;;
mr18)
mr18 | \
z1 )
merakinand_do_upgrade "$1"
;;
esac