Commit 27bd98a6 authored by Yoshinori Sato's avatar Yoshinori Sato Committed by Linus Torvalds

[PATCH] H8/300: vmlinux.lds.S update

- duplicate define section delete.

- fix CONFIG_ROMKERNEL.
Signed-off-by: default avatarYoshinori Sato <ysato@users.sourceforge.jp>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f282549a
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
/* target memory map */ /* target memory map */
#ifdef CONFIG_H8300H_GENERIC #ifdef CONFIG_H8300H_GENERIC
#define ROMTOP 0x000000 #define ROMTOP 0x000000
#define ROMSIZE 0x200000 #define ROMSIZE 0x400000
#define RAMTOP 0x200000 #define RAMTOP 0x400000
#define RAMSIZE 0x200000 #define RAMSIZE 0x400000
#endif #endif
#ifdef CONFIG_H8300H_AKI3068NET #ifdef CONFIG_H8300H_AKI3068NET
...@@ -26,16 +26,16 @@ ...@@ -26,16 +26,16 @@
#ifdef CONFIG_H8300H_SIM #ifdef CONFIG_H8300H_SIM
#define ROMTOP 0x000000 #define ROMTOP 0x000000
#define ROMSIZE 0x200000 #define ROMSIZE 0x400000
#define RAMTOP 0x200000 #define RAMTOP 0x400000
#define RAMSIZE 0x200000 #define RAMSIZE 0x400000
#endif #endif
#ifdef CONFIG_H8S_SIM #ifdef CONFIG_H8S_SIM
#define ROMTOP 0x000000 #define ROMTOP 0x000000
#define ROMSIZE 0x200000 #define ROMSIZE 0x400000
#define RAMTOP 0x200000 #define RAMTOP 0x400000
#define RAMSIZE 0x200000 #define RAMSIZE 0x800000
#endif #endif
#ifdef CONFIG_H8S_EDOSK2674 #ifdef CONFIG_H8S_EDOSK2674
...@@ -51,6 +51,8 @@ INPUT(romfs.o) ...@@ -51,6 +51,8 @@ INPUT(romfs.o)
_jiffies = _jiffies_64 + 4; _jiffies = _jiffies_64 + 4;
ENTRY(__start)
SECTIONS SECTIONS
{ {
#if defined(CONFIG_ROMKERNEL) #if defined(CONFIG_ROMKERNEL)
...@@ -81,6 +83,7 @@ SECTIONS ...@@ -81,6 +83,7 @@ SECTIONS
___start___ex_table = .; ___start___ex_table = .;
*(__ex_table) *(__ex_table)
___stop___ex_table = .; ___stop___ex_table = .;
}
RODATA RODATA
#if defined(CONFIG_ROMKERNEL) #if defined(CONFIG_ROMKERNEL)
...@@ -140,10 +143,7 @@ SECTIONS ...@@ -140,10 +143,7 @@ SECTIONS
#if defined(CONFIG_RAMKERNEL) #if defined(CONFIG_RAMKERNEL)
SECURITY_INIT SECURITY_INIT
#endif #endif
__begin_data = LOADADDR(.data) ; __begin_data = LOADADDR(.data);
#if defined(CONFIG_ROMKERNEL)
__erom = LOADADDR(.data) + SIZEOF(.data) ;
#endif
.bss : .bss :
{ {
. = ALIGN(0x4) ; . = ALIGN(0x4) ;
...@@ -159,12 +159,11 @@ SECTIONS ...@@ -159,12 +159,11 @@ SECTIONS
/DISCARD/ : { /DISCARD/ : {
*(.exitcall.exit) *(.exitcall.exit)
} }
.romfs : .romfs :
{ {
*(.romfs*) *(.romfs*)
} }
. = RAMTOP+RAMSIZE; . = RAMTOP+RAMSIZE;
.dummy : .dummy :
{ {
COMMAND_START = . - 0x200 ; COMMAND_START = . - 0x200 ;
......
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