diff options
52 files changed, 208 insertions, 135 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme167/ChangeLog b/c/src/lib/libbsp/m68k/mvme167/ChangeLog index 2e05d3d7ad..a203cad329 100644 --- a/c/src/lib/libbsp/m68k/mvme167/ChangeLog +++ b/c/src/lib/libbsp/m68k/mvme167/ChangeLog @@ -1,3 +1,10 @@ +2001-05-26 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/m68k/mvme167/configure.in b/c/src/lib/libbsp/m68k/mvme167/configure.in index fe3d658baa..6445fd0945 100644 --- a/c/src/lib/libbsp/m68k/mvme167/configure.in +++ b/c/src/lib/libbsp/m68k/mvme167/configure.in @@ -22,6 +22,7 @@ RTEMS_CANONICAL_HOST AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") +AM_CONFIG_HEADER(include/bspopts.h) RTEMS_PROJECT_ROOT # Explicitly list all Makefiles here diff --git a/c/src/lib/libbsp/m68k/mvme167/include/.cvsignore b/c/src/lib/libbsp/m68k/mvme167/include/.cvsignore index 282522db03..b0be3c54e6 100644 --- a/c/src/lib/libbsp/m68k/mvme167/include/.cvsignore +++ b/c/src/lib/libbsp/m68k/mvme167/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/m68k/mvme167/include/Makefile.am b/c/src/lib/libbsp/m68k/mvme167/include/Makefile.am index 691f3c4174..54521c75f1 100644 --- a/c/src/lib/libbsp/m68k/mvme167/include/Makefile.am +++ b/c/src/lib/libbsp/m68k/mvme167/include/Makefile.am @@ -4,37 +4,21 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = bsp.h coverhd.h $(srcdir)/../../mvme162/include/mvme16x_hw.h \ - page_table.h fatal.h +include_HEADERS = bsp.h coverhd.h mvme16x_hw.h page_table.h fatal.h bspopts.h $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/bsp.h: bsp.h +$(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -$(PROJECT_INCLUDE)/coverhd.h: coverhd.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/fatal.h: fatal.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/mvme16x_hw.h: \ - $(srcdir)/../../mvme162/include/mvme16x_hw.h - $(INSTALL_DATA) $< $@ +mvme16x_hw.h: $(srcdir)/../../mvme162/include/mvme16x_hw.h + cp $< $@ +CLEANFILES += mvme16x_hw.h -$(PROJECT_INCLUDE)/page_table.h: page_table.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/fatal.h: fatal.h - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/mvme16x_hw.h \ - $(PROJECT_INCLUDE)/page_table.h $(PROJECT_INCLUDE)/fatal.h +TMPINSTALL_FILES += $(PROJECT_INCLUDE) \ + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) all: $(TMPINSTALL_FILES) -EXTRA_DIST = bsp.h coverhd.h fatal.h page_table.h - include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h index 1efd026213..e2f0db1eaf 100644 --- a/c/src/lib/libbsp/m68k/mvme167/include/bsp.h +++ b/c/src/lib/libbsp/m68k/mvme167/include/bsp.h @@ -26,6 +26,8 @@ extern "C" { #endif +#include <bspopts.h> + #include <rtems.h> #include <clockdrv.h> #include <console.h> diff --git a/c/src/lib/libbsp/m68k/ods68302/ChangeLog b/c/src/lib/libbsp/m68k/ods68302/ChangeLog index 3fa8bcc000..3ea3860d56 100644 --- a/c/src/lib/libbsp/m68k/ods68302/ChangeLog +++ b/c/src/lib/libbsp/m68k/ods68302/ChangeLog @@ -1,3 +1,10 @@ +2001-05-26 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/m68k/ods68302/configure.in b/c/src/lib/libbsp/m68k/ods68302/configure.in index f919096190..1693e307b4 100644 --- a/c/src/lib/libbsp/m68k/ods68302/configure.in +++ b/c/src/lib/libbsp/m68k/ods68302/configure.in @@ -19,6 +19,7 @@ RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) RTEMS_CANONICAL_HOST +AM_CONFIG_HEADER(include/bspopts.h) RTEMS_PROJECT_ROOT # Explicitly list all Makefiles here diff --git a/c/src/lib/libbsp/m68k/ods68302/include/.cvsignore b/c/src/lib/libbsp/m68k/ods68302/include/.cvsignore index 282522db03..b0be3c54e6 100644 --- a/c/src/lib/libbsp/m68k/ods68302/include/.cvsignore +++ b/c/src/lib/libbsp/m68k/ods68302/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/m68k/ods68302/include/Makefile.am b/c/src/lib/libbsp/m68k/ods68302/include/Makefile.am index cddd8c5964..76b5ded379 100644 --- a/c/src/lib/libbsp/m68k/ods68302/include/Makefile.am +++ b/c/src/lib/libbsp/m68k/ods68302/include/Makefile.am @@ -4,36 +4,17 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = bare.h bsp.h coverhd.h crc.h debugport.h m68302scc.h +include_HEADERS = bare.h bsp.h coverhd.h crc.h debugport.h m68302scc.h bspopts.h $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/bare.h: bare.h +$(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -$(PROJECT_INCLUDE)/bsp.h: bsp.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/coverhd.h: coverhd.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/crc.h: crc.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/debugport.h: debugport.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/m68302scc.h: m68302scc.h - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bare.h \ - $(PROJECT_INCLUDE)/bsp.h $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_INCLUDE)/crc.h $(PROJECT_INCLUDE)/debugport.h \ - $(PROJECT_INCLUDE)/m68302scc.h +TMPINSTALL_FILES += $(PROJECT_INCLUDE) \ + $(include_HEADER:%=$(PROJECT_INCLUDE)/%) all-local: $(TMPINSTALL_FILES) -EXTRA_DIST = bare.h bsp.h coverhd.h crc.h debugport.h m68302scc.h - include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h index 2dfa83119b..72f502ba61 100644 --- a/c/src/lib/libbsp/m68k/ods68302/include/bsp.h +++ b/c/src/lib/libbsp/m68k/ods68302/include/bsp.h @@ -21,6 +21,8 @@ extern "C" { #endif +#include <bspopts.h> + #include <rtems.h> #include <console.h> #include <iosupp.h> diff --git a/c/src/lib/libbsp/m68k/sim68000/ChangeLog b/c/src/lib/libbsp/m68k/sim68000/ChangeLog index d2d375db3a..a0eef986b4 100644 --- a/c/src/lib/libbsp/m68k/sim68000/ChangeLog +++ b/c/src/lib/libbsp/m68k/sim68000/ChangeLog @@ -1,3 +1,10 @@ +2001-05-26 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/m68k/sim68000/configure.in b/c/src/lib/libbsp/m68k/sim68000/configure.in index 2ac19d1261..63a7ab72da 100644 --- a/c/src/lib/libbsp/m68k/sim68000/configure.in +++ b/c/src/lib/libbsp/m68k/sim68000/configure.in @@ -18,7 +18,9 @@ RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) RTEMS_CANONICAL_HOST + RTEMS_PROJECT_ROOT +AM_CONFIG_HEADER(include/bspopts.h) # Explicitly list all Makefiles here AC_OUTPUT( diff --git a/c/src/lib/libbsp/m68k/sim68000/include/.cvsignore b/c/src/lib/libbsp/m68k/sim68000/include/.cvsignore index 282522db03..b0be3c54e6 100644 --- a/c/src/lib/libbsp/m68k/sim68000/include/.cvsignore +++ b/c/src/lib/libbsp/m68k/sim68000/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/m68k/sim68000/include/Makefile.am b/c/src/lib/libbsp/m68k/sim68000/include/Makefile.am index 1d6c3074ec..e11e2d0f5e 100644 --- a/c/src/lib/libbsp/m68k/sim68000/include/Makefile.am +++ b/c/src/lib/libbsp/m68k/sim68000/include/Makefile.am @@ -4,22 +4,22 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = bsp.h ../../../shared/include/coverhd.h +include_HEADERS = bsp.h coverhd.h bspopts.h + +coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h + cp $< $@ + +CLEANFILES += coverhd.h $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/bsp.h: bsp.h +$(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -$(PROJECT_INCLUDE)/coverhd.h: ../../../shared/include/coverhd.h - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/coverhd.h +TMPINSTALL_FILES += $(PROJECT_INCLUDE) \ + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) all-local: $(TMPINSTALL_FILES) -EXTRA_DIST = bsp.h - include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h b/c/src/lib/libbsp/m68k/sim68000/include/bsp.h index 818579e1c1..446f822ded 100644 --- a/c/src/lib/libbsp/m68k/sim68000/include/bsp.h +++ b/c/src/lib/libbsp/m68k/sim68000/include/bsp.h @@ -20,6 +20,8 @@ extern "C" { #endif +#include <bspopts.h> + #include <rtems.h> #include <iosupp.h> #include <console.h> diff --git a/c/src/lib/libbsp/mips64orion/p4000/ChangeLog b/c/src/lib/libbsp/mips64orion/p4000/ChangeLog index 9d0d089b28..426cbd6d8f 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/ChangeLog +++ b/c/src/lib/libbsp/mips64orion/p4000/ChangeLog @@ -1,3 +1,10 @@ +2001-05-26 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/mips64orion/p4000/configure.in b/c/src/lib/libbsp/mips64orion/p4000/configure.in index 77744fa4c0..5038dd787c 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/configure.in +++ b/c/src/lib/libbsp/mips64orion/p4000/configure.in @@ -19,6 +19,7 @@ RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) RTEMS_CANONICAL_HOST +AM_CONFIG_HEADER(include/bspopts.h) RTEMS_PROJECT_ROOT # Explicitly list all Makefiles here diff --git a/c/src/lib/libbsp/mips64orion/p4000/include/.cvsignore b/c/src/lib/libbsp/mips64orion/p4000/include/.cvsignore index 282522db03..b0be3c54e6 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/include/.cvsignore +++ b/c/src/lib/libbsp/mips64orion/p4000/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/mips64orion/p4000/include/Makefile.am b/c/src/lib/libbsp/mips64orion/p4000/include/Makefile.am index 8fb32f359f..4c217fde4f 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/include/Makefile.am +++ b/c/src/lib/libbsp/mips64orion/p4000/include/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = bsp.h coverhd.h +include_HEADERS = bsp.h coverhd.h bspopts.h $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -12,10 +12,8 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) +TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) all-local: $(TMPINSTALL_FILES) -EXTRA_DIST = bsp.h coverhd.h - include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/mips64orion/p4000/include/bsp.h b/c/src/lib/libbsp/mips64orion/p4000/include/bsp.h index 092c47b41f..dc8489aeab 100644 --- a/c/src/lib/libbsp/mips64orion/p4000/include/bsp.h +++ b/c/src/lib/libbsp/mips64orion/p4000/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/eth_comm/ChangeLog b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog index d77e5a98b3..bc3bedf194 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog +++ b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog @@ -1,3 +1,11 @@ +2001-05-26 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. + * vectors/Makefile.am: Ditto. + * 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/eth_comm/configure.in b/c/src/lib/libbsp/powerpc/eth_comm/configure.in index 129148ba5a..7c9dbbf0a2 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/configure.in +++ b/c/src/lib/libbsp/powerpc/eth_comm/configure.in @@ -23,6 +23,7 @@ RTEMS_CANONICAL_HOST AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") +AM_CONFIG_HEADER(include/bspopts.h) RTEMS_PROJECT_ROOT # Explicitly list all Makefiles here diff --git a/c/src/lib/libbsp/powerpc/eth_comm/include/.cvsignore b/c/src/lib/libbsp/powerpc/eth_comm/include/.cvsignore index 282522db03..b0be3c54e6 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/include/.cvsignore +++ b/c/src/lib/libbsp/powerpc/eth_comm/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/eth_comm/include/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.am index 49898fe552..182387af33 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.am @@ -4,9 +4,10 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = bsp.h coverhd.h canbus.h info.h +include_bspdir = $(includedir)/bsp -BSP_H_FILES = commproc.h 8xx_immap.h +include_HEADERS = bsp.h coverhd.h canbus.h info.h bspopts.h +include_bsp_HEADERS = commproc.h 8xx_immap.h $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -14,31 +15,16 @@ $(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)/canbus.h: canbus.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/info.h: info.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)/info.h \ - $(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/canbus.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) -EXTRA_DIST = bsp.h canbus.h coverhd.h info.h - include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/eth_comm/include/bsp.h b/c/src/lib/libbsp/powerpc/eth_comm/include/bsp.h index 600a948672..641ef59c13 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/eth_comm/include/bsp.h @@ -21,6 +21,8 @@ extern "C" { #endif +#include <bspopts.h> + #include <rtems.h> #include <console.h> #include <clockdrv.h> diff --git a/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am index 4b5bc87fe4..f2da3c09fd 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am @@ -4,10 +4,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 +include_bspdir = $(includedir)/bsp + C_FILES = irq.c irq_init.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = irq.h +include_bsp_HEADERS = irq.h S_FILES = irq_asm.S S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) @@ -18,6 +20,7 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am +## FIXME: WTF is this? SORDID_HACK: rm -f $(PROJECT_INCLUDE)/bsp/irq.h @@ -28,7 +31,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 += diff --git a/c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am index d3a237fee4..88cd6c2f02 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/vectors/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/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) @@ -30,10 +31,11 @@ $(PGM): $(OBJS) $(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/helas403/ChangeLog b/c/src/lib/libbsp/powerpc/helas403/ChangeLog index dc44724d34..7ae0c6ea2f 100644 --- a/c/src/lib/libbsp/powerpc/helas403/ChangeLog +++ b/c/src/lib/libbsp/powerpc/helas403/ChangeLog @@ -1,3 +1,10 @@ +2001-05-26 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/helas403/configure.in b/c/src/lib/libbsp/powerpc/helas403/configure.in index c1beb00787..3bde0e2324 100644 --- a/c/src/lib/libbsp/powerpc/helas403/configure.in +++ b/c/src/lib/libbsp/powerpc/helas403/configure.in @@ -23,6 +23,7 @@ RTEMS_CANONICAL_HOST AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") +AM_CONFIG_HEADER(include/bspopts.h) RTEMS_PROJECT_ROOT # Explicitly list all Makefiles here diff --git a/c/src/lib/libbsp/powerpc/helas403/include/.cvsignore b/c/src/lib/libbsp/powerpc/helas403/include/.cvsignore index 282522db03..b0be3c54e6 100644 --- a/c/src/lib/libbsp/powerpc/helas403/include/.cvsignore +++ b/c/src/lib/libbsp/powerpc/helas403/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/helas403/include/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/include/Makefile.am index 2b8181354c..a2785f9a65 100644 --- a/c/src/lib/libbsp/powerpc/helas403/include/Makefile.am +++ b/c/src/lib/libbsp/powerpc/helas403/include/Makefile.am @@ -4,22 +4,17 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = bsp.h coverhd.h +include_HEADERS = bsp.h coverhd.h bspopts.h $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/bsp.h: bsp.h +$(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -$(PROJECT_INCLUDE)/coverhd.h: coverhd.h - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/coverhd.h +TMPINSTALL_FILES += $(PROJECT_INCLUDE) \ + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) all-local: $(TMPINSTALL_FILES) -EXTRA_DIST = bsp.h coverhd.h - include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/helas403/include/bsp.h b/c/src/lib/libbsp/powerpc/helas403/include/bsp.h index bd9f1ed3b4..7bd264c0a4 100644 --- a/c/src/lib/libbsp/powerpc/helas403/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/helas403/include/bsp.h @@ -44,6 +44,8 @@ extern "C" { #endif +#include <bspopts.h> + /* * confdefs.h overrides for this BSP: * - number of termios serial ports (defaults to 1) diff --git a/c/src/lib/libbsp/powerpc/papyrus/ChangeLog b/c/src/lib/libbsp/powerpc/papyrus/ChangeLog index dc44724d34..7ae0c6ea2f 100644 --- a/c/src/lib/libbsp/powerpc/papyrus/ChangeLog +++ b/c/src/lib/libbsp/powerpc/papyrus/ChangeLog @@ -1,3 +1,10 @@ +2001-05-26 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/papyrus/configure.in b/c/src/lib/libbsp/powerpc/papyrus/configure.in index 500b618f67..b8889794e8 100644 --- a/c/src/lib/libbsp/powerpc/papyrus/configure.in +++ b/c/src/lib/libbsp/powerpc/papyrus/configure.in @@ -23,6 +23,7 @@ RTEMS_CANONICAL_HOST AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") +AM_CONFIG_HEADER(include/bspopts.h) RTEMS_PROJECT_ROOT # Explicitly list all Makefiles here diff --git a/c/src/lib/libbsp/powerpc/papyrus/include/.cvsignore b/c/src/lib/libbsp/powerpc/papyrus/include/.cvsignore index 282522db03..b0be3c54e6 100644 --- a/c/src/lib/libbsp/powerpc/papyrus/include/.cvsignore +++ b/c/src/lib/libbsp/powerpc/papyrus/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/papyrus/include/Makefile.am b/c/src/lib/libbsp/powerpc/papyrus/include/Makefile.am index 2b8181354c..a2785f9a65 100644 --- a/c/src/lib/libbsp/powerpc/papyrus/include/Makefile.am +++ b/c/src/lib/libbsp/powerpc/papyrus/include/Makefile.am @@ -4,22 +4,17 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = bsp.h coverhd.h +include_HEADERS = bsp.h coverhd.h bspopts.h $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/bsp.h: bsp.h +$(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -$(PROJECT_INCLUDE)/coverhd.h: coverhd.h - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/coverhd.h +TMPINSTALL_FILES += $(PROJECT_INCLUDE) \ + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) all-local: $(TMPINSTALL_FILES) -EXTRA_DIST = bsp.h coverhd.h - include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/papyrus/include/bsp.h b/c/src/lib/libbsp/powerpc/papyrus/include/bsp.h index 34c86acf6c..ccbf762a06 100644 --- a/c/src/lib/libbsp/powerpc/papyrus/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/papyrus/include/bsp.h @@ -36,6 +36,8 @@ extern "C" { #endif +#include <bspopts.h> + /* * confdefs.h overrides for this BSP: * - number of termios serial ports (defaults to 1) diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog index bbcdbe997d..a496a7af84 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog @@ -1,3 +1,10 @@ +2001-05-26 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/ppcn_60x/configure.in b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.in index b36ba5ff73..f12d5047a3 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/configure.in +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.in @@ -26,7 +26,9 @@ RTEMS_CANONICAL_HOST AM_CONDITIONAL(HAS_NETWORKING,false) # AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") + RTEMS_PROJECT_ROOT +AM_CONFIG_HEADER(include/bspopts.h) # Explicitly list all Makefiles here AC_OUTPUT( diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/include/.cvsignore b/c/src/lib/libbsp/powerpc/ppcn_60x/include/.cvsignore index 282522db03..b0be3c54e6 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/include/.cvsignore +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/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/ppcn_60x/include/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.am index 9d9ea6d345..4af63cac1b 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.am @@ -4,34 +4,20 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = bsp.h ../../../shared/include/coverhd.h tod.h nvram.h \ - pci.h +include_HEADERS = bsp.h coverhd.h tod.h nvram.h pci.h bspopts.h $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/bsp.h: bsp.h +$(PROJECT_INCLUDE)/%.h: %p.h $(INSTALL_DATA) $< $@ -$(PROJECT_INCLUDE)/coverhd.h: ../../../shared/include/coverhd.h +coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h $(INSTALL_DATA) $< $@ -$(PROJECT_INCLUDE)/tod.h: tod.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/nvram.h: nvram.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE)/pci.h: pci.h - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/coverhd.h \ - $(PROJECT_INCLUDE)/tod.h $(PROJECT_INCLUDE)/nvram.h \ - $(PROJECT_INCLUDE)/pci.h +TMPINSTALL_FILES += $(PROJECT_INCLUDE) \ + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) all-local: $(TMPINSTALL_FILES) -EXTRA_DIST = bsp.h chain.h extisrdrv.h nvram.h pci.h tod.h - include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/include/bsp.h b/c/src/lib/libbsp/powerpc/ppcn_60x/include/bsp.h index 372a64e80f..4d94bed6b2 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/include/bsp.h @@ -29,6 +29,8 @@ #ifndef __BSP_h #define __BSP_h +#include <bspopts.h> + #ifdef __cplusplus extern "C" { #endif diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog index 4dde2ac375..f009a67de1 100644 --- a/c/src/lib/libbsp/powerpc/psim/ChangeLog +++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog @@ -1,3 +1,10 @@ +2001-05-26 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/psim/configure.in b/c/src/lib/libbsp/powerpc/psim/configure.in index ea34b4243a..9753c83d42 100644 --- a/c/src/lib/libbsp/powerpc/psim/configure.in +++ b/c/src/lib/libbsp/powerpc/psim/configure.in @@ -24,6 +24,7 @@ AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes") RTEMS_CONFIG_BUILD_SUBDIRS(tools) +AM_CONFIG_HEADER(include/bspopts.h) RTEMS_PROJECT_ROOT # Explicitly list all Makefiles here diff --git a/c/src/lib/libbsp/powerpc/psim/include/.cvsignore b/c/src/lib/libbsp/powerpc/psim/include/.cvsignore index 282522db03..b0be3c54e6 100644 --- a/c/src/lib/libbsp/powerpc/psim/include/.cvsignore +++ b/c/src/lib/libbsp/powerpc/psim/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/psim/include/Makefile.am b/c/src/lib/libbsp/powerpc/psim/include/Makefile.am index 2b8181354c..a2785f9a65 100644 --- a/c/src/lib/libbsp/powerpc/psim/include/Makefile.am +++ b/c/src/lib/libbsp/powerpc/psim/include/Makefile.am @@ -4,22 +4,17 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = bsp.h coverhd.h +include_HEADERS = bsp.h coverhd.h bspopts.h $(PROJECT_INCLUDE): $(mkinstalldirs) $@ -$(PROJECT_INCLUDE)/bsp.h: bsp.h +$(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -$(PROJECT_INCLUDE)/coverhd.h: coverhd.h - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \ - $(PROJECT_INCLUDE)/coverhd.h +TMPINSTALL_FILES += $(PROJECT_INCLUDE) \ + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) all-local: $(TMPINSTALL_FILES) -EXTRA_DIST = bsp.h coverhd.h - include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/psim/include/bsp.h b/c/src/lib/libbsp/powerpc/psim/include/bsp.h index 1ba31efc8f..7a176a9d6b 100644 --- a/c/src/lib/libbsp/powerpc/psim/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/psim/include/bsp.h @@ -36,6 +36,8 @@ extern "C" { #endif +#include <bspopts.h> + /* * confdefs.h overrides for this BSP: * - termios serial ports (defaults to 1) diff --git a/c/src/lib/libbsp/sparc/erc32/ChangeLog b/c/src/lib/libbsp/sparc/erc32/ChangeLog index bac112c9b3..f4cbb7e80d 100644 --- a/c/src/lib/libbsp/sparc/erc32/ChangeLog +++ b/c/src/lib/libbsp/sparc/erc32/ChangeLog @@ -1,3 +1,10 @@ +2001-05-26 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/sparc/erc32/configure.in b/c/src/lib/libbsp/sparc/erc32/configure.in index b17c97c5a6..42de8f3a6c 100644 --- a/c/src/lib/libbsp/sparc/erc32/configure.in +++ b/c/src/lib/libbsp/sparc/erc32/configure.in @@ -24,6 +24,13 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") RTEMS_CONFIG_BUILD_SUBDIRS(tools) +## 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/sparc/erc32/include/.cvsignore b/c/src/lib/libbsp/sparc/erc32/include/.cvsignore index 282522db03..b0be3c54e6 100644 --- a/c/src/lib/libbsp/sparc/erc32/include/.cvsignore +++ b/c/src/lib/libbsp/sparc/erc32/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/sparc/erc32/include/Makefile.am b/c/src/lib/libbsp/sparc/erc32/include/Makefile.am index 51d618bf80..1e98bc1a74 100644 --- a/c/src/lib/libbsp/sparc/erc32/include/Makefile.am +++ b/c/src/lib/libbsp/sparc/erc32/include/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = bsp.h coverhd.h erc32.h +include_HEADERS = bsp.h coverhd.h erc32.h bspopts.h $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -12,10 +12,9 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) +PREINSTALL_FILES += $(PROJECT_INCLUDE) \ + $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) all-local: $(PREINSTALL_FILES) -EXTRA_DIST = bsp.h coverhd.h - include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/sparc/erc32/include/bsp.h b/c/src/lib/libbsp/sparc/erc32/include/bsp.h index 12ccb5f125..77f5ef97e6 100644 --- a/c/src/lib/libbsp/sparc/erc32/include/bsp.h +++ b/c/src/lib/libbsp/sparc/erc32/include/bsp.h @@ -26,6 +26,8 @@ extern "C" { #endif +#include <bspopts.h> + #include <rtems.h> #include <iosupp.h> #include <libcpu/erc32.h> |