summaryrefslogtreecommitdiffstats
path: root/c/src/lib/libbsp/powerpc/psim
diff options
context:
space:
mode:
Diffstat (limited to 'c/src/lib/libbsp/powerpc/psim')
-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
16 files changed, 59 insertions, 52 deletions
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)) \
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 15:02:09 +0000