[rtems commit] bsp/virtex: Rename file dlentry.S in start.S

Sebastian Huber sebh at rtems.org
Mon Jun 24 08:48:40 UTC 2013


Module:    rtems
Branch:    master
Commit:    546c105646b3748f55c1cdfc5a6047db7ad1a416
Changeset: http://git.rtems.org/rtems/commit/?id=546c105646b3748f55c1cdfc5a6047db7ad1a416

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Tue Jun 18 15:19:19 2013 +0200

bsp/virtex: Rename file dlentry.S in start.S

Use default bsp_specs file.

---

 c/src/lib/libbsp/powerpc/virtex/Makefile.am        |    9 ++++-----
 c/src/lib/libbsp/powerpc/virtex/bsp_specs          |    7 +++----
 c/src/lib/libbsp/powerpc/virtex/preinstall.am      |    4 ++++
 .../virtex/{dlentry/dlentry.S => start/start.S}    |    3 +--
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/c/src/lib/libbsp/powerpc/virtex/Makefile.am b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
index ef6e206..17225be 100644
--- a/c/src/lib/libbsp/powerpc/virtex/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/virtex/Makefile.am
@@ -22,10 +22,11 @@ noinst_PROGRAMS =
 include_HEADERS += include/coverhd.h
 
 noinst_LIBRARIES = libbspstart.a
-libbspstart_a_SOURCES = ../../powerpc/shared/start/rtems_crti.S
-project_lib_DATA = rtems_crti.$(OBJEXT)
+libbspstart_a_SOURCES = start/start.S
+project_lib_DATA = start.$(OBJEXT)
 
-dist_project_lib_DATA += startup/linkcmds
+libbspstart_a_SOURCES += ../../powerpc/shared/start/rtems_crti.S
+project_lib_DATA += rtems_crti.$(OBJEXT)
 
 noinst_LIBRARIES += libbsp.a
 libbsp_a_SOURCES =
@@ -36,8 +37,6 @@ libbsp_a_SOURCES += ../../shared/bspclean.c ../../shared/bspgetworkarea.c \
     ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \
     ../../shared/bsppredriverhook.c ../../shared/bsppretaskinghook.c \
     ../../shared/sbrk.c ../../shared/gnatinstallhandler.c
-# dlentry
-libbsp_a_SOURCES += dlentry/dlentry.S
 # bspconsole
 libbsp_a_SOURCES += console/consolelite.c ../../shared/console.c \
     ../../shared/console_select.c ../../shared/console_control.c \
diff --git a/c/src/lib/libbsp/powerpc/virtex/bsp_specs b/c/src/lib/libbsp/powerpc/virtex/bsp_specs
index 14b5fc8..92f6c58 100644
--- a/c/src/lib/libbsp/powerpc/virtex/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/virtex/bsp_specs
@@ -3,13 +3,12 @@
 %rename link old_link
 
 *startfile:
-%{!qrtems: %(old_startfile)} %{!nostdlib: \
-%{qrtems:  ecrti%O%s rtems_crti%O%s  crtbegin.o%s \
-  -u __vectors -u download_entry}}
+%{!qrtems: %(old_startfile)} \
+%{!nostdlib: %{qrtems: ecrti%O%s rtems_crti%O%s  crtbegin.o%s start.o%s}}
 
 *endfile:
 %{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s ecrtn.o%s}
 
 *link:
-%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N}
+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -u __vectors -N}
 
diff --git a/c/src/lib/libbsp/powerpc/virtex/preinstall.am b/c/src/lib/libbsp/powerpc/virtex/preinstall.am
index d732788..d327cef 100644
--- a/c/src/lib/libbsp/powerpc/virtex/preinstall.am
+++ b/c/src/lib/libbsp/powerpc/virtex/preinstall.am
@@ -66,6 +66,10 @@ $(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h
 
+$(PROJECT_LIB)/start.$(OBJEXT): start.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/start.$(OBJEXT)
+TMPINSTALL_FILES += $(PROJECT_LIB)/start.$(OBJEXT)
+
 $(PROJECT_LIB)/rtems_crti.$(OBJEXT): rtems_crti.$(OBJEXT) $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
 TMPINSTALL_FILES += $(PROJECT_LIB)/rtems_crti.$(OBJEXT)
diff --git a/c/src/lib/libbsp/powerpc/virtex/dlentry/dlentry.S b/c/src/lib/libbsp/powerpc/virtex/start/start.S
similarity index 99%
rename from c/src/lib/libbsp/powerpc/virtex/dlentry/dlentry.S
rename to c/src/lib/libbsp/powerpc/virtex/start/start.S
index 06af553..2cb484e 100644
--- a/c/src/lib/libbsp/powerpc/virtex/dlentry/dlentry.S
+++ b/c/src/lib/libbsp/powerpc/virtex/start/start.S
@@ -1,5 +1,4 @@
-/*  dlentry.s
- *
+/*
  *  This file contains the entry code for RTEMS programs starting
  *  after download to RAM
  *




More information about the vc mailing list