summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/sparc/erc32
diff options
context:
space:
mode:
Diffstat (limited to 'c/src/lib/libbsp/sparc/erc32')
-rw-r--r--c/src/lib/libbsp/sparc/erc32/Makefile.am4
-rw-r--r--c/src/lib/libbsp/sparc/erc32/clock/Makefile.am4
-rw-r--r--c/src/lib/libbsp/sparc/erc32/console/Makefile.am4
-rw-r--r--c/src/lib/libbsp/sparc/erc32/console/consolereserveresources.c7
-rw-r--r--c/src/lib/libbsp/sparc/erc32/gnatsupp/Makefile.am4
-rw-r--r--c/src/lib/libbsp/sparc/erc32/include/Makefile.am4
-rw-r--r--c/src/lib/libbsp/sparc/erc32/include/bsp.h14
-rw-r--r--c/src/lib/libbsp/sparc/erc32/start/Makefile.am4
-rw-r--r--c/src/lib/libbsp/sparc/erc32/startup/Makefile.am5
-rw-r--r--c/src/lib/libbsp/sparc/erc32/startup/bspstart.c14
-rw-r--r--c/src/lib/libbsp/sparc/erc32/startup/linkcmds3
-rw-r--r--c/src/lib/libbsp/sparc/erc32/startup/spurious.c3
-rw-r--r--c/src/lib/libbsp/sparc/erc32/timer/Makefile.am4
-rw-r--r--c/src/lib/libbsp/sparc/erc32/tools/Makefile.am18
-rw-r--r--c/src/lib/libbsp/sparc/erc32/tools/runtest.in6
-rw-r--r--c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am4
16 files changed, 51 insertions, 51 deletions
diff --git a/c/src/lib/libbsp/sparc/erc32/Makefile.am b/c/src/lib/libbsp/sparc/erc32/Makefile.am
index 8e58f7529d..f3c5602470 100644
--- a/c/src/lib/libbsp/sparc/erc32/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/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/sparc/erc32/clock/Makefile.am b/c/src/lib/libbsp/sparc/erc32/clock/Makefile.am
index 0b1ebe8a61..3e08045c00 100644
--- a/c/src/lib/libbsp/sparc/erc32/clock/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/clock/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/sparc/erc32/console/Makefile.am b/c/src/lib/libbsp/sparc/erc32/console/Makefile.am
index bb01430dfc..c0107e2dcf 100644
--- a/c/src/lib/libbsp/sparc/erc32/console/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/console/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/sparc/erc32/console/consolereserveresources.c b/c/src/lib/libbsp/sparc/erc32/console/consolereserveresources.c
index 40a65de7c5..e89e30a5c8 100644
--- a/c/src/lib/libbsp/sparc/erc32/console/consolereserveresources.c
+++ b/c/src/lib/libbsp/sparc/erc32/console/consolereserveresources.c
@@ -18,9 +18,4 @@
#include <stdlib.h>
#include <assert.h>
-void console_reserve_resources(
- rtems_configuration_table *configuration
-)
-{
- rtems_termios_reserve_resources( configuration, 2 );
-}
+int console_reserve_resources_removed;
diff --git a/c/src/lib/libbsp/sparc/erc32/gnatsupp/Makefile.am b/c/src/lib/libbsp/sparc/erc32/gnatsupp/Makefile.am
index b00b01bff3..a95db91da6 100644
--- a/c/src/lib/libbsp/sparc/erc32/gnatsupp/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/gnatsupp/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/sparc/erc32/include/Makefile.am b/c/src/lib/libbsp/sparc/erc32/include/Makefile.am
index 43cf28d6c2..3f061aa216 100644
--- a/c/src/lib/libbsp/sparc/erc32/include/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/include/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/sparc/erc32/include/bsp.h b/c/src/lib/libbsp/sparc/erc32/include/bsp.h
index cb1a88f288..6af1353548 100644
--- a/c/src/lib/libbsp/sparc/erc32/include/bsp.h
+++ b/c/src/lib/libbsp/sparc/erc32/include/bsp.h
@@ -27,10 +27,20 @@ extern "C" {
#endif
#include <rtems.h>
-#include <clockdrv.h>
-#include <console.h>
#include <iosupp.h>
#include <erc32.h>
+#include <clockdrv.h>
+
+#include <console.h>
+
+/*
+ * confdefs.h overrides for this BSP:
+ * - two termios serial ports
+ * - Interrupt stack space is not minimum if defined.
+ */
+
+#define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2
+#define CONFIGURE_INTERRUPT_STACK_MEMORY (16 * 1024)
/*
* Define the time limits for RTEMS Test Suite test durations.
diff --git a/c/src/lib/libbsp/sparc/erc32/start/Makefile.am b/c/src/lib/libbsp/sparc/erc32/start/Makefile.am
index 824d7a22c5..e5a9f26a27 100644
--- a/c/src/lib/libbsp/sparc/erc32/start/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/start/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am b/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am
index 540fe1f7a6..766ef8cced 100644
--- a/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/startup/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
@@ -22,7 +22,6 @@ include $(top_srcdir)/../../../../../../automake/lib.am
#
# USE_INIT_FINI tells main.c what C++ help we need.
-
AM_CPPFLAGS += -DUSE_INIT_FINI
$(PGM): $(OBJS)
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/bspstart.c b/c/src/lib/libbsp/sparc/erc32/startup/bspstart.c
index f2f2554072..cd3df53b29 100644
--- a/c/src/lib/libbsp/sparc/erc32/startup/bspstart.c
+++ b/c/src/lib/libbsp/sparc/erc32/startup/bspstart.c
@@ -212,13 +212,7 @@ void bsp_start( void )
* This should be enough interrupt stack.
*/
- Cpu_table.interrupt_stack_size = (24 * 1024);
-
-/*
-#if defined(RTEMS_POSIX_API)
- BSP_Configuration.work_space_size *= 3;
-#endif
-*/
+ Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY;
work_space_start =
(unsigned char *)rdb_start - BSP_Configuration.work_space_size;
@@ -230,12 +224,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 SIMSPARC_FAST_IDLE
/*
* Add 1 extension for fast idle
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/linkcmds b/c/src/lib/libbsp/sparc/erc32/startup/linkcmds
index b12ff32f77..ff78e8d74c 100644
--- a/c/src/lib/libbsp/sparc/erc32/startup/linkcmds
+++ b/c/src/lib/libbsp/sparc/erc32/startup/linkcmds
@@ -143,7 +143,8 @@ SECTIONS
*(.data)
*(.gnu.linkonce.d*)
*(.gcc_except_table)
- edata = ALIGN(0x10);
+ . = ALIGN(0x10);
+ edata = .;
_edata = .;
} > ram
.shbss :
diff --git a/c/src/lib/libbsp/sparc/erc32/startup/spurious.c b/c/src/lib/libbsp/sparc/erc32/startup/spurious.c
index c22a5373e2..93694d47e4 100644
--- a/c/src/lib/libbsp/sparc/erc32/startup/spurious.c
+++ b/c/src/lib/libbsp/sparc/erc32/startup/spurious.c
@@ -182,7 +182,8 @@ void bsp_spurious_initialize()
(( trap >= 0x70 ) && ( trap <= 0x83 )))
continue;
- set_vector( bsp_spurious_handler, SPARC_SYNCHRONOUS_TRAP( trap ), 1 );
+ set_vector( (rtems_isr_entry) bsp_spurious_handler,
+ SPARC_SYNCHRONOUS_TRAP( trap ), 1 );
}
ERC32_MEC.Interrupt_Mask = mask;
diff --git a/c/src/lib/libbsp/sparc/erc32/timer/Makefile.am b/c/src/lib/libbsp/sparc/erc32/timer/Makefile.am
index 7f16dcc233..5c2b8edf56 100644
--- a/c/src/lib/libbsp/sparc/erc32/timer/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/timer/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
diff --git a/c/src/lib/libbsp/sparc/erc32/tools/Makefile.am b/c/src/lib/libbsp/sparc/erc32/tools/Makefile.am
index 5da84d4455..a8f75c6c9e 100644
--- a/c/src/lib/libbsp/sparc/erc32/tools/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/tools/Makefile.am
@@ -5,11 +5,17 @@
AUTOMAKE_OPTIONS = foreign 1.4
ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
-noinst_SCRIPTS=runtest
+noinst_SCRIPTS = runtest
-#HACK: install to build-tree
-all-local: $(SCRIPTS)
- $(mkinstalldirs) $(PROJECT_ROOT)/erc32/tests
- $(INSTALL_SCRIPT) runtest $(PROJECT_ROOT)/erc32/tests/runtest
+TMPINSTALL_FILES += $(PROJECT_ROOT)/erc32/tests \
+ $(PROJECT_ROOT)/erc32/tests/runtest
-include $(top_srcdir)/../../../../../../../automake/local.am
+$(PROJECT_ROOT)/erc32/tests:
+ $(mkinstalldirs) $@
+
+$(PROJECT_ROOT)/erc32/tests/runtest: runtest
+ $(INSTALL_SCRIPT) $< $@
+
+all-local: $(TMPINSTALL_FILES)
+
+include $(top_srcdir)/../../../../../../../automake/host.am
diff --git a/c/src/lib/libbsp/sparc/erc32/tools/runtest.in b/c/src/lib/libbsp/sparc/erc32/tools/runtest.in
index 3f9ffa73fe..b7c6f723c2 100644
--- a/c/src/lib/libbsp/sparc/erc32/tools/runtest.in
+++ b/c/src/lib/libbsp/sparc/erc32/tools/runtest.in
@@ -142,13 +142,13 @@ do
fatal "MP tests not supported"
warn "Skipping $tname; 'runtest' runs both nodes when for *-node1"
continue;;
- *-node1*)
- fatal "MP tests not supported"
+ *-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*|termio*)
+ minimum*|stackchk*|spfatal*|termio*)
warn "Skipping $tname; it locks up or takes a VERY long time to run"
continue
;;
diff --git a/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am b/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am
index 5871eeac1f..098eb0b26b 100644
--- a/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/sparc/erc32/wrapup/Makefile.am
@@ -1,6 +1,6 @@
-##
+##
## $Id$
-##
+##
AUTOMAKE_OPTIONS = foreign 1.4
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 07:06:50 +0000