From 01629105c2817a59a4f1f05039593f211cf5ddaa Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 14 Dec 1998 23:15:38 +0000
Subject: 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.

---
 c/src/lib/libbsp/m68k/mvme136/timer/Makefile.in  |  6 ++--
 c/src/lib/libbsp/m68k/mvme136/timer/timerisr.S   | 39 ++++++++++++++++++++++++
 c/src/lib/libbsp/m68k/mvme136/timer/timerisr.s   | 39 ------------------------
 c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in | 15 ++++++---
 4 files changed, 52 insertions(+), 47 deletions(-)
 create mode 100644 c/src/lib/libbsp/m68k/mvme136/timer/timerisr.S
 delete mode 100644 c/src/lib/libbsp/m68k/mvme136/timer/timerisr.s

(limited to 'c/src/lib/libbsp/m68k/mvme136')

diff --git a/c/src/lib/libbsp/m68k/mvme136/timer/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/timer/Makefile.in
index 24809cbed8..21ca9675e7 100644
--- a/c/src/lib/libbsp/m68k/mvme136/timer/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme136/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/mvme136/timer/timerisr.S b/c/src/lib/libbsp/m68k/mvme136/timer/timerisr.S
new file mode 100644
index 0000000000..63ee63bd8e
--- /dev/null
+++ b/c/src/lib/libbsp/m68k/mvme136/timer/timerisr.S
@@ -0,0 +1,39 @@
+/*  timer_isr()
+ *
+ *  This routine provides the ISR for the Z8036 timer on the MVME136
+ *  board.   The timer is set up to generate an interrupt at maximum
+ *  intervals.
+ *
+ *  Input parameters:  NONE
+ *
+ *  Output parameters:  NONE
+ *
+ *  COPYRIGHT (c) 1989-1998.
+ *  On-Line Applications Research Corporation (OAR).
+ *  Copyright assigned to U.S. Government, 1994.
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.OARcorp.com/rtems/license.html.
+ *
+ *  $Id$
+ */
+
+#include "asm.h"
+
+BEGIN_CODE
+
+.set CT1_CMD_STATUS,  0xfffb000a         | port A
+.set RELOAD,          0x24               | clr IP & IUS,allow countdown
+
+        PUBLIC (timerisr)
+SYM (timerisr):
+        movl    a0,a7@-                  | save a0
+        movl    #CT1_CMD_STATUS,a0       | a0 = addr of cmd status reg
+        movb    #RELOAD,a0@              | reload countdown
+        addql   #1, SYM (Ttimer_val)     | increment timer value
+        movl    a7@+,a0                  | save a0
+        rte
+
+END_CODE
+END
diff --git a/c/src/lib/libbsp/m68k/mvme136/timer/timerisr.s b/c/src/lib/libbsp/m68k/mvme136/timer/timerisr.s
deleted file mode 100644
index 63ee63bd8e..0000000000
--- a/c/src/lib/libbsp/m68k/mvme136/timer/timerisr.s
+++ /dev/null
@@ -1,39 +0,0 @@
-/*  timer_isr()
- *
- *  This routine provides the ISR for the Z8036 timer on the MVME136
- *  board.   The timer is set up to generate an interrupt at maximum
- *  intervals.
- *
- *  Input parameters:  NONE
- *
- *  Output parameters:  NONE
- *
- *  COPYRIGHT (c) 1989-1998.
- *  On-Line Applications Research Corporation (OAR).
- *  Copyright assigned to U.S. Government, 1994.
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- *  $Id$
- */
-
-#include "asm.h"
-
-BEGIN_CODE
-
-.set CT1_CMD_STATUS,  0xfffb000a         | port A
-.set RELOAD,          0x24               | clr IP & IUS,allow countdown
-
-        PUBLIC (timerisr)
-SYM (timerisr):
-        movl    a0,a7@-                  | save a0
-        movl    #CT1_CMD_STATUS,a0       | a0 = addr of cmd status reg
-        movb    #RELOAD,a0@              | reload countdown
-        addql   #1, SYM (Ttimer_val)     | increment timer value
-        movl    a7@+,a0                  | save a0
-        rte
-
-END_CODE
-END
diff --git a/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in
index 4dc4ea5208..aecc98b975 100644
--- a/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/m68k/mvme136/wrapup/Makefile.in
@@ -8,17 +8,22 @@ VPATH = @srcdir@
 RTEMS_ROOT = @top_srcdir@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-BSP_PIECES=startup clock console shmsupp timer
-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 +=
 #
-- 
cgit v1.2.3