X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Fbcm53xx%2Fbase-files%2Flib%2Fupgrade%2Fplatform.sh;h=cbb82902752b5adf72e3edf2d5859fedfa6453c5;hp=3e4eae5a82fba979e4f50b51646cb93ce610b1f1;hb=0e4092cbade0a601a2e924932c8b900aef5a11a4;hpb=2d61c26f02557b0b3734f694efdb81a2694fdd70

diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
index 3e4eae5a82..cbb8290275 100644
--- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
@@ -1,13 +1,19 @@
+RAMFS_COPY_BIN='osafeloader oseama otrx truncate'
+
 PART_NAME=firmware
 
+LXL_FLAGS_VENDOR_LUXUL=0x00000001
+
 # $(1): file to read magic from
 # $(2): offset in bytes
 get_magic_long_at() {
 	dd if="$1" skip=$2 bs=1 count=4 2>/dev/null | hexdump -v -e '1/1 "%02x"'
 }
 
-platform_machine() {
-	cat /proc/device-tree/compatible | tr '\0' '\t' | cut -f 1
+# $(1): file to read LE long number from
+# $(2): offset in bytes
+get_le_long_at() {
+	echo $((0x$(dd if="$1" skip=$2 bs=1 count=4 2>/dev/null | hexdump -v -e '1/4 "%02x"')))
 }
 
 platform_flash_type() {
@@ -21,16 +27,29 @@ platform_flash_type() {
 }
 
 platform_expected_image() {
-	local machine=$(platform_machine)
+	local machine=$(board_name)
 
 	case "$machine" in
 		"dlink,dir-885l")	echo "seama wrgac42_dlink.2015_dir885l"; return;;
+		"luxul,abr-4500-v1")	echo "lxl ABR-4500"; return;;
+		"luxul,xap-810-v1")	echo "lxl XAP-810"; return;;
+		"luxul,xap-1410v1")	echo "lxl XAP-1410"; return;;
+		"luxul,xap-1440-v1")	echo "lxl XAP-1440"; return;;
+		"luxul,xap-1510v1")	echo "lxl XAP-1510"; return;;
+		"luxul,xap-1610-v1")	echo "lxl XAP-1610"; return;;
+		"luxul,xbr-4500-v1")	echo "lxl XBR-4500"; return;;
+		"luxul,xwc-1000")	echo "lxl XWC-1000"; return;;
+		"luxul,xwc-2000-v1")	echo "lxl XWC-2000"; return;;
+		"luxul,xwr-1200v1")	echo "lxl XWR-1200"; return;;
+		"luxul,xwr-3100v1")	echo "lxl XWR-3100"; return;;
+		"luxul,xwr-3150-v1")	echo "lxl XWR-3150"; return;;
 		"netgear,r6250v1")	echo "chk U12H245T00_NETGEAR"; return;;
 		"netgear,r6300v2")	echo "chk U12H240T00_NETGEAR"; return;;
 		"netgear,r7000")	echo "chk U12H270T00_NETGEAR"; return;;
 		"netgear,r7900")	echo "chk U12H315T30_NETGEAR"; return;;
 		"netgear,r8000")	echo "chk U12H315T00_NETGEAR"; return;;
 		"netgear,r8500")	echo "chk U12H334T00_NETGEAR"; return;;
+		"tplink,archer-c9-v1")	echo "safeloader"; return;;
 	esac
 }
 
@@ -47,6 +66,10 @@ platform_identify() {
 			echo "chk"
 			return
 			;;
+		"4c584c23")
+			echo "lxl"
+			return
+			;;
 		"5ea3a417")
 			echo "seama"
 			return
@@ -59,7 +82,13 @@ platform_identify() {
 		return
 	}
 
-	if osafeloader info "$1" > /dev/null; then
+	magic=$(get_magic_long_at "$1" 60)
+	[ "$magic" = "4c584c23" ] && {
+		echo "lxlold"
+		return
+	}
+
+	if osafeloader info "$1" > /dev/null 2>&1; then
 		echo "safeloader"
 		return
 	fi
@@ -67,7 +96,7 @@ platform_identify() {
 	echo "unknown"
 }
 
