summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/powerpc
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-06-12 15:00:15 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-06-12 15:00:15 +0000
commitdf49c60c9671e4a28e636964d744c1f59fb6cb68 (patch)
treeeabd85e189514ad412a35414ba5d483dcda3ef1f /c/src/lib/libbsp/powerpc
parent0ab65474316231792faec37ec1dbddeaf8645775 (diff)
downloadrtems-df49c60c9671e4a28e636964d744c1f59fb6cb68.tar.bz2
Merged from 4.5.0-beta3a
Diffstat (limited to 'c/src/lib/libbsp/powerpc')
-rw-r--r--c/src/lib/libbsp/powerpc/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/Makefile.am7
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/bsp_specs2
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/console/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/include/bsp.h9
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/start/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c8
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/bsp_specs8
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/canbus/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/console/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/include/bsp.h9
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/network/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/start/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/start/start.S4
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/startup/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/startup/bspstart.c7
-rw-r--r--c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/helas403/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/helas403/dlentry/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/helas403/flashentry/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/helas403/include/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/helas403/include/bsp.h9
-rw-r--r--c/src/lib/libbsp/powerpc/helas403/startup/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/helas403/startup/bspstart.c11
-rw-r--r--c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am18
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs2
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am6
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am9
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/dlentry/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/flashentry/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/include/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/include/bsp.h9
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/startup/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c2
-rw-r--r--c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/bsp_specs2
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/clock/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/console/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/console/console.c8
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/include/bsp.h9
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/network/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/nvram/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/pci/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/start/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/startup/Makefile.am6
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/startup/bspstart.c14
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/timer/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/tod/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/universe/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/vectors/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am8
-rw-r--r--c/src/lib/libbsp/powerpc/psim/Makefile.am8
-rw-r--r--c/src/lib/libbsp/powerpc/psim/bsp_specs2
-rw-r--r--c/src/lib/libbsp/powerpc/psim/clock/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/psim/console/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/psim/console/console.c7
-rw-r--r--c/src/lib/libbsp/powerpc/psim/include/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/psim/include/bsp.h9
-rw-r--r--c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/psim/start/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/psim/startup/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/psim/startup/bspstart.c8
-rw-r--r--c/src/lib/libbsp/powerpc/psim/timer/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/psim/tools/Makefile.am26
-rwxr-xr-xc/src/lib/libbsp/powerpc/psim/tools/runtest11
-rw-r--r--c/src/lib/libbsp/powerpc/psim/vectors/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am8
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/bsp_specs2
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/clock/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/console/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/console/consolereserveresources.c7
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/include/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/include/bsp.h13
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/start/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c8
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/timer/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/tod/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/shared/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/shared/bootloader/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/shared/bootloader/misc.c4
-rw-r--r--c/src/lib/libbsp/powerpc/shared/clock/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/shared/console/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/shared/console/console.c10
-rw-r--r--c/src/lib/libbsp/powerpc/shared/include/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/shared/include/bsp.h9
-rw-r--r--c/src/lib/libbsp/powerpc/shared/irq/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S7
-rw-r--r--c/src/lib/libbsp/powerpc/shared/motorola/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/shared/openpic/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/shared/pci/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/shared/residual/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/shared/start/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/shared/start/start.S7
-rw-r--r--c/src/lib/libbsp/powerpc/shared/startup/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/shared/startup/bspstart.c19
-rw-r--r--c/src/lib/libbsp/powerpc/shared/vectors/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/support/new_exception_processing/Makefile.am16
-rw-r--r--c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am23
-rw-r--r--c/src/lib/libbsp/powerpc/support/old_exception_processing/irq_stub.S2
129 files changed, 364 insertions, 353 deletions
diff --git a/c/src/lib/libbsp/powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/Makefile.am
index aa7543aa89..b0225d2b1d 100644
--- a/c/src/lib/libbsp/powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/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/dmv177/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/Makefile.am
index e8a7c6f744..622214a2e1 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/Makefile.am
@@ -1,14 +1,13 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
# wrapup is the one that actually builds and installs the library
# from the individual .rel files built in other directories
-SUBDIRS = include clock console startup start timer scv64 tod \
- sonic wrapup
+SUBDIRS = include clock console startup start timer scv64 tod sonic wrapup
include $(top_srcdir)/../../bsp.am
diff --git a/c/src/lib/libbsp/powerpc/dmv177/bsp_specs b/c/src/lib/libbsp/powerpc/dmv177/bsp_specs
index 491b059df3..b0fbfa982f 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/dmv177/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/dmv177/clock/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.am
index f5f3fd8112..f921d0730a 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/clock/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.am
index 30616f4de0..ffa00c85d9 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/console/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am
index 2302aeeecb..2497acacad 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h b/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h
index d0c5574348..d16d6698b8 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/dmv177/include/bsp.h
@@ -20,6 +20,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 4
+#define CONFIGURE_INTERRUPT_STACK_MEMORY (12 * 1024)
+
#ifdef ASM
/* Definition of where to store registers in alignment handler */
#define ALIGN_REGS 0x0140
diff --git a/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.am
index 7a552ad128..7108307411 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/scv64/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.am
index a91fafbf9e..f5bb79a8a3 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/sonic/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.am
index 354f02440b..58abb62a6e 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/start/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.am
index e0381c0f59..b48e9ec4db 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/startup/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c b/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c
index 0825b0e45c..e5190c75f7 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c
@@ -113,12 +113,6 @@ void bsp_start( void )
BSP_Configuration.work_space_start = work_space_start;
/*
- * Account for the console's resources
- */
-
- console_reserve_resources( &BSP_Configuration );
-
- /*
* initialize the CPU table for this BSP
*/
@@ -130,7 +124,7 @@ void bsp_start( void )
Cpu_table.clicks_per_usec = 66666667 / 4000000 / 2;
Cpu_table.do_zero_of_workspace = TRUE;
- Cpu_table.interrupt_stack_size = (12 * 1024);
+ Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY;
/*
* Enable whatever caching is desired
diff --git a/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.am
index 7f16dcc233..5c2b8edf56 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/timer/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.am
index 0887a9830b..6951625591 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/tod/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am
index 792d785bb5..6f4655620d 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
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
diff --git a/c/src/lib/libbsp/powerpc/helas403/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/Makefile.am
index c4a517c567..73ae3481d3 100644
--- a/c/src/lib/libbsp/powerpc/helas403/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/helas403/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/helas403/dlentry/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/dlentry/Makefile.am
index 70c08c79f7..0e7348c235 100644
--- a/c/src/lib/libbsp/powerpc/helas403/dlentry/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/helas403/dlentry/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/helas403/flashentry/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/flashentry/Makefile.am
index 8ed973873f..a993f39735 100644
--- a/c/src/lib/libbsp/powerpc/helas403/flashentry/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/helas403/flashentry/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/helas403/include/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/include/Makefile.am
index 091727637a..2b8181354c 100644
--- a/c/src/lib/libbsp/powerpc/helas403/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/helas403/include/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/helas403/include/bsp.h b/c/src/lib/libbsp/powerpc/helas403/include/bsp.h
index 710fc75867..bd9f1ed3b4 100644
--- a/c/src/lib/libbsp/powerpc/helas403/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/helas403/include/bsp.h
@@ -44,6 +44,15 @@
extern "C" {
#endif
+/*
+ * confdefs.h overrides for this BSP:
+ * - number of 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)
+
#ifdef ASM
/* Definition of where to store registers in alignment handler */
#define ALIGN_REGS 0x0140
diff --git a/c/src/lib/libbsp/powerpc/helas403/startup/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/startup/Makefile.am
index 07786b4684..a9f24acdbd 100644
--- a/c/src/lib/libbsp/powerpc/helas403/startup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/helas403/startup/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/helas403/startup/bspstart.c b/c/src/lib/libbsp/powerpc/helas403/startup/bspstart.c
index 4d26d77a6f..175f6e147b 100644
--- a/c/src/lib/libbsp/powerpc/helas403/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/helas403/startup/bspstart.c
@@ -156,9 +156,6 @@ void bsp_start( void )
* tell the RTEMS configuration where it is. This memory is
* not malloc'ed. It is just "pulled from the air".
*/
- /* FIXME: this should be modified. work_space_size cannot be valid
- * now, since console_reserve_resources will modify something...
- */
/* FIME: plan usage of RAM better:
- make top of ram dynamic,
- take out some part for persistant log
@@ -170,19 +167,13 @@ void bsp_start( void )
((char *)(bsp_ram_end)) - BSP_Configuration.work_space_size;
/*
- * 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.predriver_hook = bsp_predriver_hook;
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 = 25;
Cpu_table.serial_per_sec = 25000000;
diff --git a/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am
index e007524688..b098954601 100644
--- a/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/helas403/wrapup/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index 705daffa04..63b6c40c9a 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/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/motorola_powerpc/bootloader/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
index 8e43957699..398dee820e 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bootloader/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
@@ -23,12 +23,12 @@ include $(top_srcdir)/../../../../../../automake/lib.am
# (OPTIONAL) Add local stuff here using +=
#
-AM_CPPFLAGS += -D__BOOT__ -DDEBUG
-AM_CFLAGS += -msoft-float -mstrict-align -fno-builtin -Wall -mmultiple \
- -mstring -O2 -fomit-frame-pointer -mrelocatable -ffixed-r13 -mno-sdata \
- -D__BOOT__ -DDEBUG
+## FIXME:
+## ASFLAGS = -mrelocatable
+CFLAGS_DEBUG_V = $(CFLAGS_OPTIMIZE_V)
-ASFLAGS += -mrelocatable
+AM_CPPFLAGS += -D__BOOT__ -DDEBUG -mrelocatable
+AM_CFLAGS += -msoft-float -mstrict-align -fno-builtin -Wall -mmultiple -mstring -O2 -fomit-frame-pointer -ffixed-r13 -mno-sdata
IMAGES = rtems.gz
@@ -47,7 +47,7 @@ DISTCLEANFILES += $(IMAGES)
bootloader : $(OBJS) $(IMAGES) $(BINARY_LOADED) ppcboot.lds
$(LD) -o bootloader $(OBJS) --just-symbols=$(BINARY_LOADED) \
-b binary $(IMAGES) -T @srcdir@/../../shared/bootloader/ppcboot.lds \
- -Map bootloader.map
+ -Map $(ARCH)/bootloader.map
check_unresolved : $(OBJS)
$(LD) -r -o reloc.O $(OBJS)
@@ -55,7 +55,7 @@ check_unresolved : $(OBJS)
echo "Every symbol listed should be defined in @srcdir@/ppcboot.lds"
rtems: $(BINARY_LOADED)
- $(OBJCOPY) $(BINARY_LOADED) rtems -O binary -R .comment -S
+ $(OBJCOPY) $(BINARY_LOADED) rtems -O binary -R .comment -S
rtems.gz: rtems
gzip -vf9 rtems
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs b/c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs
index 394b4363dd..16296016c0 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/bsp_specs
@@ -19,5 +19,5 @@
%{qrtems_debug: start_g.o%s}}
*link:
-%{!qrtems: %(old_link)} %{qrtems: -Qy -dp -Bstatic -T linkcmds%s -e __rtems_entry_point -u __vectors}
+%{!qrtems: %(old_link)} %{qrtems: -Qy -dp -Bstatic -e __rtems_entry_point -u __vectors}
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am
index 979bf52f1b..1206b032bb 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/clock/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am
index 202b2eaa8b..360e36037d 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am
index a6ee837cdc..980401fd37 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am
index 44fe052a2e..da96801117 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/irq/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am
index 59e52de5c3..bd50126c27 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/motorola/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am
index be3141a744..03ed4ac63c 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/openpic/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am
index 32d9e7e96d..9334f0ffb2 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/pci/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
@@ -20,6 +20,8 @@ include $(top_srcdir)/../../../../../../automake/lib.am
# (OPTIONAL) Add local stuff here using +=
#
+AM_CFLAGS = -O2
+
$(PROJECT_INCLUDE)/bsp:
$(mkinstalldirs) $<
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am
index add4fd61a8..d5382769d6 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/residual/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am
index af4903eb54..f0c6e6180f 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/start/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am
index ca1c49cea2..c1ca73b2f5 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/startup/Makefile.am
@@ -1,11 +1,10 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
-VPATH = \
- @srcdir@:@srcdir@/../console:@srcdir@/../../../shared:@srcdir@/../../shared/startup
+VPATH = @srcdir@:@srcdir@/../console:@srcdir@/../../../shared:@srcdir@/../../shared/startup
C_FILES = bootcard.c main.c bspstart.c bsppost.c bsplibc.c sbrk.c bspclean.c \
gnatinstallhandler.c
@@ -24,7 +23,7 @@ $(PROJECT_RELEASE)/lib/linkcmds: linkcmds
$(INSTALL_DATA) $< $@
# FIXME: This should not be here
-# $(PROJECT_RELEASE)/lib/libbsp.a:
+# $(PROJECT_RELEASE)/lib/libbsp.a:
# cd ../wrapup; $(MAKE) $(AM_MAKEFLAGS)
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/linkcmds
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am
index 42bc5d4533..5d158dbe4f 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/vectors/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am
index 88c149b8a8..7f45a1d1b7 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/papyrus/Makefile.am b/c/src/lib/libbsp/powerpc/papyrus/Makefile.am
index fe52252374..1e5c6460c5 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/papyrus/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/papyrus/dlentry/Makefile.am b/c/src/lib/libbsp/powerpc/papyrus/dlentry/Makefile.am
index 70c08c79f7..0e7348c235 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/dlentry/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/papyrus/dlentry/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/papyrus/flashentry/Makefile.am b/c/src/lib/libbsp/powerpc/papyrus/flashentry/Makefile.am
index 8ed973873f..a993f39735 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/flashentry/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/papyrus/flashentry/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/papyrus/include/Makefile.am b/c/src/lib/libbsp/powerpc/papyrus/include/Makefile.am
index 091727637a..2b8181354c 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/papyrus/include/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/papyrus/include/bsp.h b/c/src/lib/libbsp/powerpc/papyrus/include/bsp.h
index bc1ab09267..34c86acf6c 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/papyrus/include/bsp.h
@@ -36,6 +36,15 @@
extern "C" {
#endif
+/*
+ * confdefs.h overrides for this BSP:
+ * - number of 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)
+
#ifdef ASM
/* Definition of where to store registers in alignment handler */
#define ALIGN_REGS 0x0140
diff --git a/c/src/lib/libbsp/powerpc/papyrus/startup/Makefile.am b/c/src/lib/libbsp/powerpc/papyrus/startup/Makefile.am
index 887b0fa744..db765ee0cf 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/startup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/papyrus/startup/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c b/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c
index a330497c1e..c5e15313bf 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/papyrus/startup/bspstart.c
@@ -120,7 +120,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 = 10;
Cpu_table.serial_per_sec = 10000000;
diff --git a/c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.am
index e007524688..b098954601 100644
--- a/c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/papyrus/wrapup/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
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
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index 04b9f71aab..318781378e 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -1,14 +1,14 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
# wrapup is the one that actually builds and installs the library
# from the individual .rel files built in other directories
-SUBDIRS = include start clock console startup shmsupp timer vectors \
- wrapup tools
+SUBDIRS = include start clock console startup shmsupp timer vectors wrapup \
+ tools
include $(top_srcdir)/../../bsp.am
diff --git a/c/src/lib/libbsp/powerpc/psim/bsp_specs b/c/src/lib/libbsp/powerpc/psim/bsp_specs
index 491b059df3..b0fbfa982f 100644
--- a/c/src/lib/libbsp/powerpc/psim/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/psim/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/psim/clock/Makefile.am b/c/src/lib/libbsp/powerpc/psim/clock/Makefile.am
index f5f3fd8112..f921d0730a 100644
--- a/c/src/lib/libbsp/powerpc/psim/clock/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/clock/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/psim/console/Makefile.am b/c/src/lib/libbsp/powerpc/psim/console/Makefile.am
index 1c753810c1..24f53c83da 100644
--- a/c/src/lib/libbsp/powerpc/psim/console/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/console/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/psim/console/console.c b/c/src/lib/libbsp/powerpc/psim/console/console.c
index 161ead99a2..90e46e6c06 100644
--- a/c/src/lib/libbsp/powerpc/psim/console/console.c
+++ b/c/src/lib/libbsp/powerpc/psim/console/console.c
@@ -196,10 +196,3 @@ rtems_device_driver console_control(
{
return rtems_termios_ioctl (arg);
}
-
-void console_reserve_resources(
- rtems_configuration_table *configuration
-)
-{
- rtems_termios_reserve_resources( configuration, 1 );
-}
diff --git a/c/src/lib/libbsp/powerpc/psim/include/Makefile.am b/c/src/lib/libbsp/powerpc/psim/include/Makefile.am
index 091727637a..2b8181354c 100644
--- a/c/src/lib/libbsp/powerpc/psim/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/include/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/psim/include/bsp.h b/c/src/lib/libbsp/powerpc/psim/include/bsp.h
index aafcb261f0..1ba31efc8f 100644
--- a/c/src/lib/libbsp/powerpc/psim/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/psim/include/bsp.h
@@ -36,6 +36,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 (12 * 1024)
+
#ifdef ASM
/* Definition of where to store registers in alignment handler */
#define ALIGN_REGS 0x0140
diff --git a/c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.am b/c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.am
index 07ad321462..23fc433016 100644
--- a/c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/shmsupp/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/psim/start/Makefile.am b/c/src/lib/libbsp/powerpc/psim/start/Makefile.am
index 824d7a22c5..e5a9f26a27 100644
--- a/c/src/lib/libbsp/powerpc/psim/start/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/start/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/psim/startup/Makefile.am b/c/src/lib/libbsp/powerpc/psim/startup/Makefile.am
index 0afcb9a929..6f4e5b22f0 100644
--- a/c/src/lib/libbsp/powerpc/psim/startup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/startup/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c b/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c
index bbd470f856..a5cc6ebd9f 100644
--- a/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/psim/startup/bspstart.c
@@ -202,7 +202,7 @@ void bsp_start( void )
Cpu_table.do_zero_of_workspace = FALSE;
- Cpu_table.interrupt_stack_size = (12 * 1024);
+ Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY;
/*
* The monitor likes the exception table to be at 0x0.
@@ -233,12 +233,6 @@ void bsp_start( void )
BSP_Configuration.work_space_start = work_space_start;
- /*
- * Account for the console's resources
- */
-
- console_reserve_resources( &BSP_Configuration );
-
#if PSIM_FAST_IDLE
/*
* Add 1 extension for fast idle
diff --git a/c/src/lib/libbsp/powerpc/psim/timer/Makefile.am b/c/src/lib/libbsp/powerpc/psim/timer/Makefile.am
index 7f16dcc233..5c2b8edf56 100644
--- a/c/src/lib/libbsp/powerpc/psim/timer/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/timer/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/psim/tools/Makefile.am b/c/src/lib/libbsp/powerpc/psim/tools/Makefile.am
index 704c7c2d31..ff177ddb9d 100644
--- a/c/src/lib/libbsp/powerpc/psim/tools/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/tools/Makefile.am
@@ -5,13 +5,25 @@
AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
-noinst_SCRIPTS=psim runtest
+noinst_SCRIPTS = psim runtest
+
+TMPINSTALL_FILES += $(PROJECT_ROOT)/psim/tests \
+ $(PROJECT_ROOT)/psim/tests/runtest $(PROJECT_ROOT)/psim/tests/psim \
+ $(PROJECT_ROOT)/psim/tests/psim-gdb
+
+$(PROJECT_ROOT)/psim/tests:
+ $(mkinstalldirs) $@
+
+$(PROJECT_ROOT)/psim/tests/runtest: runtest
+ $(INSTALL_SCRIPT) $< $@
+
+$(PROJECT_ROOT)/psim/tests/psim: psim
+ $(INSTALL_SCRIPT) $< $@
+
+$(PROJECT_ROOT)/psim/tests/psim-gdb: psim
+ $(INSTALL_SCRIPT) $< $@
## HACK: install to build-tree
-all-local: $(SCRIPTS)
- $(mkinstalldirs) $(PROJECT_ROOT)/psim/tests
- $(INSTALL_SCRIPT) $(srcdir)/runtest $(PROJECT_ROOT)/psim/tests/runtest
- $(INSTALL_SCRIPT) $(srcdir)/psim $(PROJECT_ROOT)/psim/tests/psim
- $(INSTALL_SCRIPT) $(srcdir)/psim $(PROJECT_ROOT)/psim/tests/psim-gdb
+all-local: $(TMPINSTALL_FILES)
-include $(top_srcdir)/../../../../../../../automake/local.am
+include $(top_srcdir)/../../../../../../../automake/host.am
diff --git a/c/src/lib/libbsp/powerpc/psim/tools/runtest b/c/src/lib/libbsp/powerpc/psim/tools/runtest
index 5b53f9080e..8fa385e239 100755
--- a/c/src/lib/libbsp/powerpc/psim/tools/runtest
+++ b/c/src/lib/libbsp/powerpc/psim/tools/runtest
@@ -164,10 +164,11 @@ do
continue;;
*-node1*)
warn "Running both nodes associated with $tname"
+ variant=`echo $tname | sed 's/.*-node[12]//' | sed 's/\.exe//'`
tname=`echo $tname | sed 's/-node.*//'`
TEST_TYPE="mp"
;;
- minimum*|stackchk*|spfatal*|malloctest*)
+ minimum*|stackchk*|spfatal*|termio*)
continue
;;
esac
@@ -176,8 +177,8 @@ do
then
cpus="1 2"
- logfile1=$logdir/${tname}_1
- logfile2=$logdir/${tname}_2
+ logfile1=$logdir/${tname}_1${variant}
+ logfile2=$logdir/${tname}_2${variant}
infofile1=$logfile1.info
infofile2=$logfile2.info
@@ -193,7 +194,7 @@ do
-o "/shm@0xc0000000/key 0x1234" \
-o "/sem@0xc0010000/reg 0xc0010000 12" \
-o "/sem@0xc0010000/key 0x1234" \
- -o "/sem@0xc0010000/value 1" ${tname}-node1.exe | \
+ -o "/sem@0xc0010000/value 1" ${tname}-node1${variant}.exe | \
sed -e 's/ //' -e '/^$/d' > ${logfile1} &
${simulator} $extra_options -c ${instruction_limit} \
@@ -203,7 +204,7 @@ do
-o "/shm@0xc0000000/key 0x1234" \
-o "/sem@0xc0010000/reg 0xc0010000 12" \
-o "/sem@0xc0010000/key 0x1234" \
- -o "/sem@0xc0010000/value -1" ${tname}-node2.exe | \
+ -o "/sem@0xc0010000/value -1" ${tname}-node2${variant}.exe | \
sed -e 's/ //' -e '/^$/d' > ${logfile2} &
wait
diff --git a/c/src/lib/libbsp/powerpc/psim/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/psim/vectors/Makefile.am
index a2a94d7acd..a7d103cbd9 100644
--- a/c/src/lib/libbsp/powerpc/psim/vectors/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/vectors/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am
index e563b9eb63..02fb4a1625 100644
--- a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am
@@ -1,14 +1,12 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../../../automake/lib.am
-BSP_PIECES = startup clock console timer vectors
-
if HAS_MP
GENERIC_MP_REL_PIECES = shmdr
endif
@@ -17,7 +15,7 @@ GENERIC_PIECES += $(GENERIC_MP_REL_PIECES)
if HAS_MP
BSP_MP_O_PIECES = shmsupp
endif
-BSP_PIECES += $(BSP_MP_O_PIECES)
+BSP_PIECES = startup clock console timer vectors $(BSP_MP_O_PIECES)
# bummer; have to use $foreach since % pattern subst rules only replace 1x
OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \
diff --git a/c/src/lib/libbsp/powerpc/score603e/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/Makefile.am
index a907ce6b0f..6fd72e2f09 100644
--- a/c/src/lib/libbsp/powerpc/score603e/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/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/score603e/PCI_bus/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.am
index 4cc465ced1..007befdff4 100644
--- a/c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/PCI_bus/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/score603e/bsp_specs b/c/src/lib/libbsp/powerpc/score603e/bsp_specs
index 491b059df3..b0fbfa982f 100644
--- a/c/src/lib/libbsp/powerpc/score603e/bsp_specs
+++ b/c/src/lib/libbsp/powerpc/score603e/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/score603e/clock/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/clock/Makefile.am
index f5f3fd8112..f921d0730a 100644
--- a/c/src/lib/libbsp/powerpc/score603e/clock/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/clock/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/score603e/console/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/console/Makefile.am
index d5046de240..861491254b 100644
--- a/c/src/lib/libbsp/powerpc/score603e/console/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/console/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/score603e/console/consolereserveresources.c b/c/src/lib/libbsp/powerpc/score603e/console/consolereserveresources.c
index 440e44f941..7039d8c8fc 100644
--- a/c/src/lib/libbsp/powerpc/score603e/console/consolereserveresources.c
+++ b/c/src/lib/libbsp/powerpc/score603e/console/consolereserveresources.c
@@ -20,10 +20,5 @@
#include "consolebsp.h"
-void console_reserve_resources(
- rtems_configuration_table *configuration
-)
-{
- rtems_termios_reserve_resources( configuration, NUM_Z85C30_PORTS );
-}
+int console_reserve_resources_removed;
diff --git a/c/src/lib/libbsp/powerpc/score603e/include/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/include/Makefile.am
index 986b0fe056..8e3935008f 100644
--- a/c/src/lib/libbsp/powerpc/score603e/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/include/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
index 2888a1dc9a..f40ead300b 100644
--- a/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/score603e/include/bsp.h
@@ -20,6 +20,19 @@
extern "C" {
#endif
+/*
+ * confdefs.h overrides for this BSP:
+ * - termios serial ports (defaults to 1)
+ * - Interrupt stack space is not minimum if defined.
+ */
+
+#if (HAS_PMC_PSC8)
+#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS (4 + 4)
+#else
+#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS (4)
+#endif
+#define CONFIGURE_INTERRUPT_STACK_MEMORY (12 * 1024)
+
#ifdef ASM
/* Definition of where to store registers in alignment handler */
#define ALIGN_REGS 0x0140
diff --git a/c/src/lib/libbsp/powerpc/score603e/start/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/start/Makefile.am
index 354f02440b..58abb62a6e 100644
--- a/c/src/lib/libbsp/powerpc/score603e/start/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/start/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am
index 32521bbf8f..35a35071f6 100644
--- a/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/startup/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c b/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c
index 6575c7425a..4da15d89b6 100644
--- a/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/score603e/startup/bspstart.c
@@ -276,12 +276,6 @@ void bsp_start( void )
BSP_Configuration.work_space_start = work_space_start;
/*
- * Account for the console's resources
- */
-
- console_reserve_resources( &BSP_Configuration );
-
- /*
* initialize the CPU table for this BSP
*/
@@ -291,7 +285,7 @@ void bsp_start( void )
Cpu_table.postdriver_hook = SCORE603e_bsp_postdriver_hook;
Cpu_table.clicks_per_usec = 66 / 4; /* XXX get from linkcmds */
Cpu_table.do_zero_of_workspace = TRUE;
- Cpu_table.interrupt_stack_size = (12 * 1024);
+ Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY;
Cpu_table.idle_task_stack_size = (3 * STACK_MINIMUM_SIZE);
#if ( PPC_USE_DATA_CACHE )
diff --git a/c/src/lib/libbsp/powerpc/score603e/timer/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/timer/Makefile.am
index 7f16dcc233..5c2b8edf56 100644
--- a/c/src/lib/libbsp/powerpc/score603e/timer/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/timer/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/score603e/tod/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/tod/Makefile.am
index f56d2670fa..6a99b886be 100644
--- a/c/src/lib/libbsp/powerpc/score603e/tod/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/tod/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.am
index edacb0973a..67266e13a2 100644
--- a/c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/vectors/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am
index c877167f3f..75424fe399 100644
--- a/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/score603e/wrapup/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/shared/Makefile.am b/c/src/lib/libbsp/powerpc/shared/Makefile.am
index 471789bf3e..ae5a0cc05f 100644
--- a/c/src/lib/libbsp/powerpc/shared/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/shared/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/Makefile.am b/c/src/lib/libbsp/powerpc/shared/bootloader/Makefile.am
index ad187cd187..dfe0e94c7d 100644
--- a/c/src/lib/libbsp/powerpc/shared/bootloader/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/shared/bootloader/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c b/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c
index e7dd568c22..e71858bc83 100644
--- a/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c
+++ b/c/src/lib/libbsp/powerpc/shared/bootloader/misc.c
@@ -238,7 +238,7 @@ setup_hw(void)
char *cp, ch;
register RESIDUAL * res;
/* PPC_DEVICE * nvram; */
- struct pci_dev *p, *default_vga;
+ struct pci_dev *default_vga;
int timer, err;
u_short default_vga_cmd;
static unsigned int indic;
@@ -270,7 +270,7 @@ setup_hw(void)
printk("\nModel: %s\nSerial: %s\n"
"Processor/Bus frequencies (Hz): %ld/%ld\n"
"Time Base Divisor: %ld\n"
- "Memory Size: %x\n",
+ "Memory Size: %lx\n",
vpd.PrintableModel,
vpd.Serial,
vpd.ProcessorHz,
diff --git a/c/src/lib/libbsp/powerpc/shared/clock/Makefile.am b/c/src/lib/libbsp/powerpc/shared/clock/Makefile.am
index 3f2e00568f..3c4ffc9eb1 100644
--- a/c/src/lib/libbsp/powerpc/shared/clock/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/shared/clock/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/shared/console/Makefile.am b/c/src/lib/libbsp/powerpc/shared/console/Makefile.am
index 004de3a27a..a164927d56 100644
--- a/c/src/lib/libbsp/powerpc/shared/console/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/shared/console/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/shared/console/console.c b/c/src/lib/libbsp/powerpc/shared/console/console.c
index 834f960cfc..68158906f6 100644
--- a/c/src/lib/libbsp/powerpc/shared/console/console.c
+++ b/c/src/lib/libbsp/powerpc/shared/console/console.c
@@ -84,16 +84,6 @@ isr_is_on(const rtems_irq_connect_data *irq)
return BSP_irq_enabled_at_i8259s(irq->name);
}
-void console_reserve_resources(rtems_configuration_table *conf)
-{
- if(BSPConsolePort != BSP_CONSOLE_PORT_CONSOLE)
- {
- rtems_termios_reserve_resources(conf, 1);
- }
-
- return;
-}
-
void __assert (const char *file, int line, const char *msg)
{
static char exit_msg[] = "EXECUTIVE SHUTDOWN! Any key to reboot...";
diff --git a/c/src/lib/libbsp/powerpc/shared/include/Makefile.am b/c/src/lib/libbsp/powerpc/shared/include/Makefile.am
index b1c33532a1..0f1ce0ff94 100644
--- a/c/src/lib/libbsp/powerpc/shared/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/shared/include/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/shared/include/bsp.h b/c/src/lib/libbsp/powerpc/shared/include/bsp.h
index 201351f972..db98a4c002 100644
--- a/c/src/lib/libbsp/powerpc/shared/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/shared/include/bsp.h
@@ -18,6 +18,15 @@
#include <clockdrv.h>
#include <bsp/vectors.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 (16 * 1024)
+
#ifndef ASM
#define outport_byte(port,value) outb(value,port)
#define outport_word(port,value) outw(value,port)
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/Makefile.am b/c/src/lib/libbsp/powerpc/shared/irq/Makefile.am
index 1348121c90..07bff968a8 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/shared/irq/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S b/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S
index 0d8ab62452..9e77146e11 100644
--- a/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S
+++ b/c/src/lib/libbsp/powerpc/shared/irq/irq_asm.S
@@ -85,8 +85,15 @@ SYM (shared_raw_irq_code_entry):
stw r2, SRR1_FRAME_OFFSET(r1)
/*
* Enable data and instruction address translation, exception recovery
+ *
+ * also, on CPUs with FP, enable FP so that FP context can be
+ * saved and restored (using FP instructions)
*/
+#if (PPC_HAS_FPU == 0)
ori r3, r3, MSR_RI | MSR_IR | MSR_DR
+#else
+ ori r3, r3, MSR_RI | MSR_IR | MSR_DR | MSR_FP
+#endif
mtmsr r3
SYNC
/*
diff --git a/c/src/lib/libbsp/powerpc/shared/motorola/Makefile.am b/c/src/lib/libbsp/powerpc/shared/motorola/Makefile.am
index 9869a42fc1..2ba8001455 100644
--- a/c/src/lib/libbsp/powerpc/shared/motorola/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/shared/motorola/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/shared/openpic/Makefile.am b/c/src/lib/libbsp/powerpc/shared/openpic/Makefile.am
index 030c358214..14f400e8a7 100644
--- a/c/src/lib/libbsp/powerpc/shared/openpic/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/shared/openpic/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/shared/pci/Makefile.am b/c/src/lib/libbsp/powerpc/shared/pci/Makefile.am
index 45520cb61b..f7da13a6db 100644
--- a/c/src/lib/libbsp/powerpc/shared/pci/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/shared/pci/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/shared/residual/Makefile.am b/c/src/lib/libbsp/powerpc/shared/residual/Makefile.am
index 43890c7b67..1cdf3fd3eb 100644
--- a/c/src/lib/libbsp/powerpc/shared/residual/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/shared/residual/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/shared/start/Makefile.am b/c/src/lib/libbsp/powerpc/shared/start/Makefile.am
index 13330128b0..e26c892fd6 100644
--- a/c/src/lib/libbsp/powerpc/shared/start/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/shared/start/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/shared/start/start.S b/c/src/lib/libbsp/powerpc/shared/start/start.S
index ee09686659..9f91cb7365 100644
--- a/c/src/lib/libbsp/powerpc/shared/start/start.S
+++ b/c/src/lib/libbsp/powerpc/shared/start/start.S
@@ -106,8 +106,13 @@ enter_C_code:
.type MMUon,@function
MMUon:
mfmsr r0
- ori r0,r0, MSR_IP | MSR_RI | MSR_IR | MSR_DR | MSR_EE | MSR_FE0 | MSR_FE1
+#if (PPC_HAS_FPU == 0)
+ ori r0,r0, MSR_IP | MSR_RI | MSR_IR | MSR_DR | MSR_EE | MSR_FE0 | MSR_FE1 | MSR_FP
xori r0, r0, MSR_EE | MSR_IP | MSR_FP
+#else
+ ori r0,r0, MSR_IP | MSR_RI | MSR_IR | MSR_DR | MSR_EE | MSR_FE0 | MSR_FE1 | MSR_FP
+ xori r0, r0, MSR_EE | MSR_IP | MSR_FE0 | MSR_FE1
+#endif
mflr r11
mtsrr0 r11
mtsrr1 r0
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/Makefile.am b/c/src/lib/libbsp/powerpc/shared/startup/Makefile.am
index cc1ab757c2..161db96b44 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/shared/startup/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
index 4ca991e229..c45decac70 100644
--- a/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/shared/startup/bspstart.c
@@ -73,7 +73,7 @@ unsigned int BSP_time_base_divisor;
* system init stack and soft ir stack size
*/
#define INIT_STACK_SIZE 0x1000
-#define INTR_STACK_SIZE 0x4000
+#define INTR_STACK_SIZE CONFIGURE_INTERRUPT_STACK_MEMORY
void BSP_panic(char *s)
{
@@ -302,12 +302,12 @@ void bsp_start( void )
* they can use atexit()
*/
- 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 = INTR_STACK_SIZE;
- Cpu_table.clicks_per_usec = BSP_processor_frequency/(BSP_time_base_divisor * 1000);
- Cpu_table.exceptions_in_RAM = TRUE;
+ 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 = CONFIGURE_INTERRUPT_STACK_MEMORY;
+ Cpu_table.clicks_per_usec = BSP_processor_frequency/(BSP_time_base_divisor * 1000);
+ Cpu_table.exceptions_in_RAM = TRUE;
#ifdef SHOW_MORE_INIT_SETTINGS
printk("BSP_Configuration.work_space_size = %x\n", BSP_Configuration.work_space_size);
@@ -323,11 +323,6 @@ void bsp_start( void )
BSP_Configuration.work_space_start = work_space_start;
/*
- * Account for the console's resources
- */
-
- console_reserve_resources( &BSP_Configuration );
- /*
* Initalize RTEMS IRQ system
*/
BSP_rtems_irq_mng_init(0);
diff --git a/c/src/lib/libbsp/powerpc/shared/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/shared/vectors/Makefile.am
index dc97722ce4..625a5260ce 100644
--- a/c/src/lib/libbsp/powerpc/shared/vectors/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/shared/vectors/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/powerpc/support/new_exception_processing/Makefile.am b/c/src/lib/libbsp/powerpc/support/new_exception_processing/Makefile.am
index c3195b159d..1f4affe8f4 100644
--- a/c/src/lib/libbsp/powerpc/support/new_exception_processing/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/support/new_exception_processing/Makefile.am
@@ -9,7 +9,7 @@ C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
ROOT_H_FILES =
RTEMS_SCORE_H_FILES = cpu.h c_isr.inl
-noinst_HEADERS = $(ROOT_H_FILES) $(RTEMS_SCORE_H_FILES)
+noinst_HEADERS = $(ROOT_H_FILES) $(RTEMS_SCORE_H_FILES)
S_FILES = cpu_asm.S
S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
@@ -21,11 +21,9 @@ include $(top_srcdir)/../../../../../../automake/lib.am
# (OPTIONAL) Add local stuff here using +=
#
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(PROJECT_INCLUDE)/rtems/score \
-$(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \
-$(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \
+ $(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \
+ $(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
##TMPINSTALL_FILES += \
##$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
@@ -55,10 +53,8 @@ all-local: $(ARCH) $(PREINSTALL_FILES) $(REL)
## all-local: $(ARCH)/rtems.o
all-local: $(TMPINSTALL_FILES)
-clean-local:
- $(RM) -r ../o-optimize ../o-debug ../o-profile
+CLEANDIRS = ../o-optimize ../o-debug ../o-profile
-EXTRA_DIST = \
-$(C_FILES) $(S_FILES)
+EXTRA_DIST = $(C_FILES) $(S_FILES)
include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am b/c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am
index afd66502eb..9629808140 100644
--- a/c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am
@@ -19,14 +19,11 @@ S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../../../automake/lib.am
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE) \
-$(PROJECT_INCLUDE)/rtems/score \
-$(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \
-$(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
+PREINSTALL_FILES += $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems/score \
+ $(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \
+ $(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%)
-TMPINSTALL_FILES += \
-$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o
$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o
$(INSTALL_DATA) $< $@
@@ -49,18 +46,12 @@ $(REL): $(C_O_FILES) $(S_O_FILES)
test -d ../$(ARCH) || mkdir ../$(ARCH)
$(make-rel)
-all-local: $(ARCH) $(PREINSTALL_FILES) $(REL)
-all-local: $(ARCH)/rtems.o
-all-local: $(TMPINSTALL_FILES)
+all-local: $(ARCH) $(PREINSTALL_FILES) $(REL) $(ARCH)/rtems.o $(TMPINSTALL_FILES)
-clean-local:
- $(RM) -r ../o-optimize ../o-debug ../o-profile
+CLEANDIRS = ../o-optimize ../o-debug ../o-profile
UNUSED_FILES = irq_stub.S
-EXTRA_DIST = \
-TODO \
-rtems.S \
-$(C_FILES) $(S_FILES) $(UNUSED_FILES)
+EXTRA_DIST = TODO rtems.S $(C_FILES) $(S_FILES) $(UNUSED_FILES)
include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/support/old_exception_processing/irq_stub.S b/c/src/lib/libbsp/powerpc/support/old_exception_processing/irq_stub.S
index 76c8927305..400cccdf73 100644
--- a/c/src/lib/libbsp/powerpc/support/old_exception_processing/irq_stub.S
+++ b/c/src/lib/libbsp/powerpc/support/old_exception_processing/irq_stub.S
@@ -55,7 +55,9 @@
lis r11,_CPU_IRQ_info@ha
addi r11,r11,_CPU_IRQ_info@l
#endif
+#if ( PPC_USE_DATA_CACHE )
dcbt r0, r11
+#endif
stw r5, IP_CR(r1)
stw r6, IP_CTR(r1)
stw r7, IP_XER(r1)