oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: Make sure __k_unpaged_MINIX is first

Browse Source 
Do not rely on build order to set startup symbol (`__k_unpaged_MINIX`)
at kernel binary start

Change-Id: I1ed3f9309fe66ff97e24915938c114d5a159deaf
This commit is contained in:
Emmanuel Blot 2015-01-19 14:39:44 +01:00 committed by Lionel Sambuc
parent 54841c0102
commit 41b870c890
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
minix/kernel/arch/earm/head.S
View File

@ -18,7 +18,7 @@
#include "arch_proto.h" /* K_STACK_SIZE */ #include "arch_proto.h" /* K_STACK_SIZE */
.text .section .startup
/*===========================================================================*/ /*===========================================================================*/
/* MINIX */ /* MINIX */
/*===========================================================================*/ /*===========================================================================*/
@ -27,6 +27,7 @@ MINIX:
/* this is the entry point for the MINIX kernel */ /* this is the entry point for the MINIX kernel */
b multiboot_init b multiboot_init
.text
multiboot_init: multiboot_init:
ldr sp, =load_stack_start /* make usable stack */ ldr sp, =load_stack_start /* make usable stack */
mov fp, #0 mov fp, #0

2
minix/kernel/arch/earm/kernel.lds
View File

@ -14,7 +14,7 @@ SECTIONS
. = _kern_phys_base; . = _kern_phys_base;
__k_unpaged__kern_unpaged_start = .; __k_unpaged__kern_unpaged_start = .;
.unpaged_text ALIGN(4096) : { unpaged_*.o(.text) } .unpaged_text ALIGN(4096) : { unpaged_*.o(.startup); unpaged_*.o(.text) }
.unpaged_data ALIGN(4096) : { unpaged_*.o(.data .rodata*) } .unpaged_data ALIGN(4096) : { unpaged_*.o(.data .rodata*) }
__k_unpaged__kern_unpaged_edata = .; __k_unpaged__kern_unpaged_edata = .;