From a5bded78f458324c76f82d36dcc0d2c262371830 Mon Sep 17 00:00:00 2001
From: ryuz <ryuz@users.sourceforge.jp>
Date: Wed, 6 Apr 2011 00:13:30 +0900
Subject: [PATCH] modify linker scripts

---
 aplfw/sample/arm/utb_arm7at91/gcc/link.lds   | 12 ++++++------
 aplfw/sample/mips/jelly/gcc/ram.lds          | 12 ++++++------
 aplfw/sample/mips/jelly/gcc/rom.lds          | 12 ++++++------
 aplfw/sample/mn103/mn103sfa5k/gcc/link.lds   | 12 ++++++------
 aplfw/sample/sh/cq7144a/gcc/link_ext.lds     | 12 ++++++------
 aplfw/sample/sh/cq7144a/gcc/link_rom.lds     | 12 ++++++------
 kernel/include/arch/irc/mb/axi_intc/ircatr.h |  2 +-
 sample/arm/aduc7000/gcc/link.lds             | 12 ++++++------
 sample/arm/lpc2000/gcc/link.lds              | 12 ++++++------
 sample/arm/lpc2000/gcc/linkext.lds           | 12 ++++++------
 sample/mips/jelly/gcc/ram.lds                | 12 ++++++------
 11 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/aplfw/sample/arm/utb_arm7at91/gcc/link.lds b/aplfw/sample/arm/utb_arm7at91/gcc/link.lds
index 5a7f072..c73636f 100755
--- a/aplfw/sample/arm/utb_arm7at91/gcc/link.lds
+++ b/aplfw/sample/arm/utb_arm7at91/gcc/link.lds
@@ -4,8 +4,8 @@ ENTRY(_reset_handler)
 MEMORY
 {
 	vector : o = 0x20000000, l = 0x00000040
-	rom    : o = 0x20000040, l = 0x000fffc0
-	ram    : o = 0x20100000, l = 0x00100000
+	ro     : o = 0x20000040, l = 0x000fffc0
+	rw     : o = 0x20100000, l = 0x00100000
 }
 
 SECTIONS
@@ -25,7 +25,7 @@ SECTIONS
 		*(.rodata*)
 		*(.glue*)
 		 ___text_end = . ; 
-	}  > rom
+	} > ro
 	.tors :
 	{
 		. = ALIGN(4);
@@ -35,20 +35,20 @@ SECTIONS
 		___dtors = . ;
 		*(.dtors)
 		___dtors_end = . ;
-	} > rom
+	} > ro
 	data : AT (ADDR(.tors) + SIZEOF(.tors))
 	{
 	    ___data_rom = ADDR(.tors) + SIZEOF(.tors);
 		___data = . ;
 		*(.data)
 		___data_end = . ;
-	} > ram
+	} > rw
 	.bss :
 	{
 		___bss = . ;
 		*(.bss)
 		*(COMMON)
 		___bss_end = . ;  
-	}  >ram
+	} > rw
 }
 
diff --git a/aplfw/sample/mips/jelly/gcc/ram.lds b/aplfw/sample/mips/jelly/gcc/ram.lds
index 6b83cc9..2ee0a97 100755
--- a/aplfw/sample/mips/jelly/gcc/ram.lds
+++ b/aplfw/sample/mips/jelly/gcc/ram.lds
@@ -3,8 +3,8 @@ ENTRY(_reset_handler)
 
 MEMORY
 {
-	rom    : o = 0x00000000, l = 0x00020000
-	ram    : o = 0x00020000, l = 0x000e0000
+	ro    : o = 0x00000000, l = 0x00020000
+	rw    : o = 0x00020000, l = 0x000e0000
 }
 
 SECTIONS
@@ -18,7 +18,7 @@ SECTIONS
 		*(.rodata*)
 		*(.glue*)
 		 ___text_end = . ; 
-	}  > rom
+	}  > ro
 	.tors :
 	{
 		. = ALIGN(4);
@@ -28,7 +28,7 @@ SECTIONS
 		___dtors = . ;
 		*(.dtors)
 		___dtors_end = . ;
-	} > rom
+	} > ro
 	data : AT (ADDR(.tors) + SIZEOF(.tors))
 	{
 	    ___data_rom = ADDR(.tors) + SIZEOF(.tors);
@@ -38,7 +38,7 @@ SECTIONS
 		*(.sdata)
 		*(.eh_frame)
 		___data_end = . ;
-	} > ram
+	} > rw
 	.bss :
 	{
 		___bss = . ;
@@ -47,6 +47,6 @@ SECTIONS
 		*(COMMON)
 		*(.scommon)
 		___bss_end = . ;  
-	} > ram
+	} > rw
 }
 