-platform_check_image() {
+platform_other_check_image() {
 	[ "$#" -gt 1 ] && return 1
 
 	local file_type=$(platform_identify "$1")
@@ -89,7 +118,10 @@ platform_check_image() {
 
 			if ! otrx check "$1" -o "$header_len"; then
 				echo "No valid TRX firmware in the CHK image"
+				notify_firmware_test_result "trx_valid" 0
 				error=1
+			else
+				notify_firmware_test_result "trx_valid" 1
 			fi
 		;;
 		"cybertan")
@@ -104,7 +136,52 @@ platform_check_image() {
 
 			if ! otrx check "$1" -o 32; then
 				echo "No valid TRX firmware in the CyberTAN image"
+				notify_firmware_test_result "trx_valid" 0
+				error=1
+			else
+				notify_firmware_test_result "trx_valid" 1
+			fi
+		;;
+		"lxl")
+			local hdr_len=$(get_le_long_at "$1" 8)
+			local flags=$(get_le_long_at "$1" 12)
+			local board=$(dd if="$1" skip=16 bs=1 count=16 2>/dev/null | hexdump -v -e '1/1 "%c"')
+			local dev_board=$(platform_expected_image)
+			echo "Found LXL image for board $board"
+
+			[ -n "$dev_board" -a "lxl $board" != "$dev_board" ] && {
+				echo "Firmware ($board) doesn't match device ($dev_board)"
+				error=1
+			}
+
+			[ $((flags & LXL_FLAGS_VENDOR_LUXUL)) -gt 0 ] && notify_firmware_no_backup
+
+			if ! otrx check "$1" -o "$hdr_len"; then
+				echo "No valid TRX firmware in the LXL image"
+				notify_firmware_test_result "trx_valid" 0
+				error=1
+			else
+				notify_firmware_test_result "trx_valid" 1
+			fi
+		;;
+		"lxlold")
+			local board_id=$(dd if="$1" skip=48 bs=1 count=12 2>/dev/null | hexdump -v -e '1/1 "%c"')
+			local dev_board_id=$(platform_expected_image)
+			echo "Found LXL image with device board_id $board_id"
+
+			[ -n "$dev_board_id" -a "lxl $board_id" != "$dev_board_id" ] && {
+				echo "Firmware board_id doesn't match device board_id ($dev_board_id)"
 				error=1
+			}
+
+			notify_firmware_no_backup
+
+			if ! otrx check "$1" -o 64; then
+				echo "No valid TRX firmware in the Luxul image"
+				notify_firmware_test_result "trx_valid" 0
+				error=1
+			else
+				notify_firmware_test_result "trx_valid" 1
 			fi
 		;;
 		"safeloader")
@@ -134,11 +211,15 @@ platform_check_image() {
 
 			if ! otrx check "$1"; then
 				echo "Invalid (corrupted?) TRX firmware"
+				notify_firmware_test_result "trx_valid" 0
 				error=1
+			else
+				notify_firmware_test_result "trx_valid" 1
 			fi
 		;;
 		*)
-			echo "Invalid image type. Please use only .trx files"
+			echo "Invalid image type. Please use firmware specific for this device."
+			notify_firmware_broken
 			error=1
 		;;
 	esac
@@ -146,9 +227,28 @@ platform_check_image() {
 	return $error
 }
 
+platform_check_image() {
+	case "$(board_name)" in
+	meraki,mr32)
+		# Ideally, REQUIRE_IMAGE_METADATA=1 would suffice
+		# but this would require converting all other
+		# devices too.
+		nand_do_platform_check meraki-mr32 "$1"
+		return $?
+		;;
+	*)
+		platform_other_check_image "$1"
+		return $?
+		;;
+	esac
+
+	return 1
+}
+
+
 # $(1): image for upgrade (with possible extra header)
 # $(2): offset of trx in image
