duplicate define section delete.
fix CONFIG_ROMKERNEL.
Signed-off-by: Yoshinori Sato <[email protected]>
diff -Nru a/arch/h8300/kernel/vmlinux.lds.S b/arch/h8300/kernel/vmlinux.lds.S
--- a/arch/h8300/kernel/vmlinux.lds.S 2004-11-13 01:12:50 +09:00
+++ b/arch/h8300/kernel/vmlinux.lds.S 2004-11-13 01:12:50 +09:00
@@ -5,9 +5,9 @@
/* target memory map */
#ifdef CONFIG_H8300H_GENERIC
#define ROMTOP 0x000000
-#define ROMSIZE 0x200000
-#define RAMTOP 0x200000
-#define RAMSIZE 0x200000
+#define ROMSIZE 0x400000
+#define RAMTOP 0x400000
+#define RAMSIZE 0x400000
#endif
#ifdef CONFIG_H8300H_AKI3068NET
@@ -26,16 +26,16 @@
#ifdef CONFIG_H8300H_SIM
#define ROMTOP 0x000000
-#define ROMSIZE 0x200000
-#define RAMTOP 0x200000
-#define RAMSIZE 0x200000
+#define ROMSIZE 0x400000
+#define RAMTOP 0x400000
+#define RAMSIZE 0x400000
#endif
#ifdef CONFIG_H8S_SIM
#define ROMTOP 0x000000
-#define ROMSIZE 0x200000
-#define RAMTOP 0x200000
-#define RAMSIZE 0x200000
+#define ROMSIZE 0x400000
+#define RAMTOP 0x400000
+#define RAMSIZE 0x800000
#endif
#ifdef CONFIG_H8S_EDOSK2674
@@ -51,6 +51,8 @@
_jiffies = _jiffies_64 + 4;
+ENTRY(__start)
+
SECTIONS
{
#if defined(CONFIG_ROMKERNEL)
@@ -81,10 +83,8 @@
___start___ex_table = .;
*(__ex_table)
___stop___ex_table = .;
-
- ___start___ksymtab = .; /* Kernel symbol table */
- *(__ksymtab)
}
+
RODATA
#if defined(CONFIG_ROMKERNEL)
SECURITY_INIT
@@ -143,10 +143,7 @@
#if defined(CONFIG_RAMKERNEL)
SECURITY_INIT
#endif
- __begin_data = LOADADDR(.data) ;
-#if defined(CONFIG_ROMKERNEL)
- __erom = LOADADDR(.data) + SIZEOF(.data) ;
-#endif
+ __begin_data = LOADADDR(.data);
.bss :
{
. = ALIGN(0x4) ;
@@ -162,12 +159,11 @@
/DISCARD/ : {
*(.exitcall.exit)
}
-
.romfs :
{
*(.romfs*)
}
- . = RAMTOP+RAMSIZE;
+ . = RAMTOP+RAMSIZE;
.dummy :
{
COMMAND_START = . - 0x200 ;
--
Yoshinori Sato
<[email protected]>