make xscale images containing proprietary microcode optional, but enabled by default

SVN-Revision: 7431

diff --git a/target/linux/ixp4xx-2.6/image/Config.in b/target/linux/ixp4xx-2.6/image/Config.in
new file mode 100644 (file)
index 0000000..b87aa51
--- /dev/null
+++ b/target/linux/ixp4xx-2.6/image/Config.in
@@ -0,0 +1,9 @@
+config IXP4XX_INCLUDE_UCODE
+       bool "Build images with Intel IXP4xx Microcode
+       default y
+       help
+         You must manually download IPL_ixp400NpeLibrary-2_4.zip from
+         http://www.intel.com/design/network/products/npfamily/ixp400_archives.htm
+         and put it in the dl/ directory of the build system.
+         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/Makefile b/target/linux/ixp4xx-2.6/image/Makefile
index 7d230028530e0aed60824ff32150b61eeeb20632..8d05a1b8f1294c0dd5f6e21c1e4ff21f18889c18 100644 (file)
--- a/target/linux/ixp4xx-2.6/image/Makefile
+++ b/target/linux/ixp4xx-2.6/image/Makefile
@@ -7,15 +7,33 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 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
+       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
+endif
+

 define Build/Compile
        $(MAKE) -C apex \
                BUILD_DIR="$(KDIR)" \
                TARGET="$(KDIR)" \
                compile 
 define Build/Compile
        $(MAKE) -C apex \
                BUILD_DIR="$(KDIR)" \
                TARGET="$(KDIR)" \
                compile 

-       $(MAKE) -C npe-ucode \
-               BUILD_DIR="$(KDIR)" \
-               TARGET="$(KDIR)" \
-               compile
+       $(call Build/Compile/npe)

 endef
 
 define Build/Clean
 endef
 
 define Build/Clean


@@ -37,14 +55,6 @@ define Image/Build
        $(call Image/Build/$(1),$(1))
 endef
 
        $(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-64k
        dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img bs=65536 conv=sync
 endef


@@ -62,12 +72,6 @@ endef
 
 $(eval $(call BuildImage))
 
 
 $(eval $(call BuildImage))
 

-UCODEFILE:=IPL_ixp400NpeLibrary-2_4.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_archives.htm \\\
 $(eval $(call Require,npe-ucode, \
        You must manually download $(UCODEFILE) from \\\
        http://www.intel.com/design/network/products/npfamily/ixp400_archives.htm \\\