aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-04-04 16:06:29 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-04-04 16:06:29 +0000
commitb545c4b4fe5fc6792e6fe8c647396d05d3609a51 (patch)
tree5a2880cbda76dfd7acb81e1e0154bc0496c085bc
parent930a8201726a3f1318fbf14ff3ccfb274ebf324d (diff)
downloadupstream-b545c4b4fe5fc6792e6fe8c647396d05d3609a51.tar.gz
upstream-b545c4b4fe5fc6792e6fe8c647396d05d3609a51.tar.bz2
upstream-b545c4b4fe5fc6792e6fe8c647396d05d3609a51.zip
generic: use magic_long in sysupgrade
Signed-off-by: Matthias Bücher <mail@maddes.net> SVN-Revision: 31200
-rw-r--r--target/linux/orion/generic/base-files/lib/upgrade/platform.sh15
1 files changed, 11 insertions, 4 deletions
diff --git a/target/linux/orion/generic/base-files/lib/upgrade/platform.sh b/target/linux/orion/generic/base-files/lib/upgrade/platform.sh
index fdd26c5176..9c9967e4af 100644
--- a/target/linux/orion/generic/base-files/lib/upgrade/platform.sh
+++ b/target/linux/orion/generic/base-files/lib/upgrade/platform.sh
@@ -1,3 +1,7 @@
+#
+# Copyright (C) 2010-2011 OpenWrt.org
+#
+
# use default "image" for PART_NAME
# use default for platform_do_upgrade()
@@ -6,17 +10,20 @@ platform_check_image() {
local hardware=`sed -n /Hardware/s/.*:.//p /proc/cpuinfo`
local magic="$(get_magic_word "$1")"
+ local magic_long="$(get_magic_long "$1")"
case "${hardware}" in
- # hardware with padded uImage + padded rootfs
+ # hardware with a direct uImage partition
+ # image header format as described in U-Boot's include/image.h
+ # see http://git.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=blob;f=include/image.h
'Linksys WRT350N v2')
- [ "${magic}" != '2705' ] && {
- echo "Invalid image type ${magic}."
+ [ "${magic_long}" != '27051956' ] && {
+ echo "Invalid image type ${magic_long}."
return 1
}
return 0
;;
- # Netgear WNR854T has extra header before uImage
+ # Netgear WNR854T (has uImage as file inside a JFFS2 partition)
'Netgear WNR854T')
[ "${magic}" != '8519' ] && {
echo "Invalid image type ${magic}."