Disable the use of lzma since the alchemy images are zlib compressed and there is...

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4108 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/image/au1000/Makefile b/target/image/au1000/Makefile
index 0d25f8449742d6b5594031894c9b24c50f7e0e45..0fb3cb2229a3db6f4f8568cbc55f728898f8afb8 100644 (file)
--- a/target/image/au1000/Makefile
+++ b/target/image/au1000/Makefile
@@ -7,28 +7,15 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-LOADADDR = 0x8108c8f4          # RAM start + 16M 
-KERNEL_ENTRY = 0x80100000      # Default kernel entry in arch/mips/Makefile
-RAMSIZE = 0x04000000           # 64MB
-
-LOADER_MAKEOPTS= \
-               KDIR=$(KDIR) \
-               LOADADDR=$(LOADADDR) \
-               KERNEL_ENTRY=$(KERNEL_ENTRY) \
-               RAMSIZE=$(RAMSIZE)
-
 define Build/Clean
-       $(MAKE) -C ../generic/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
-       $(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) compile
 endef
 
 define Image/Build
-       $(TARGET_CROSS)objcopy -O srec -I binary --adjust-vma 0xbe000000 $(KDIR)/root.$(1) $(KDIR)/root.srec
-       grep -v S7 $(KDIR)/root.srec > $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).img
+       $(TARGET_CROSS)objcopy -O srec -I binary --adjust-vma 0xbe000000 $(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
 endef
 

diff --git a/target/linux/au1000-2.6/Makefile b/target/linux/au1000-2.6/Makefile
index a09c029d22c2a84d74a339c0214e8d8070cda63e..5d2711cb30b1f447aff6ccc18f94db9b9ab70e24 100644 (file)
--- a/target/linux/au1000-2.6/Makefile
+++ b/target/linux/au1000-2.6/Makefile
@@ -23,6 +23,5 @@ $(LINUX_DIR)/.patched: $(LINUX_DIR)/.unpacked
 $(LINUX_BUILD_DIR)/zImage.flash.srec: $(LINUX_DIR)/vmlinux
        $(CP) $(LINUX_DIR)/arch/mips/boot/compressed/images/zImage.flash.srec $(LINUX_DIR)/zImage.flash.srec
        $(CP) $(LINUX_DIR)/arch/mips/boot/compressed/images/zImage.srec $(LINUX_DIR)/zImage.srec
-       touch $@
 
 compile: $(LINUX_BUILD_DIR)/zImage.flash.srec