summaryrefslogtreecommitdiffstats
path: root/c/src
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-11-20 19:03:09 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-11-20 19:03:09 +0000
commit019713474b52efa0110d181f182b0e4eaec87278 (patch)
treebe22fa74a82e018a9fab74b916f8efa008f7d050 /c/src
parent2001-11-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-019713474b52efa0110d181f182b0e4eaec87278.tar.bz2
2001-11-16 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/dmv177.cfg; Rename PPC_USE_INSTRUCTION_CACHE to DMV177_USE_INSTRUCTION_CACHE, Add RTEMS_PPC_EXCEPTIONS([old]). * include/Makefile.am: include force-preinstall.am. * startup/bspstart.c: Rename PPC_USE_INSTRUCTION_CACHE to DMV177_USE_INSTRUCTION_CACHE. * wrapup/Makefile.am: Apply @exceptions@.
Diffstat (limited to '')
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/ChangeLog12
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/Makefile.am3
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/configure.ac36
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am1
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c2
-rw-r--r--c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am2
6 files changed, 48 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/powerpc/dmv177/ChangeLog b/c/src/lib/libbsp/powerpc/dmv177/ChangeLog
index 1a7caafca2..300f4e8527 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/dmv177/ChangeLog
@@ -1,3 +1,15 @@
+2001-11-16 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/dmv177.cfg;
+ Rename PPC_USE_INSTRUCTION_CACHE to DMV177_USE_INSTRUCTION_CACHE,
+ Add RTEMS_PPC_EXCEPTIONS([old]).
+ * include/Makefile.am: include force-preinstall.am.
+ * startup/bspstart.c: Rename PPC_USE_INSTRUCTION_CACHE to
+ DMV177_USE_INSTRUCTION_CACHE.
+ * wrapup/Makefile.am: Apply @exceptions@.
+
2001-10-25 Joel Sherrill <joel@OARcorp.com>
* startup/linkcmds: Added _init and _fini.
diff --git a/c/src/lib/libbsp/powerpc/dmv177/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/Makefile.am
index 8a2fde6f00..a808c72e79 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/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 clock console startup start timer scv64 tod sonic wrapup
+SUBDIRS = include clock console startup start timer scv64 tod sonic \
+ @exceptions@ wrapup
include $(top_srcdir)/../../bsp.am
diff --git a/c/src/lib/libbsp/powerpc/dmv177/configure.ac b/c/src/lib/libbsp/powerpc/dmv177/configure.ac
index eed6f3d1fc..bc30ca7cb8 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/configure.ac
+++ b/c/src/lib/libbsp/powerpc/dmv177/configure.ac
@@ -25,10 +25,32 @@ RTEMS_CANONICAL_HOST
AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
## bsp-specific options
-CONSOLE_USE_INTERRUPTS=${CONSOLE_USE_INTERRUPTS-0}
-AC_DEFINE_UNQUOTED([CONSOLE_USE_INTERRUPTS],
- [$CONSOLE_USE_INTERRUPTS],
- [whether using console interrupts])
+RTEMS_BSPOPTS_SET([CONSOLE_USE_INTERRUPTS],[*],[0])
+RTEMS_BSPOPTS_HELP([CONSOLE_USE_INTERRUPTS],
+[whether using console interrupts])
+
+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_USE_DATA_CACHE],[*],[0])
+RTEMS_BSPOPTS_HELP([PPC_USE_DATA_CACHE],
+[If set != 0, then the PowerPC specific code in RTEMS will use
+ data cache instructions to optimize the context switch code.
+ This code can conflict with debuggers or emulators. It is known
+ to break the Corelis PowerPC emulator with at least some combinations
+ of PowerPC 603e revisions and emulator versions.
+ The BSP actually contains the call that enables this.])
+
+RTEMS_BSPOPTS_SET([DMV177_USE_INSTRUCTION_CACHE],[*],[1])
+RTEMS_BSPOPTS_HELP([DMV177_USE_INSTRUCTION_CACHE],
+[If set != 0, then the PowerPC specific code in RTEMS will use
+ data cache instructions to optimize the context switch code.
+ This code can conflict with debuggers or emulators.
+ The BSP actually contains the call that enables this.])
AM_CONFIG_HEADER(include/bspopts.h)
RTEMS_PROJECT_ROOT
@@ -44,5 +66,9 @@ start/Makefile
startup/Makefile
timer/Makefile
tod/Makefile
-wrapup/Makefile])
+wrapup/Makefile
+])
+
+RTEMS_PPC_EXCEPTIONS([old])
+
AC_OUTPUT
diff --git a/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am
index 3e001a3fce..e4ed456a22 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/include/Makefile.am
@@ -23,4 +23,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/dmv177/startup/bspstart.c b/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c
index 3fccb309fb..68e33e0784 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/dmv177/startup/bspstart.c
@@ -129,7 +129,7 @@ void bsp_start( void )
* Enable whatever caching is desired
*/
-#if ( PPC_USE_INSTRUCTION_CACHE )
+#if ( DMV177_USE_INSTRUCTION_CACHE )
rtems_cache_enable_instruction();
#endif
diff --git a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am
index e6066bcb51..f8fd68fe9f 100644
--- a/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/dmv177/wrapup/Makefile.am
@@ -14,7 +14,7 @@ BSP_PIECES = startup clock console scv64 timer tod $(NETWORKING)
# 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 \
$(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o)
LIB = $(ARCH)/libbsp.a