From b7e4837c3741f78861c410e95544305a316e7ea0 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel@rtems.org>
Date: Tue, 19 Dec 2017 11:04:07 -0600
Subject: mcf5235: Simplify bsp_specs

Updates #3520.
---
 c/src/lib/libbsp/m68k/mcf5235/bsp_specs             | 7 ++-----
 c/src/lib/libbsp/m68k/mcf5235/startup/linkcmds      | 2 ++
 c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsflash | 2 ++
 c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsram   | 2 ++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/c/src/lib/libbsp/m68k/mcf5235/bsp_specs b/c/src/lib/libbsp/m68k/mcf5235/bsp_specs
index 5154de8c55..3a20757667 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/bsp_specs
+++ b/c/src/lib/libbsp/m68k/mcf5235/bsp_specs
@@ -1,13 +1,10 @@
 %rename endfile old_endfile
 %rename startfile old_startfile
-%rename link old_link
 
 *startfile:
 %{!qrtems: %(old_startfile)} \
-%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e start}}
-
-*link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
+%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}}
 
 *endfile:
 %{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}
+
diff --git a/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmds b/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmds
index 0aa079a938..660c931e26 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmds
+++ b/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmds
@@ -38,6 +38,8 @@ __SRAMBASE = DEFINED(__SRAMBASE) ? __SRAMBASE : 0x20000000 ;
 _VBR = 0x0;
 
 ENTRY(start)
+STARTUP(start.o)
+
 MEMORY
 {
     dram : ORIGIN = 0, LENGTH = 16M
diff --git a/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsflash b/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsflash
index 6a724a9067..832424a2d9 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsflash
+++ b/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsflash
@@ -38,6 +38,8 @@ __SRAMBASE = DEFINED(__SRAMBASE) ? __SRAMBASE : 0x20000000 ;
 _VBR = 0x0;
 
 ENTRY(start)
+STARTUP(start.o)
+
 /*
  *  NOTE: If loading to flash with dBUG remember to change the origin to 0xFFF00000 because that's where user flash is
  *  located.
diff --git a/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsram b/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsram
index 06a62e1765..ec7483001e 100644
--- a/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsram
+++ b/c/src/lib/libbsp/m68k/mcf5235/startup/linkcmdsram
@@ -38,6 +38,8 @@ __SRAMBASE = DEFINED(__SRAMBASE) ? __SRAMBASE : 0x20000000 ;
 _VBR = 0x0;
 
 ENTRY(start)
+STARTUP(start.o)
+
 MEMORY
 {
     ram : ORIGIN = 0, LENGTH = 16M
-- 
cgit v1.2.3