Skip to content

Commit

Permalink
h8300: Cleanup linker script using new linker script macros.
Browse files Browse the repository at this point in the history
Signed-off-by: Tim Abbott <tabbott@ksplice.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Tim Abbott authored and Linus Torvalds committed Sep 25, 2009
1 parent 5d150a9 commit eb121d1
Showing 1 changed file with 7 additions and 18 deletions.
25 changes: 7 additions & 18 deletions arch/h8300/kernel/vmlinux.lds.S
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#define VMLINUX_SYMBOL(_sym_) _##_sym_
#include <asm-generic/vmlinux.lds.h>
#include <asm/page.h>

/* target memory map */
#ifdef CONFIG_H8300H_GENERIC
Expand Down Expand Up @@ -79,11 +80,8 @@ SECTIONS
SCHED_TEXT
LOCK_TEXT
__etext = . ;
. = ALIGN(16); /* Exception table */
___start___ex_table = .;
*(__ex_table)
___stop___ex_table = .;
}
EXCEPTION_TABLE(16)

RODATA
#if defined(CONFIG_ROMKERNEL)
Expand All @@ -100,8 +98,7 @@ SECTIONS
__sdata = . ;
___data_start = . ;

. = ALIGN(0x2000) ;
*(.data.init_task)
INIT_TASK_DATA(0x2000)
. = ALIGN(0x4) ;
DATA_DATA
. = ALIGN(0x4) ;
Expand All @@ -114,24 +111,16 @@ SECTIONS
__einittext = .;
INIT_DATA
. = ALIGN(0x4) ;
INIT_SETUP(0x4)
___setup_start = .;
*(.init.setup)
. = ALIGN(0x4) ;
___setup_end = .;
___initcall_start = .;
INITCALLS
___initcall_end = .;
___con_initcall_start = .;
*(.con_initcall.init)
___con_initcall_end = .;
INIT_CALLS
CON_INITCALL
EXIT_TEXT
EXIT_DATA
#if defined(CONFIG_BLK_DEV_INITRD)
. = ALIGN(4);
___initramfs_start = .;
*(.init.ramfs)
___initramfs_end = .;
#endif
INIT_RAM_FS
. = ALIGN(0x4) ;
___init_end = .;
__edata = . ;
Expand Down

0 comments on commit eb121d1

Please sign in to comment.