Changeset 6598

Timestamp:

2007-03-18T10:32:22+01:00 (11 years ago)

Author:

ejka

Message:

Make lzma-loader sdram mapping configurable (#1169)

Location:

trunk/target/linux/generic-2.6/image/lzma-loader/src

Files:

• Makefile (modified) (2 diffs)
• decompress.c (modified) (1 diff)
• start.S (modified) (1 diff)

trunk/target/linux/generic-2.6/image/lzma-loader/src/Makefile

@@ -5 +5 @@
 # See /LICENSE for more information.
 #
+RAMSTART = 0x80000000
+RAMSIZE = 0x00100000            # 1MB
 LOADADDR = 0x80400000           # RAM start + 4M
 KERNEL_ENTRY = 0x80001000
-RAMSIZE = 0x00100000            # 1MB
 IMAGE_COPY:=0
 
@@ -13 +14 @@
 
 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

trunk/target/linux/generic-2.6/image/lzma-loader/src/decompress.c

@@ -97 +97 @@
 }
 
-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[];

trunk/target/linux/generic-2.6/image/lzma-loader/src/start.S

@@ -42 +42 @@
         
         /* set up stack */
-        li      sp, 0xa0000000 + RAMSIZE - 16
+        li      sp, RAMSTART + RAMSIZE - 16
 
 #ifdef IMAGE_COPY