diff --git a/aplfw/sample/mips/jelly/gcc/rom.lds b/aplfw/sample/mips/jelly/gcc/rom.lds
index f8dd150..cfca258 100755
--- a/aplfw/sample/mips/jelly/gcc/rom.lds
+++ b/aplfw/sample/mips/jelly/gcc/rom.lds
@@ -3,8 +3,8 @@ ENTRY(_reset_handler)
 
 MEMORY
 {
-	rom    : o = 0x00000000, l = 0x00010000
-	ram    : o = 0x01000000, l = 0x00100000
+	ro    : o = 0x00000000, l = 0x00010000
+	ra    : o = 0x01000000, l = 0x00100000
 }
 
 SECTIONS
@@ -18,7 +18,7 @@ SECTIONS
 		*(.rodata*)
 		*(.glue*)
 		 ___text_end = . ; 
-	}  > rom
+	} > ro
 	.tors :
 	{
 		. = ALIGN(4);
@@ -28,7 +28,7 @@ SECTIONS
 		___dtors = . ;
 		*(.dtors)
 		___dtors_end = . ;
-	} > rom
+	} > ro
 	data : AT (ADDR(.tors) + SIZEOF(.tors))
 	{
 	    ___data_rom = ADDR(.tors) + SIZEOF(.tors);
@@ -38,7 +38,7 @@ SECTIONS
 		*(.sdata)
 		*(.eh_frame)
 		___data_end = . ;
-	} > ram
+	} > rw
 	.bss :
 	{
 		___bss = . ;
@@ -47,6 +47,6 @@ SECTIONS
 		*(COMMON)
 		*(.scommon)
 		___bss_end = . ;  
-	}  >ram
+	} > rw
 }
 
diff --git a/aplfw/sample/mn103/mn103sfa5k/gcc/link.lds b/aplfw/sample/mn103/mn103sfa5k/gcc/link.lds
index 2e331cd..51f2901 100755
--- a/aplfw/sample/mn103/mn103sfa5k/gcc/link.lds
+++ b/aplfw/sample/mn103/mn103sfa5k/gcc/link.lds
@@ -3,8 +3,8 @@ ENTRY(_reset_handler)
 
 MEMORY
 {
-	ram    : o = 0x00000004, l = 0x00001ffc
-	rom    : o = 0x40000000, l = 0x00040000
+	rw    : o = 0x00000004, l = 0x00001ffc
+	ro    : o = 0x40000000, l = 0x00040000
 }
 
 SECTIONS
@@ -17,7 +17,7 @@ SECTIONS
 		*(.rodata*)
 		*(.glue*)
 		 ___text_end = . ; 
-	}  > rom
+	}  > ro
 	.tors :
 	{
 		. = ALIGN(4);
@@ -27,20 +27,20 @@ SECTIONS
 		___dtors = . ;
 		*(.dtors)
 		___dtors_end = . ;
-	} > rom
+	} > ro
 	data : AT (ADDR(.tors) + SIZEOF(.tors))
 	{
 	    ___data_rom = ADDR(.tors) + SIZEOF(.tors);
 		___data = . ;
 		*(.data)
 		___data_end = . ;
-	} > ram
+	} > rw
 	.bss :
 	{
 		___bss = . ;
 		*(.bss)
 		*(COMMON)
 		___bss_end = . ;  
-	}  >ram
+	} > rw
 }
 
diff --git a/aplfw/sample/sh/cq7144a/gcc/link_ext.lds b/aplfw/sample/sh/cq7144a/gcc/link_ext.lds
index 7fa93a7..713d361 100755
--- a/aplfw/sample/sh/cq7144a/gcc/link_ext.lds
+++ b/aplfw/sample/sh/cq7144a/gcc/link_ext.lds
@@ -4,8 +4,8 @@ ENTRY(_reset_handler)
 MEMORY
 {
 	vector : o = 0x400000, l = 0x00400
-	rom    : o = 0x400400, l = 0x0fc00
-	ram    : o = 0x410000, l = 0x10000
+	ro     : o = 0x400400, l = 0x0fc00
+	rw     : o = 0x410000, l = 0x10000
 }
 
 SECTIONS
@@ -24,7 +24,7 @@ SECTIONS
 		*(.strings)
 		*(.rodata*)
 		 ___text_end = . ; 
-	}  > rom
+	} > ro
 	.tors :
 	{
 		. = ALIGN(4);
@@ -34,20 +34,20 @@ SECTIONS
 		___dtors = . ;
 		*(.dtors)
 		___dtors_end = . ;
-	} > rom
+	} > ro
 	data : AT (ADDR(.tors) + SIZEOF(.tors))
 	{
 	    ___data_rom = ADDR(.tors) + SIZEOF(.tors);
 		___data = . ;
 		*(.data)
 		___data_end = . ;
-	} > ram
+	} > rw
 	.bss :
 	{
 		___bss = . ;
 		*(.bss)
 		*(COMMON)
 		___bss_end = . ;  
-	}  >ram
+	} > rw
 }
 
