X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fixp4xx-2.6%2Fimage%2Fnpe-ucode%2FMakefile;h=b5181e81e6238defdf6adb71297e012f16c2d4f1;hb=2df65b0a43229d2c4a5d569a71bb397ecbd3d701;hp=982cbc8312a9974723bfeb3543352256104ac81e;hpb=c34c37a5690d2827ee9303af461f46c984575bc4;p=openwrt-10.03%2F.git

diff --git a/target/linux/ixp4xx-2.6/image/npe-ucode/Makefile b/target/linux/ixp4xx-2.6/image/npe-ucode/Makefile
index 982cbc831..b5181e81e 100644
--- a/target/linux/ixp4xx-2.6/image/npe-ucode/Makefile
+++ b/target/linux/ixp4xx-2.6/image/npe-ucode/Makefile
@@ -9,43 +9,32 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=npe-ucode
-PKG_VERSION:=2.3
+PKG_VERSION:=2.4
 PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=IPL_ixp400NpeLibrary-2_3.zip
-PKG_SOURCE_URL:=http://www.intel.com/design/network/products/npfamily/ixp400_current.htm
-PKG_CAT:=unzip
+PKG_SOURCE:=IPL_ixp400NpeLibrary-2_4.zip
 
-include $(INCLUDE_DIR)/unpack.mk
+include $(INCLUDE_DIR)/package.mk
 
-$(PKG_BUILD_DIR)/.prepared:
-	mkdir $(PKG_BUILD_DIR)
-	$(PKG_UNPACK)
+define Build/Prepare
+	rm -rf $(PKG_BUILD_DIR)
+	mkdir -p $(PKG_BUILD_DIR)
+	unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE)
 	mv $(PKG_BUILD_DIR)/ixp400_xscale_sw/src/npeDl/IxNpeMicrocode.c $(PKG_BUILD_DIR)/
 	rm -rf $(PKG_BUILD_DIR)/ixp400_xscale_sw
 	$(CP) ./src/* $(PKG_BUILD_DIR)/
-	touch $@
-
-$(PKG_BUILD_DIR)/NPE-B: $(PKG_BUILD_DIR)/.prepared
-	( cd $(PKG_BUILD_DIR) ; \
-	  $(HOSTCC) -Wall IxNpeMicrocode.c -o IxNpeMicrocode ; \
-	  ./IxNpeMicrocode -be )
+endef
 
-$(DL_DIR)/$(PKG_SOURCE):
-	mkdir -p $(DL_DIR)
-	echo "You must manually download $(PKG_SOURCE) from $(PKG_SOURCE_URL) and put it in $(DL_DIR)."
-	echo "You will need to agree to the Intel Public License to do so - please do read it!"
-	false
+define Build/Compile
+	(cd $(PKG_BUILD_DIR); \
+		$(HOSTCC) -Wall IxNpeMicrocode.c -o IxNpeMicrocode; \
+		./IxNpeMicrocode -be \
+	)
+endef
 
-download: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.prepared
-compile: $(PKG_BUILD_DIR)/NPE-B
-
-ifneq ($(TARGET),)
-install: compile
+define Build/InstallDev
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/NPE-B $(TARGET)/
-endif
+endef
 
-clean:
-	rm -rf $(PKG_BUILD_DIR)
+$(eval $(call Build/DefaultTargets))