X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;ds=sidebyside;f=target%2Flinux%2Fimage%2Faruba%2FMakefile;h=432a85d59e2a492d8362b3f7607468ae8a9717e4;hb=b5ea82a30ac38ea8ad97f87ee75c7c738922779a;hp=aba11156d7a56601787adef8d94295cad1f89689;hpb=a72d14baa00fdd93001a891563d2beb9bb29cbd3;p=openwrt.git

diff --git a/target/linux/image/aruba/Makefile b/target/linux/image/aruba/Makefile
index aba11156d7..432a85d59e 100644
--- a/target/linux/image/aruba/Makefile
+++ b/target/linux/image/aruba/Makefile
@@ -15,25 +15,19 @@ 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)-$(FS).ari: $(KDIR)/vmlinux.lzma
-install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FS).ari
-endif
-
-ifeq ($(FS),jffs2-8MB)
-TRXALIGN:=-a 0x20000
-endif
-ifeq ($(FS),jffs2-4MB)
-TRXALIGN:=-a 0x10000
+$(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)-$(FSNAME).ari: $(KDIR)/loader.elf
+$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari: $(KDIR)/loader.elf
 	./addVersion -n ArubaOS $(KDIR)/loader.elf $@ version
 
-$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).ari $(KDIR)/root.$(FS)
+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
@@ -41,6 +35,9 @@ $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin: $(BIN_DIR)/openwrt-$(BOARD)
 
 install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(FSNAME).bin
 endif
+
+install: $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari
+endif
 endif
 
 ifeq ($(IB),)