lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

microblaze: Cleanup linker script using new linker script macros.

Browse Source 
I wasn't able to further clean up the linker script using the
INIT_DATA_SECTION macro because of the FIXME comment for the
.init.ramfs section; when that is resolved we should convert
microblaze to use INIT_DATA_SECTION.

Signed-off-by: Tim Abbott <tabbott@ksplice.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: microblaze-uclinux@itee.uq.edu.au
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Michal Simek <monstr@monstr.eu>
This commit is contained in:
Tim Abbott
2009-09-06 23:10:10 -04:00
committed by Michal Simek
parent 1f74b1f7e5
commit 8cc11f5ab5
1 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
arch/microblaze/kernel/vmlinux.lds.S
View File

@@ -13,6 +13,8 @@ OUTPUT_ARCH(microblaze)
ENTRY(_start) ENTRY(_start)
#include <asm-generic/vmlinux.lds.h> #include <asm-generic/vmlinux.lds.h>
#include <asm/page.h>
#include <asm/thread_info.h>
jiffies = jiffies_64 + 4; jiffies = jiffies_64 + 4;
@@ -39,12 +41,7 @@ SECTIONS {
. = ALIGN(16); . = ALIGN(16);
RODATA RODATA
. = ALIGN(16); EXCEPTION_TABLE(16)
__ex_table : {
__start___ex_table = .;
*(__ex_table)
__stop___ex_table = .;
}
/* /*
* sdata2 section can go anywhere, but must be word aligned * sdata2 section can go anywhere, but must be word aligned
@@ -61,12 +58,7 @@ SECTIONS {
} }
_sdata = . ; _sdata = . ;
.data ALIGN (4096) : { /* page aligned when MMU used - origin 0x4 */ RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE)
DATA_DATA
CONSTRUCTORS
}
. = ALIGN(32);
.data.cacheline_aligned : { *(.data.cacheline_aligned) }
_edata = . ; _edata = . ;
/* Reserve some low RAM for r0 based memory references */ /* Reserve some low RAM for r0 based memory references */
@@ -74,10 +66,6 @@ SECTIONS {
r0_ram = . ; r0_ram = . ;
. = . + 4096; /* a page should be enough */ . = . + 4096; /* a page should be enough */
/* The initial task */
. = ALIGN(8192);
.data.init_task : { *(.data.init_task) }
/* Under the microblaze ABI, .sdata and .sbss must be contiguous */ /* Under the microblaze ABI, .sdata and .sbss must be contiguous */
. = ALIGN(8); . = ALIGN(8);
.sdata : { .sdata : {
@@ -96,12 +84,7 @@ SECTIONS {
__init_begin = .; __init_begin = .;
. = ALIGN(4096); INIT_TEXT_SECTION(PAGE_SIZE)
.init.text : {
_sinittext = . ;
INIT_TEXT
_einittext = .;
}
.init.data : { .init.data : {
INIT_DATA INIT_DATA
@@ -115,21 +98,15 @@ SECTIONS {
} }
.init.setup : { .init.setup : {
__setup_start = .; INIT_SETUP(0)
*(.init.setup)
__setup_end = .;
} }
.initcall.init : { .initcall.init : {
__initcall_start = .; INIT_CALLS
INITCALLS
__initcall_end = .;
} }
.con_initcall.init : { .con_initcall.init : {
__con_initcall_start = .; CON_INITCALL
*(.con_initcall.init)
__con_initcall_end = .;
} }
SECURITY_INIT SECURITY_INIT