diff options
Diffstat (limited to '')
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/clock/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/console/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/console/console.c | 13 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/include/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/include/bsp.h | 9 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/start/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/startup/Makefile.am | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c | 14 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/startup/linkcmds | 2 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/timer/Makefile.am | 4 | ||||
-rw-r--r-- | c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am | 7 |
12 files changed, 36 insertions, 40 deletions
diff --git a/c/src/lib/libbsp/m68k/gen68340/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/Makefile.am index 487cec1fb5..06d6ecdaeb 100644 --- a/c/src/lib/libbsp/m68k/gen68340/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal diff --git a/c/src/lib/libbsp/m68k/gen68340/clock/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/clock/Makefile.am index 0b1ebe8a61..3e08045c00 100644 --- a/c/src/lib/libbsp/m68k/gen68340/clock/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/gen68340/console/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/console/Makefile.am index 460f87b67e..ea3e69cd4c 100644 --- a/c/src/lib/libbsp/m68k/gen68340/console/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/console/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/gen68340/console/console.c b/c/src/lib/libbsp/m68k/gen68340/console/console.c index 234060e0da..4b519c226d 100644 --- a/c/src/lib/libbsp/m68k/gen68340/console/console.c +++ b/c/src/lib/libbsp/m68k/gen68340/console/console.c @@ -523,19 +523,6 @@ SetAttributes (int minor, const struct termios *t) } /****************************************************** - Name: console_reserve_resources - Input parameters: - - Output parameters: - - Description: Reserve resources consumed by this driver - *****************************************************/ -void console_reserve_resources( - rtems_configuration_table *configuration -) -{ - rtems_termios_reserve_resources (configuration, 1); -} - -/****************************************************** Name: console_initialize Input parameters: MAJOR # of console_driver, minor is always 0, diff --git a/c/src/lib/libbsp/m68k/gen68340/include/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/include/Makefile.am index 707d2fde19..8bf11a4ce6 100644 --- a/c/src/lib/libbsp/m68k/gen68340/include/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/include/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h index e353253b15..657b3d5a48 100644 --- a/c/src/lib/libbsp/m68k/gen68340/include/bsp.h +++ b/c/src/lib/libbsp/m68k/gen68340/include/bsp.h @@ -30,6 +30,15 @@ extern "C" { #include <clockdrv.h> /* + * confdefs.h overrides for this BSP: + * - termios serial ports (defaults to 1) + * - Interrupt stack space is not minimum if defined. + */ + +/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ +#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) + +/* * Define the time limits for RTEMS Test Suite test durations. * Long test and short test duration limits are provided. These * values are in seconds and need to be converted to ticks for the diff --git a/c/src/lib/libbsp/m68k/gen68340/start/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/start/Makefile.am index d5a9ad6741..c91ab5d3a9 100644 --- a/c/src/lib/libbsp/m68k/gen68340/start/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/start/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/startup/Makefile.am index 59645567f6..0808e981d9 100644 --- a/c/src/lib/libbsp/m68k/gen68340/startup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/startup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -22,6 +22,9 @@ include $(top_srcdir)/../../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # +# USE_INIT_FINI tells main.c what C++ help we need. +AM_CPPFLAGS += -DUSE_INIT_FINI + $(PGM): $(OBJS) $(make-rel) diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c b/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c index 23f5a13bf5..a9e6823ef5 100644 --- a/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/gen68340/startup/bspstart.c @@ -54,7 +54,11 @@ void bsp_pretasking_hook(void); /* m68k version */ void bsp_start( void ) { - extern void *_WorkspaceBase; + extern void *_WorkspaceBase; + extern void *_RamSize; + extern unsigned long _M68k_Ramsize; + + _M68k_Ramsize = (unsigned long)&_RamSize; /* RAM size set in linker script */ /* * Allocate the memory for the RTEMS Work Space. This can come from @@ -76,17 +80,11 @@ void bsp_start( void ) BSP_Configuration.work_space_start = (void *)&_WorkspaceBase; /* - * Account for the console's resources - */ - - console_reserve_resources( &BSP_Configuration ); - - /* * initialize the CPU table for this BSP */ Cpu_table.pretasking_hook = bsp_pretasking_hook; /* init libc, etc. */ Cpu_table.postdriver_hook = bsp_postdriver_hook; Cpu_table.do_zero_of_workspace = TRUE; - Cpu_table.interrupt_stack_size = 4096; + Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; } diff --git a/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds b/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds index 297579ce25..e49ec2ec39 100644 --- a/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds +++ b/c/src/lib/libbsp/m68k/gen68340/startup/linkcmds @@ -20,7 +20,7 @@ /* * Declare some sizes. */ -_RamBase = 0x10000000; +_RamBase = DEFINED(_RamBase) ? _RamBase : 0x10000000; _RamSize = DEFINED(_RamSize) ? _RamSize : 4M; _HeapSize = DEFINED(_HeapSize) ? _HeapSize : 0x10000; _StackSize = DEFINED(_StackSize) ? _StackSize : 0x1000; diff --git a/c/src/lib/libbsp/m68k/gen68340/timer/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/timer/Makefile.am index 7f16dcc233..5c2b8edf56 100644 --- a/c/src/lib/libbsp/m68k/gen68340/timer/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am b/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am index 9ea62060a3..1db35832b2 100644 --- a/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am +++ b/c/src/lib/libbsp/m68k/gen68340/wrapup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -8,8 +8,7 @@ BSP_PIECES = startup clock console timer # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ - $(wildcard \ - ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel) + $(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/fpsp/$(ARCH)/fpsp.rel) LIB = $(ARCH)/libbsp.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg |