Replaced Makefile.in's with modified copies of cvme961 to get

autoconf/automake changes.
This commit is contained in:
Joel Sherrill
1999-10-27 16:19:24 +00:00
parent d73a8649ed
commit 919822f961
9 changed files with 244 additions and 154 deletions

View File

@@ -4,13 +4,28 @@
@SET_MAKE@ @SET_MAKE@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ top_srcdir = @top_srcdir@
RTEMS_ROOT = @top_srcdir@ top_builddir = ../..
subdir = i960/rxgen960
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@
include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg VPATH = @srcdir@
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(RTEMS_ROOT)/make/directory.cfg include $(RTEMS_ROOT)/make/directory.cfg
INSTALL_CHANGE = @INSTALL_CHANGE@
# We only build the multiprocessing support if HAS_MP was defined
MP_SUPPORT_yes_V = shmsupp
MP_SUPPORT = $(MP_SUPPORT_$(HAS_MP)_V)
# wrapup is the one that actually builds and installs the library # wrapup is the one that actually builds and installs the library
# from the individual .rel files built in other directories # from the individual .rel files built in other directories
SUB_DIRS=include startup clock console shmsupp timer wrapup SUB_DIRS = include startup clock console $(MP_SUPPORT) timer wrapup
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

View File

@@ -4,25 +4,32 @@
@SET_MAKE@ @SET_MAKE@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ top_srcdir = @top_srcdir@
RTEMS_ROOT = @top_srcdir@ top_builddir = ../../..
subdir = i960/cvme961/clock
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@
PGM=${ARCH}/clock.rel VPATH = @srcdir@
PGM = ${ARCH}/clock.rel
# C source names, if any, go here -- minus the .c # C source names, if any, go here -- minus the .c
C_PIECES=ckinit C_PIECES = ckinit
C_FILES=$(C_PIECES:%=%.c) C_FILES = $(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
H_FILES= H_FILES =
SRCS=$(C_FILES) $(H_FILES) SRCS = $(C_FILES) $(H_FILES)
OBJS=$(C_O_FILES) OBJS = $(C_O_FILES)
include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(RTEMS_ROOT)/make/leaf.cfg include $(RTEMS_ROOT)/make/leaf.cfg
INSTALL_CHANGE = @INSTALL_CHANGE@
# #
# (OPTIONAL) Add local stuff here using += # (OPTIONAL) Add local stuff here using +=
# #
@@ -52,3 +59,7 @@ all: ${ARCH} $(SRCS) $(PGM)
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
install: all install: all
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

View File

@@ -4,30 +4,32 @@
@SET_MAKE@ @SET_MAKE@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ top_srcdir = @top_srcdir@
RTEMS_ROOT = @top_srcdir@ top_builddir = ../../..
subdir = i960/rxgen/console
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@
PGM=${ARCH}/console.rel VPATH = @srcdir@
PGM = ${ARCH}/console.rel
# C source names, if any, go here -- minus the .c # C source names, if any, go here -- minus the .c
C_PIECES=console pcimsgreg C_PIECES = console pcimsgreg
C_FILES=$(C_PIECES:%=%.c) C_FILES = $(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
H_FILES=$(srcdir)/concntl.h H_FILES =
# Assembly source names, if any, go here -- minus the .s SRCS = $(C_FILES) $(H_FILES)
S_PIECES= OBJS = $(C_O_FILES)
S_FILES=$(S_PIECES:%=%.s)
S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
SRCS=$(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
OBJS=$(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg include $(RTEMS_ROOT)/make/leaf.cfg
INSTALL_CHANGE = @INSTALL_CHANGE@
# #
# (OPTIONAL) Add local stuff here using += # (OPTIONAL) Add local stuff here using +=
# #
@@ -54,6 +56,10 @@ ${PGM}: ${SRCS} ${OBJS}
$(make-rel) $(make-rel)
all: ${ARCH} $(SRCS) $(PGM) all: ${ARCH} $(SRCS) $(PGM)
$(INSTALL) -m 444 $(H_FILES) ${PROJECT_RELEASE}/include
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
install: all
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

View File

@@ -4,10 +4,15 @@
@SET_MAKE@ @SET_MAKE@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ top_srcdir = @top_srcdir@
RTEMS_ROOT = @top_srcdir@ top_builddir = ../../..
subdir = i960/rxgen960/include
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@
VPATH = @srcdir@
H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h
# #
@@ -23,16 +28,28 @@ H_FILES = $(srcdir)/bsp.h $(srcdir)/coverhd.h
EQ_FILES = EQ_FILES =
SRCS=$(H_FILES) $(EQ_FILES) SRCS = $(H_FILES) $(EQ_FILES)
include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(RTEMS_ROOT)/make/leaf.cfg include $(RTEMS_ROOT)/make/leaf.cfg
INSTALL_CHANGE = @INSTALL_CHANGE@
mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
INSTALLDIRS = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/cpu
$(INSTALLDIRS):
@$(mkinstalldirs) $(INSTALLDIRS)
CLEAN_ADDITIONS += CLEAN_ADDITIONS +=
CLOBBER_ADDITIONS += CLOBBER_ADDITIONS +=
all: $(SRCS) all: $(SRCS)
$(INSTALL) -m 444 $(H_FILES) $(PROJECT_INCLUDE) @$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
$(INSTALL) -m 444 $(EQ_FILES) $(PROJECT_INCLUDE)/cpu @$(INSTALL_CHANGE) -m 644 $(EQ_FILES) $(PROJECT_INCLUDE)/cpu
install: all install: all
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

View File

@@ -4,25 +4,32 @@
@SET_MAKE@ @SET_MAKE@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ top_srcdir = @top_srcdir@
RTEMS_ROOT = @top_srcdir@ top_builddir = ../../..
subdir = i960/rxgen960/shmsupp
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@
PGM=${ARCH}/shmsupp.rel VPATH = @srcdir@
PGM = ${ARCH}/shmsupp.rel
# C source names, if any, go here -- minus the .c # C source names, if any, go here -- minus the .c
C_PIECES=addrconv getcfg lock mpisr C_PIECES = addrconv getcfg lock mpisr
C_FILES=$(C_PIECES:%=%.c) C_FILES = $(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
H_FILES= H_FILES =
SRCS=$(C_FILES) $(H_FILES) SRCS = $(C_FILES) $(H_FILES)
OBJS=$(C_O_FILES) OBJS = $(C_O_FILES)
include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(RTEMS_ROOT)/make/leaf.cfg include $(RTEMS_ROOT)/make/leaf.cfg
INSTALL_CHANGE = @INSTALL_CHANGE@
# #
# (OPTIONAL) Add local stuff here using += # (OPTIONAL) Add local stuff here using +=
# #
@@ -53,3 +60,6 @@ all: ${ARCH} $(SRCS) $(PGM)
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
install: all install: all
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

View File

@@ -1,5 +1,4 @@
/* Shm_isr_cvme961() /*
*
* NOTE: This routine is not used when in polling mode. Either * NOTE: This routine is not used when in polling mode. Either
* this routine OR Shm_clockisr is used in a particular system. * this routine OR Shm_clockisr is used in a particular system.
* *
@@ -22,7 +21,7 @@
#include <bsp.h> #include <bsp.h>
#include "shm.h" #include "shm.h"
rtems_isr Shm_isr_cvme961( rtems_isr Shm_isr_rxgen960(
rtems_vector_number vector rtems_vector_number vector
) )
{ {
@@ -60,7 +59,7 @@ void Shm_setvec()
/* VME slave address */ /* VME slave address */
(*(rtems_unsigned8 *)0xc00000b0) = (*(rtems_unsigned8 *)0xc00000b0) =
(Shm_RTEMS_MP_Configuration->node - 1) | 0x10; (Shm_RTEMS_MP_Configuration->node - 1) | 0x10;
set_vector( Shm_isr_cvme961, 6, 1 ); set_vector( Shm_isr_rxgen960, 6, 1 );
/* set ICMS Bector Base Register */ /* set ICMS Bector Base Register */
(*(rtems_unsigned8 *)0xa0000053) = 0x60; /* XINT6 vector is 0x62 */ (*(rtems_unsigned8 *)0xa0000053) = 0x60; /* XINT6 vector is 0x62 */
/* set ICMS Intr Control Reg */ /* set ICMS Intr Control Reg */

View File

@@ -4,47 +4,46 @@
@SET_MAKE@ @SET_MAKE@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@:@srcdir@/../../../shared top_srcdir = @top_srcdir@
RTEMS_ROOT = @top_srcdir@ top_builddir = ../../..
subdir = i960/rxgen960/startup
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@
PGM=${ARCH}/startup.rel VPATH = @srcdir@:@srcdir@/../../../shared
IPGM=${ARCH}/startup.indv
PGM = ${ARCH}/startup.rel
# C source names, if any, go here -- minus the .c # C source names, if any, go here -- minus the .c
# OLD:C_PIECES=bspclean bsplibc bsppost bspstart main sbrk setvec #C_PIECES = bspclean bsplibc bsppost bspstart bootcard main sbrk setvec \
# we assume to get the following sources from bsplib/shared # gnatinstallhandler
C_PIECES=bspstart bsppost bspclean bsplibc main sbrk setvec kkprintf frmstr nmi XtInt C_PIECES = bspstart cntrltbl exit fault flttbl frmstr intrtbl kkprintf \
C_FILES=$(C_PIECES:%=%.c) nmi nulsystbl prcb rom_cntrltbl rom_ibr rom_prcb save_systbl
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) sctns setvec systbl
C_FILES = $(C_PIECES:%=%.c)
C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
# C individual source names, if any, go here -- minus the .c S_PIECES = asmfault asmstub ihandler rxgen_romld sctns systbl
CI_PIECES=cntrltbl flttbl intrtbl prcb sctns fault nulsystbl systbl rom_cntrltbl rom_prcb rom_ibr S_FILES = $(S_PIECES:%=%.S)
CI_FILES=$(CI_PIECES:%=%.c) S_O_FILES = $(S_PIECES:%=${ARCH}/%.o)
CI_O_FILES=$(CI_PIECES:%=${ARCH}/%.o)
H_FILES= H_FILES =
# Assembly source names, if any, go here -- minus the .s SRCS = $(C_FILES) $(S_FILES) $(H_FILES)
S_PIECES= OBJS = $(C_O_FILES) $(S_O_FILES)
S_FILES=$(S_PIECES:%=%.s)
S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o)
# Assembly individual source names, if any, go here -- minus the .s include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
SI_PIECES=rxgen_romld asmfault asmstub ihandler
SI_FILES=$(SI_PIECES:%=%.s)
SI_O_FILES=$(SI_FILES:%.s=${ARCH}/%.o)
SRCS=$(C_FILES) $(H_FILES) $(S_FILES)
OBJS=$(C_O_FILES) $(S_O_FILES)
ISRCS=$(CI_FILES) $(H_FILES) $(SI_FILES)
IOBJS=$(CI_O_FILES) $(SI_O_FILES)
include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/leaf.cfg include $(RTEMS_ROOT)/make/leaf.cfg
INSTALL_CHANGE = @INSTALL_CHANGE@
mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
INSTALLDIRS = $(PROJECT_RELEASE)/lib
$(INSTALLDIRS):
@$(mkinstalldirs) $(INSTALLDIRS)
# #
# (OPTIONAL) Add local stuff here using += # (OPTIONAL) Add local stuff here using +=
# #
@@ -66,17 +65,16 @@ LDFLAGS +=
CLEAN_ADDITIONS += CLEAN_ADDITIONS +=
CLOBBER_ADDITIONS += CLOBBER_ADDITIONS +=
${PGM}: ${SRCS} ${OBJS} ${PGM}: ${SRCS} ${OBJS}
$(make-rel) $(make-rel)
${IPGM}: ${ISRCS} ${IOBJS} all: ${ARCH} $(SRCS) $(PGM)
touch ${IPGM} $(INSTALL_CHANGE) -m 644 $(srcdir)/linkcmds $(PROJECT_RELEASE)/lib
all: ${ARCH} $(SRCS) $(PGM) $(ISRCS) $(IPGM)
$(INSTALL) $(srcdir)/linkcmds ${PROJECT_RELEASE}/lib
i960-rtems-strip --strip-debug ${ARCH}/rom_ibr.o
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
install: all install: all
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

View File

@@ -4,30 +4,37 @@
@SET_MAKE@ @SET_MAKE@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ top_srcdir = @top_srcdir@
RTEMS_ROOT = @top_srcdir@ top_builddir = ../../..
subdir = i960/rxgen/timer
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@
PGM=${ARCH}/timer.rel VPATH = @srcdir@
PGM = ${ARCH}/timer.rel
# C source names, if any, go here -- minus the .c # C source names, if any, go here -- minus the .c
C_PIECES=timer C_PIECES = timer
C_FILES=$(C_PIECES:%=%.c) C_FILES = $(C_PIECES:%=%.c)
C_O_FILES=$(C_PIECES:%=${ARCH}/%.o) C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
H_FILES= H_FILES =
# Assembly source names, if any, go here -- minus the .s # Assembly source names, if any, go here -- minus the .S
S_PIECES= S_PIECES = timerisr
S_FILES=$(S_PIECES:%=%.s) S_FILES = $(S_PIECES:%=%.S)
S_O_FILES=$(S_FILES:%.s=${ARCH}/%.o) S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
SRCS=$(C_FILES) $(H_FILES) $(S_FILES) SRCS = $(C_FILES) $(H_FILES) $(S_FILES)
OBJS=$(C_O_FILES) $(S_O_FILES) OBJS = $(C_O_FILES) $(S_O_FILES)
include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(RTEMS_ROOT)/make/leaf.cfg include $(RTEMS_ROOT)/make/leaf.cfg
INSTALL_CHANGE = @INSTALL_CHANGE@
# #
# (OPTIONAL) Add local stuff here using += # (OPTIONAL) Add local stuff here using +=
# #
@@ -57,3 +64,7 @@ all: ${ARCH} $(SRCS) $(PGM)
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
install: all install: all
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

View File

@@ -4,20 +4,37 @@
@SET_MAKE@ @SET_MAKE@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = @srcdir@ top_srcdir = @top_srcdir@
RTEMS_ROOT = @top_srcdir@ top_builddir = ../../..
subdir = i960/rxgen960/wrapup
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@ PROJECT_ROOT = @PROJECT_ROOT@
BSP_PIECES=startup clock console shmsupp timer VPATH = @srcdir@
GENERIC_PIECES=shmdr
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(RTEMS_ROOT)/make/lib.cfg
INSTALL = @INSTALL@
INSTALL_CHANGE = @INSTALL_CHANGE@
BSP_PIECES = startup clock console timer
GENERIC_PIECES =
GENERIC_MP_REL_PIECES_yes_V = shmdr
GENERIC_MP_REL_PIECES_no_V =
GENERIC_PIECES += $(GENERIC_MP_REL_PIECES_$(HAS_MP)_V)
BSP_MP_O_PIECES_yes_V = shmsupp
BSP_MP_O_PIECES_no_V =
BSP_PIECES += $(BSP_MP_O_PIECES_$(HAS_MP)_V)
# bummer; have to use $foreach since % pattern subst rules only replace 1x # bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS=$(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/$(piece).rel) \ OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
$(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel) $(foreach piece, $(GENERIC_PIECES), \
LIB=$(ARCH)/libbsp.a ../../../$(piece)/$(ARCH)/$(piece).rel)
LIB = $(ARCH)/libbsp.a
include $(RTEMS_ROOT)/make/custom/$(RTEMS_BSP).cfg
include $(RTEMS_ROOT)/make/lib.cfg
# #
# (OPTIONAL) Add local stuff here using += # (OPTIONAL) Add local stuff here using +=
@@ -45,7 +62,13 @@ $(LIB): ${OBJS}
$(make-library) $(make-library)
all: ${ARCH} $(SRCS) $(LIB) all: ${ARCH} $(SRCS) $(LIB)
$(INSTALL_VARIANT) -m 644 $(LIB) ${PROJECT_RELEASE}/lib $(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
install: all install: all
$(PROJECT_ROOT)/@RTEMS_BSP@/lib/bsp_specs: ../bsp_specs
$(INSTALL_DATA) $< $@
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status