diff options
| author | Nicolas Thill <nico@openwrt.org> | 2010-04-14 14:36:41 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2010-04-14 14:36:41 +0000 |
| commit | 841eff56d4a1a4dc5623c64f223e287332a1a732 (patch) | |
| tree | 8a9ffc14a3f43e21d642f01a878a6f64db9bdd4d | |
| parent | 01ca56639cc2b64c7480077e251576166cf86613 (diff) | |
| download | upstream-841eff56d4a1a4dc5623c64f223e287332a1a732.tar.gz upstream-841eff56d4a1a4dc5623c64f223e287332a1a732.tar.bz2 upstream-841eff56d4a1a4dc5623c64f223e287332a1a732.zip | |
target/ixp4xx: fix image building after r20834 (closes: #7157)
SVN-Revision: 20854
| -rwxr-xr-x | scripts/arm-magic.sh | 2 | ||||
| -rw-r--r-- | target/linux/iop32x/image/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/ixp4xx/image/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/arm-magic.sh b/scripts/arm-magic.sh index e8f41d3372..8bc35c1d4b 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 808628953a..160067386d 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 da8f0fdde6..6108e9166d 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 |