Make rdc boot a little further, still broken though, resync kernel config

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

diff --git a/target/linux/aruba-2.6/image/Makefile b/target/linux/aruba-2.6/image/Makefile
index 37dd6fc..7773f6a 100644 (file)
--- a/target/linux/aruba-2.6/image/Makefile
+++ b/target/linux/aruba-2.6/image/Makefile
@@ -18,12 +18,12 @@ LOADER_MAKEOPTS= \
                RAMSIZE=$(RAMSIZE)
 
 define Build/Clean
                RAMSIZE=$(RAMSIZE)
 
 define Build/Clean

-       $(MAKE) -C ../../generic-2.6/image/lzma-loader $(LOADER_MAKEOPTS) clean
+       $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader $(LOADER_MAKEOPTS) clean

 endef
 
 define Image/Prepare
        cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
 endef
 
 define Image/Prepare
        cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma

-       $(MAKE) -C ../../generic-2.6/image/lzma-loader $(LOADER_MAKEOPTS) clean compile
+       $(MAKE) -C $(GENERIC_PLATFORM_DIR)/image/lzma-loader $(LOADER_MAKEOPTS) clean compile

 endef
 
 define Image/BuildKernel
 endef
 
 define Image/BuildKernel


@@ -31,11 +31,18 @@ define Image/BuildKernel
 endef
 
 define Image/Build/jffs2-64k
 endef
 
 define Image/Build/jffs2-64k

-       @dd if=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari of=$(KDIR)/image.tmp bs=655360 conv=sync
+       @dd if=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari of=$(KDIR)/image.tmp bs=786432 conv=sync

        @cat $(KDIR)/root.$(1) >> $(KDIR)/image.tmp
        mv $(KDIR)/image.tmp $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(patsubst jffs2-%,jffs2,$(1)).bin
 endef
 
        @cat $(KDIR)/root.$(1) >> $(KDIR)/image.tmp
        mv $(KDIR)/image.tmp $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(patsubst jffs2-%,jffs2,$(1)).bin
 endef
 

+define Image/Build/squashfs
+       @dd if=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari of=$(KDIR)/image.tmp bs=786432 conv=sync
+       $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
+       @cat $(KDIR)/root.$(1) >> $(KDIR)/image.tmp
+       @dd if=$(KDIR)/image.tmp of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).bin bs=64k conv=sync
+endef
+

 define Image/Build
        $(call Image/Build/$(1),$(1))
 endef
 define Image/Build
        $(call Image/Build/$(1),$(1))
 endef