X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f87a57f5afd43676c71cba1d6f691bfac7fe752c..6437db66c4bb34f107005192dbf62cf745a3011f:/target/linux/image/aruba/Makefile

diff --git a/target/linux/image/aruba/Makefile b/target/linux/image/aruba/Makefile
index 59bf59777..a2cceaf0c 100644
--- a/target/linux/image/aruba/Makefile
+++ b/target/linux/image/aruba/Makefile
@@ -1,15 +1,25 @@
 include $(TOPDIR)/rules.mk
 
+LOADADDR = 0x81000000		# RAM start + 16M 
+KERNEL_ENTRY = 0x80100000
+RAMSIZE = 0x00100000		# 1MB
+
+LOADER_MAKEOPTS= \
+		KDIR=$(KDIR) \
+		LOADADDR=$(LOADADDR) \
+		KERNEL_ENTRY=$(KERNEL_ENTRY) \
+		RAMSIZE=$(RAMSIZE)
+
 KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
 
 lzma-loader-clean:
-	$(MAKE) -C lzma-loader clean
+	$(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) clean
 
 lzma-loader-prepare:
-	$(MAKE) -C lzma-loader prepare
+	$(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) prepare
 
 lzma-loader-compile: $(KDIR)/vmlinux.lzma lzma-loader-prepare
-	$(MAKE) -C lzma-loader compile KDIR=$(KDIR)
+	$(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) compile
 
 ifeq ($(IB),)
 $(KDIR)/vmlinux.lzma: $(KDIR)/vmlinux
@@ -26,6 +36,16 @@ ifeq ($(FS),jffs2-4MB)
 $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari: $(KDIR)/loader.elf
 	./addVersion -n ArubaOS $(KDIR)/loader.elf $@ version
 
+ifneq ($(BR2_ARUBA_RAMDISK),y)
+$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari $(KDIR)/root.$(FS)
+	@dd if=$< of=$@.tmp bs=655360 conv=sync
+	@cat $(KDIR)/root.$(FS) >> $@.tmp
+	@dd if=$@.tmp of=$@ bs=3604480 conv=sync
+	@rm -f $@.tmp
+
+install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin
+endif
+
 install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari
 endif
 endif
@@ -42,5 +62,5 @@ endif
 install-ib:
 	mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin
 	mkdir -p $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)
-	cp -fpR $(KDIR)/loader.elf $(IB_DIR)/build_$(ARCH)/
-	cp -fpR $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/
+	$(CP) $(KDIR)/loader.elf $(IB_DIR)/build_$(ARCH)/
+	$(CP) $(KDIR)/vmlinux.lzma $(IB_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD)/