From fc16e176fc5801fd65a68a2e5f42e751cc22bfaa Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 27 Nov 2001 01:20:22 +0000 Subject: 2001-11-26 Ralf Corsepius * Makefile.am: Remove . from SUBDIRS, remove duplicate bsp_specs rules, add @exceptions@ to SUBDIRS. * configure.ac: Add RTEMS_BSPOPTS_*(PPC_USE_SPRG), RTEMS_BSPOPTS_*(PPC_VECTOR_FILE_BASE), RTEMS_PPC_EXCEPTIONS([old]), autoupdate to autoconf 2.52. * include/Makefile.am: Convert PREINSTALL_FILES to TMPINSTALL_FILES, include force-preinstall.am. * wrapup/Makefile.am: Apply @exceptions@. --- c/src/lib/libbsp/powerpc/gen405/ChangeLog | 11 +++++++++ c/src/lib/libbsp/powerpc/gen405/Makefile.am | 7 +----- c/src/lib/libbsp/powerpc/gen405/configure.ac | 26 +++++++++++++++++----- .../lib/libbsp/powerpc/gen405/include/Makefile.am | 3 ++- c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am | 2 +- 5 files changed, 36 insertions(+), 13 deletions(-) diff --git a/c/src/lib/libbsp/powerpc/gen405/ChangeLog b/c/src/lib/libbsp/powerpc/gen405/ChangeLog index 94f7b2836e..8d11844e93 100644 --- a/c/src/lib/libbsp/powerpc/gen405/ChangeLog +++ b/c/src/lib/libbsp/powerpc/gen405/ChangeLog @@ -1,3 +1,14 @@ +2001-11-26 Ralf Corsepius + + * Makefile.am: Remove . from SUBDIRS, remove duplicate bsp_specs + rules, add @exceptions@ to SUBDIRS. + * configure.ac: Add RTEMS_BSPOPTS_*(PPC_USE_SPRG), + RTEMS_BSPOPTS_*(PPC_VECTOR_FILE_BASE), + RTEMS_PPC_EXCEPTIONS([old]), autoupdate to autoconf 2.52. + * include/Makefile.am: Convert PREINSTALL_FILES to + TMPINSTALL_FILES, include force-preinstall.am. + * wrapup/Makefile.am: Apply @exceptions@. + 2001-11-20 Joel Sherrill * include/bspopts.h.in: Automatically generated file that should not diff --git a/c/src/lib/libbsp/powerpc/gen405/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/Makefile.am index 7dff0f01ea..9db3fef986 100644 --- a/c/src/lib/libbsp/powerpc/gen405/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen405/Makefile.am @@ -7,15 +7,10 @@ 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 dlentry startup wrapup +SUBDIRS = include dlentry startup @exceptions@ wrapup include $(top_srcdir)/../../bsp.am -$(PROJECT_RELEASE)/lib/bsp_specs: bsp_specs - $(INSTALL_DATA) $< $@ - -PREINSTALL_FILES += $(PROJECT_RELEASE)/lib/bsp_specs - EXTRA_DIST = bsp_specs times include $(top_srcdir)/../../../../../../automake/subdirs.am diff --git a/c/src/lib/libbsp/powerpc/gen405/configure.ac b/c/src/lib/libbsp/powerpc/gen405/configure.ac index 771e829801..c961996839 100644 --- a/c/src/lib/libbsp/powerpc/gen405/configure.ac +++ b/c/src/lib/libbsp/powerpc/gen405/configure.ac @@ -2,8 +2,9 @@ dnl Process this file with autoconf to produce a configure script. dnl dnl $Id$ -AC_PREREQ(2.13) -AC_INIT(bsp_specs) +AC_PREREQ(2.52) +AC_INIT +AC_CONFIG_SRCDIR([bsp_specs]) RTEMS_TOP(../../../../../..) AC_CONFIG_AUX_DIR(../../../../../..) @@ -23,13 +24,28 @@ RTEMS_CANONICAL_HOST AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") +RTEMS_BSPOPTS_SET([PPC_USE_SPRG],[*],[1]) +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],[*],[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.]) + AM_CONFIG_HEADER(include/bspopts.h) RTEMS_PROJECT_ROOT # Explicitly list all Makefiles here -AC_OUTPUT( -Makefile +AC_CONFIG_FILES([Makefile dlentry/Makefile include/Makefile startup/Makefile -wrapup/Makefile) +wrapup/Makefile]) + +RTEMS_PPC_EXCEPTIONS([old]) + +AC_OUTPUT diff --git a/c/src/lib/libbsp/powerpc/gen405/include/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/include/Makefile.am index a2785f9a65..7d1459ab06 100644 --- a/c/src/lib/libbsp/powerpc/gen405/include/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen405/include/Makefile.am @@ -12,9 +12,10 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -TMPINSTALL_FILES += $(PROJECT_INCLUDE) \ +TMPINSTALL_FILES = $(PROJECT_INCLUDE) \ $(include_HEADERS:%=$(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/gen405/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am index 6b694289bf..48cedfe040 100644 --- a/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/gen405/wrapup/Makefile.am @@ -10,7 +10,7 @@ CPU_PIECES = clock timer console tty_drv vectors ictrl # 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, $(CPU_PIECES), ../../../../libcpu/$(RTEMS_CPU)/ppc403/$(piece)/$(ARCH)/$(piece).rel) LIB = $(ARCH)/libbsp.a -- cgit v1.2.3