Make lzma-loader sdram mapping configurable (#1169)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6598 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/generic-2.6/image/lzma-loader/src/Makefile b/target/linux/generic-2.6/image/lzma-loader/src/Makefile
index dbe9019..13ed962 100644 (file)
--- a/target/linux/generic-2.6/image/lzma-loader/src/Makefile
+++ b/target/linux/generic-2.6/image/lzma-loader/src/Makefile
@@ -4,15 +4,16 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
+RAMSTART = 0x80000000
+RAMSIZE = 0x00100000           # 1MB
 LOADADDR = 0x80400000          # RAM start + 4M
 KERNEL_ENTRY = 0x80001000
-RAMSIZE = 0x00100000           # 1MB
 IMAGE_COPY:=0
 
 CROSS_COMPILE = mips-linux-
 
 OBJCOPY:= $(CROSS_COMPILE)objcopy -O binary -R .reginfo -R .note -R .comment -R .mdebug -S
-CFLAGS := -fno-builtin -Os -G 0 -ffunction-sections -mno-abicalls -fno-pic -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap -Wall -DRAMSIZE=${RAMSIZE} -DKERNEL_ENTRY=${KERNEL_ENTRY} -D_LZMA_IN_CB
+CFLAGS := -fno-builtin -Os -G 0 -ffunction-sections -mno-abicalls -fno-pic -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap -Wall -DRAMSTART=${RAMSTART} -DRAMSIZE=${RAMSIZE} -DKERNEL_ENTRY=${KERNEL_ENTRY} -D_LZMA_IN_CB
 ifeq ($(IMAGE_COPY),1)
 CFLAGS += -DLOADADDR=${LOADADDR} -DIMAGE_COPY=1
 endif

diff --git a/target/linux/generic-2.6/image/lzma-loader/src/decompress.c b/target/linux/generic-2.6/image/lzma-loader/src/decompress.c
index 4ed432d..45ac509 100644 (file)
--- a/target/linux/generic-2.6/image/lzma-loader/src/decompress.c
+++ b/target/linux/generic-2.6/image/lzma-loader/src/decompress.c
@@ -96,7 +96,10 @@ static __inline__ unsigned char get_byte(void)
        return read_byte(0, &buffer, &fake), *buffer;
 }
 
-static char *buffer = (char *)0x80C00000;
+/* This puts lzma workspace 128k below RAM end. 
+ * That should be enough for both lzma and stack
+ */
+static char *buffer = (char *)(RAMSTART + RAMSIZE - 0x00020000);
 extern char lzma_start[];
 extern char lzma_end[];
 

diff --git a/target/linux/generic-2.6/image/lzma-loader/src/start.S b/target/linux/generic-2.6/image/lzma-loader/src/start.S
index 9a85c4c..8642933 100644 (file)
--- a/target/linux/generic-2.6/image/lzma-loader/src/start.S
+++ b/target/linux/generic-2.6/image/lzma-loader/src/start.S
@@ -41,7 +41,7 @@ LEAF(_start)
        move t7, a3
        
        /* set up stack */
-       li      sp, 0xa0000000 + RAMSIZE - 16
+       li      sp, RAMSTART + RAMSIZE - 16
 
 #ifdef IMAGE_COPY
        /* Copy decompressor code to the right place */