UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

h8300: zImage fix 

- stack fix
- configure base address

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
This commit is contained in:
Yoshinori Sato 2015-05-31 23:42:37 +09:00
parent 780ffcd51c
commit 78f02cac95
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/h8300/boot/compressed/Makefile
View File

@ -14,11 +14,12 @@ OBJECTS = $(obj)/head.o $(obj)/misc.o
# in order to suppress error message. # in order to suppress error message.
# #
CONFIG_MEMORY_START ?= 0x00400000 CONFIG_MEMORY_START ?= 0x00400000
CONFIG_BOOT_LINK_OFFSET ?= 0x00140000 CONFIG_BOOT_LINK_OFFSET ?= 0x00280000
IMAGE_OFFSET := $(shell printf "0x%08x" $$(($(CONFIG_MEMORY_START)+$(CONFIG_BOOT_LINK_OFFSET)))) IMAGE_OFFSET := $(shell printf "0x%08x" $$(($(CONFIG_MEMORY_START)+$(CONFIG_BOOT_LINK_OFFSET))))
LIBGCC := $(shell $(CROSS-COMPILE)$(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name) LIBGCC := $(shell $(CROSS-COMPILE)$(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)
LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -estartup $(obj)/vmlinux.lds LDFLAGS_vmlinux := -Ttext $(IMAGE_OFFSET) -estartup -T $(obj)/vmlinux.lds \
--defsym output=$(CONFIG_MEMORY_START)
$(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o $(LIBGCC) FORCE $(obj)/vmlinux: $(OBJECTS) $(obj)/piggy.o $(LIBGCC) FORCE
$(call if_changed,ld) $(call if_changed,ld)

4
arch/h8300/boot/compressed/head.S
View File

@ -9,8 +9,8 @@
.section .text..startup,"ax" .section .text..startup,"ax"
.global startup .global startup
startup: startup:
mov.l #startup, sp
mov.l er0, er4 mov.l er0, er4
mov.l er0, sp
mov.l #__sbss, er0 mov.l #__sbss, er0
mov.l #__ebss, er1 mov.l #__ebss, er1
sub.l er0, er1 sub.l er0, er1
@ -24,7 +24,7 @@ startup:
bne 1b bne 1b
jsr @decompress_kernel jsr @decompress_kernel
mov.l er4, er0 mov.l er4, er0
jmp @0x400000 jmp @output
.align 9 .align 9
fake_headers_as_bzImage: fake_headers_as_bzImage:

7
arch/h8300/boot/compressed/misc.c
View File

@ -28,7 +28,7 @@ static unsigned long free_mem_end_ptr;
extern char input_data[]; extern char input_data[];
extern int input_len; extern int input_len;
static unsigned char *output; extern char output[];
#define HEAP_SIZE 0x10000 #define HEAP_SIZE 0x10000
@ -56,15 +56,10 @@ void *memcpy(void *dest, const void *src, size_t n)
static void error(char *x) static void error(char *x)
{ {
while (1) while (1)
; /* Halt */ ; /* Halt */
} }
#define STACK_SIZE (4096)
long user_stack[STACK_SIZE];
long *stack_start = &user_stack[STACK_SIZE];
void decompress_kernel(void) void decompress_kernel(void)
{ {
free_mem_ptr = (unsigned long)&_end; free_mem_ptr = (unsigned long)&_end;

2
arch/h8300/boot/compressed/vmlinux.lds
View File

@ -27,6 +27,6 @@ SECTIONS
*(.bss*) *(.bss*)
. = ALIGN(0x4) ; . = ALIGN(0x4) ;
__ebss = . ; __ebss = . ;
__end = . ;
} }
_end = . ;
} }