diff --git a/aplfw/sample/sh/cq7144a/gcc/link_rom.lds b/aplfw/sample/sh/cq7144a/gcc/link_rom.lds
index c95f9c1..a5a72e1 100755
--- a/aplfw/sample/sh/cq7144a/gcc/link_rom.lds
+++ b/aplfw/sample/sh/cq7144a/gcc/link_rom.lds
@@ -4,8 +4,8 @@ ENTRY(_reset_handler)
 MEMORY
 {
 	vector : o = 0x0000000, l = 0x00400
-	rom    : o = 0x0000400, l = 0x3fc00
-	ram    : o = 0x0040000, l = 0x80000
+	ro     : o = 0x0000400, l = 0x3fc00
+	rw     : o = 0x0040000, l = 0x80000
 }
 
 SECTIONS
@@ -24,7 +24,7 @@ SECTIONS
 		*(.strings)
 		*(.rodata*)
 		 ___text_end = . ; 
-	}  > rom
+	} > ro
 	.tors :
 	{
 		. = ALIGN(4);
@@ -34,21 +34,21 @@ SECTIONS
 		___dtors = . ;
 		*(.dtors)
 		___dtors_end = . ;
-	} > rom
+	} > ro
 	data : AT (ADDR(.tors) + SIZEOF(.tors))
 	{
 	    ___data_rom = ADDR(.tors) + SIZEOF(.tors);
 		___data = . ;
 		*(.data)
 		___data_end = . ;
-	} > ram
+	} > rw
 	.bss :
 	{
 		___bss = . ;
 		*(.bss)
 		*(COMMON)
 		___bss_end = . ;  
-	}  >ram
+	}  >rw
 }
 
 
diff --git a/kernel/include/arch/irc/mb/axi_intc/ircatr.h b/kernel/include/arch/irc/mb/axi_intc/ircatr.h
index 9831d30..5088016 100644
--- a/kernel/include/arch/irc/mb/axi_intc/ircatr.h
+++ b/kernel/include/arch/irc/mb/axi_intc/ircatr.h
@@ -17,7 +17,7 @@
 
 #define _KERNEL_IRCATR_IRC					TRUE		/**< %jp{IRCの有無} */
 #define _KERNEL_IRCATR_REG_BASE				TRUE		/**< %jp{IRCレジスタベースアドレスの有無} */
-#define _KERNEL_IRCATR_REG_BASE_DEF			0x00000000	/**< %jp{デフォルトのIRCレジスタベースアドレス} */
+#define _KERNEL_IRCATR_REG_BASE_DEF			0x41200000	/**< %jp{デフォルトのIRCレジスタベースアドレス} */
 
 #define _KERNEL_IRCATR_TMIN_INTNO			0			/**< %jp{割込み番号の最小値} */
 #define _KERNEL_IRCATR_TMAX_INTNO			31			/**< %jp{割込み番号の最大値} */
diff --git a/sample/arm/aduc7000/gcc/link.lds b/sample/arm/aduc7000/gcc/link.lds
index e84cc12..ffc3990 100755
--- a/sample/arm/aduc7000/gcc/link.lds
+++ b/sample/arm/aduc7000/gcc/link.lds
@@ -4,8 +4,8 @@ ENTRY(_reset_handler)
 MEMORY
 {
 	vector : o = 0x00000000, l = 0x00000040
-	rom    : o = 0x00000040, l = 0x0000ffc0
-	ram    : o = 0x00010000, l = 0x00002000
+	ro     : o = 0x00000040, l = 0x0000ffc0
+	rw     : o = 0x00010000, l = 0x00002000
 }
 
 SECTIONS
@@ -25,7 +25,7 @@ SECTIONS
 		*(.rodata*)
 		*(.glue*)
 		 ___text_end = . ; 
-	}  > rom
+	}  > ro
 	.tors :
 	{
 		. = ALIGN(4);
@@ -35,20 +35,20 @@ SECTIONS
 		___dtors = . ;
 		*(.dtors)
 		___dtors_end = . ;
-	} > rom
+	} > ro
 	data : AT (ADDR(.tors) + SIZEOF(.tors))
 	{
 	    ___data_rom = ADDR(.tors) + SIZEOF(.tors);
 		___data = . ;
 		*(.data)
 		___data_end = . ;
-	} > ram
+	} > rw
 	.bss :
 	{
 		___bss = . ;
 		*(.bss)
 		*(COMMON)
 		___bss_end = . ;  
-	}  >ram
+	} > rw
 }
 
