aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-01-20 18:45:54 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-01-20 18:45:54 +0000
commit54c017e74b36c90295a3ad0baf6e5521acea1b0a (patch)
tree3941fc37a4b57e630698e04bc80011faba06002e
parentd8cc1426e4470657b543f09b3166c20129e05dea (diff)
downloadupstream-54c017e74b36c90295a3ad0baf6e5521acea1b0a.tar.gz
upstream-54c017e74b36c90295a3ad0baf6e5521acea1b0a.tar.bz2
upstream-54c017e74b36c90295a3ad0baf6e5521acea1b0a.zip
turn the IXP4xx microcode check into a prereq check so that the error message is displayed before the compile starts
SVN-Revision: 6148
-rw-r--r--target/linux/ixp4xx-2.6/image/Makefile14
-rw-r--r--target/linux/ixp4xx-2.6/image/npe-ucode/Makefile7
2 files changed, 14 insertions, 7 deletions
diff --git a/target/linux/ixp4xx-2.6/image/Makefile b/target/linux/ixp4xx-2.6/image/Makefile
index cbbb29b6b9..bb33aff7f8 100644
--- a/target/linux/ixp4xx-2.6/image/Makefile
+++ b/target/linux/ixp4xx-2.6/image/Makefile
@@ -51,3 +51,17 @@ define Image/Build/jffs2-128k
endef
$(eval $(call BuildImage))
+
+UCODEFILE:=IPL_ixp400NpeLibrary-2_3.zip
+
+define Require/npe-ucode
+ [ -f $(DL_DIR)/$(UCODEFILE) ]
+endef
+
+$(eval $(call Require,npe-ucode, \
+ You must manually download $(UCODEFILE) from \\\
+ http://www.intel.com/design/network/products/npfamily/ixp400_current.htm \\\
+ and put it in $(DL_DIR). \\\
+ You will need to agree to the Intel Public License to do so - please do read it! \
+))
+
diff --git a/target/linux/ixp4xx-2.6/image/npe-ucode/Makefile b/target/linux/ixp4xx-2.6/image/npe-ucode/Makefile
index 7dc476b6b1..1f61570dc4 100644
--- a/target/linux/ixp4xx-2.6/image/npe-ucode/Makefile
+++ b/target/linux/ixp4xx-2.6/image/npe-ucode/Makefile
@@ -14,7 +14,6 @@ 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_UNPACK:=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE)
include $(INCLUDE_DIR)/unpack.mk
@@ -32,12 +31,6 @@ $(PKG_BUILD_DIR)/NPE-B: $(PKG_BUILD_DIR)/.prepared
$(HOSTCC) -Wall IxNpeMicrocode.c -o IxNpeMicrocode ; \
./IxNpeMicrocode -be )
-$(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
-
download: $(DL_DIR)/$(PKG_SOURCE)
prepare: $(PKG_BUILD_DIR)/.prepared
compile: $(PKG_BUILD_DIR)/NPE-B