From a848acb6e62476a161fc4d723ddaec494f4ab840 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 25 Sep 2000 19:01:14 +0000
Subject: 2000-09-25	Joel Sherrill <joel@OARcorp.com>

	* bsp_specs: Formatting more like other bsp_specs.
	* include/bsp.h: CPU_CLOCK_RATE_MHZ not a real variable to
	elimate need for including bsp.h in libcpu.
	* startup/bspstart.c: Ditto.
	* wrapup/Makefile.am: Did not list shmdr.
---
 c/src/lib/libbsp/a29k/ChangeLog                 | 8 ++++++++
 c/src/lib/libbsp/a29k/portsw/bsp_specs          | 5 +++--
 c/src/lib/libbsp/a29k/portsw/include/bsp.h      | 2 +-
 c/src/lib/libbsp/a29k/portsw/startup/bspstart.c | 2 ++
 c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.am | 8 +++++++-
 5 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'c')

diff --git a/c/src/lib/libbsp/a29k/ChangeLog b/c/src/lib/libbsp/a29k/ChangeLog
index 101734ce64..fdbaaafa7a 100644
--- a/c/src/lib/libbsp/a29k/ChangeLog
+++ b/c/src/lib/libbsp/a29k/ChangeLog
@@ -1,3 +1,11 @@
+2000-09-25	Joel Sherrill <joel@OARcorp.com>
+
+	* bsp_specs: Formatting more like other bsp_specs.
+	* include/bsp.h: CPU_CLOCK_RATE_MHZ not a real variable to
+	elimate need for including bsp.h in libcpu.
+	* startup/bspstart.c: Ditto.
+	* wrapup/Makefile.am: Did not list shmdr.
+
 2000-08-10	Joel Sherrill <joel@OARcorp.com>
 
 	* ChangeLog: New file.
diff --git a/c/src/lib/libbsp/a29k/portsw/bsp_specs b/c/src/lib/libbsp/a29k/portsw/bsp_specs
index 02371f113f..ac52cc4fb9 100644
--- a/c/src/lib/libbsp/a29k/portsw/bsp_specs
+++ b/c/src/lib/libbsp/a29k/portsw/bsp_specs
@@ -15,8 +15,9 @@
  %{!qnolinkcmds: -T linkcmds%s}}
 
 *startfile:
-%{!qrtems: %(old_startfile)} \
-%{qrtems: %{qrtems_debug: start_g.o%s} %{!qrtems_debug: start.o%s}}
+%{!qrtems: %(old_startfile)} %{qrtems: \
+%{!qrtems_debug: start.o%s} \
+%{qrtems_debug: start_g.o%s}}
 
 *link:
 %{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e _start}
diff --git a/c/src/lib/libbsp/a29k/portsw/include/bsp.h b/c/src/lib/libbsp/a29k/portsw/include/bsp.h
index 930f55fb98..67a18eff90 100644
--- a/c/src/lib/libbsp/a29k/portsw/include/bsp.h
+++ b/c/src/lib/libbsp/a29k/portsw/include/bsp.h
@@ -69,7 +69,7 @@ extern "C" {
   }
 
 /* Constants */
-#define CPU_CLOCK_RATE_MHZ 25
+/* #define CPU_CLOCK_RATE_MHZ 25*/
 
 #define RAM_START 0
 #define RAM_END   0x100000
diff --git a/c/src/lib/libbsp/a29k/portsw/startup/bspstart.c b/c/src/lib/libbsp/a29k/portsw/startup/bspstart.c
index 819239cb3e..dcb3b82525 100644
--- a/c/src/lib/libbsp/a29k/portsw/startup/bspstart.c
+++ b/c/src/lib/libbsp/a29k/portsw/startup/bspstart.c
@@ -25,6 +25,8 @@
 static char _sccsid[] = "@(#)bspstart.c 09/11/96     1.15\n";
 #endif
 
+int CPU_CLOCK_RATE_MHZ = 25;
+
 /*
  *  The original table from the application and our copy of it with
  *  some changes.
diff --git a/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.am b/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.am
index 9dc33c9aac..7779b09f0e 100644
--- a/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/a29k/portsw/wrapup/Makefile.am
@@ -4,6 +4,11 @@
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
+if HAS_MP
+GENERIC_MP_REL_PIECES = shmdr
+endif
+GENERIC_PIECES += $(GENERIC_MP_REL_PIECES)
+
 if HAS_MP
 MP_BSP_O_FILES = shmsupp
 endif
@@ -13,7 +18,8 @@ CPU_FILES = clock timer
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
 OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
-    $(foreach piece, $(CPU_FILES), ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel)
+    $(foreach piece, $(CPU_FILES), ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel) \
+    $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel)
 LIB = $(ARCH)/libbsp.a
 
 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-- 
cgit v1.2.3