diff --git a/sample/arm/lpc2000/gcc/link.lds b/sample/arm/lpc2000/gcc/link.lds
index 24f4b63..369422c 100755
--- a/sample/arm/lpc2000/gcc/link.lds
+++ b/sample/arm/lpc2000/gcc/link.lds
@@ -4,8 +4,8 @@ ENTRY(_reset_handler)
 MEMORY
 {
 	vector : o = 0x00000000, l = 0x00000040
-	rom    : o = 0x00000040, l = 0x0000ffc0
-	ram    : o = 0x40000000, l = 0x00004000
+	ro     : o = 0x00000040, l = 0x0000ffc0
+	rw     : o = 0x40000000, l = 0x00004000
 }
 
 SECTIONS
@@ -25,7 +25,7 @@ SECTIONS
 		*(.rodata*)
 		*(.glue*)
 		 ___text_end = . ; 
-	}  > rom
+	} > ro
 	.tors :
 	{
 		. = ALIGN(4);
@@ -35,20 +35,20 @@ SECTIONS
 		___dtors = . ;
 		*(.dtors)
 		___dtors_end = . ;
-	} > rom
+	} > ro
 	data : AT (ADDR(.tors) + SIZEOF(.tors))
 	{
 	    ___data_rom = ADDR(.tors) + SIZEOF(.tors);
 		___data = . ;
 		*(.data)
 		___data_end = . ;
-	} > ram
+	} > rw
 	.bss :
 	{
 		___bss = . ;
 		*(.bss)
 		*(COMMON)
 		___bss_end = . ;  
-	}  >ram
+	} > rw
 }
 
diff --git a/sample/arm/lpc2000/gcc/linkext.lds b/sample/arm/lpc2000/gcc/linkext.lds
index 466bea7..1210ac6 100755
--- a/sample/arm/lpc2000/gcc/linkext.lds
+++ b/sample/arm/lpc2000/gcc/linkext.lds
@@ -4,8 +4,8 @@ ENTRY(_reset_handler)
 MEMORY
 {
 	vector : o = 0x80000000, l = 0x00000040
-	rom    : o = 0x80000040, l = 0x0000ffc0
-	ram    : o = 0x80010000, l = 0x00002000
+	ro     : o = 0x80000040, l = 0x0000ffc0
+	rw     : o = 0x80010000, l = 0x00002000
 }
 
 SECTIONS
@@ -25,7 +25,7 @@ SECTIONS
 		*(.rodata*)
 		*(.glue*)
 		 ___text_end = . ; 
-	}  > rom
+	} > ro
 	.tors :
 	{
 		. = ALIGN(4);
@@ -35,20 +35,20 @@ SECTIONS
 		___dtors = . ;
 		*(.dtors)
 		___dtors_end = . ;
-	} > rom
+	} > ro
 	data : AT (ADDR(.tors) + SIZEOF(.tors))
 	{
 	    ___data_rom = ADDR(.tors) + SIZEOF(.tors);
 		___data = . ;
 		*(.data)
 		___data_end = . ;
-	} > ram
+	} > rw
 	.bss :
 	{
 		___bss = . ;
 		*(.bss)
 		*(COMMON)
 		___bss_end = . ;  
-	}  >ram
+	} > rw
 }
 
diff --git a/sample/mips/jelly/gcc/ram.lds b/sample/mips/jelly/gcc/ram.lds
index d900edb..814a981 100755
--- a/sample/mips/jelly/gcc/ram.lds
+++ b/sample/mips/jelly/gcc/ram.lds
@@ -3,8 +3,8 @@ ENTRY(_reset_handler)
 
 MEMORY
 {
-	rom    : o = 0x00000000, l = 0x00010000
-	ram    : o = 0x00010000, l = 0x00001000
+	ro  : o = 0x00000000, l = 0x00010000
+	rw  : o = 0x00010000, l = 0x00001000
 }
 
 SECTIONS
@@ -18,7 +18,7 @@ SECTIONS
 		*(.rodata*)
 		*(.glue*)
 		 ___text_end = . ; 
-	}  > rom
+	} > ro
 	.tors :
 	{
 		. = ALIGN(4);
@@ -28,7 +28,7 @@ SECTIONS
 		___dtors = . ;
 		*(.dtors)
 		___dtors_end = . ;
-	} > rom
+	} > ro
 	.data : AT (ADDR(.tors) + SIZEOF(.tors))
 	{
 	    ___data_rom = ADDR(.tors) + SIZEOF(.tors);
@@ -37,7 +37,7 @@ SECTIONS
 		_gp = ALIGN(16) + 0x7ff0;
 		*(.sdata)
 		___data_end = . ;
-	} > ram
+	} > rw
 	.bss :
 	{
 		___bss = . ;
@@ -46,6 +46,6 @@ SECTIONS
 		*(COMMON)
 		*(.scommon)
 		___bss_end = . ;  
-	} > ram
+	} > rw
 }
 
-- 
2.11.0