From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 2 Jul 2006 15:11:55 +0000 (+0000)
Subject: Disable the use of lzma since the alchemy images are zlib compressed and there is... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d8088204a33a0f2ee47c477b34158d0c1fd25d4e;p=openwrt%2Fstaging%2Fjow.git

Disable the use of lzma since the alchemy images are zlib compressed and there is a lot of space. Fix makefile error when "touching" zImage.flash.srec

SVN-Revision: 4108
---

diff --git a/openwrt/target/image/au1000/Makefile b/openwrt/target/image/au1000/Makefile
index 0d25f84497..0fb3cb2229 100644
--- a/openwrt/target/image/au1000/Makefile
+++ b/openwrt/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/openwrt/target/linux/au1000-2.6/Makefile b/openwrt/target/linux/au1000-2.6/Makefile
index a09c029d22..5d2711cb30 100644
--- a/openwrt/target/linux/au1000-2.6/Makefile
+++ b/openwrt/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