From 8b9acbf06e4203a506167c09fcf463bd5bca5a48 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 13 Sep 2000 19:42:20 +0000 Subject: 2000-09-13 Joel Sherrill * Makefile.am, bsp_specs, configure.in, console/Makefile.am, include/Makefile.am, irq/Makefile.am, irq/irq.c, start/Makefile.am, startup/Makefile.am, startup/exit.c, wrapup/Makefile.am: Made to conform to current practice concerning automake and autoconf. Corrected minor warnings. --- c/src/lib/libbsp/arm/vegaplus/ChangeLog | 8 ++++++ c/src/lib/libbsp/arm/vegaplus/Makefile.am | 4 ++- c/src/lib/libbsp/arm/vegaplus/bsp_specs | 2 +- c/src/lib/libbsp/arm/vegaplus/configure.in | 11 --------- c/src/lib/libbsp/arm/vegaplus/console/Makefile.am | 17 ++++++++----- c/src/lib/libbsp/arm/vegaplus/include/Makefile.am | 11 +++++---- c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am | 30 +++++++++++------------ c/src/lib/libbsp/arm/vegaplus/irq/irq.c | 6 +++-- c/src/lib/libbsp/arm/vegaplus/start/Makefile.am | 8 +++--- c/src/lib/libbsp/arm/vegaplus/startup/Makefile.am | 24 +++++++++--------- c/src/lib/libbsp/arm/vegaplus/startup/exit.c | 2 +- c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am | 22 +++++++++-------- 12 files changed, 75 insertions(+), 70 deletions(-) diff --git a/c/src/lib/libbsp/arm/vegaplus/ChangeLog b/c/src/lib/libbsp/arm/vegaplus/ChangeLog index 1ad019195a..8d135238e2 100644 --- a/c/src/lib/libbsp/arm/vegaplus/ChangeLog +++ b/c/src/lib/libbsp/arm/vegaplus/ChangeLog @@ -1,3 +1,11 @@ +2000-09-13 Joel Sherrill + + * Makefile.am, bsp_specs, configure.in, console/Makefile.am, + include/Makefile.am, irq/Makefile.am, irq/irq.c, start/Makefile.am, + startup/Makefile.am, startup/exit.c, wrapup/Makefile.am: + Made to conform to current practice concerning automake and + autoconf. Corrected minor warnings. + 2000-09-13 Emmanuel Raguet * vegaplus BSP submitted by Emmanuel Raguet and diff --git a/c/src/lib/libbsp/arm/vegaplus/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/Makefile.am index d7ef24e6b8..663347d231 100644 --- a/c/src/lib/libbsp/arm/vegaplus/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/Makefile.am @@ -7,7 +7,9 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal # wrapup is the one that actually builds and installs the library # from the individual .rel files built in other directories -SUBDIRS = . include console startup start irq wrapup +SUBDIRS = . include irq console startup start wrapup + +include $(top_srcdir)/../../bsp.am EXTRA_DIST = bsp_specs diff --git a/c/src/lib/libbsp/arm/vegaplus/bsp_specs b/c/src/lib/libbsp/arm/vegaplus/bsp_specs index cec6e5bc4c..6d94c35fdb 100644 --- a/c/src/lib/libbsp/arm/vegaplus/bsp_specs +++ b/c/src/lib/libbsp/arm/vegaplus/bsp_specs @@ -19,5 +19,5 @@ %{qrtems_debug: start_g.o%s crtbegin.o%s}} *link: -%{!qrtems: %(old_link)} %{qrtems: -Qy -dp -Bstatic -T linkcmds%s -e _start} +%{!qrtems: %(old_link)} %{qrtems: -Qy -dp -Bstatic -N -e _start} diff --git a/c/src/lib/libbsp/arm/vegaplus/configure.in b/c/src/lib/libbsp/arm/vegaplus/configure.in index cc0b0e253b..4132bed1a0 100644 --- a/c/src/lib/libbsp/arm/vegaplus/configure.in +++ b/c/src/lib/libbsp/arm/vegaplus/configure.in @@ -17,19 +17,8 @@ RTEMS_CANONICALIZE_TOOLS RTEMS_ENV_RTEMSBSP RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) -RTEMS_CHECK_NETWORKING RTEMS_CANONICAL_HOST -dnl if this is an i386, does gas have good code16 support? -RTEMS_I386_GAS_CODE16 -AM_CONDITIONAL(RTEMS_GAS_CODE16,test "$RTEMS_GAS_CODE16" = "yes"); - -AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") - -AC_CONFIG_SUBDIRS(tools) - -AC_SUBST(RTEMS_BSP) - RTEMS_PROJECT_ROOT # Explicitly list all Makefiles here diff --git a/c/src/lib/libbsp/arm/vegaplus/console/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/console/Makefile.am index 668e7c05b5..b87e7b0332 100644 --- a/c/src/lib/libbsp/arm/vegaplus/console/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/console/Makefile.am @@ -8,25 +8,30 @@ VPATH = @srcdir@/../../shared/comm:@srcdir@/../../shared/io PGM = $(ARCH)/console.rel -C_FILES = uart.c console.c printk.c +C_FILES = uart.c console.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -H_FILES = uart.h bspio.h - -console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) +OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += # -$(PGM): $(console_rel_OBJECTS) +AM_CPPFLAGS += -I $(srcdir)/../irq + +$(PGM): $(OBJS) $(make-rel) -all: $(ARCH) $(console_rel_OBJECTS) $(PGM) +# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile + +all-local: $(ARCH) $(OBJS) $(PGM) .PRECIOUS: $(PGM) +EXTRA_DIST = console.c + include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/vegaplus/include/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/include/Makefile.am index 6e4ee50f82..8bcfe9d8be 100644 --- a/c/src/lib/libbsp/arm/vegaplus/include/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/include/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_FILES = bsp.h registers.h +H_FILES = bsp.h registers.h ../../../shared/include/coverhd.h $(PROJECT_INCLUDE): $(mkinstalldirs) $@ @@ -12,13 +12,14 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h +$(PROJECT_INCLUDE)/coverhd.h: ../../../shared/include/coverhd.h $(INSTALL_DATA) $< $@ -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) +TMPINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp.h \ + $(PROJECT_INCLUDE)/registers.h $(PROJECT_INCLUDE)/coverhd.h -all: $(PREINSTALL_FILES) +all-local: $(TMPINSTALL_FILES) -EXTRA_DIST = bspio.h bsp.h uart.h registers.h +EXTRA_DIST = bsp.h registers.h include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am index ec9fccfbf4..8a8dd2c93d 100644 --- a/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/irq/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -9,36 +9,34 @@ VPATH = @srcdir@:@srcdir@/../../shared/irq PGM = $(ARCH)/irq.rel C_FILES = irq.c irq_init.c bsp_irq_init.c -S_FILES = irq_asm.S bsp_irq_asm.S -H_FILES = irq.h - C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) - -irq_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ +S_FILES = irq_asm.S bsp_irq_asm.S +S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ +H_FILES = irq.h -PREINSTALL_FILES += $(PROJECT_INCLUDE) $(H_FILES:%.h=$(PROJECT_INCLUDE)/%.h) +OBJS = $(C_O_FILES) $(S_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += # -$(PGM): $(startup_rel_OBJECTS) +AM_CPPFLAGS += -I$(srcdir) + +$(PGM): $(OBJS) $(make-rel) -all: $(PREINSTALL_FILES) $(ARCH) $(irq_rel_OBJECTS) $(PGM) +# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile + +all-local: $(ARCH) $(OBJS) $(PGM) .PRECIOUS: $(PGM) -EXTRA_DIST = irq.c bsp_irq_init.c bsp_irq_asm.S +EXTRA_DIST = bsp_irq_asm.S bsp_irq_init.c irq.c irq.h include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/vegaplus/irq/irq.c b/c/src/lib/libbsp/arm/vegaplus/irq/irq.c index 0f90bb1d47..f6efc284ed 100644 --- a/c/src/lib/libbsp/arm/vegaplus/irq/irq.c +++ b/c/src/lib/libbsp/arm/vegaplus/irq/irq.c @@ -39,6 +39,7 @@ static int isValidInterrupt(int irq) int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) { rtems_irq_hdl *HdlTable; + rtems_interrupt_level level; if (!isValidInterrupt(irq->name)) { return 0; @@ -46,7 +47,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) /* * Check if default handler is actually connected. If not issue an error. */ - HdlTable = VECTOR_TABLE; + HdlTable = (rtems_irq_hdl *) VECTOR_TABLE; if (*(HdlTable + irq->name) != default_int_handler) { return 0; } @@ -86,6 +87,7 @@ int BSP_install_rtems_irq_handler (const rtems_irq_connect_data* irq) int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) { rtems_irq_hdl *HdlTable; + rtems_interrupt_level level; if (!isValidInterrupt(irq->name)) { return 0; @@ -93,7 +95,7 @@ int BSP_remove_rtems_irq_handler (const rtems_irq_connect_data* irq) /* * Check if the handler is actually connected. If not issue an error. */ - HdlTable = VECTOR_TABLE; + HdlTable = (rtems_irq_hdl *) VECTOR_TABLE; if (*(HdlTable + irq->name) != irq->hdl) { return 0; } diff --git a/c/src/lib/libbsp/arm/vegaplus/start/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/start/Makefile.am index 22fda2740d..c307810d35 100644 --- a/c/src/lib/libbsp/arm/vegaplus/start/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/start/Makefile.am @@ -11,22 +11,20 @@ S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) OBJS = $(S_O_FILES) -TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += # -LINKCMDS = $(top_srcdir)/startup/linkcmds - $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o: $(ARCH)/start.o $(INSTALL_DATA) $< $@ +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o -all: $(ARCH) $(OBJS) $(TMPINSTALL_FILES) +all: $(ARCH) $(OBJS) $(PGMS) $(TMPINSTALL_FILES) EXTRA_DIST = start.S diff --git a/c/src/lib/libbsp/arm/vegaplus/startup/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/startup/Makefile.am index ef64b64dad..764e703b76 100644 --- a/c/src/lib/libbsp/arm/vegaplus/startup/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/startup/Makefile.am @@ -1,40 +1,40 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 VPATH = @srcdir@:@srcdir@/../../../shared -C_FILES = bsplibc.c bsppost.c bspstart.c exit.c bootcard.c main.c sbrk.c gnatinstallhandler.c -C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) +PGM = $(ARCH)/startup.rel -S_FILES = -S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o) +C_FILES = bsplibc.c bsppost.c bspstart.c exit.c bootcard.c main.c sbrk.c \ + gnatinstallhandler.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) -startup_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES) +OBJS = $(C_O_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += # - -$(PGM): $(startup_rel_OBJECTS) +$(PGM): $(OBJS) $(make-rel) $(PROJECT_RELEASE)/lib/linkcmds: linkcmds $(INSTALL_DATA) $< $@ +# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds -all: $(ARCH) $(startup_rel_OBJECTS) $(PGM) $(TMPINSTALL_FILES) +all-local: $(ARCH) $(OBJS) $(PGM) $(TMPINSTALL_FILES) .PRECIOUS: $(PGM) -EXTRA_DIST = linkcmds +EXTRA_DIST = bspstart.c exit.c linkcmds include $(top_srcdir)/../../../../../../automake/local.am - diff --git a/c/src/lib/libbsp/arm/vegaplus/startup/exit.c b/c/src/lib/libbsp/arm/vegaplus/startup/exit.c index 7eb3056585..5342a2805a 100644 --- a/c/src/lib/libbsp/arm/vegaplus/startup/exit.c +++ b/c/src/lib/libbsp/arm/vegaplus/startup/exit.c @@ -16,7 +16,7 @@ #include #include -#include +#include #include void rtemsReboot (void) diff --git a/c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am b/c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am index 8d7d4068b2..60acf4996e 100644 --- a/c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am +++ b/c/src/lib/libbsp/arm/vegaplus/wrapup/Makefile.am @@ -1,23 +1,27 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 BSP_PIECES = console startup irq -# bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) -LIB = $(ARCH)/libbsp.a - include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/compile.am include $(top_srcdir)/../../../../../../automake/lib.am +# bummer; have to use $foreach since % pattern subst rules only replace 1x +OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/$(ARCH)/*.o) \ + $(foreach piece, $(GENERIC_FILES), ../../../$(piece)/$(ARCH)/$(piece).rel) + +LIB = $(ARCH)/libbsp.a + # # (OPTIONAL) Add local stuff here using += # -$(LIB): $(OBJS) +$(LIB): ${OBJS} $(make-library) $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a: $(LIB) @@ -25,8 +29,6 @@ $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a: $(LIB) TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/libbsp$(LIB_VARIANT).a -all: $(ARCH) $(OBJS) $(LIB) $(TMPINSTALL_FILES) - -.PRECIOUS: $(LIB) +all-local: ${ARCH} $(TMPINSTALL_FILES) include $(top_srcdir)/../../../../../../automake/local.am -- cgit v1.2.3