summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-11-21 18:34:28 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-11-21 18:34:28 +0000
commit6af8512c64724e43b66b76b7c787eb28dc0b7055 (patch)
tree4dcd7d3b755a36e2911f35fcacecfda786552fe1
parent524c74142863fe201baa6843e7476db1bc4d7fd6 (diff)
downloadrtems-6af8512c64724e43b66b76b7c787eb28dc0b7055.tar.bz2
2001-11-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add @exceptions@ to SUBDIRS. * configure.ac: Apply RTEMS_BSPOPTS_*(*) to merge-in settings from make/custom/psim.cfg; Remove RTEMS_OUTPUT_BUILD_SUBDIRS; Add RTEMS_PPC_EXCEPTIONS([old]). * include/Makefile.am: include force-preinstall.am. * wrapup/Makefile.am: Apply @exceptions@.
-rw-r--r--c/src/lib/libbsp/powerpc/psim/ChangeLog10
-rw-r--r--c/src/lib/libbsp/powerpc/psim/Makefile.am3
-rw-r--r--c/src/lib/libbsp/powerpc/psim/configure.ac17
-rw-r--r--c/src/lib/libbsp/powerpc/psim/include/Makefile.am1
-rw-r--r--c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am2
5 files changed, 29 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/powerpc/psim/ChangeLog b/c/src/lib/libbsp/powerpc/psim/ChangeLog
index d9490118fa..606f6763dc 100644
--- a/c/src/lib/libbsp/powerpc/psim/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/psim/ChangeLog
@@ -1,3 +1,13 @@
+2001-11-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Add @exceptions@ to SUBDIRS.
+ * configure.ac: Apply RTEMS_BSPOPTS_*(*) to merge-in settings from
+ make/custom/psim.cfg;
+ Remove RTEMS_OUTPUT_BUILD_SUBDIRS;
+ Add RTEMS_PPC_EXCEPTIONS([old]).
+ * include/Makefile.am: include force-preinstall.am.
+ * wrapup/Makefile.am: Apply @exceptions@.
+
2001-11-20 Joel Sherrill <joel@OARcorp.com>
* console/console-io.c: Fix incorrect comment.
diff --git a/c/src/lib/libbsp/powerpc/psim/Makefile.am b/c/src/lib/libbsp/powerpc/psim/Makefile.am
index 4b8e91c8c1..33d216fd2d 100644
--- a/c/src/lib/libbsp/powerpc/psim/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/Makefile.am
@@ -7,7 +7,8 @@ ACLOCAL_AMFLAGS = -I ../../../../../../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 \
+SUBDIRS = include start clock console startup shmsupp timer vectors \
+ @exceptions@ wrapup \
tools
include $(top_srcdir)/../../bsp.am
diff --git a/c/src/lib/libbsp/powerpc/psim/configure.ac b/c/src/lib/libbsp/powerpc/psim/configure.ac
index 96db37f4d5..71228b97d6 100644
--- a/c/src/lib/libbsp/powerpc/psim/configure.ac
+++ b/c/src/lib/libbsp/powerpc/psim/configure.ac
@@ -25,6 +25,18 @@ AM_CONDITIONAL(HAS_MP,test "$HAS_MP" = "yes")
RTEMS_CONFIG_BUILD_SUBDIRS(tools)
+RTEMS_BSPOPTS_SET([PPC_USE_SPRG],[*],[0])
+RTEMS_BSPOPTS_HELP([PPC_USE_SPRG],
+[If defined, then the PowerPC specific code in RTEMS will use some
+of the special purpose registers to slightly optimize interrupt
+response time. The use of these registers can conflict with
+other tools like debuggers.])
+
+RTEMS_BSPOPTS_SET([PPC_VECTOR_FILE_BASE],[*],[0xFFF00100])
+RTEMS_BSPOPTS_HELP([PPC_VECTOR_FILE_BASE],
+[This defines the base address of the exception table.
+ NOTE: Vectors are actually at 0xFFF00000 but file starts at offset.])
+
AM_CONFIG_HEADER(include/bspopts.h)
RTEMS_PROJECT_ROOT
@@ -39,6 +51,7 @@ startup/Makefile
timer/Makefile
vectors/Makefile
wrapup/Makefile])
-AC_OUTPUT
-RTEMS_OUTPUT_BUILD_SUBDIRS(RTEMS_BUILD_SUBDIRS)
+RTEMS_PPC_EXCEPTIONS([old])
+
+AC_OUTPUT
diff --git a/c/src/lib/libbsp/powerpc/psim/include/Makefile.am b/c/src/lib/libbsp/powerpc/psim/include/Makefile.am
index 60bd763d9b..7d1459ab06 100644
--- a/c/src/lib/libbsp/powerpc/psim/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/include/Makefile.am
@@ -17,4 +17,5 @@ TMPINSTALL_FILES = $(PROJECT_INCLUDE) \
all-local: $(TMPINSTALL_FILES)
+include $(top_srcdir)/../../../../../../automake/force-preinstall.am
include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am
index 288e7d17e3..14af265633 100644
--- a/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/psim/wrapup/Makefile.am
@@ -20,7 +20,7 @@ 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)) \
- $(wildcard ../../../../libcpu/powerpc/old_exception_processing/$(ARCH)/*.rel) \
+ ../@exceptions@/$(ARCH)/rtems-cpu.rel \
$(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/$(piece).rel)
LIB = $(ARCH)/libbsp.a