openrisc: move board linker script(s) to a common in cpu/

Unifies the openrisc boards linker scripts into a common one.

Signed-off-by: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>

diff --git a/arch/openrisc/config.mk b/arch/openrisc/config.mk
index 521e73aae6b599a96d4c9b94b54e9c2b511e599e..01c0f770eaec048b2f454a0c85a1aef5239a0527 100644 (file)
--- a/arch/openrisc/config.mk
+++ b/arch/openrisc/config.mk
@@ -25,3 +25,5 @@ CROSS_COMPILE ?= or32-elf-
 PLATFORM_CPPFLAGS += -DCONFIG_OPENRISC -D__OR1K__ -ffixed-r10
 
 CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000
+
+LDSCRIPT ?= $(SRCTREE)/$(CPUDIR)/u-boot.lds

diff --git a/arch/openrisc/cpu/u-boot.lds b/arch/openrisc/cpu/u-boot.lds
new file mode 100644 (file)
index 0000000..d9bb7b7
--- /dev/null
+++ b/arch/openrisc/cpu/u-boot.lds
@@ -0,0 +1,77 @@
+#include <config.h>
+OUTPUT_ARCH(or32)
+__DYNAMIC  =  0;
+
+MEMORY
+{
+       vectors : ORIGIN = 0, LENGTH = 0x2000
+       ram     : ORIGIN = CONFIG_SYS_MONITOR_BASE,
+                 LENGTH = CONFIG_SYS_MONITOR_LEN
+}
+
+SECTIONS
+{
+       .vectors :
+       {
+               *(.vectors)
+       } > vectors
+
+       __start = .;
+       .text : AT (__start) {
+               _stext = .;
+               *(.text)
+               _etext = .;
+               *(.lit)
+               *(.shdata)
+               _endtext = .;
+       }  > ram
+
+
+        . = ALIGN(4);
+        .u_boot_list : {
+               KEEP(*(SORT(.u_boot_list*)));
+        } > ram
+
+       .rodata : {
+               *(.rodata);
+               *(.rodata.*)
+       } > ram
+
+       .shbss :
+       {
+               *(.shbss)
+       } > ram
+
+       .talias :
+       {
+       }  > ram
+
+       .data : {
+               sdata = .;
+               _sdata = .;
+               *(.data)
+               edata = .;
+               _edata = .;
+       } > ram
+
+       .bss :
+       {
+               _bss_start = .;
+               *(.bss)
+               *(COMMON)
+               _bss_end = .;
+       } > ram
+       __end = .;
+
+       /* No stack specification - done manually */
+
+       .stab  0 (NOLOAD) :
+       {
+               [ .stab ]
+       }
+
+       .stabstr  0 (NOLOAD) :
+       {
+               [ .stabstr ]
+       }
+}

diff --git a/board/openrisc/openrisc-generic/u-boot.lds b/board/openrisc/openrisc-generic/u-boot.lds
deleted file mode 100644 (file)
index d9bb7b7..0000000
--- a/board/openrisc/openrisc-generic/u-boot.lds
+++ /dev/null
@@ -1,77 +0,0 @@
-#include <config.h>
-OUTPUT_ARCH(or32)
-__DYNAMIC  =  0;
-
-MEMORY
-{
-       vectors : ORIGIN = 0, LENGTH = 0x2000
-       ram     : ORIGIN = CONFIG_SYS_MONITOR_BASE,
-                 LENGTH = CONFIG_SYS_MONITOR_LEN
-}
-
-SECTIONS
-{
-       .vectors :
-       {
-               *(.vectors)
-       } > vectors
-
-       __start = .;
-       .text : AT (__start) {
-               _stext = .;
-               *(.text)
-               _etext = .;
-               *(.lit)
-               *(.shdata)
-               _endtext = .;
-       }  > ram
-
-
-        . = ALIGN(4);
-        .u_boot_list : {
-               KEEP(*(SORT(.u_boot_list*)));
-        } > ram
-
-       .rodata : {
-               *(.rodata);
-               *(.rodata.*)
-       } > ram
-
-       .shbss :
-       {
-               *(.shbss)
-       } > ram
-
-       .talias :
-       {
-       }  > ram
-
-       .data : {
-               sdata = .;
-               _sdata = .;
-               *(.data)
-               edata = .;
-               _edata = .;
-       } > ram
-
-       .bss :
-       {
-               _bss_start = .;
-               *(.bss)
-               *(COMMON)
-               _bss_end = .;
-       } > ram
-       __end = .;
-
-       /* No stack specification - done manually */
-
-       .stab  0 (NOLOAD) :
-       {
-               [ .stab ]
-       }
-
-       .stabstr  0 (NOLOAD) :
-       {
-               [ .stabstr ]
-       }
-}