summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-01-05 13:35:32 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-01-05 13:35:32 +0000
commit96b2583fdd30743153f2903dcddf6e96a6162684 (patch)
tree19f8a0c4c577f11327b3f9d305fb1fde61e5bf9f
parent2001-01-05 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-96b2583fdd30743153f2903dcddf6e96a6162684.tar.bz2
2001-01-05 Joel Sherrill <joel@OARcorp.com>
* include/bsp.h: Changed <sh/null.h> to <rtems/devnull.h> to reflect the movement of this component to libmisc. * wrapup/Makefile.am: /dev/null driver is no longer in libcpu/sh.
-rw-r--r--c/src/lib/libbsp/sh/gensh1/ChangeLog6
-rw-r--r--c/src/lib/libbsp/sh/gensh1/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.am2
-rw-r--r--c/src/lib/libbsp/sh/gensh2/ChangeLog6
-rw-r--r--c/src/lib/libbsp/sh/gensh2/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/sh/gensh2/wrapup/Makefile.am4
6 files changed, 17 insertions, 5 deletions
diff --git a/c/src/lib/libbsp/sh/gensh1/ChangeLog b/c/src/lib/libbsp/sh/gensh1/ChangeLog
index 1f0264b282..8bf3636181 100644
--- a/c/src/lib/libbsp/sh/gensh1/ChangeLog
+++ b/c/src/lib/libbsp/sh/gensh1/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-05 Joel Sherrill <joel@OARcorp.com>
+
+ * include/bsp.h: Changed <sh/null.h> to <rtems/devnull.h> to reflect
+ the movement of this component to libmisc.
+ * wrapup/Makefile.am: /dev/null driver is no longer in libcpu/sh.
+
2000-11-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS.
diff --git a/c/src/lib/libbsp/sh/gensh1/include/bsp.h b/c/src/lib/libbsp/sh/gensh1/include/bsp.h
index b9dc3fb98c..d5c9d31271 100644
--- a/c/src/lib/libbsp/sh/gensh1/include/bsp.h
+++ b/c/src/lib/libbsp/sh/gensh1/include/bsp.h
@@ -45,7 +45,7 @@ extern "C" {
/* EDIT: To activate the sci driver, change the define below */
#if 1
-#include <sh/null.h>
+#include <rtems/devnull.h>
#define BSP_CONSOLE_DEVNAME "/dev/null"
#define BSP_CONSOLE_DRIVER_TABLE_ENTRY DEVNULL_DRIVER_TABLE_ENTRY
#else
diff --git a/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.am b/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.am
index 30111cc51c..c9f3a140d3 100644
--- a/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh1/wrapup/Makefile.am
@@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = foreign 1.4
BSP_PIECES = startup scitab console
# pieces to pick up out of libcpu/sh/sh7032
-CPU_PIECES = null clock timer sci delay score
+CPU_PIECES = clock timer sci delay score
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
diff --git a/c/src/lib/libbsp/sh/gensh2/ChangeLog b/c/src/lib/libbsp/sh/gensh2/ChangeLog
index 2c7c537dce..b4e054ddd3 100644
--- a/c/src/lib/libbsp/sh/gensh2/ChangeLog
+++ b/c/src/lib/libbsp/sh/gensh2/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-05 Joel Sherrill <joel@OARcorp.com>
+
+ * include/bsp.h: Changed <sh/null.h> to <rtems/devnull.h> to reflect
+ the movement of this component to libmisc.
+ * wrapup/Makefile.am: /dev/null driver is no longer in libcpu/sh.
+
2000-11-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS.
diff --git a/c/src/lib/libbsp/sh/gensh2/include/bsp.h b/c/src/lib/libbsp/sh/gensh2/include/bsp.h
index 115353ce96..d4b0338449 100644
--- a/c/src/lib/libbsp/sh/gensh2/include/bsp.h
+++ b/c/src/lib/libbsp/sh/gensh2/include/bsp.h
@@ -55,7 +55,7 @@ extern "C" {
#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024)
#if 0
-#include <sh/null.h>
+#include <rtems/devnull.h>
#define BSP_CONSOLE_DEVNAME "/dev/null"
#define BSP_CONSOLE_DRIVER_TABLE_ENTRY DEVNULL_DRIVER_TABLE_ENTRY
#else
diff --git a/c/src/lib/libbsp/sh/gensh2/wrapup/Makefile.am b/c/src/lib/libbsp/sh/gensh2/wrapup/Makefile.am
index b36baea2f0..80f0d3ac29 100644
--- a/c/src/lib/libbsp/sh/gensh2/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/sh/gensh2/wrapup/Makefile.am
@@ -8,8 +8,8 @@ AUTOMAKE_OPTIONS = foreign 1.4
BSP_PIECES = startup scitab console
-# pieces to pick up out of libcpu/sh
-CPU_PIECES = null clock timer sci score
+# pieces to pick up out of libcpu/sh/sh7045
+CPU_PIECES = clock timer sci score
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \