diff options
Diffstat (limited to 'c/src/lib/libbsp/arm/arm_bare_bsp')
10 files changed, 71 insertions, 16 deletions
diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/clock/.cvsignore b/c/src/lib/libbsp/arm/arm_bare_bsp/clock/.cvsignore new file mode 100644 index 0000000000..282522db03 --- /dev/null +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/clock/.cvsignore @@ -0,0 +1,2 @@ +Makefile +Makefile.in diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/clock/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/clock/Makefile.am new file mode 100644 index 0000000000..7c33173275 --- /dev/null +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/clock/Makefile.am @@ -0,0 +1,32 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +PGM = $(ARCH)/clock.rel + +C_FILES = clockdrv.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) + +OBJS = $(C_O_FILES) + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am + +# +# (OPTIONAL) Add local stuff here using += +# + +$(PGM): $(OBJS) + $(make-rel) + +# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile + +all-local: $(ARCH) $(OBJS) $(PGM) + +.PRECIOUS: $(PGM) + +EXTRA_DIST = ckinit.c + +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/clock/clockdrv.c b/c/src/lib/libbsp/arm/arm_bare_bsp/clock/clockdrv.c new file mode 100644 index 0000000000..c49150fba6 --- /dev/null +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/clock/clockdrv.c @@ -0,0 +1,22 @@ +/* + * Instantiate the clock driver shell. + * + * Since there is no clock source on the simulator, all we do is + * make sure it will build. + * + * $Id$ + */ + +#define CLOCK_VECTOR 0 + +#define Clock_driver_support_at_tick() + +#define Clock_driver_support_install_isr( _new, _old ) \ + do { _old = 0; } while(0) + + +#define Clock_driver_support_initialize_hardware() + +#define Clock_driver_support_shutdown_hardware() + +#include "../../../shared/clockdrv_shell.c" diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am index 668e7c05b5..d654c11ba0 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/console/Makefile.am @@ -8,10 +8,10 @@ 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 +H_FILES = uart.h console_rel_OBJECTS = $(C_FILES:%.c=$(ARCH)/%.o) diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am index ec9fccfbf4..473034f50e 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/Makefile.am @@ -32,7 +32,7 @@ include $(top_srcdir)/../../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -$(PGM): $(startup_rel_OBJECTS) +$(PGM): $(irq_rel_OBJECTS) $(make-rel) all: $(PREINSTALL_FILES) $(ARCH) $(irq_rel_OBJECTS) $(PGM) diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.c b/c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.c index b4f2d14931..e2ea33e916 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/irq/irq.c +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/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; @@ -72,6 +73,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; diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/start/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/start/Makefile.am index 22fda2740d..e5a9f26a27 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/start/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/start/Makefile.am @@ -1,18 +1,16 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -PGMS = $(ARCH)/start.o +PGM = $(ARCH)/start.o S_FILES = start.S 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/lib.am @@ -20,13 +18,14 @@ 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 +$(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o: $(PGM) $(INSTALL_DATA) $< $@ +TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/start$(LIB_VARIANT).o + +all-local: $(ARCH) $(OBJS) $(PGM) $(TMPINSTALL_FILES) -all: $(ARCH) $(OBJS) $(TMPINSTALL_FILES) +.PRECIOUS: $(PGM) EXTRA_DIST = start.S diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/startup/bspstart.c b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/bspstart.c index a3bfa2672a..93822cc40d 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/startup/bspstart.c +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/bspstart.c @@ -118,8 +118,6 @@ void bsp_start_default( void ) rtemsFreeMemStart += BSP_Configuration.work_space_size; - console_reserve_resources(&BSP_Configuration); - /* * Init rtems exceptions management */ diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/startup/exit.c b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/exit.c index 7eb3056585..5342a2805a 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/startup/exit.c +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/startup/exit.c @@ -16,7 +16,7 @@ #include <stdio.h> #include <bsp.h> -#include <bspio.h> +#include <bspIo.h> #include <rtems/libio.h> void rtemsReboot (void) diff --git a/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am b/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am index 8d7d4068b2..d4db966c77 100644 --- a/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am +++ b/c/src/lib/libbsp/arm/arm_bare_bsp/wrapup/Makefile.am @@ -4,7 +4,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 -BSP_PIECES = console startup irq +BSP_PIECES = clock console startup irq # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) |