summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-11-21 18:38:48 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-11-21 18:38:48 +0000
commit4fe0abdcd129d27ce1e0b63ed9f8085c0e0bc766 (patch)
treedc872a32b975822c02a0227d050c1efef6a3ae53
parent26f6042e28f5baae810624d21886c4666b22a1b3 (diff)
downloadrtems-4fe0abdcd129d27ce1e0b63ed9f8085c0e0bc766.tar.bz2
2001-11-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add @exceptions@ to SUBDIRS; Remove need_motorola_powerpc. * configure.ac: Apply RTEMS_BSPOPTS_*(*) to merge-in settings from make/custom/mcp750.cfg, make/custom/mvme2307.cfg; Remove need_motorola_powerpc; Add RTEMS_PPC_EXCEPTIONS([new]). * include/Makefile.am: Replace PREINSTALL_FILES with TMPINSTALL_FILES, include force-preinstall.am. * wrapup/Makefile.am: Apply @exceptions@.
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog12
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am4
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac14
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am5
-rw-r--r--c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am2
5 files changed, 29 insertions, 8 deletions
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
index ea64ff5b06..9c8967b482 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/ChangeLog
@@ -1,3 +1,15 @@
+ * wrapup/Makefile.am: Remove AUTOMAKE_OPTIONS.
+
+2001-12-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: Remove RTEMS_ENABLE_NETWORKING.
+
+2001-11-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: Introduce RTEMS_BSP_CONFIGURE.
+
+2001-11-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
* Makefile.am: Add @exceptions@ to SUBDIRS;
Remove need_motorola_powerpc.
* configure.ac: Apply RTEMS_BSPOPTS_*(*) to merge-in settings from
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
index 44b4357f51..cff2fe1187 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am
@@ -7,10 +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
-if need_motorola_powerpc
SUBDIRS = include clock console pci residual openpic irq vectors start \
- startup bootloader motorola wrapup
-endif
+ startup bootloader motorola @exceptions@ wrapup
include $(top_srcdir)/../../bsp.am
diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
index 879374f718..919e072a03 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/configure.ac
@@ -23,11 +23,18 @@ RTEMS_CHECK_NETWORKING
RTEMS_CANONICAL_HOST
AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
-AM_CONDITIONAL(need_motorola_powerpc, test "$RTEMS_BSP_FAMILY" = "motorola_powerpc")
-
AS=$CC
AM_PROG_AS
+RTEMS_BSPOPTS_SET([PPC_USE_DATA_CACHE],[*],[1])
+RTEMS_BSPOPTS_HELP([PPC_USE_DATA_CACHE],
+[If defined, 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.])
+
AM_CONFIG_HEADER(include/bspopts.h)
RTEMS_PROJECT_ROOT
@@ -46,4 +53,7 @@ start/Makefile
startup/Makefile
vectors/Makefile
wrapup/Makefile])
+
+RTEMS_PPC_EXCEPTIONS([new])
+
AC_OUTPUT
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 4ae605a8e8..8ce7de11a0 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/include/Makefile.am
@@ -42,13 +42,14 @@ $(PROJECT_INCLUDE)/bsp/irq.h: ../../shared/irq/irq.h
$(PROJECT_INCLUDE)/bsp/motorola.h: ../../shared/motorola/motorola.h
$(INSTALL_DATA) $< $@
-PREINSTALL_FILES = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp \
+TMPINSTALL_FILES = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp \
$(PROJECT_INCLUDE)/nvram.h $(PROJECT_INCLUDE)/bsp.h \
$(PROJECT_INCLUDE)/coverhd.h $(PROJECT_INCLUDE)/bsp/consoleIo.h \
$(PROJECT_INCLUDE)/bsp/uart.h $(PROJECT_INCLUDE)/bsp/irq.h \
$(PROJECT_INCLUDE)/bsp/motorola.h \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
-all-local: $(PREINSTALL_FILES)
+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/motorola_powerpc/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am
index c24d9864c0..042566220c 100644
--- a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.am
@@ -10,7 +10,7 @@ BSP_PIECES = clock console irq openpic pci residual startup vectors motorola
OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) \
$(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \
$(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc6xx/*/$(ARCH)/*.o) \
- $(wildcard ../../../../libcpu/powerpc/new_exception_processing/$(ARCH)/*.rel) \
+ ../@exceptions@/$(ARCH)/rtems-cpu.rel \
$(wildcard ../../../../libcpu/$(RTEMS_CPU)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.o)
LIB = $(ARCH)/libbsp.a