Commit 4a5e3513 authored by Tim Abbott's avatar Tim Abbott Committed by Linus Torvalds

blackfin: Cleanup linker script using new linker script macros.

Signed-off-by: default avatarTim Abbott <tabbott@ksplice.com>
Cc: Bryan Wu <cooloney@kernel.org>
Cc: uclinux-dist-devel@blackfin.uclinux.org
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarMike Frysinger <vapier.adi@gmail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4295f8b3
...@@ -96,8 +96,7 @@ SECTIONS ...@@ -96,8 +96,7 @@ SECTIONS
{ {
__sdata = .; __sdata = .;
/* This gets done first, so the glob doesn't suck it in */ /* This gets done first, so the glob doesn't suck it in */
. = ALIGN(32); CACHELINE_ALIGNED_DATA(32)
*(.data.cacheline_aligned)
#if !L1_DATA_A_LENGTH #if !L1_DATA_A_LENGTH
. = ALIGN(32); . = ALIGN(32);
...@@ -116,12 +115,7 @@ SECTIONS ...@@ -116,12 +115,7 @@ SECTIONS
DATA_DATA DATA_DATA
CONSTRUCTORS CONSTRUCTORS
/* make sure the init_task is aligned to the INIT_TASK_DATA(THREAD_SIZE)
* kernel thread size so we can locate the kernel
* stack properly and quickly.
*/
. = ALIGN(THREAD_SIZE);
*(.init_task.data)
__edata = .; __edata = .;
} }
...@@ -134,39 +128,10 @@ SECTIONS ...@@ -134,39 +128,10 @@ SECTIONS
. = ALIGN(PAGE_SIZE); . = ALIGN(PAGE_SIZE);
___init_begin = .; ___init_begin = .;
.init.text : INIT_TEXT_SECTION(PAGE_SIZE)
{ . = ALIGN(16);
. = ALIGN(PAGE_SIZE); INIT_DATA_SECTION(16)
__sinittext = .;
INIT_TEXT
__einittext = .;
}
.init.data :
{
. = ALIGN(16);
INIT_DATA
}
.init.setup :
{
. = ALIGN(16);
___setup_start = .;
*(.init.setup)
___setup_end = .;
}
.initcall.init :
{
___initcall_start = .;
INITCALLS
___initcall_end = .;
}
.con_initcall.init :
{
___con_initcall_start = .;
*(.con_initcall.init)
___con_initcall_end = .;
}
PERCPU(4) PERCPU(4)
SECURITY_INIT
/* we have to discard exit text and such at runtime, not link time, to /* we have to discard exit text and such at runtime, not link time, to
* handle embedded cross-section references (alt instructions, bug * handle embedded cross-section references (alt instructions, bug
...@@ -181,18 +146,9 @@ SECTIONS ...@@ -181,18 +146,9 @@ SECTIONS
EXIT_DATA EXIT_DATA
} }
.init.ramfs :
{
. = ALIGN(4);
___initramfs_start = .;
*(.init.ramfs)
. = ALIGN(4);
___initramfs_end = .;
}
__l1_lma_start = .; __l1_lma_start = .;
.text_l1 L1_CODE_START : AT(LOADADDR(.init.ramfs) + SIZEOF(.init.ramfs)) .text_l1 L1_CODE_START : AT(LOADADDR(.exit.data) + SIZEOF(.exit.data))
{ {
. = ALIGN(4); . = ALIGN(4);
__stext_l1 = .; __stext_l1 = .;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment