reorder sdk menuconfig entry, so that it does not force the toolchain selection into...

[openwrt.git] / target / linux / image / aruba / Makefile

diff --git a/target/linux/image/aruba/Makefile b/target/linux/image/aruba/Makefile
index 4888dad..ad13ffd 100644 (file)
--- a/target/linux/image/aruba/Makefile
+++ b/target/linux/image/aruba/Makefile
@@ -1,4 +1,5 @@
-include ../image.mk
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/image.mk
 
 LOADADDR = 0x81000000          # RAM start + 16M 
 KERNEL_ENTRY = 0x80100000
@@ -19,16 +20,19 @@ define Image/Prepare
        $(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) clean compile
 endef
 
-define Image/Build
+define Image/BuildKernel
        ./addVersion -n ArubaOS $(KDIR)/loader.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari version
-ifneq ($(CONFIG_ARUBA_RAMDISK),y)
-ifeq ($(1),jffs2-64k)
-endif
+endef
+
+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
-endif
+endef
+
+define Image/Build
+       $(call Image/Build/$(1),$(1))
 endef
 
 $(eval $(call BuildImage))