瀏覽代碼

target/ixp4xx: fix image building after r20834 (closes: #7157)

SVN-Revision: 20854
Nicolas Thill 15 年之前
父節點
當前提交
841eff56d4
共有 3 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      scripts/arm-magic.sh
  2. 1 1
      target/linux/iop32x/image/Makefile
  3. 1 1
      target/linux/ixp4xx/image/Makefile

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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