From 1c3c6056468fbede70c040d38e93fbd5829be146 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Wed, 21 Nov 2001 18:34:54 +0000 Subject: 2001-11-21 Ralf Corsepius * Makefile.am: Add @exceptions@ to SUBDIRS. * configure.ac: Apply RTEMS_BSPOPTS_*(*) to merge-in settings from make/custom/ppcn_60x.cfg; Add RTEMS_PPC_EXCEPTIONS([old]). * include/Makefile.am: include force-preinstall.am. * wrapup/Makefile.am: Apply @exceptions@. --- c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog | 9 +++++ c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac | 39 +++++++++++++++++++++- .../libbsp/powerpc/ppcn_60x/include/Makefile.am | 1 + .../lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am | 2 +- 5 files changed, 50 insertions(+), 3 deletions(-) (limited to 'c') diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog index 562fcfb6fe..0ea9132465 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/ChangeLog @@ -1,3 +1,12 @@ +2001-11-21 Ralf Corsepius + + * Makefile.am: Add @exceptions@ to SUBDIRS. + * configure.ac: Apply RTEMS_BSPOPTS_*(*) to merge-in settings from + make/custom/ppcn_60x.cfg; + Add RTEMS_PPC_EXCEPTIONS([old]). + * include/Makefile.am: include force-preinstall.am. + * wrapup/Makefile.am: Apply @exceptions@. + 2001-11-08 Dennis Ehlin (ECS) This modification is part of the submitted modifications necessary to diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am index eed4f89a8d..7b2e3fa503 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/Makefile.am @@ -8,7 +8,7 @@ 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 tod network universe pci \ - nvram vectors wrapup + nvram vectors @exceptions@ wrapup include $(top_srcdir)/../../bsp.am diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac index 1c32eaabd3..6563824433 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/configure.ac @@ -27,6 +27,41 @@ RTEMS_CANONICAL_HOST AM_CONDITIONAL(HAS_NETWORKING,false) # AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") +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],[*],[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.]) + +# FIXME: This should be a 1 out of 2 (3??) selection. +RTEMS_BSPOPTS_SET([PPCN_60X_USE_DINK],[*],[1]) +RTEMS_BSPOPTS_HELP([PPCN_60X_USE_DINK], +[The Score603e board can be configured with 3 ROM monitors. Only two + are appropriate for use with RTEMS. Set exactly one of these to "1" + to indicate which ROM monitor is on the board you are using. Corresponds to +PPCN_60X_USE_NONE]) + +RTEMS_BSPOPTS_SET([PPCN_60X_USE_NONE],[*],[0]) +RTEMS_BSPOPTS_HELP([PPCN_60X_USE_NONE], +[The Score603e board can be configured with 3 ROM monitors. Only two + are appropriate for use with RTEMS. Set exactly one of these to "1" + to indicate which ROM monitor is on the board you are using. Corresponds to +PPCN_60X_USE_DINK]) + +RTEMS_BSPOPTS_SET([PPC_VECTOR_FILE_BASE],[*],[0x0100]) +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.]) RTEMS_PROJECT_ROOT AM_CONFIG_HEADER(include/bspopts.h) @@ -46,5 +81,7 @@ tod/Makefile universe/Makefile vectors/Makefile wrapup/Makefile]) -AC_OUTPUT +RTEMS_PPC_EXCEPTIONS([old]) + +AC_OUTPUT diff --git a/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.am index ae908498e3..e2a5bfd405 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/include/Makefile.am @@ -20,4 +20,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/ppcn_60x/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am index f937201aba..29d0a3aba0 100644 --- a/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/ppcn_60x/wrapup/Makefile.am @@ -15,7 +15,7 @@ BSP_PIECES = startup clock console timer tod $(NETWORK) nvram universe pci \ # 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 LIB = $(ARCH)/libbsp.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -- cgit v1.2.3