Add initial version of the new Image Builder

[15.05/openwrt.git] / target / linux / ixp4xx-2.6 / image / Makefile

diff --git a/target/linux/ixp4xx-2.6/image/Makefile b/target/linux/ixp4xx-2.6/image/Makefile
index fc17c0f..cbbb29b 100644 (file)
--- a/target/linux/ixp4xx-2.6/image/Makefile
+++ b/target/linux/ixp4xx-2.6/image/Makefile
@@ -12,17 +12,23 @@ define Build/Compile
                BUILD_DIR="$(KDIR)" \
                TARGET="$(KDIR)" \
                install
+       $(MAKE) -C npe-ucode \
+               BUILD_DIR="$(KDIR)" \
+               TARGET="$(KDIR)" \
+               install
 endef
 
 define Build/Clean
        $(MAKE) -C apex clean
+       $(MAKE) -C npe-ucode clean
 endef
 
 define Image/Prepare
+       cp $(LINUX_DIR)/arch/arm/boot/zImage $(KDIR)/zImage
 endef
 
 define Image/BuildKernel
-       cp $(LINUX_DIR)/arch/arm/boot/zImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-zImage
+       cp $(KDIR)/zImage $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-zImage
 #      $(shell BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/arm-magic.sh)
        BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/arm-magic.sh
 endef
@@ -38,11 +44,10 @@ endef
 define Image/Build/jffs2-128k
        dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img bs=131072 conv=sync
        BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/slugimage.pl \
-               -L $(KDIR)/apex-nslu2-armeb.bin \
+               -L $(KDIR)/apex-nslu2-armeb.bin -m $(KDIR)/NPE-B \
                -k $(BIN_DIR)/openwrt-nslu2-$(KERNEL)-zImage \
                -r Flashdisk:$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img \
                -p -o $(BIN_DIR)/openwrt-nslu2-$(KERNEL)-$(1).bin
-#              -m $(BIN_DIR)/NPE-B
 endef
 
 $(eval $(call BuildImage))