X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/02eae88c3599c13df02546694887b629e8892fd0..b827761cb51040171162c698ec9a873b26ae7ad9:/target/linux/image/aruba/Makefile

diff --git a/target/linux/image/aruba/Makefile b/target/linux/image/aruba/Makefile
index 0ddde2026..ad13ffd54 100644
--- a/target/linux/image/aruba/Makefile
+++ b/target/linux/image/aruba/Makefile
@@ -1,4 +1,5 @@
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/image.mk
 
 LOADADDR = 0x81000000		# RAM start + 16M 
 KERNEL_ENTRY = 0x80100000
@@ -10,57 +11,28 @@ LOADER_MAKEOPTS= \
 		KERNEL_ENTRY=$(KERNEL_ENTRY) \
 		RAMSIZE=$(RAMSIZE)
 
-KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)
-
-lzma-loader-clean:
+define Build/Clean
 	$(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) clean
+endef
 
-lzma-loader-prepare:
-	$(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) prepare
-
-lzma-loader-compile: $(KDIR)/vmlinux.lzma lzma-loader-prepare
-	$(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) compile
-
-ifeq ($(IB),)
-$(KDIR)/vmlinux.lzma: $(KDIR)/vmlinux
-	cat $^ | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $@ || (rm -f $@ && false)
-
-$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari: $(KDIR)/vmlinux.lzma
-install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari
-endif
-
-ifeq ($(KERNEL),2.6)
-FSNAME:=$(patsubst jffs2-%,jffs2,$(FS))
-
-ifeq ($(FS),jffs2-4MB)
-$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari: $(KDIR)/loader.elf
-	./addVersion -n ArubaOS $(KDIR)/loader.elf $@ version
+define Image/Prepare
+	cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
+	$(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) clean compile
+endef
 
-ifneq ($(CONFIG_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
+define Image/BuildKernel
+	./addVersion -n ArubaOS $(KDIR)/loader.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari version
+endef
 
-install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin
-endif
+define Image/Build/jffs2-64k
+	@dd if=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari of=$(KDIR)/image.tmp bs=655360 conv=sync
+	@cat $(KDIR)/root.$(1) >> $(KDIR)/image.tmp
+	@dd if=$(KDIR)/image.tmp of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(patsubst jffs2-%,jffs2,$(1)).bin bs=3604480 conv=sync
+	@rm -f $(KDIR)/image.tmp
+endef
 
-install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari
-endif
-endif
+define Image/Build
+	$(call Image/Build/$(1),$(1))
+endef
 
-ifeq ($(IB),)
-clean: lzma-loader-clean
-prepare: lzma-loader-prepare
-compile: lzma-loader-compile
-else
-clean:
-prepare:
-compile:
-endif
-install-ib:
-	mkdir -p $(IB_DIR)/staging_dir_$(ARCH)/bin
-	mkdir -p $(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)/
+$(eval $(call BuildImage))