X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f56b55940b85b85eab5b3c98eb2a65962657d3b7..8e9ff93f54b30ee2cf316737c896398ecf8631c0:/target/linux/ixp4xx/image/Makefile

diff --git a/target/linux/ixp4xx/image/Makefile b/target/linux/ixp4xx/image/Makefile
index 167bd1d5f..b1c715a64 100644
--- a/target/linux/ixp4xx/image/Makefile
+++ b/target/linux/ixp4xx/image/Makefile
@@ -7,43 +7,30 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-UCODEFILE:=IPL_ixp400NpeLibrary-2_4.zip
-
-ifneq ($(CONFIG_IXP4XX_INCLUDE_UCODE),)
-  define Require/npe-ucode
-	[ -f $(DL_DIR)/$(UCODEFILE) ]
-  endef
-  define Build/Compile/npe
-	$(MAKE) -C npe-ucode \
-		BUILD_DIR="$(KDIR)" \
-		TARGET="$(KDIR)" \
-		compile
-  endef
-  define Image/Build/slug
+ifdef CONFIG_PACKAGE_apex
+  define Image/Build/Linksys
 	BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/slugimage.pl \
-		-L $(KDIR)/apex-nslu2-armeb.bin -m $(KDIR)/NPE-B \
-		-k $(BIN_DIR)/openwrt-nslu2-zImage \
+		-L $(BIN_DIR)/apex/apex-$(2)-armeb.bin \
+		-k $(BIN_DIR)/openwrt-$(2)-zImage \
 		-r rootfs:$(BIN_DIR)/openwrt-$(BOARD)-$(1).img \
-		-p -o $(BIN_DIR)/openwrt-nslu2-$(1).bin
+		-p -o $(BIN_DIR)/openwrt-$(2)-$(1).bin
 	BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/slugimage.pl \
-		-F -L $(KDIR)/apex-nslu2-armeb.bin -m $(KDIR)/NPE-B \
-		-k $(BIN_DIR)/openwrt-nslu2-zImage \
+		-F -L $(BIN_DIR)/apex/apex-$(2)-16mb-armeb.bin \
+		-k $(BIN_DIR)/openwrt-$(2)-zImage \
 		-r rootfs:$(BIN_DIR)/openwrt-$(BOARD)-$(1).img \
-		-p -o $(BIN_DIR)/openwrt-nslu2-$(1)-16mb.bin
+		-p -o $(BIN_DIR)/openwrt-$(2)-$(1)-16mb.bin
   endef
 endif
 
-define Build/Compile
-	$(MAKE) -C apex \
-		BUILD_DIR="$(KDIR)" \
-		TARGET="$(KDIR)" \
-		compile	
-	$(call Build/Compile/npe)
-endef
-
-define Build/Clean
-	$(MAKE) -C apex clean
-	$(MAKE) -C npe-ucode clean
+define Image/Build/Freecom
+	$(INSTALL_DIR) $(TARGET_DIR)/boot
+	# TODO: Add special CMDLINE shim for webupgrade image here
+	$(CP) $(BIN_DIR)/openwrt-$(2)-zImage $(TARGET_DIR)/zImage
+	rm -rf $(TARGET_DIR)/{var,jffs,rom}
+	$(INSTALL_DIR) $(TARGET_DIR)/var
+	$(TAR) cfj $(BIN_DIR)/openwrt-$(2)-$(1).img --numeric-owner --owner=0 --group=0 -C $(TARGET_DIR)/ .
+	$(STAGING_DIR_HOST)/bin/encode_crc $(BIN_DIR)/openwrt-$(2)-$(1).img $(BIN_DIR)/openwrt-$(2)-$(1)-webupgrade.img
+	rm -f $(TARGET_DIR)/zImage
 endef
 
 define Image/Prepare
@@ -52,7 +39,6 @@ endef
 
 define Image/BuildKernel
 	cp $(KDIR)/zImage $(BIN_DIR)/openwrt-$(BOARD)-zImage
-#	$(shell BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/arm-magic.sh)
 	BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/arm-magic.sh
 endef
 
@@ -66,20 +52,15 @@ endef
 
 define Image/Build/jffs2-128k
 	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=131072 conv=sync
-	$(call Image/Build/slug,$(1))
+	$(call Image/Build/Linksys,$(1))
+	$(call Image/Build/Freecom,$(1),fsg3,$(1))
 endef
 
 define Image/Build/squashfs
-    $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
+	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
 	dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=131072 conv=sync
-	$(call Image/Build/slug,$(1))
+	$(call Image/Build/Linksys,$(1),nslu2,$(1))
+	$(call Image/Build/Freecom,$(1),fsg3,$(1))
 endef
 
 $(eval $(call BuildImage))
-
-$(eval $(call Require,npe-ucode, \
-	You must manually download $(UCODEFILE) from \\\
-	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! \
-))