From: kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 11 Nov 2012 11:07:59 +0000 (+0000)
Subject: [ixp4xx]: fix machtype handling above 4096
X-Git-Tag: fast2504n-3.10.28-merged~4490
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=84fdef3fd274ff829f7ae6bc8b72897947d19d8d;p=openwrt.git

[ixp4xx]: fix machtype handling above 4096

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34141 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/scripts/arm-magic.sh b/scripts/arm-magic.sh
index 8bc35c1d4b..e40f9fb17f 100755
--- a/scripts/arm-magic.sh
+++ b/scripts/arm-magic.sh
@@ -2,7 +2,7 @@
 #
 #   Empty/wrong machtype-workaround generator
 #
-#   Copyright (C) 2006 Imre Kaloz <kaloz@openwrt.org>
+#   Copyright (C) 2006-2012 Imre Kaloz <kaloz@openwrt.org>
 #   based on linux/arch/arm/boot/compressed/head-xscale.S
 #
 #   This program is free software; you can redistribute it and/or modify
@@ -31,7 +31,11 @@ do
     printf "\xe3\xa0\x10\x$hexid" > $BIN_DIR/openwrt-$1-zImage
   else
     # we have a high machtypeid, we need a "mov" (e3a) and an "orr" (e38)
-    printf "\xe3\xa0\x10\x$(echo $hexid|cut -b "2 3")\xe3\x81\x1c\x$(echo $hexid|cut -b 1)" > $BIN_DIR/openwrt-$1-zImage
+    if [ "$2" -lt "4096" ]; then
+      printf "\xe3\xa0\x10\x$(echo $hexid|cut -b "2 3")\xe3\x81\x1c\x$(echo $hexid|cut -b 1)" > $BIN_DIR/openwrt-$1-zImage
+    else
+      printf "\xe3\xa0\x10\x$(echo $hexid|cut -b "3 4")\xe3\x81\x1c\x$(echo $hexid|cut -b "1 2")" > $BIN_DIR/openwrt-$1-zImage
+    fi
   fi
     # generate the image
     cat $BIN_DIR/$IMG_PREFIX-zImage >> $BIN_DIR/openwrt-$1-zImage