Patch from Ralf Corsepius <corsepiu@faw.uni-ulm.de> to rename all

.s files to .S in conformance with GNU conventions.  This is a
minor step along the way to supporting automake.

5 files changed, 18 insertions, 41 deletions

diff --git a/c/src/lib/libbsp/m68k/mvme147/timer/Makefile.in b/c/src/lib/libbsp/m68k/mvme147/timer/Makefile.in
index 24809cbed8..21ca9675e7 100644
--- a/c/src/lib/libbsp/m68k/mvme147/timer/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme147/timer/Makefile.in
@@ -17,10 +17,10 @@ C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
 
 H_FILES=
 
-# Assembly source names, if any, go here -- minus the .s
+# Assembly source names, if any, go here -- minus the .S
 S_PIECES=timerisr
-S_FILES=$(S_PIECES:%=%.s)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_FILES=$(S_PIECES:%=%.S)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
 OBJS=$(C_O_FILES) $(S_O_FILES)
diff --git a/c/src/lib/libbsp/m68k/mvme147/timer/timerisr.s b/c/src/lib/libbsp/m68k/mvme147/timer/timerisr.s
deleted file mode 100644
index 7debd13849..0000000000
--- a/c/src/lib/libbsp/m68k/mvme147/timer/timerisr.s
+++ /dev/null
@@ -1,28 +0,0 @@
-/*  timer_isr()
- *
- *  This routine provides the ISR for the PCC timer on the MVME147
- *  board.   The timer is set up to generate an interrupt at maximum
- *  intervals.
- *
- *  MVME147 port for TNI - Telecom Bretagne
- *  by Dominique LE CAMPION (Dominique.LECAMPION@enst-bretagne.fr)
- *  May 1996
- *
- *  $Id$
- */
-
-#include "asm.h"
-
-BEGIN_CODE
-
-.set T1_CONTROL_REGISTER,  0xfffe1018    | timer 1 control register
-
-        PUBLIC (timerisr)
-SYM (timerisr):
-	orb	#0x80, T1_CONTROL_REGISTER | clear T1 int status bit
-        addql   #1, SYM (Ttimer_val)     | increment timer value
-end_timerisr:
-	rte	
-
-END_CODE
-END
diff --git a/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.in
index 33d990d882..a42a827299 100644
--- a/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme147/wrapup/Makefile.in
@@ -8,8 +8,8 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-BSP_PIECES=startup clock console timer # shmsupp
-GENERIC_PIECES=# shmdr
+BSP_PIECES=startup clock console timer
+GENERIC_PIECES=
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \
diff --git a/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.in b/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.in
index c12e535ace..03902da08d 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme147s/timer/Makefile.in
@@ -15,10 +15,10 @@ C_PIECES=timer
 C_FILES=$(C_PIECES:%=%.c)
 C_O_FILES=$(C_PIECES:%=${ARCH}/%.o)
 
-# Assembly source names, if any, go here -- minus the .s
+# Assembly source names, if any, go here -- minus the .S
 S_PIECES=timerisr
-S_FILES=$(S_PIECES:%=%.s)
-S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
+S_FILES=$(S_PIECES:%=%.S)
+S_O_FILES=$(S_FILES:%.S=${ARCH}/%.o)
 
 H_FILES=
 
diff --git a/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in
index 8c70b9398f..aecc98b975 100644
--- a/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme147s/wrapup/Makefile.in
@@ -8,17 +8,22 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-BSP_PIECES=startup clock console timer shmsupp
-GENERIC_PIECES=shmdr
+BSP_PIECES=startup clock console timer
+GENERIC_PIECES=
+
+include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
+include $(RTEMS_ROOT)/make/lib.cfg
+
+ifeq ($(HAS_MP),yes)
+GENERIC_PIECES += shmdr
+BSP_PIECES += shmsupp
+endif
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \
      $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel)
 LIB=$(ARCH)/libbsp.a
 
-include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #