diff options
Diffstat (limited to 'c/src/lib/libbsp/powerpc/ppcn_60x')
18 files changed, 42 insertions, 53 deletions
diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am index 59c3997569..ead64fc129 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/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/powerpc/ppcn_60x/bsp_specs b/c/src/lib/libbsp/powerpc/ppcn_60x/bsp_specs index 491b059df3..b0fbfa982f 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/bsp_specs +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/bsp_specs @@ -22,5 +22,5 @@ %{!qrtems: %(old_endfile)} %{qrtems: ecrtn%O%s} *link: -%{!qrtems: %(old_link)} %{qrtems: -Qy -dp -Bstatic -T linkcmds%s -e _start -u __vectors} +%{!qrtems: %(old_link)} %{qrtems: -Qy -dp -Bstatic -e _start -u __vectors} diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.am index f5f3fd8112..f921d0730a 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.am index 835d386666..05e2a7d15a 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/console/console.c b/c/src/lib/libbsp/powerpc/ppcn_60x/console/console.c index 6b60503ec9..1c788bac0f 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/console/console.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/console/console.c @@ -134,14 +134,6 @@ rtems_device_driver console_open( return status; } -void console_reserve_resources( - rtems_configuration_table *configuration -) -{ - rtems_termios_reserve_resources( configuration, 2 ); -} - - rtems_device_driver console_close( rtems_device_major_number major, rtems_device_minor_number minor, diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.am index a4777f556c..ecdbc56b47 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/include/bsp.h b/c/src/lib/libbsp/powerpc/ppcn_60x/include/bsp.h index 98fc0781bf..372a64e80f 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/include/bsp.h @@ -33,6 +33,15 @@ extern "C" { #endif +/* + * 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 (32 * 1024) + /* Define processor identification. */ #define MPC601 1 diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.am index 59928cc3b2..f549a6409c 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.am index 8bcadd2b2f..4b739a0883 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.am index 25081b608a..9b504bff3d 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.am index 824d7a22c5..e5a9f26a27 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.am index 28eb6236d8..1e11acc3ed 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.am @@ -1,6 +1,6 @@ -## -## $Id: -## +## +## $Id$ +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/bspstart.c b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/bspstart.c index e8ecd15472..e2a4ee0d39 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/startup/bspstart.c @@ -277,18 +277,6 @@ void bsp_start( void ) BSP_Configuration.work_space_start = work_space_start; /* - * Add 1 region for RTEMS Malloc - */ - - BSP_Configuration.RTEMS_api_configuration->maximum_regions++; - - /* - * Account for the console's resources - */ - - console_reserve_resources( &BSP_Configuration ); - - /* * initialize the CPU table for this BSP */ @@ -297,7 +285,7 @@ void bsp_start( void ) Cpu_table.predriver_hook = bsp_predriver_hook; Cpu_table.postdriver_hook = bsp_postdriver_hook; Cpu_table.do_zero_of_workspace = TRUE; - Cpu_table.interrupt_stack_size = (32 * 1024); + Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; Cpu_table.clicks_per_usec = ulCpuBusClock/4000000; diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.am index 7f16dcc233..5c2b8edf56 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.am index 90bb37fe0b..6286fc3534 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.am index a3e1e122dd..83f3319dfb 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.am index 3c2da3a009..a85eb2c9e8 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am index f5d8d44a5f..83b051cdf6 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -9,8 +9,8 @@ if HAS_NETWORKING NETWORK = network endif -BSP_PIECES = startup clock console timer tod $(NETWORK) nvram \ - universe pci vectors +BSP_PIECES = startup clock console timer tod $(NETWORK) nvram universe pci \ + vectors # pieces to pick up out of libcpu/$(RTEMS_CPU) # bummer; have to use $foreach since % pattern subst rules only replace 1x |