X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/2d44840e41160844817be26550e520a956d26178..4d3c75a4bfc8ce68573de726ce25a98f070f16c8:/target/linux/ixp4xx-2.6/image/Makefile

diff --git a/target/linux/ixp4xx-2.6/image/Makefile b/target/linux/ixp4xx-2.6/image/Makefile
index bb33aff7f..7d2300285 100644
--- a/target/linux/ixp4xx-2.6/image/Makefile
+++ b/target/linux/ixp4xx-2.6/image/Makefile
@@ -11,11 +11,11 @@ define Build/Compile
 	$(MAKE) -C apex \
 		BUILD_DIR="$(KDIR)" \
 		TARGET="$(KDIR)" \
-		install
+		compile	
 	$(MAKE) -C npe-ucode \
 		BUILD_DIR="$(KDIR)" \
 		TARGET="$(KDIR)" \
-		install
+		compile
 endef
 
 define Build/Clean
@@ -37,22 +37,32 @@ define Image/Build
 	$(call Image/Build/$(1),$(1))
 endef
 
+define Image/Build/slug
+	BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/slugimage.pl \
+		-L $(KDIR)/apex-nslu2-armeb.bin -m $(KDIR)/NPE-B \
+		-k $(BIN_DIR)/openwrt-nslu2-$(KERNEL)-zImage \
+		-r rootfs:$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img \
+		-p -o $(BIN_DIR)/openwrt-nslu2-$(KERNEL)-$(1).bin
+endef
+
 define Image/Build/jffs2-64k
 	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img bs=65536 conv=sync
 endef
 
 define Image/Build/jffs2-128k
 	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img bs=131072 conv=sync
-	BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/slugimage.pl \
-		-L $(KDIR)/apex-nslu2-armeb.bin -m $(KDIR)/NPE-B \
-		-k $(BIN_DIR)/openwrt-nslu2-$(KERNEL)-zImage \
-		-r Flashdisk:$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img \
-		-p -o $(BIN_DIR)/openwrt-nslu2-$(KERNEL)-$(1).bin
+	$(call Image/Build/slug,$(1))
+endef
+
+define Image/Build/squashfs
+    $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
+	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img bs=131072 conv=sync
+	$(call Image/Build/slug,$(1))
 endef
 
 $(eval $(call BuildImage))
 
-UCODEFILE:=IPL_ixp400NpeLibrary-2_3.zip
+UCODEFILE:=IPL_ixp400NpeLibrary-2_4.zip
 
 define Require/npe-ucode
 	[ -f $(DL_DIR)/$(UCODEFILE) ]
@@ -60,8 +70,7 @@ endef
 
 $(eval $(call Require,npe-ucode, \
 	You must manually download $(UCODEFILE) from \\\
-	http://www.intel.com/design/network/products/npfamily/ixp400_current.htm \\\
+	http://www.intel.com/design/network/products/npfamily/ixp400_archives.htm \\\
 	and put it in $(DL_DIR). \\\
 	You will need to agree to the Intel Public License to do so - please do read it! \
 ))
-