From f204e31070ee8e185ba6a75c0b103cb82661a52c Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Tue, 12 Nov 2013 10:28:54 +0100
Subject: bsp/leon3: Enable linker script variants

---
 c/src/lib/libbsp/sparc/leon3/Makefile.am            |  4 +++-
 c/src/lib/libbsp/sparc/leon3/configure.ac           |  1 +
 c/src/lib/libbsp/sparc/leon3/preinstall.am          | 10 +++++++---
 c/src/lib/libbsp/sparc/leon3/startup/linkcmds       | 20 --------------------
 c/src/lib/libbsp/sparc/leon3/startup/linkcmds.leon3 | 20 ++++++++++++++++++++
 5 files changed, 31 insertions(+), 24 deletions(-)
 delete mode 100644 c/src/lib/libbsp/sparc/leon3/startup/linkcmds
 create mode 100644 c/src/lib/libbsp/sparc/leon3/startup/linkcmds.leon3

diff --git a/c/src/lib/libbsp/sparc/leon3/Makefile.am b/c/src/lib/libbsp/sparc/leon3/Makefile.am
index 8b21893fc7..f34bb1779f 100644
--- a/c/src/lib/libbsp/sparc/leon3/Makefile.am
+++ b/c/src/lib/libbsp/sparc/leon3/Makefile.am
@@ -23,7 +23,9 @@ noinst_LIBRARIES = libbspstart.a
 libbspstart_a_SOURCES = ../../sparc/shared/start.S
 project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds ../shared/startup/linkcmds.base
+dist_project_lib_DATA += ../shared/startup/linkcmds.base
+dist_project_lib_DATA += startup/linkcmds
+dist_project_lib_DATA += startup/linkcmds.leon3
 
 noinst_LIBRARIES += libbsp.a
 libbsp_a_SOURCES =
diff --git a/c/src/lib/libbsp/sparc/leon3/configure.ac b/c/src/lib/libbsp/sparc/leon3/configure.ac
index fc049d3f62..dbefd3e8f2 100644
--- a/c/src/lib/libbsp/sparc/leon3/configure.ac
+++ b/c/src/lib/libbsp/sparc/leon3/configure.ac
@@ -38,6 +38,7 @@ RTEMS_BSPOPTS_HELP([BSP_LEON3_SMP],
  determining the CPU core number in an SMP configuration.])
 
 RTEMS_BSP_CLEANUP_OPTIONS(0, 1)
+RTEMS_BSP_LINKCMDS
 
 # Explicitly list all Makefiles here
 AC_CONFIG_FILES([Makefile])
diff --git a/c/src/lib/libbsp/sparc/leon3/preinstall.am b/c/src/lib/libbsp/sparc/leon3/preinstall.am
index dffbb5aba4..fb404e52c9 100644
--- a/c/src/lib/libbsp/sparc/leon3/preinstall.am
+++ b/c/src/lib/libbsp/sparc/leon3/preinstall.am
@@ -69,13 +69,17 @@ $(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
 TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
 
+$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
+PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
+
 $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds
 PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds
 
-$(PROJECT_LIB)/linkcmds.base: ../shared/startup/linkcmds.base $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.base
-PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
+$(PROJECT_LIB)/linkcmds.leon3: startup/linkcmds.leon3 $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.leon3
+PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.leon3
 
 $(PROJECT_INCLUDE)/amba.h: include/amba.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/amba.h
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/linkcmds b/c/src/lib/libbsp/sparc/leon3/startup/linkcmds
deleted file mode 100644
index 30f2b68bb9..0000000000
--- a/c/src/lib/libbsp/sparc/leon3/startup/linkcmds
+++ /dev/null
@@ -1,20 +0,0 @@
-/*  linkcmds
- */
-
-/* Default values, can be overridden */
-
-_PROM_SIZE = DEFINED (_PROM_SIZE) ? _PROM_SIZE : 2M;
-_PROM_START = DEFINED (_PROM_START) ? _PROM_START : 0x00000000;
-
-_RAM_SIZE = DEFINED (_RAM_SIZE) ? _RAM_SIZE : 4M;
-_RAM_START = DEFINED (_RAM_START) ? _RAM_START : 0x40000000;
-
-/* these are the maximum values */
-
-MEMORY
-{
-  rom     : ORIGIN = 0x00000000, LENGTH = 256M
-  ram     : ORIGIN = 0x40000000, LENGTH = 1024M
-}
-
-INCLUDE linkcmds.base
diff --git a/c/src/lib/libbsp/sparc/leon3/startup/linkcmds.leon3 b/c/src/lib/libbsp/sparc/leon3/startup/linkcmds.leon3
new file mode 100644
index 0000000000..30f2b68bb9
--- /dev/null
+++ b/c/src/lib/libbsp/sparc/leon3/startup/linkcmds.leon3
@@ -0,0 +1,20 @@
+/*  linkcmds
+ */
+
+/* Default values, can be overridden */
+
+_PROM_SIZE = DEFINED (_PROM_SIZE) ? _PROM_SIZE : 2M;
+_PROM_START = DEFINED (_PROM_START) ? _PROM_START : 0x00000000;
+
+_RAM_SIZE = DEFINED (_RAM_SIZE) ? _RAM_SIZE : 4M;
+_RAM_START = DEFINED (_RAM_START) ? _RAM_START : 0x40000000;
+
+/* these are the maximum values */
+
+MEMORY
+{
+  rom     : ORIGIN = 0x00000000, LENGTH = 256M
+  ram     : ORIGIN = 0x40000000, LENGTH = 1024M
+}
+
+INCLUDE linkcmds.base
-- 
cgit v1.2.3