xtensa: Cleanup linker script using new linker script macros.

Signed-off-by: Tim Abbott <tabbott@ksplice.com>
Cc: Chris Zankel <chris@zankel.net>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Tim Abbott 2009-09-24 10:36:19 -04:00 committed by Linus Torvalds
parent ab635e7d49
commit cd3db323eb
1 changed files with 15 additions and 62 deletions

View File

@ -15,6 +15,8 @@
*/ */
#include <asm-generic/vmlinux.lds.h> #include <asm-generic/vmlinux.lds.h>
#include <asm/page.h>
#include <asm/thread_info.h>
#include <variant/core.h> #include <variant/core.h>
#include <platform/hardware.h> #include <platform/hardware.h>
@ -107,41 +109,18 @@ SECTIONS
.fixup : { *(.fixup) } .fixup : { *(.fixup) }
. = ALIGN(16); EXCEPTION_TABLE(16)
__ex_table : {
__start___ex_table = .;
*(__ex_table)
__stop___ex_table = .;
}
/* Data section */ /* Data section */
. = ALIGN(XCHAL_ICACHE_LINESIZE);
_fdata = .; _fdata = .;
.data : RW_DATA_SECTION(XCHAL_ICACHE_LINESIZE, PAGE_SIZE, THREAD_SIZE)
{
DATA_DATA
CONSTRUCTORS
. = ALIGN(XCHAL_ICACHE_LINESIZE);
*(.data.cacheline_aligned)
}
_edata = .; _edata = .;
/* The initial task */
. = ALIGN(8192);
.data.init_task : { *(.data.init_task) }
/* Initialization code and data: */ /* Initialization code and data: */
. = ALIGN(1 << 12); . = ALIGN(PAGE_SIZE);
__init_begin = .; __init_begin = .;
.init.text : { INIT_TEXT_SECTION(PAGE_SIZE)
_sinittext = .;
INIT_TEXT
_einittext = .;
}
.init.data : .init.data :
{ {
@ -168,36 +147,15 @@ SECTIONS
.DebugInterruptVector.text); .DebugInterruptVector.text);
__boot_reloc_table_end = ABSOLUTE(.) ; __boot_reloc_table_end = ABSOLUTE(.) ;
INIT_SETUP(XCHAL_ICACHE_LINESIZE)
INIT_CALLS
CON_INITCALL
SECURITY_INITCALL
INIT_RAM_FS
} }
. = ALIGN(XCHAL_ICACHE_LINESIZE); PERCPU(PAGE_SIZE)
__setup_start = .;
.init.setup : { *(.init.setup) }
__setup_end = .;
__initcall_start = .;
.initcall.init : {
INITCALLS
}
__initcall_end = .;
__con_initcall_start = .;
.con_initcall.init : { *(.con_initcall.init) }
__con_initcall_end = .;
SECURITY_INIT
#ifdef CONFIG_BLK_DEV_INITRD
. = ALIGN(4096);
__initramfs_start =.;
.init.ramfs : { *(.init.ramfs) }
__initramfs_end = .;
#endif
PERCPU(4096)
/* We need this dummy segment here */ /* We need this dummy segment here */
@ -252,16 +210,11 @@ SECTIONS
.DoubleExceptionVector.literal) .DoubleExceptionVector.literal)
. = (LOADADDR( .DoubleExceptionVector.text ) + SIZEOF( .DoubleExceptionVector.text ) + 3) & ~ 3; . = (LOADADDR( .DoubleExceptionVector.text ) + SIZEOF( .DoubleExceptionVector.text ) + 3) & ~ 3;
. = ALIGN(1 << 12); . = ALIGN(PAGE_SIZE);
__init_end = .; __init_end = .;
. = ALIGN(8192); BSS_SECTION(0, 8192, 0)
/* BSS section */
_bss_start = .;
.bss : { *(.bss.page_aligned) *(.bss) }
_bss_end = .;
_end = .; _end = .;