diff options
Diffstat (limited to '')
12 files changed, 33 insertions, 27 deletions
diff --git a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am index 889da12850..53670b1343 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/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/eth_comm/bsp_specs b/c/src/lib/libbsp/powerpc/eth_comm/bsp_specs index fa48d8ca78..1190a2c0eb 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/bsp_specs +++ b/c/src/lib/libbsp/powerpc/eth_comm/bsp_specs @@ -8,15 +8,15 @@ %(old_cpp) %{qrtems: -D__embedded__} -Asystem(embedded) *lib: -%{!qrtems: %(old_lib)} %{qrtems: ecrti%O%s --start-group \ +%{!qrtems: %(old_lib)} %{qrtems: --start-group \ %{!qrtems_debug: -lrtemsall} %{qrtems_debug: -lrtemsall_g} \ -lc -lgcc --end-group \ %{!qnolinkcmds: -T linkcmds%s}} *startfile: -%{!qrtems: %(old_startfile)} %{qrtems: \ -%{!qrtems_debug: } \ -%{qrtems_debug: }} +%{!qrtems: %(old_startfile)} %{qrtems: ecrti%O%s \ +%{!qrtems_debug: start.o%s} \ +%{qrtems_debug: start_g.o%s}} *endfile: %{!qrtems: %(old_endfile)} %{qrtems: ecrtn%O%s} diff --git a/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am index 7b624a62c9..69522a1a98 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.am index 82b58ef82e..d4e5619fac 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.am index 680492e1b7..1c9de158e1 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/powerpc/eth_comm/include/bsp.h b/c/src/lib/libbsp/powerpc/eth_comm/include/bsp.h index 20b12bd15f..f7ccceedb2 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/include/bsp.h +++ b/c/src/lib/libbsp/powerpc/eth_comm/include/bsp.h @@ -26,6 +26,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) + +/* * Network driver configuration */ struct rtems_bsdnet_ifconfig; diff --git a/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.am index a310556fa5..c94307a351 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.am index 824d7a22c5..e5a9f26a27 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/powerpc/eth_comm/start/start.S b/c/src/lib/libbsp/powerpc/eth_comm/start/start.S index f7b9d420fe..b119379641 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/start/start.S +++ b/c/src/lib/libbsp/powerpc/eth_comm/start/start.S @@ -133,7 +133,9 @@ cpy_b: lwz r5, 0(r3) /* In with the old ... */ xor r4, r4, r4 .extern SYM (boot_card) - b SYM (boot_card) /* call the first C routine */ + bl SYM (boot_card) /* call the first C routine */ +loopstop: + b loopstop /* * bssclr - zero out bss diff --git a/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am index 4b85006e62..08c4df7b96 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c b/c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c index e6ca71afbe..be35333ea5 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c +++ b/c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c @@ -148,7 +148,7 @@ void bsp_start(void) Cpu_table.pretasking_hook = bsp_pretasking_hook; /* init libc, etc. */ Cpu_table.postdriver_hook = bsp_postdriver_hook; - Cpu_table.interrupt_stack_size = 4 * 1024; + Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; Cpu_table.clicks_per_usec = 1; /* for 4MHz extclk */ Cpu_table.serial_per_sec = 10000000; @@ -160,11 +160,6 @@ void bsp_start(void) Cpu_table.timer_least_valid = 0; Cpu_table.clock_speed = 40000000; - /* - * Call this in case we use TERMIOS for console I/O - */ - m860_console_reserve_resources(&BSP_Configuration); - /* * Since we are currently autodetecting whether to use SCC1 or * the FEC for ethernet, we set up a register in the ethernet diff --git a/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am index 9fa41cc877..b84c9b000b 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 |