From 73d6cdc54836bd454ef8fb33046254a18f1eb845 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 20 Nov 2001 18:51:46 +0000 Subject: 2001-11-15 Ralf Corsepius * Makefile.am: Add @exceptions@ to SUBDIRS. * configure.ac: Add RTEMS_BSPOPTS_*(UARTS_IO_MODE), RTEMS_PPC_EXCEPTIONS([new]). * include/Makefile.am: Convert PREINSTALL_FILES to TMPINSTALL_FILES, include force-preinstall.am. * irq/Makefile.am: remove irq.h from EXTRA_DIST. * wrapup/Makefile.am: Apply @exceptions@. --- c/src/lib/libbsp/powerpc/eth_comm/ChangeLog | 10 ++++++++++ c/src/lib/libbsp/powerpc/eth_comm/Makefile.am | 3 ++- c/src/lib/libbsp/powerpc/eth_comm/configure.ac | 18 ++++++++++++++++++ c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.am | 5 +++-- c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am | 2 +- c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am | 2 +- 6 files changed, 35 insertions(+), 5 deletions(-) diff --git a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog index 7af17c219d..28b037dc74 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog +++ b/c/src/lib/libbsp/powerpc/eth_comm/ChangeLog @@ -1,3 +1,13 @@ +2001-11-15 Ralf Corsepius + + * Makefile.am: Add @exceptions@ to SUBDIRS. + * configure.ac: Add RTEMS_BSPOPTS_*(UARTS_IO_MODE), + RTEMS_PPC_EXCEPTIONS([new]). + * include/Makefile.am: Convert PREINSTALL_FILES to + TMPINSTALL_FILES, include force-preinstall.am. + * irq/Makefile.am: remove irq.h from EXTRA_DIST. + * wrapup/Makefile.am: Apply @exceptions@. + 2001-10-29 Joel Sherrill * include/bsp.h: Modify Install_tm27_vector() so this BSP will link tm27. diff --git a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am index a2f8425e14..6a0f827cb0 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/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 include startup start canbus console irq network vectors wrapup +SUBDIRS = clock include startup start canbus console irq network vectors \ + @exceptions@ wrapup include $(top_srcdir)/../../bsp.am diff --git a/c/src/lib/libbsp/powerpc/eth_comm/configure.ac b/c/src/lib/libbsp/powerpc/eth_comm/configure.ac index fc7f34910a..86ad873962 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/configure.ac +++ b/c/src/lib/libbsp/powerpc/eth_comm/configure.ac @@ -24,6 +24,21 @@ RTEMS_CANONICAL_HOST AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") +# FIXME: Explanation cloned from mbx8xx +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.]) + AM_CONFIG_HEADER(include/bspopts.h) RTEMS_PROJECT_ROOT @@ -39,4 +54,7 @@ start/Makefile startup/Makefile vectors/Makefile wrapup/Makefile]) + +RTEMS_PPC_EXCEPTIONS([new]) + AC_OUTPUT diff --git a/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.am index 87ec6afa25..7c4279a5c1 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/include/Makefile.am @@ -21,10 +21,11 @@ $(PROJECT_INCLUDE)/%.h: %.h $(PROJECT_INCLUDE)/bsp/%.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/eth_comm/irq/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am index b168985a3c..1cce4a3278 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/irq/Makefile.am @@ -44,6 +44,6 @@ $(PGM): $(OBJS) all-local: SORDID_HACK $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(PGM) -EXTRA_DIST = irq.c irq.h irq_asm.S irq_init.c +EXTRA_DIST = irq.c irq_asm.S irq_init.c include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am index 6e0916e4ad..48b59fd376 100644 --- a/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am +++ b/c/src/lib/libbsp/powerpc/eth_comm/wrapup/Makefile.am @@ -17,7 +17,7 @@ BSP_PIECES = clock irq startup start canbus vectors console $(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)/$(RTEMS_CPU_MODEL)/*/$(ARCH)/*.o) LIB = $(ARCH)/libbsp.a -- cgit v1.2.3