[PATCH] Changes to v850 platform linker-script fragments

This does two things:

 (1) Move the v850 platform-specific linker-script fragments into
     arch/v850/kernel, from arch/v850.  This move was prompted by a
     recent (all-architecture) move for vmlinux.lds.S, to keep the
     script together, but I think it also makes sense -- this way, all
     platform-specific non-header files are in the same directory with
     similar names.

 (2) Remove some hardwired constants in the linker script fragments,
     using already defined cpp macros anyway.  This eliminates one
     annoying source of duplicate definitions (which had to be kept in
     sync).

arch/v850/anna-rom.ld → arch/v850/kernel/anna-rom.ld

@@ -6,9 +6,9 @@ MEMORY {
 	ROM   : ORIGIN = 0,          LENGTH = 0x00800000
 
 	/* 1MB of static RAM.  This memory is mirrored 64 times.  */
-	SRAM  : ORIGIN = 0x04000000, LENGTH = 0x00100000
+	SRAM  : ORIGIN = SRAM_ADDR,  LENGTH = SRAM_SIZE
 	/* 64MB of DRAM.  */
-	SDRAM : ORIGIN = 0x08000000, LENGTH = 0x04000000
+	SDRAM : ORIGIN = SDRAM_ADDR, LENGTH = SDRAM_SIZE
 }
 
 SECTIONS {

arch/v850/anna.ld → arch/v850/kernel/anna.ld

@@ -3,14 +3,14 @@
 
 MEMORY {
 	/* 256KB of internal memory (followed by one mirror).  */
-	iMEM0 : ORIGIN = 0,	    LENGTH = 0x00040000
+	iMEM0 : ORIGIN = 0,	     LENGTH = 0x00040000
 	/* 256KB of internal memory (followed by one mirror).  */
 	iMEM1 : ORIGIN = 0x00040000, LENGTH = 0x00040000
 
 	/* 1MB of static RAM.  This memory is mirrored 64 times.  */
-	SRAM  : ORIGIN = 0x04000000, LENGTH = 0x00100000
+	SRAM  : ORIGIN = SRAM_ADDR,  LENGTH = SRAM_SIZE
 	/* 64MB of DRAM.  */
-	SDRAM : ORIGIN = 0x08000000, LENGTH = 0x04000000
+	SDRAM : ORIGIN = SDRAM_ADDR, LENGTH = SDRAM_SIZE
 }
 
 SECTIONS {

arch/v850/as85ep1-rom.ld → arch/v850/kernel/as85ep1-rom.ld

@@ -6,14 +6,14 @@ MEMORY {
 	ROM   : ORIGIN = 0,          LENGTH = 0x00400000
 
 	/* 1MB of static RAM.  */
-	SRAM  : ORIGIN = 0x00400000, LENGTH = 0x00100000
+	SRAM  : ORIGIN = SRAM_ADDR,  LENGTH = SRAM_SIZE
 
 	/* About 58MB of DRAM.  This can actually be at one of two
 	   positions, determined by jumper JP3; we have to use the first
 	   position because the second is partially out of processor
 	   instruction addressing range (though in the second position
 	   there's actually 64MB available).  */
-	SDRAM : ORIGIN = 0x00600000, LENGTH = 0x039F8000
+	SDRAM : ORIGIN = SDRAM_ADDR, LENGTH = SDRAM_SIZE
 }
 
 SECTIONS {

arch/v850/as85ep1.ld → arch/v850/kernel/as85ep1.ld

@@ -2,18 +2,18 @@
    (CONFIG_V850E_AS85EP1).  */
 
 MEMORY {
-	/* 1MB of internal memory ($BFbB"L?Na(BRAM).  */
-	iMEM0 : ORIGIN = 0,	    LENGTH = 0x00100000
+	/* 1MB of internal memory (Æâ¢̿ÎáRAM).  */
+	iMEM0 : ORIGIN = 0,	     LENGTH = 0x00100000
 
 	/* 1MB of static RAM.  */
-	SRAM  : ORIGIN = 0x00400000, LENGTH = 0x00100000
+	SRAM  : ORIGIN = SRAM_ADDR,  LENGTH = SRAM_SIZE
 
 	/* About 58MB of DRAM.  This can actually be at one of two
 	   positions, determined by jump JP3; we have to use the first
 	   position because the second is partially out of processor
 	   instruction addressing range (though in the second position
 	   there's actually 64MB available).  */
-	SDRAM : ORIGIN = 0x00600000, LENGTH = 0x039F8000
+	SDRAM : ORIGIN = SDRAM_ADDR, LENGTH = SDRAM_SIZE
 }
 
 SECTIONS {

arch/v850/rte_ma1_cb-rom.ld → arch/v850/kernel/rte_ma1_cb-rom.ld

@@ -4,9 +4,9 @@
 MEMORY {
 	ROM   : ORIGIN = 0x00000000, LENGTH = 0x00100000
 	/* 1MB of SRAM.  This memory is mirrored 4 times.  */
-	SRAM  : ORIGIN = 0x00400000, LENGTH = 0x00100000
+	SRAM  : ORIGIN = SRAM_ADDR,  LENGTH = SRAM_SIZE
 	/* 32MB of SDRAM.  */
-	SDRAM : ORIGIN = 0x00800000, LENGTH = 0x02000000
+	SDRAM : ORIGIN = SDRAM_ADDR, LENGTH = SDRAM_SIZE
 }
 
 SECTIONS {

arch/v850/rte_ma1_cb.ld → arch/v850/kernel/rte_ma1_cb.ld

@@ -4,11 +4,11 @@
 MEMORY {
 	/* 1MB of SRAM; we can't use the last 32KB, because it's used by
 	   the monitor scratch-RAM.  This memory is mirrored 4 times.  */
-	SRAM  : ORIGIN = 0x00400000, LENGTH = 0x000F8000
+	SRAM  : ORIGIN = SRAM_ADDR,  LENGTH = (SRAM_SIZE - MON_SCRATCH_SIZE)
 	/* Monitor scratch RAM; only the interrupt vectors should go here.  */
-	MRAM  : ORIGIN = 0x004F8000, LENGTH = 0x00008000
+	MRAM  : ORIGIN = MON_SCRATCH_ADDR,  LENGTH = MON_SCRATCH_SIZE
 	/* 32MB of SDRAM.  */
-	SDRAM : ORIGIN = 0x00800000, LENGTH = 0x02000000
+	SDRAM : ORIGIN = SDRAM_ADDR, LENGTH = SDRAM_SIZE
 }
 
 #ifdef CONFIG_RTE_CB_MA1_KSRAM

arch/v850/rte_me2_cb.ld → arch/v850/kernel/rte_me2_cb.ld

@@ -4,9 +4,9 @@
 MEMORY {
 	/* 128Kbyte of IRAM */
 	IRAM : ORIGIN = 0x00000000, LENGTH = 0x00020000
-	
+
 	/* 32MB of SDRAM.  */
-	SDRAM : ORIGIN = 0x00800000, LENGTH = 0x02000000
+	SDRAM : ORIGIN = SDRAM_ADDR, LENGTH = SDRAM_SIZE
 }
 
 #define KRAM SDRAM

arch/v850/rte_nb85e_cb-multi.ld → arch/v850/kernel/rte_nb85e_cb-multi.ld

@@ -4,11 +4,11 @@
 MEMORY {
 	/* 1MB of SRAM; we can't use the last 96KB, because it's used by
 	   the monitor scratch-RAM.  This memory is mirrored 4 times.  */
-	SRAM  : ORIGIN = 0x03C00000, LENGTH = 0x000E8000
+	SRAM  : ORIGIN = SRAM_ADDR,  LENGTH = (SRAM_SIZE - MON_SCRATCH_SIZE)
 	/* Monitor scratch RAM; only the interrupt vectors should go here.  */
-	MRAM  : ORIGIN = 0x03CE8000, LENGTH = 0x00018000
+	MRAM  : ORIGIN = MON_SCRATCH_ADDR,  LENGTH = MON_SCRATCH_SIZE
 	/* 16MB of SDRAM.  */
-	SDRAM : ORIGIN = 0x01000000, LENGTH = 0x01000000
+	SDRAM : ORIGIN = SDRAM_ADDR, LENGTH = SDRAM_SIZE
 }
 
 #ifdef CONFIG_RTE_CB_NB85E_KSRAM

arch/v850/rte_nb85e_cb.ld → arch/v850/kernel/rte_nb85e_cb.ld

@@ -3,13 +3,10 @@
 
 MEMORY {
 	LOW   : ORIGIN = 0x0,	     LENGTH = 0x00100000
-	/* 1MB of SRAM; we can't use the last 96KB, because it's used by
-	   the monitor scratch-RAM.  This memory is mirrored 4 times.  */
-	SRAM  : ORIGIN = 0x03C00000, LENGTH = 0x000E8000
-	/* Monitor scratch RAM; only the interrupt vectors should go here.  */
-	MRAM  : ORIGIN = 0x03CE8000, LENGTH = 0x00018000
+	/* 1MB of SRAM  This memory is mirrored 4 times.  */
+	SRAM  : ORIGIN = SRAM_ADDR,  LENGTH = SRAM_SIZE
 	/* 16MB of SDRAM.  */
-	SDRAM : ORIGIN = 0x01000000, LENGTH = 0x01000000
+	SDRAM : ORIGIN = SDRAM_ADDR, LENGTH = SDRAM_SIZE
 }
 
 #ifdef CONFIG_RTE_CB_NB85E_KSRAM

arch/v850/sim.ld → arch/v850/kernel/sim.ld

@@ -3,9 +3,8 @@
 MEMORY {
 	/* Interrupt vectors.  */
 	INTV  : ORIGIN = 0x0, LENGTH = 0xe0
-	/* 16MB of RAM.
-	   This must match RAM_ADDR and RAM_SIZE in include/asm-v850/sim.h  */
-	RAM   : ORIGIN = 0x8F000000, LENGTH = 0x01000000
+	/* Main RAM.  */
+	RAM   : ORIGIN = RAM_ADDR, LENGTH = RAM_SIZE
 }
 
 SECTIONS {

arch/v850/sim85e2.ld → arch/v850/kernel/sim85e2.ld

@@ -3,26 +3,18 @@
 
 MEMORY {
 	/* 1MB of `instruction RAM', starting at 0.
-	   Instruction fetches are much faster from IRAM than from DRAM.
-	   This should match IRAM_ADDR in "include/asm-v580/sim85e2c.h".    */
-	IRAM		: ORIGIN = 0x00000000, LENGTH = 0x00100000
+	   Instruction fetches are much faster from IRAM than from DRAM.  */
+	IRAM : ORIGIN = IRAM_ADDR, LENGTH = IRAM_SIZE
 
 	/* 1MB of `data RAM', below and contiguous with the I/O space.
-	   Data fetches are much faster from DRAM than from IRAM.
-	   This should match DRAM_ADDR in "include/asm-v580/sim85e2c.h".  */
-	DRAM		: ORIGIN = 0xfff00000, LENGTH = 0x000ff000
-	/* We have to load DRAM at a mirror-address of 0x1ff00000,
-	   because the simulator's preprocessing script isn't smart
-	   enough to deal with the above LMA.  */
-	DRAM_LOAD 	: ORIGIN = 0x1ff00000, LENGTH = 0x000ff000
+	   Data fetches are much faster from DRAM than from IRAM.  */
+	DRAM : ORIGIN = DRAM_ADDR, LENGTH = DRAM_SIZE
 
-	/* `external ram' (CS1 area), comes after IRAM.
-	   This should match ERAM_ADDR in "include/asm-v580/sim85e2c.h".  */
-	ERAM		: ORIGIN = 0x00100000, LENGTH = 0x07f00000
+	/* `external ram' (CS1 area), comes after IRAM.  */
+	ERAM : ORIGIN = ERAM_ADDR, LENGTH = ERAM_SIZE
 
 	/* Dynamic RAM; uses memory controller.  */
-	/* SDRAM	: ORIGIN = 0x10000000, LENGTH = 0x01000000 */
-	SDRAM		: ORIGIN = 0x10000000, LENGTH = 0x00200000/*use 2MB*/
+	SDRAM : ORIGIN = SDRAM_ADDR, LENGTH = SDRAM_SIZE
 }
 
 SECTIONS {

arch/v850/kernel/vmlinux.lds.S

@@ -14,6 +14,9 @@
 #include <linux/config.h>
 #include <asm-generic/vmlinux.lds.h>
 
+/* For most platforms, this will define useful things like RAM addr/size.  */
+#include <asm/machdep.h>
+
 
 /* The following macros contain the usual definitions for various data areas.
    The prefix `RAMK_' is used to indicate macros suitable for kernels loaded