From 0d833168cca1f3fbad5b51ed0016498c28b22cf4 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 30 Apr 2010 14:27:24 +0000 Subject: 2010-04-30 Sebastian Huber * Makefile.am, preinstall.am: Added generic interrupt support modules. * include/bsp.h: Define BSP_FEATURE_IRQ_EXTENSION. * startup/bspstart.c, rtl8019/rtl8019.c: Interrupt support changes. --- c/src/lib/libbsp/arm/gumstix/ChangeLog | 6 ++++++ c/src/lib/libbsp/arm/gumstix/Makefile.am | 10 ++++++++++ c/src/lib/libbsp/arm/gumstix/include/bsp.h | 2 ++ c/src/lib/libbsp/arm/gumstix/preinstall.am | 8 ++++++++ c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c | 2 +- c/src/lib/libbsp/arm/gumstix/startup/bspstart.c | 6 ++++-- 6 files changed, 31 insertions(+), 3 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/arm/gumstix/ChangeLog b/c/src/lib/libbsp/arm/gumstix/ChangeLog index 16b68963f2..7f2c45c196 100644 --- a/c/src/lib/libbsp/arm/gumstix/ChangeLog +++ b/c/src/lib/libbsp/arm/gumstix/ChangeLog @@ -1,3 +1,9 @@ +2010-04-30 Sebastian Huber + + * Makefile.am, preinstall.am: Added generic interrupt support modules. + * include/bsp.h: Define BSP_FEATURE_IRQ_EXTENSION. + * startup/bspstart.c, rtl8019/rtl8019.c: Interrupt support changes. + 2010-04-30 Sebastian Huber * make/custom/gumstix.cfg: Use VFP floating point model. diff --git a/c/src/lib/libbsp/arm/gumstix/Makefile.am b/c/src/lib/libbsp/arm/gumstix/Makefile.am index cb695ef7f6..7d67a69a3c 100755 --- a/c/src/lib/libbsp/arm/gumstix/Makefile.am +++ b/c/src/lib/libbsp/arm/gumstix/Makefile.am @@ -14,6 +14,8 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_bsp_HEADERS = + nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h @@ -38,6 +40,14 @@ libbsp_a_SOURCES += ../../shared/bsplibc.c ../../shared/bsppost.c \ #console libbsp_a_SOURCES += console/uarts.c ../../shared/console.c +# IRQ +include_bsp_HEADERS += ../../shared/include/irq-generic.h \ + ../../shared/include/irq-info.h +libbsp_a_SOURCES += ../../shared/src/irq-generic.c \ + ../../shared/src/irq-legacy.c \ + ../../shared/src/irq-info.c \ + ../../shared/src/irq-shell.c \ + ../../shared/src/irq-server.c #abort libbsp_a_SOURCES += ../shared/abort/abort.c #framebuffer diff --git a/c/src/lib/libbsp/arm/gumstix/include/bsp.h b/c/src/lib/libbsp/arm/gumstix/include/bsp.h index 46b634f21e..144e534003 100755 --- a/c/src/lib/libbsp/arm/gumstix/include/bsp.h +++ b/c/src/lib/libbsp/arm/gumstix/include/bsp.h @@ -22,6 +22,8 @@ extern "C" { #include #include +#define BSP_FEATURE_IRQ_EXTENSION + #define BSP_HAS_FRAME_BUFFER 1 /* What is the input clock freq in hertz */ diff --git a/c/src/lib/libbsp/arm/gumstix/preinstall.am b/c/src/lib/libbsp/arm/gumstix/preinstall.am index dd3a1e57b7..dea7ee94dd 100755 --- a/c/src/lib/libbsp/arm/gumstix/preinstall.am +++ b/c/src/lib/libbsp/arm/gumstix/preinstall.am @@ -65,6 +65,14 @@ $(PROJECT_LIB)/linkcmds: startup/linkcmds $(PROJECT_LIB)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds +$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h + +$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h + if ON_SKYEYE endif if ON_SKYEYE diff --git a/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c b/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c index ab1f5378f4..177bd0f658 100644 --- a/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c +++ b/c/src/lib/libbsp/arm/gumstix/rtl8019/rtl8019.c @@ -11,7 +11,7 @@ */ #include -#include +#include #include "wd80x3.h" #include diff --git a/c/src/lib/libbsp/arm/gumstix/startup/bspstart.c b/c/src/lib/libbsp/arm/gumstix/startup/bspstart.c index 445035f764..57db2ef042 100755 --- a/c/src/lib/libbsp/arm/gumstix/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/gumstix/startup/bspstart.c @@ -9,13 +9,13 @@ */ #include +#include #include #include #include /* Function prototypes */ void rtems_exception_init_mngt(void); -void rtems_irq_mngt_init(void); /* * @@ -36,7 +36,9 @@ void bsp_start_default( void ) /* disable interrupts */ XSCALE_INT_ICMR = 0x0; rtems_exception_init_mngt(); - rtems_irq_mngt_init(); + if (bsp_interrupt_initialize() != RTEMS_SUCCESSFUL) { + _CPU_Fatal_halt(0xe); + } } /* bsp_start */ /* -- cgit v1.2.3