From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 1 Jan 2007 00:01:58 +0000 (+0000)
Subject: Include apex bootloader in nslu2 image
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=0e9c39e784a6c6373ebb418eb4bde2ee7fbf85cf

Include apex bootloader in nslu2 image

SVN-Revision: 5948
---

diff --git a/target/linux/ixp4xx-2.6/image/Makefile b/target/linux/ixp4xx-2.6/image/Makefile
index 6142d09faf..fc17c0f9ee 100644
--- a/target/linux/ixp4xx-2.6/image/Makefile
+++ b/target/linux/ixp4xx-2.6/image/Makefile
@@ -7,7 +7,15 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
+define Build/Compile
+	$(MAKE) -C apex \
+		BUILD_DIR="$(KDIR)" \
+		TARGET="$(KDIR)" \
+		install
+endef
+
 define Build/Clean
+	$(MAKE) -C apex clean
 endef
 
 define Image/Prepare
@@ -30,10 +38,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 \
 		-k $(BIN_DIR)/openwrt-nslu2-$(KERNEL)-zImage \
-		-r Ramdisk:1,Flashdisk:$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img \
+		-r Flashdisk:$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img \
 		-p -o $(BIN_DIR)/openwrt-nslu2-$(KERNEL)-$(1).bin
-#		-L $(BIN_DIR)/apex-nslu2-armeb.bin
 #		-m $(BIN_DIR)/NPE-B
 endef