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

SVN-Revision: 7431
This commit is contained in:
Felix Fietkau 2007-06-01 13:21:55 +00:00
parent 40ca38580d
commit 82be2de620
2 changed files with 31 additions and 18 deletions

View File

@ -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!

View File

@ -7,15 +7,33 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.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 define Build/Compile
$(MAKE) -C apex \ $(MAKE) -C apex \
BUILD_DIR="$(KDIR)" \ BUILD_DIR="$(KDIR)" \
TARGET="$(KDIR)" \ TARGET="$(KDIR)" \
compile compile
$(MAKE) -C npe-ucode \ $(call Build/Compile/npe)
BUILD_DIR="$(KDIR)" \
TARGET="$(KDIR)" \
compile
endef endef
define Build/Clean define Build/Clean
@ -37,14 +55,6 @@ define Image/Build
$(call Image/Build/$(1),$(1)) $(call Image/Build/$(1),$(1))
endef 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 define Image/Build/jffs2-64k
dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img bs=65536 conv=sync dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img bs=65536 conv=sync
endef 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, \ $(eval $(call Require,npe-ucode, \
You must manually download $(UCODEFILE) from \\\ You must manually download $(UCODEFILE) from \\\
http://www.intel.com/design/network/products/npfamily/ixp400_archives.htm \\\ http://www.intel.com/design/network/products/npfamily/ixp400_archives.htm \\\