-platform_pre_upgrade_trx() {
+platform_do_upgrade_nand_trx() {
 	local dir="/tmp/sysupgrade-bcm53xx"
 	local trx="$1"
 	local offset="$2"
@@ -200,18 +300,18 @@ platform_pre_upgrade_trx() {
 	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
+	truncate -s $ubi_length $dir/root
 	[ $? -ne 0 ] && {
 		echo "Failed to prepare new UBI image."
 		return
 	}
 
 	# Flash
-	mtd write /tmp/kernel.trx firmware
-	nand_do_upgrade /tmp/root.ubi
+	mtd write /tmp/kernel.trx firmware || exit 1
+	nand_do_upgrade $dir/root
 }
 
-platform_pre_upgrade_seama() {
+platform_do_upgrade_nand_seama() {
 	local dir="/tmp/sysupgrade-bcm53xx"
 	local seama="$1"
 	local tmp
@@ -253,35 +353,29 @@ platform_pre_upgrade_seama() {
 
 	# Flash
 	local kernel_size=$(sed -n 's/mtd[0-9]*: \([0-9a-f]*\).*"\(kernel\|linux\)".*/\1/p' /proc/mtd)
-	mtd write $dir/kernel.seama firmware
+	mtd write $dir/kernel.seama firmware || exit 1
 	mtd ${kernel_size:+-c 0x$kernel_size} fixseama firmware
 	nand_do_upgrade $dir/root.ubi
 }
 
-platform_pre_upgrade() {
-	export RAMFS_COPY_BIN="${RAMFS_COPY_BIN} /usr/bin/osafeloader /usr/bin/oseama /bin/sed"
-
-	local file_type=$(platform_identify "$1")
+platform_trx_from_chk_cmd() {
+	local header_len=$((0x$(get_magic_long_at "$1" 4)))
 
-	[ "$(platform_flash_type)" != "nand" ] && return
+	echo -n dd skip=$header_len iflag=skip_bytes
+}
 
-	# Find trx offset
-	case "$file_type" in
-		"chk")		platform_pre_upgrade_trx "$1" $((0x$(get_magic_long_at "$1" 4)));;
-		"cybertan")	platform_pre_upgrade_trx "$1" 32;;
-		"seama")	platform_pre_upgrade_seama "$1";;
-		"trx")		platform_pre_upgrade_trx "$1";;
-	esac
+platform_trx_from_cybertan_cmd() {
+	echo -n dd skip=32 iflag=skip_bytes
 }
 
-platform_trx_from_chk_cmd() {
-	local header_len=$((0x$(get_magic_long_at "$1" 4)))
+platform_trx_from_lxl_cmd() {
+	local hdr_len=$(get_le_long_at "$1" 8)
 
-	echo -n dd bs=$header_len skip=1
+	echo -n dd skip=$hdr_len iflag=skip_bytes
 }
 
-platform_trx_from_cybertan_cmd() {
-	echo -n dd bs=32 skip=1
+platform_trx_from_lxlold_cmd() {
+	echo -n dd bs=64 skip=1
 }
 
 platform_img_from_safeloader() {
@@ -318,21 +412,54 @@ platform_img_from_seama() {
 	echo -n $dir/image-entity.bin
 }
 
-platform_do_upgrade() {
+platform_other_do_upgrade() {
 	local file_type=$(platform_identify "$1")
 	local trx="$1"
 	local cmd=
 
 	[ "$(platform_flash_type)" == "nand" ] && {
+		case "$file_type" in
+			"chk")		platform_do_upgrade_nand_trx "$1" $((0x$(get_magic_long_at "$1" 4)));;
+			"cybertan")	platform_do_upgrade_nand_trx "$1" 32;;
+			"lxl")		platform_do_upgrade_nand_trx "$1" $(get_le_long_at "$1" 8);;
+			"lxlold")	platform_do_upgrade_nand_trx "$1" 64;;
+			"seama")	platform_do_upgrade_nand_seama "$1";;
+			"trx")		platform_do_upgrade_nand_trx "$1";;
+		esac
+
+		# Above calls exit on success.
+		# If we got here something went wrong.
 		echo "Writing whole image to NAND flash. All erase counters will be lost."
 	}
 
 	case "$file_type" in
 		"chk")		cmd=$(platform_trx_from_chk_cmd "$trx");;
 		"cybertan")	cmd=$(platform_trx_from_cybertan_cmd "$trx");;
-		"safeloader")	trx=$(platform_img_from_safeloader "$trx");;
+		"lxl")		cmd=$(platform_trx_from_lxl_cmd "$trx");;
+		"lxlold")	cmd=$(platform_trx_from_lxlold_cmd "$trx");;
+		"safeloader")	trx=$(platform_img_from_safeloader "$trx"); PART_NAME=os-image;;
 		"seama")	trx=$(platform_img_from_seama "$trx");;
 	esac
 
 	default_do_upgrade "$trx" "$cmd"
 }
+
+platform_do_upgrade() {
+	case "$(board_name)" in
+	meraki,mr32)
+		CI_KERNPART="part.safe"
+		nand_do_upgrade "$1"
+		;;
+	*)
+		platform_other_do_upgrade "$1"
+		;;
+	esac
+}
+
+platform_nand_pre_upgrade() {
+	case "$(board_name)" in
+	meraki,mr32)
+		CI_KERNPART="part.safe"
+		;;
+	esac
+}