aclindsa/aedrix-kernel
1
0
Fork 0
Code Releases Activity

arch/arm: Fixup formatting to match arch/i386

Browse Source
This commit is contained in:
Aaron Lindsay 2012-12-17 00:36:25 -05:00
parent c51062ce87
commit ed52a8af5c
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/kernel.ld
View File

@ -2,8 +2,11 @@ ENTRY (start)
SECTIONS SECTIONS
{ {
. = 0x80100000; . = 0xc0100000;
.text : { *(.text*) *(.rodata*) } kernel_start = .;
.text : {
*(.text*) *(.rodata*)
}
.init : { .init : {
early_initcalls_start = .; early_initcalls_start = .;
*(.earlyinitcalls*) *(.earlyinitcalls*)
@ -12,8 +15,13 @@ SECTIONS
*(.driversubsysinitcalls*) *(.driversubsysinitcalls*)
*(.deviceinitcalls*) *(.deviceinitcalls*)
initcalls_end = .; initcalls_end = .;
*(.init*)
}
.data : {
*(.data*)
}
.bss : {
*(.bss*) *(COMMON*)
} }
.data : { *(.data*) }
.bss : { *(.bss*) *(COMMON*) }
kernel_end = .; kernel_end = .;
} }

16
arch/arm/start.S
View File

@ -18,6 +18,8 @@
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/ */
#define STACK_SIZE 0x4000 /* 16k */
/* /*
* Kernel entry in assembly. This handles relocating the kernel so that it is * Kernel entry in assembly. This handles relocating the kernel so that it is
* in both physical and virtual memory where we want it to be. We copy the * in both physical and virtual memory where we want it to be. We copy the
@ -27,7 +29,7 @@
* function in C using the address it is linked against. When the MMU gets * function in C using the address it is linked against. When the MMU gets
* initialized fully later, it will remove the initial 1:1 mapping. * initialized fully later, it will remove the initial 1:1 mapping.
*/ */
.globl start .global start
start: start:
str r1, machine_type /* Backup atags/machine type registers so we can access them later from C */ str r1, machine_type /* Backup atags/machine type registers so we can access them later from C */
str r2, atags_ptr str r2, atags_ptr
@ -37,7 +39,7 @@ copy_kernel_lr: /* Used to calculate address at which kernel is currently loaded
bl setup_mmu bl setup_mmu
ldr sp, =stack+0x10000 /* Set up the stack */ ldr sp, =stack+STACK_SIZE /* Set up the stack */
bl main bl main
1: 1:
@ -174,17 +176,17 @@ tt_base_align:
.word 0b111111111111111 /* 16k - 1 */ .word 0b111111111111111 /* 16k - 1 */
tt_section_align: tt_section_align:
.word 0b11111111111111111111 /* 1mb - 1 */ .word 0b11111111111111111111 /* 1mb - 1 */
.globl tt_base_virtual .global tt_base_virtual
tt_base_virtual: tt_base_virtual:
.word 0 .word 0
.globl tt_base_physical .global tt_base_physical
tt_base_physical: tt_base_physical:
.word 0 .word 0
.globl atags_ptr .global atags_ptr
atags_ptr: atags_ptr:
.word 0 .word 0
.globl machine_type .global machine_type
machine_type: machine_type:
.word 0 .word 0
.comm stack, 0x10000 /* Reserve 64k for the stack in .bss */ .lcomm stack, STACK_SIZE /* Reserve space for the stack in .bss */