Commit 78f02cac authored by Yoshinori Sato's avatar Yoshinori Sato
Browse files

h8300: zImage fix 



- stack fix
- configure base address

Signed-off-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
parent 780ffcd5

arch/h8300/boot/compressed/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -14,11 +14,12 @@ OBJECTS = $(obj)/head.o $(obj)/misc.o 
# in order to suppress error message.

#

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))))



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

	$(call if_changed,ld)

arch/h8300/boot/compressed/head.S

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ 
	.section	.text..startup,"ax"

	.global	startup

startup:

	mov.l	#startup, sp

	mov.l	er0, er4

	mov.l	er0, sp

	mov.l	#__sbss, er0

	mov.l	#__ebss, er1

	sub.l	er0, er1
@@ -24,7 +24,7 @@ startup: 
	bne	1b

	jsr	@decompress_kernel

	mov.l	er4, er0

	jmp	@0x400000

	jmp	@output



	.align	9

fake_headers_as_bzImage:

arch/h8300/boot/compressed/misc.c

+1 −6
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static unsigned long free_mem_end_ptr; 


extern char input_data[];

extern int input_len;

static unsigned char *output;

extern char output[];



#define HEAP_SIZE             0x10000
@@ -56,15 +56,10 @@ void *memcpy(void *dest, const void *src, size_t n) 


static void error(char *x)

{



	while (1)

		;	/* Halt */

}



#define STACK_SIZE (4096)

long user_stack[STACK_SIZE];

long *stack_start = &user_stack[STACK_SIZE];



void decompress_kernel(void)

{

	free_mem_ptr = (unsigned long)&_end;

arch/h8300/boot/compressed/vmlinux.lds

+1 −1
Original line number Diff line number Diff line
@@ -27,6 +27,6 @@ SECTIONS 
                *(.bss*)

        . = ALIGN(0x4) ;

        __ebss = . ;

        __end = . ;

        }

        _end = . ;

}