2009-11-04 Ralf Corsépius <ralf.corsepius@rtems.org>

	* startup/linkcmds, startup/linkcmds.pm520: Remove.
	* startup/linkcmds.pm520_ze30, startup/linkcmds.pm520_cr825:
	New (Copy of former startup/linkcmds.pm520).
	* Makefile.am: Rework linkcmds handling.
	* configure.ac: Add RTEMS_BSP_LINKCMDS.
	* make/custom/brs5l.cfg, make/custom/icecube.cfg,
	make/custom/pm520_cr825.cfg, make/custom/pm520_ze30.cfg:
	Remove RTEMS_LINKCMDS.
	* make/custom/gen5200.inc: Remove LDFLAGS.

10 files changed, 21 insertions, 17 deletions

diff --git a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog
index 130b2bdb7e..a6f7f6256e 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/gen5200/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-04	Ralf Corsépius <ralf.corsepius@rtems.org>
+
+	* startup/linkcmds, startup/linkcmds.pm520: Remove.
+	* startup/linkcmds.pm520_ze30, startup/linkcmds.pm520_cr825:
+	New (Copy of former startup/linkcmds.pm520).
+	* Makefile.am: Rework linkcmds handling.
+	* configure.ac: Add RTEMS_BSP_LINKCMDS.
+	* make/custom/brs5l.cfg, make/custom/icecube.cfg,
+	make/custom/pm520_cr825.cfg, make/custom/pm520_ze30.cfg:
+	Remove RTEMS_LINKCMDS.
+	* make/custom/gen5200.inc: Remove LDFLAGS.
+
 2009-11-02	Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
 
 	* start/start.S: call to boot_card checked, removed warning 
diff --git a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
index 8f8b8d35e9..250b76341b 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/gen5200/Makefile.am
@@ -31,11 +31,12 @@ project_lib_DATA = start.$(OBJEXT)
 libbspstart_a_SOURCES += ../../powerpc/shared/start/rtems_crti.S
 project_lib_DATA += rtems_crti.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds \
-    startup/linkcmds.base \
-    startup/linkcmds.brs5l \
-    startup/linkcmds.icecube \
-    startup/linkcmds.pm520
+dist_project_lib_DATA += startup/linkcmds.base
+project_lib_DATA += startup/linkcmds
+EXTRA_DIST = startup/linkcmds.brs5l
+EXTRA_DIST += startup/linkcmds.icecube
+EXTRA_DIST += startup/linkcmds.pm520_cr825
+EXTRA_DIST += startup/linkcmds.pm520_ze30
 
 noinst_LIBRARIES += libbsp.a
 libbsp_a_SOURCES =
diff --git a/c/src/lib/libbsp/powerpc/gen5200/configure.ac b/c/src/lib/libbsp/powerpc/gen5200/configure.ac
index c485a91199..eb8ea31507 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/configure.ac
+++ b/c/src/lib/libbsp/powerpc/gen5200/configure.ac
@@ -69,6 +69,7 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
 AC_CONFIG_FILES([Makefile])
 
 RTEMS_BSP_CLEANUP_OPTIONS(0, 0)
+RTEMS_BSP_LINKCMDS
 
 RTEMS_PPC_EXCEPTIONS
 
diff --git a/c/src/lib/libbsp/powerpc/gen5200/make/custom/brs5l.cfg b/c/src/lib/libbsp/powerpc/gen5200/make/custom/brs5l.cfg
index 9b8e41355d..bc80861ed8 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/make/custom/brs5l.cfg
+++ b/c/src/lib/libbsp/powerpc/gen5200/make/custom/brs5l.cfg
@@ -9,6 +9,4 @@
 #  parameters differ.
 #  
 
-RTEMS_LINKCMDS=linkcmds.brs5l
-
 include $(RTEMS_ROOT)/make/custom/gen5200.inc
diff --git a/c/src/lib/libbsp/powerpc/gen5200/make/custom/gen5200.inc b/c/src/lib/libbsp/powerpc/gen5200/make/custom/gen5200.inc
index 50e53a787f..8ef3fe749a 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/make/custom/gen5200.inc
+++ b/c/src/lib/libbsp/powerpc/gen5200/make/custom/gen5200.inc
@@ -17,5 +17,3 @@ CPU_CFLAGS = -mcpu=603e -mstrict-align \
 
 # optimize flag: typically -O2
 CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions
-
-LDFLAGS += -qnolinkcmds -T $(RTEMS_LINKCMDS) 
diff --git a/c/src/lib/libbsp/powerpc/gen5200/make/custom/icecube.cfg b/c/src/lib/libbsp/powerpc/gen5200/make/custom/icecube.cfg
index b765d3a3f4..7a55aa8266 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/make/custom/icecube.cfg
+++ b/c/src/lib/libbsp/powerpc/gen5200/make/custom/icecube.cfg
@@ -12,6 +12,4 @@
 #  parameters differ.
 #  
 
-RTEMS_LINKCMDS=linkcmds.icecube
-
 include $(RTEMS_ROOT)/make/custom/gen5200.inc
diff --git a/c/src/lib/libbsp/powerpc/gen5200/make/custom/pm520_cr825.cfg b/c/src/lib/libbsp/powerpc/gen5200/make/custom/pm520_cr825.cfg
index 2835faa7b9..64b0ebe1ff 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/make/custom/pm520_cr825.cfg
+++ b/c/src/lib/libbsp/powerpc/gen5200/make/custom/pm520_cr825.cfg
@@ -10,6 +10,4 @@
 #  parameters differ.
 #  
 
-RTEMS_LINKCMDS=linkcmds.pm520
-
 include $(RTEMS_ROOT)/make/custom/gen5200.inc
diff --git a/c/src/lib/libbsp/powerpc/gen5200/make/custom/pm520_ze30.cfg b/c/src/lib/libbsp/powerpc/gen5200/make/custom/pm520_ze30.cfg
index 6977dc974c..9af206a259 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/make/custom/pm520_ze30.cfg
+++ b/c/src/lib/libbsp/powerpc/gen5200/make/custom/pm520_ze30.cfg
@@ -10,6 +10,4 @@
 #  parameters differ.
 #  
 
-RTEMS_LINKCMDS=linkcmds.pm520
-
 include $(RTEMS_ROOT)/make/custom/gen5200.inc
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520 b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_cr825
index 5c072eb583..5c072eb583 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520
+++ b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_cr825
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_ze30
index a14c91f5f9..5c072eb583 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds
+++ b/c/src/lib/libbsp/powerpc/gen5200/startup/linkcmds.pm520_ze30
@@ -1,11 +1,11 @@
 /**
  * @file
  *
- * Dummy linker command file to make the Autotools happy.
+ * Linker command file for the MicroSys PM520 board.
  */
 
 MEMORY {
-	RAM : ORIGIN = 0x0, LENGTH = 256M
+	RAM : ORIGIN = 0x0, LENGTH = 64M
 	ROM : ORIGIN = 0xffe00000, LENGTH = 2M
 	DPRAM : ORIGIN = 0xff000000, LENGTH = 1k
 	REGS : ORIGIN = 0xf0000000, LENGTH = 64k