diff options
5 files changed, 53 insertions, 4 deletions
diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog index c1d8bebaf4..7db7378466 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/ChangeLog @@ -1,3 +1,12 @@ +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/mpc8260ads.cfg, add RTEMS_PPC_EXCEPTIONS([new]). + * include/Makefile.am: Convert PREINSTALL_FILES to + TMPINSTALL_FILES, include force-preinstall.am. + * wrapup/Makefile.am: Apply @exceptions@. + 2001-10-29 Joel Sherrill <joel@OARcorp.com> * .cvsignore: Add more entries. diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am index f4d4d10dd0..a8ab6b840f 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/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 = clock console include vectors irq network start startup wrapup +SUBDIRS = include clock console vectors irq network start startup \ + @exceptions@ wrapup include $(top_srcdir)/../../bsp.am diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac b/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac index 034783a749..9c4cb33a57 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/configure.ac @@ -20,6 +20,41 @@ RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) RTEMS_CANONICAL_HOST +RTEMS_BSPOPTS_SET([UARTS_USE_TERMIOS],[*],[0]) +RTEMS_BSPOPTS_HELP([UARTS_USE_TERMIOS], +[Define to 1 if you want termios support for every port. + Termios support is independent of the choice of UART I/O mode.]) + +RTEMS_BSPOPTS_SET([CONSOLE_MINOR],[*],[SCC2_MINOR]) +RTEMS_BSPOPTS_HELP([CONSOLE_MINOR], +[(BSP--console driver) Must be defined to be one of SMC1_MINOR, + SMC2_MINOR, SCC2_MINOR, SCC3_MINOR, or SCC4_MINOR. + Determines which device will be registered as /dev/console.]) + +RTEMS_BSPOPTS_SET([UARTS_IO_MODE],[*],[0]) +RTEMS_BSPOPTS_HELP([UARTS_IO_MODE], +[(BSP--console driver) + Define to 0 or 1 if you want polled I/O performed by RTEMS. + Define to 1 if you want interrupt-driven performed by RTEMS. + Define to 2 if you want polled I/O performed by EPPCBug. + There is no provision to have a mix of interrupt-driven and polled I/O + ports, except that the printk port may use a different mode from the + other ports. If this is done, do not open the printk port from an RTEMS + application. With EPPCBug 1.1, if mode 2 is selected, CONSOLE_MINOR + must be set to SMC1_MINOR. This is a deficiency of the firmware: it + does not perform serial I/O on any port other than its default debug + port, which must be SMC1.]) + +RTEMS_BSPOPTS_SET([PRINTK_MINOR],[*],[SMC2_MINOR]) +RTEMS_BSPOPTS_HELP([PRINTK_MINOR], +[(BSP--console driver) + Must be defined to be one of SMC1_MINOR, SMC2_MINOR, SCC2_MINOR, + SCC3_MINOR, or SCC4_MINOR. Determines which device is used for output + by printk(). If the port that printk() uses is also used for other + I/O (e.g. if PRINTK_MINOR == \$CONSOLE_MINOR), then both ports should + use the same type of I/O, otherwise the drivers will likely conflict with + each other.]) + AM_CONFIG_HEADER(include/bspopts.h) RTEMS_PROJECT_ROOT @@ -36,4 +71,7 @@ vectors/Makefile start/Makefile startup/Makefile wrapup/Makefile]) + +RTEMS_PPC_EXCEPTIONS([new]) + AC_OUTPUT diff --git a/c/src/lib/libbsp/powerpc/mpc8260ads/include/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/include/Makefile.am index 44f8daa26b..c431d84ea4 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/include/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/include/Makefile.am @@ -15,10 +15,11 @@ $(PROJECT_INCLUDE)/bsp: $(PROJECT_INCLUDE)/%.h: %.h $(INSTALL_DATA) $< $@ -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp \ +TMPINSTALL_FILES = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/bsp \ $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \ $(include_bsp_HEADERS:%=$(PROJECT_INCLUDE)/bsp/%) -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/mpc8260ads/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am index 71e6a86f25..8d98e54c74 100644 --- a/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/mpc8260ads/wrapup/Makefile.am @@ -17,7 +17,7 @@ BSP_PIECES = clock irq start startup console vectors $(NETWORKING) # bummer; have to use $foreach since % pattern subst rules only replace 1x OBJS = $(foreach piece, $(BSP_PIECES), $(wildcard ../$(piece)/$(ARCH)/*.o)) \ $(wildcard ../../../../libcpu/$(RTEMS_CPU)/shared/*/$(ARCH)/*.o) \ - $(wildcard ../../../../libcpu/powerpc/new_exception_processing/$(ARCH)/*.rel) \ + ../@exceptions@/$(ARCH)/rtems-cpu.rel \ $(wildcard ../../../../libcpu/$(RTEMS_CPU)/mpc8260/*/$(ARCH)/*.o) LIB = $(ARCH)/libbsp.a |