microblaze: Cleanup linker script using new linker script macros.
PATCH 1/1 microblaze: Cleanup linker script using new linker script macros.
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.
--- arch/microblaze/kernel/vmlinux.lds.S | 39 +++++++--------------------------- 1 files changed, 8 insertions(+), 31 deletions(-)
arch/microblaze/kernel/vmlinux.lds.S +8 -31
@@ -13,6 +13,8 @@ OUTPUT_ARCH(microblaze) ENTRY(_start) #include <asm-generic/vmlinux.lds.h> +#include <asm/page.h> +#include <asm/thread_info.h> jiffies = jiffies_64 + 4;
@@ -39,12 +41,7 @@ SECTIONS { . = ALIGN(16); RODATA - . = ALIGN(16); - __ex_table : { - __start___ex_table = .; - *(__ex_table) - __stop___ex_table = .; - } + EXCEPTION_TABLE(16) /* * sdata2 section can go anywhere, but must be word aligned
@@ -61,12 +58,7 @@ SECTIONS { } _sdata = . ; - .data ALIGN (4096) : { /* page aligned when MMU used - origin 0x4 */ - DATA_DATA - CONSTRUCTORS - } - . = ALIGN(32); - .data.cacheline_aligned : { *(.data.cacheline_aligned) } + RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE) _edata = . ; /* Reserve some low RAM for r0 based memory references */
@@ -74,10 +66,6 @@ SECTIONS { r0_ram = . ; . = . + 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 */ . = ALIGN(8); .sdata : {
@@ -96,12 +84,7 @@ SECTIONS { __init_begin = .; - . = ALIGN(4096); - .init.text : { - _sinittext = . ; - INIT_TEXT - _einittext = .; - } + INIT_TEXT_SECTION(PAGE_SIZE) .init.data : { INIT_DATA
@@ -115,21 +98,15 @@ SECTIONS { } .init.setup : { - __setup_start = .; - *(.init.setup) - __setup_end = .; + INIT_SETUP(0) } .initcall.init : { - __initcall_start = .; - INITCALLS - __initcall_end = .; + INIT_CALLS } .con_initcall.init : { - __con_initcall_start = .; - *(.con_initcall.init) - __con_initcall_end = .; + CON_INITCALL } SECURITY_INIT
Signature · 1 line
1.6.3.3
Hi Tim,
Quoted 9 lines · Tim Abbott
I wasn't able to further clean up the linker script using the
INIT_DATA_SECTIONmacro because of the FIXME comment for the .init.ramfs section; when that is resolved we should convert microblaze to useINIT_DATA_SECTION.Signed-off-by Tim Abbott <[email protected]>Cc Michal Simek <[email protected]>Cc Sam Ravnborg <[email protected]>
If you want to add this patch through microblaze tree, please let me know.
Thanks,
Michal
Quoted 95 lines
--- arch/microblaze/kernel/vmlinux.lds.S | 39 +++++++--------------------------- 1 files changed, 8 insertions(+), 31 deletions(-)arch/microblaze/kernel/vmlinux.lds.S +8
-31@@ -13,6 +13,8 @@ OUTPUT_ARCH(microblaze) ENTRY(_start) #include <asm-generic/vmlinux.lds.h> +#include <asm/page.h> +#include <asm/thread_info.h> jiffies = jiffies_64 + 4;@@ -39,12 +41,7 @@ SECTIONS { . = ALIGN(16); RODATA - . = ALIGN(16); - __ex_table : { - __start___ex_table = .; - *(__ex_table) - __stop___ex_table = .; - } + EXCEPTION_TABLE(16) /* * sdata2 section can go anywhere, but must be word aligned@@ -61,12 +58,7 @@ SECTIONS { } _sdata = . ; - .data ALIGN (4096) : { /* page aligned when MMU used - origin 0x4 */ - DATA_DATA - CONSTRUCTORS - } - . = ALIGN(32); - .data.cacheline_aligned : { *(.data.cacheline_aligned) } + RW_DATA_SECTION(32, PAGE_SIZE, THREAD_SIZE) _edata = . ; /* Reserve some low RAM for r0 based memory references */@@ -74,10 +66,6 @@ SECTIONS { r0_ram = . ; . = . + 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 */ . = ALIGN(8); .sdata : {@@ -96,12 +84,7 @@ SECTIONS { __init_begin = .; - . = ALIGN(4096); - .init.text : { - _sinittext = . ; - INIT_TEXT - _einittext = .; - } + INIT_TEXT_SECTION(PAGE_SIZE) .init.data : { INIT_DATA@@ -115,21 +98,15 @@ SECTIONS { } .init.setup : { - __setup_start = .; - *(.init.setup) - __setup_end = .; + INIT_SETUP(0) } .initcall.init : { - __initcall_start = .; - INITCALLS - __initcall_end = .; + INIT_CALLS } .con_initcall.init : { - __con_initcall_start = .; - *(.con_initcall.init) - __con_initcall_end = .; + CON_INITCALL } SECURITY_INIT
Signature · 4 lines
Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/ Microblaze U-BOOT custodian
Quoted 1 line · Michal Simek
If you want to add this patch through microblaze tree, please let me know.
I think it would be best to add it via the microblaze tree (in general I have been adding these cleanup patches via the architecture trees when possible).
-Tim Abbott
Michal Simek
maintainerQuoted 7 lines · Tim Abbott
Quoted 1 line · Michal Simek
If you want to add this patch through microblaze tree, please let me know.
I think it would be best to add it via the microblaze tree (in general I have been adding these cleanup patches via the architecture trees when possible).
ok. Added to microblaze next branch.
Thanks,
Michal
Quoted 9 lines
-Tim Abbott
___________________________
microblaze-uclinux mailing list
[email protected]
Project Home Page : http://www.itee.uq.edu.au/~jwilliams/mblaze-uclinux
Mailing List Archive : http://www.itee.uq.edu.au/~listarch/microblaze-uclinux/
Signature · 4 lines
Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/ Microblaze U-BOOT custodian