From 418ae3a0458250b390478c772a61a553221d0421 Mon Sep 17 00:00:00 2001
From: Eugene Konev <ejka@imfi.kspu.ru>
Date: Sun, 18 Mar 2007 09:32:22 +0000
Subject: [PATCH] Make lzma-loader sdram mapping configurable (#1169)
SVN-Revision: 6598
---
target/linux/generic-2.6/image/lzma-loader/src/Makefile | 5 +++--
target/linux/generic-2.6/image/lzma-loader/src/decompress.c | 5 ++++-
target/linux/generic-2.6/image/lzma-loader/src/start.S | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
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 dbe9019f2b..13ed96213e 100644
--- 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 4ed432d1a5..45ac509cdc 100644
--- 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 9a85c4c357..864293379f 100644
--- 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 */
--
GitLab