summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xscripts/arm-magic.sh2
-rw-r--r--target/linux/iop32x/image/Makefile2
-rw-r--r--target/linux/ixp4xx/image/Makefile2
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/arm-magic.sh b/scripts/arm-magic.sh
index e8f41d337..8bc35c1d4 100755
--- a/scripts/arm-magic.sh
+++ b/scripts/arm-magic.sh
@@ -34,5 +34,5 @@ do
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
fi
# generate the image
- cat $BIN_DIR/openwrt-ixp4xx-zImage >> $BIN_DIR/openwrt-$1-zImage
+ cat $BIN_DIR/$IMG_PREFIX-zImage >> $BIN_DIR/openwrt-$1-zImage
done
diff --git a/target/linux/iop32x/image/Makefile b/target/linux/iop32x/image/Makefile
index 808628953..160067386 100644
--- a/target/linux/iop32x/image/Makefile
+++ b/target/linux/iop32x/image/Makefile
@@ -16,7 +16,7 @@ define Image/BuildKernel
#
# XXX - FIXME
#
-# BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/arm-magic.sh
+# BIN_DIR=$(BIN_DIR) IMG_PREFIX="$(IMG_PREFIX)" $(TOPDIR)/scripts/arm-magic.sh
endef
define Image/Build
diff --git a/target/linux/ixp4xx/image/Makefile b/target/linux/ixp4xx/image/Makefile
index da8f0fdde..6108e9166 100644
--- a/target/linux/ixp4xx/image/Makefile
+++ b/target/linux/ixp4xx/image/Makefile
@@ -37,7 +37,7 @@ endef
define Image/BuildKernel
cp $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-zImage
- BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/arm-magic.sh
+ BIN_DIR=$(BIN_DIR) IMG_PREFIX="$(IMG_PREFIX)" $(TOPDIR)/scripts/arm-magic.sh
endef
define Image/Build