From f0f8e4deb282ab3ce7447b68db9e139a63ffc29f Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 3 Mar 2009 00:10:56 +0000 Subject: 2009-03-02 Joel Sherrill * Makefile.am, preinstall.am, include/bsp.h, startup/setvec.c: Now compiles again but applications do not link. --- c/src/lib/libbsp/nios2/nios2_iss/ChangeLog | 5 +++++ c/src/lib/libbsp/nios2/nios2_iss/Makefile.am | 5 +++++ c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h | 2 +- c/src/lib/libbsp/nios2/nios2_iss/preinstall.am | 9 +++++++++ c/src/lib/libbsp/nios2/nios2_iss/startup/setvec.c | 4 ++-- 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog b/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog index dfbb84f61d..71985f3c18 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog +++ b/c/src/lib/libbsp/nios2/nios2_iss/ChangeLog @@ -1,3 +1,8 @@ +2009-03-02 Joel Sherrill + + * Makefile.am, preinstall.am, include/bsp.h, startup/setvec.c: Now + compiles again but applications do not link. + 2008-12-04 Joel Sherrill * bsp_specs: Move -e start from *link to *startfile to avoid warning diff --git a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am index 11719e0199..90f7949ecd 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am +++ b/c/src/lib/libbsp/nios2/nios2_iss/Makefile.am @@ -8,10 +8,13 @@ include $(top_srcdir)/../../../../automake/compile.am dist_project_lib_DATA = bsp_specs +include_bspdir = $(includedir)/bsp + include_HEADERS = include/bsp.h include_HEADERS += ../../shared/include/tm27.h nodist_include_HEADERS = include/bspopts.h +nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h include_HEADERS += ../../shared/include/coverhd.h @@ -39,9 +42,11 @@ libbsp_a_SOURCES += clock/clock.c ../../../shared/clockdrv_shell.h libbsp_a_SOURCES += console/console.c # timer libbsp_a_SOURCES += timer/timer.c +if HAS_MP # shmsupp libbsp_a_SOURCES += shmsupp/addrconv.c shmsupp/getcfg.c shmsupp/lock.c \ shmsupp/mpisr.c +endif include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h b/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h index 600408f068..7f1e247e17 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h +++ b/c/src/lib/libbsp/nios2/nios2_iss/include/bsp.h @@ -129,7 +129,7 @@ altera_avalon_jtag_uart_regs; /* functions */ -nios2_isr_entry set_vector( /* returns old vector */ +rtems_isr_entry set_vector( /* returns old vector */ rtems_isr_entry handler, /* isr routine */ rtems_vector_number vector, /* vector number */ int type /* RTEMS or RAW intr */ diff --git a/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am b/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am index 0492745830..5e40708306 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am +++ b/c/src/lib/libbsp/nios2/nios2_iss/preinstall.am @@ -32,6 +32,11 @@ $(PROJECT_LIB)/bsp_specs: bsp_specs $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs +$(PROJECT_INCLUDE)/bsp/$(dirstamp): + @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp + @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp.h @@ -44,6 +49,10 @@ $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h +$(PROJECT_INCLUDE)/bsp/bootcard.h: ../../shared/include/bootcard.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/bootcard.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h + $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h diff --git a/c/src/lib/libbsp/nios2/nios2_iss/startup/setvec.c b/c/src/lib/libbsp/nios2/nios2_iss/startup/setvec.c index a35618a8c5..c6750794a3 100644 --- a/c/src/lib/libbsp/nios2/nios2_iss/startup/setvec.c +++ b/c/src/lib/libbsp/nios2/nios2_iss/startup/setvec.c @@ -27,13 +27,13 @@ #include #include -nios2_isr_entry set_vector( /* returns old vector */ +rtems_isr_entry set_vector( /* returns old vector */ rtems_isr_entry handler, /* isr routine */ rtems_vector_number vector, /* vector number */ int type /* RTEMS or RAW intr */ ) { - nios2_isr_entry previous_isr; + rtems_isr_entry previous_isr; if ( type ) rtems_interrupt_catch( handler, vector, (rtems_isr_entry *) &previous_isr ); -- cgit v1.2.3