From 5f78f5d07fc47c8e9f2dd09e24ebdb6db1d0219a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 8 Jan 2001 18:19:27 +0000 Subject: 2001-01-08 Joel Sherrill * start/start.S: init_exc_vecs is now called mips_install_isr_entries. * wrapup/Makefile.am: Corrected to reflect new libcpu structure. --- c/src/lib/libbsp/mips/p4000/ChangeLog | 5 +++++ c/src/lib/libbsp/mips/p4000/start/start.S | 2 +- c/src/lib/libbsp/mips/p4000/wrapup/Makefile.am | 16 +++++++++++----- 3 files changed, 17 insertions(+), 6 deletions(-) (limited to 'c/src') diff --git a/c/src/lib/libbsp/mips/p4000/ChangeLog b/c/src/lib/libbsp/mips/p4000/ChangeLog index 006e3bacc4..012d05643b 100644 --- a/c/src/lib/libbsp/mips/p4000/ChangeLog +++ b/c/src/lib/libbsp/mips/p4000/ChangeLog @@ -1,3 +1,8 @@ +2001-01-08 Joel Sherrill + + * start/start.S: init_exc_vecs is now called mips_install_isr_entries. + * wrapup/Makefile.am: Corrected to reflect new libcpu structure. + 2000-11-09 Ralf Corsepius * Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS. diff --git a/c/src/lib/libbsp/mips/p4000/start/start.S b/c/src/lib/libbsp/mips/p4000/start/start.S index 2f35543a99..1a1fa11a0d 100644 --- a/c/src/lib/libbsp/mips/p4000/start/start.S +++ b/c/src/lib/libbsp/mips/p4000/start/start.S @@ -173,7 +173,7 @@ FRAME(start,sp,0,ra) bltu v0, v1, 4b /* clear out temp stack */ add v0, 4 - jal init_exc_vecs /* install exception handlers */ + jal mips_install_isr_entries/* install exception handlers */ nop /* MUST do before memory probes */ la v0, 5f diff --git a/c/src/lib/libbsp/mips/p4000/wrapup/Makefile.am b/c/src/lib/libbsp/mips/p4000/wrapup/Makefile.am index 787e44593a..c9c4168a37 100644 --- a/c/src/lib/libbsp/mips/p4000/wrapup/Makefile.am +++ b/c/src/lib/libbsp/mips/p4000/wrapup/Makefile.am @@ -7,15 +7,21 @@ AUTOMAKE_OPTIONS = foreign 1.4 BSP_FILES = startup console liblnk CPU_FILES = clock timer -# bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_FILES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(foreach piece, $(CPU_FILES), ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/$(piece).rel) -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)) \ + $(foreach piece, $(CPU_FILES), \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(piece)/$(ARCH)/*.o)) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \ + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/r46xx/*/$(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 += # -- cgit v1.2.3