3 files changed, 40 insertions, 6 deletions
diff --git a/target/image/au1000/Makefile b/target/image/au1000/Makefile
index 0fb3cb2229..fa3f06e318 100644
--- a/target/image/au1000/Makefile
+++ b/target/image/au1000/Makefile
@@ -7,16 +7,49 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
+LOADADDR = 0x81000000		# RAM start + 16M 
+KERNEL_ENTRY = 0x80100000
+RAMSIZE = 0x00100000		# 1MB
+
+FLASH_KERNEL := 0xBFD00000
+FLASH_FS     := 0xBE000000
+
+LOADER_MAKEOPTS= \
+		KDIR=$(KDIR) \
+		LOADADDR=$(LOADADDR) \
+		KERNEL_ENTRY=$(KERNEL_ENTRY) \
+		RAMSIZE=$(RAMSIZE)
+
 define Build/Clean
+	$(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) clean
 endef
 
+DROP_SECTIONS := .reginfo .mdebug .comment .note .pdr .options .MIPS.options
+OBJCOPY_KERNEL := $(TARGET_CROSS)objcopy -S -O srec $(addprefix --remove-section=,$(DROP_SECTIONS))
+
 define Image/Prepare
+	cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
+	
+	# Build RAM image
+	$(MAKE) -C ../generic/lzma-loader \
+		$(LOADER_MAKEOPTS) \
+		clean compile
+	$(OBJCOPY_KERNEL) $(KDIR)/loader.elf $(KDIR)/kernel.ram.srec
+	
+	# Build Flash image
+	$(MAKE) -C ../generic/lzma-loader \
+		$(LOADER_MAKEOPTS) \
+		IMAGE_COPY=1 \
+		LOADER_ENTRY=$(FLASH_KERNEL) \
+		LOADER_TYPE=_flash \
+		clean compile
+	$(OBJCOPY_KERNEL) $(KDIR)/loader_flash.elf $(KDIR)/kernel.flash.srec
 endef
 
 define Image/Build
-	$(TARGET_CROSS)objcopy -O srec -I binary --adjust-vma 0xbe000000 $(KDIR)/root.$(1) $(KDIR)/root.$(1).srec
+	$(TARGET_CROSS)objcopy -O srec -I binary --adjust-vma $(FLASH_FS) $(KDIR)/root.$(1) $(KDIR)/root.$(1).srec
 	grep -v S7 $(KDIR)/root.$(1).srec > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img
-	grep -v S0 $(LINUX_DIR)/arch/mips/boot/compressed/images/zImage.flash.srec >> $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img
+	grep -v S0 $(KDIR)/kernel.flash.srec >> $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img
 endef
 
 $(eval $(call BuildImage))
diff --git a/target/image/generic/lzma-loader/Makefile b/target/image/generic/lzma-loader/Makefile
index 5bd01eefb6..e3a98afbce 100644
--- a/target/image/generic/lzma-loader/Makefile
+++ b/target/image/generic/lzma-loader/Makefile
@@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME := loader
 PKG_VERSION := 0.05
 
-PKG_BUILD_DIR := $(KDIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR := $(KDIR)/$(PKG_NAME)-$(PKG_VERSION)$(LOADER_TYPE)
 
 $(PKG_BUILD_DIR)/.prepared:
 	mkdir $(PKG_BUILD_DIR)
@@ -30,12 +30,12 @@ $(PKG_BUILD_DIR)/lzma.elf: $(PKG_BUILD_DIR)/.prepared $(PKG_BUILD_DIR)/vmlinux.l
 $(PKG_BUILD_DIR)/vmlinux.lzma: $(KDIR)/vmlinux.lzma
 	$(CP) $< $@
 
-$(KDIR)/loader.elf: $(PKG_BUILD_DIR)/lzma.elf
+$(KDIR)/loader$(LOADER_TYPE).elf: $(PKG_BUILD_DIR)/lzma.elf
 	$(CP) $< $@
 
 download: 
 prepare: $(PKG_BUILD_DIR)/.prepared
-compile: $(KDIR)/loader.elf
+compile: $(KDIR)/loader$(LOADER_TYPE).elf
 install:
 
 clean:
diff --git a/target/image/generic/lzma-loader/src/Makefile b/target/image/generic/lzma-loader/src/Makefile
index d4a100df4b..dbe9019f2b 100644
--- a/target/image/generic/lzma-loader/src/Makefile
+++ b/target/image/generic/lzma-loader/src/Makefile
@@ -44,6 +44,7 @@ kernel.o: vmlinux.lzma lzma.lds
 	$(LD) -r -b binary --oformat $(O_FORMAT) -o $@ $<
 
 ifeq ($(IMAGE_COPY),1)
+LOADER_ENTRY ?= $(KERNEL_ENTRY)
 lzma.o: decompress.o LzmaDecode.o kernel.o
 	sed -e 's,@LOADADDR@,$(LOADADDR),g' -e 's,@ENTRY@,entry,g' lzma.lds.in >lzma-stage2.lds
 	$(LD) -static --no-warn-mismatch -e entry -Tlzma-stage2.lds -o temp-$@ $^
@@ -52,7 +53,7 @@ lzma.o: decompress.o LzmaDecode.o kernel.o
 	$(LD) -no-warn-mismatch -T lzma-data.lds -r -o $@ -b binary lzma.tmp --oformat $(O_FORMAT)
 	
 lzma.elf: start.o lzma.o
-	sed -e 's,@LOADADDR@,$(KERNEL_ENTRY),g' lzma-copy.lds.in >lzma-copy.lds
+	sed -e 's,@LOADADDR@,$(LOADER_ENTRY),g' lzma-copy.lds.in >lzma-copy.lds
 	$(LD) -s -Tlzma-copy.lds -o $@ $^
 else
 lzma.elf: start.o decompress.o LzmaDecode.o kernel.o