summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-06-19 14:27:24 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-06-19 14:27:24 +0000
commitd4f9cef5402556a804ae4b37eb45b389e3b08318 (patch)
tree361fc954e6f5fa612b69a627578ea434440be052
parent2afd32b7d73fd6fdd4edcd19714619004cfb9ffa (diff)
downloadrtems-d4f9cef5402556a804ae4b37eb45b389e3b08318.tar.bz2
2001-06-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.in: Add bspopts.h. * include/.cvsignore: Add bspopts.h*, stamp-h*. * include/Makefile.am: Use *_HEADERS instead of *H_FILES. * include/bsp.h: Include bspopts.h.
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog7
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/configure.in2
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/include/.cvsignore4
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/include/Makefile.am23
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h2
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/irq/Makefile.am11
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/vectors/Makefile.am11
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/ChangeLog7
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/configure.in7
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/include/.cvsignore4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/include/Makefile.am25
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/include/bsp.h2
12 files changed, 63 insertions, 42 deletions
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
index 02a38cb8d1..e858ad4b9a 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
@@ -1,3 +1,10 @@
+2001-06-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.in: Add bspopts.h.
+ * include/.cvsignore: Add bspopts.h*, stamp-h*.
+ * include/Makefile.am: Use *_HEADERS instead of *H_FILES.
+ * include/bsp.h: Include bspopts.h.
+
2000-06-08 Eric Valette <valette@crf.canon.fr>
* console/console.c, include/commproc.h, startup/start.S:
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/configure.in b/c/src/lib/libbsp/powerpc/mbx8xx/configure.in
index 7e74e58bde..cdba87e85f 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/configure.in
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/configure.in
@@ -22,7 +22,9 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
RTEMS_CHECK_NETWORKING
RTEMS_CANONICAL_HOST
+
RTEMS_PROJECT_ROOT
+AM_CONFIG_HEADER(include/bspopts.h)
AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
# Explicitly list a Makefile here
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/include/.cvsignore b/c/src/lib/libbsp/powerpc/mbx8xx/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/include/.cvsignore
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/include/.cvsignore
@@ -1,2 +1,6 @@
Makefile
Makefile.in
+bspopts.h
+bspopts.h.in
+stamp-h
+stamp-h.in
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/include/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/include/Makefile.am
index 6728c6032c..5aa1d41035 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/include/Makefile.am
@@ -4,9 +4,10 @@
AUTOMAKE_OPTIONS = foreign 1.4
-H_FILES = bsp.h coverhd.h
+include_bspdir = $(includedir)/bsp
-BSP_H_FILES = mbx.h commproc.h 8xx_immap.h
+include_HEADERS = bsp.h coverhd.h bspopts.h
+include_bsp_HEADERS = mbx.h commproc.h 8xx_immap.h
$(PROJECT_INCLUDE):
$(mkinstalldirs) $@
@@ -14,25 +15,15 @@ $(PROJECT_INCLUDE):
$(PROJECT_INCLUDE)/bsp:
$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/bsp.h: bsp.h
+$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
-$(PROJECT_INCLUDE)/coverhd.h: coverhd.h
- $(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/bsp/mbx.h : mbx.h
- $(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/bsp/commproc.h : commproc.h
- $(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/bsp/8xx_immap.h : 8xx_immap.h
+$(PROJECT_INCLUDE)/bsp/%.h : %.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp \
- $(PROJECT_INCLUDE)/bsp.h \
- $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/bsp/mbx.h \
- $(PROJECT_INCLUDE)/bsp/commproc.h $(PROJECT_INCLUDE)/bsp/8xx_immap.h
+ $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \
+ $(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%)
all-local: $(PREINSTALL_FILES)
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h b/c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h
index a3dd69e9ba..f9c8e03c62 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/include/bsp.h
@@ -22,6 +22,8 @@
extern "C" {
#endif
+#include <bspopts.h>
+
#include <rtems.h>
#include <console.h>
#include <clockdrv.h>
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/irq/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/irq/Makefile.am
index 4b5bc87fe4..0e3072617c 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/irq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/irq/Makefile.am
@@ -7,7 +7,8 @@ AUTOMAKE_OPTIONS = foreign 1.4
C_FILES = irq.c irq_init.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
-H_FILES = irq.h
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS = irq.h
S_FILES = irq_asm.S
S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
@@ -18,9 +19,13 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../../../automake/compile.am
include $(top_srcdir)/../../../../../../automake/lib.am
+#HACK: WTF is this?
SORDID_HACK:
rm -f $(PROJECT_INCLUDE)/bsp/irq.h
+$(PROJECT_INCLUDE):
+ $(mkinstalldirs) $@
+
$(PROJECT_INCLUDE)/bsp:
$(mkinstalldirs) $@
@@ -28,7 +33,7 @@ $(PROJECT_INCLUDE)/bsp/%.h: %.h
$(INSTALL_DATA) $< $@
PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp \
- $(H_FILES:%.h=$(PROJECT_INCLUDE)/bsp/%.h)
+ $(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%)
#
# (OPTIONAL) Add local stuff here using +=
@@ -41,6 +46,6 @@ $(PGM): $(OBJS)
all-local: SORDID_HACK $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(PGM)
-EXTRA_DIST = irq.c irq.h irq_asm.S irq_init.c
+EXTRA_DIST = irq.c irq_asm.S irq_init.c
include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/vectors/Makefile.am
index d3a237fee4..5c5d16c642 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/vectors/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/vectors/Makefile.am
@@ -9,7 +9,8 @@ VPATH = @srcdir@:
C_FILES = vectors_init.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
-H_FILES = vectors.h
+include_bspdir = $(includedir)/bsp
+include_bsp_HEADERS = vectors.h
S_FILES = vectors.S
S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
@@ -27,13 +28,15 @@ include $(top_srcdir)/../../../../../../automake/lib.am
$(PGM): $(OBJS)
$(make-rel)
+$(PROJECT_INCLUDE):
+ $(mkinstalldirs) $@
$(PROJECT_INCLUDE)/bsp:
$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/bsp/vectors.h: vectors.h
+$(PROJECT_INCLUDE)/bsp/%.h: %.h
$(INSTALL_DATA) $< $@
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp $(PROJECT_INCLUDE)/bsp/vectors.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp \
+ $(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%)
all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS)
diff --git a/c/src/lib/libbsp/powerpc/score603e/ChangeLog b/c/src/lib/libbsp/powerpc/score603e/ChangeLog
index 6333d67300..86280b9688 100644
--- a/c/src/lib/libbsp/powerpc/score603e/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/score603e/ChangeLog
@@ -1,3 +1,10 @@
+2001-06-19 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.in: Add bspopts.h.
+ * include/.cvsignore: Add bspopts.h*, stamp-h*.
+ * include/Makefile.am: Use *_HEADERS instead of *H_FILES.
+ * include/bsp.h: Include bspopts.h.
+
2001-05-10 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.in: Use RTEMS_PROG_CC_FOR_TARGET([-ansi -fasm]).
diff --git a/c/src/lib/libbsp/powerpc/score603e/configure.in b/c/src/lib/libbsp/powerpc/score603e/configure.in
index 6908b17fbf..5a7c9c1797 100644
--- a/c/src/lib/libbsp/powerpc/score603e/configure.in
+++ b/c/src/lib/libbsp/powerpc/score603e/configure.in
@@ -19,6 +19,13 @@ RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
RTEMS_CANONICAL_HOST
+## bsp-specific options
+CONSOLE_USE_INTERRUPTS=${CONSOLE_USE_INTERRUPTS-0}
+AC_DEFINE_UNQUOTED([CONSOLE_USE_INTERRUPTS],
+ [$CONSOLE_USE_INTERRUPTS],
+ [whether using console interrupts])
+
+AM_CONFIG_HEADER(include/bspopts.h)
RTEMS_PROJECT_ROOT
# Explicitly list all Makefiles here
diff --git a/c/src/lib/libbsp/powerpc/score603e/include/.cvsignore b/c/src/lib/libbsp/powerpc/score603e/include/.cvsignore
index 282522db03..b0be3c54e6 100644
--- a/c/src/lib/libbsp/powerpc/score603e/include/.cvsignore
+++ b/c/src/lib/libbsp/powerpc/score603e/include/.cvsignore
@@ -1,2 +1,6 @@
Makefile
Makefile.in
+bspopts.h
+bspopts.h.in
+stamp-h
+stamp-h.in
diff --git a/c/src/lib/libbsp/powerpc/score603e/include/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/include/Makefile.am
index 90734dec8a..2ad5cb1bab 100644
--- a/c/src/lib/libbsp/powerpc/score603e/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/include/Makefile.am
@@ -4,30 +4,17 @@
AUTOMAKE_OPTIONS = foreign 1.4
-H_FILES = bsp.h coverhd.h gen1.h gen2.h tod.h
+include_HEADERS = bsp.h coverhd.h gen1.h gen2.h tod.h bspopts.h
-$(PROJECT_INCLUDE)/bsp.h: bsp.h
- $(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/coverhd.h: coverhd.h
- $(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/gen1.h: gen1.h
- $(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/gen2.h: gen2.h
- $(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE):
+ $(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/tod.h: tod.h
+$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
-TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \
- $(PROJECT_INCLUDE)/coverhd.h \
- $(PROJECT_INCLUDE)/gen1.h $(PROJECT_INCLUDE)/gen2.h \
- $(PROJECT_INCLUDE)/tod.h
+TMPINSTALL_FILES += $(PROJECT_INCLUDE) \
+ $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
all-local: $(TMPINSTALL_FILES)
-EXTRA_DIST = bsp.h chain.h coverhd.h gen1.h gen2.h tod.h
-
include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
index f40ead300b..7d8c7668d4 100644
--- a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
@@ -20,6 +20,8 @@
extern "C" {
#endif
+#include <bspopts.h>
+
/*
* confdefs.h overrides for this BSP:
* - termios serial ports (defaults to 1)