summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-11-20 18:58:22 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-11-20 18:58:22 +0000
commitbb507e9e252f0ebac3f2209809d69d381994b2e1 (patch)
treec79ae8eea15c716713e2c18c818006745dd19253
parent708a87c51e6acfa1e2be90e2d1a1e12c272e5170 (diff)
downloadrtems-bb507e9e252f0ebac3f2209809d69d381994b2e1.tar.bz2
2001-11-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Add @exceptions@ to SUBDIRS. * configure.ac: Add RTEMS_BSPOPTS_*(), merge-in settings from make/custom/mbx*.cfg, add RTEMS_PPC_EXCEPTIONS([new]). * include/Makefile.am: Convert PREINSTALL_FILES to TMPINSTALL_FILES, include force-preinstall.am. * vectors/Makefile.am: remove bogus VPATH. * wrapup/Makefile.am: Apply @exceptions@.
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog10
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am3
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/configure.ac90
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/include/Makefile.am5
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/vectors/Makefile.am2
-rw-r--r--c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am2
6 files changed, 105 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
index 899aa2f0d8..7681502b1c 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/ChangeLog
@@ -1,3 +1,13 @@
+2001-11-15 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Add @exceptions@ to SUBDIRS.
+ * configure.ac: Add RTEMS_BSPOPTS_*(), merge-in settings
+ from make/custom/mbx*.cfg, add RTEMS_PPC_EXCEPTIONS([new]).
+ * include/Makefile.am: Convert PREINSTALL_FILES to
+ TMPINSTALL_FILES, include force-preinstall.am.
+ * vectors/Makefile.am: remove bogus VPATH.
+ * wrapup/Makefile.am: Apply @exceptions@.
+
2001-10-29 Joel Sherrill <joel@OARcorp.com>
* include/bsp.h: Modify Install_tm27_vector() so this BSP will link tm27.
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am
index c9765b8063..80cfc4448e 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/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 irq network startup vectors wrapup
+SUBDIRS = include clock console irq network startup vectors \
+ @exceptions@ wrapup
include $(top_srcdir)/../../bsp.am
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac b/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac
index ceb701578f..43833d46f2 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/configure.ac
@@ -23,8 +23,93 @@ RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
RTEMS_CHECK_NETWORKING
RTEMS_CANONICAL_HOST
-
RTEMS_PROJECT_ROOT
+
+RTEMS_BSPOPTS_SET([PPC_USE_DATA_CACHE],[mbx860_005b],[0])
+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.])
+
+RTEMS_BSPOPTS_SET([NVRAM_CONFIGURE],[mbx860_005b],[0])
+RTEMS_BSPOPTS_SET([NVRAM_CONFIGURE],[*],[1])
+RTEMS_BSPOPTS_HELP([NVRAM_CONFIGURE],
+[Define to 1 if you want the console driver, network driver and caches
+ configured at boot time from parameters stored in NVRAM. If set to 1,
+ most parameters below are ignored during the build. If not set to 1,
+ then the console driver is configured at build time, the network host
+ information is obtained from application supplied data structures, and
+ the caches are configured at boot time based on the information
+ supplied
+ in this file.])
+
+RTEMS_BSPOPTS_SET([UARTS_USE_TERMIOS],[mbx860_005b],[1])
+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],[mbx860_005b],[SMC1_MINOR])
+RTEMS_BSPOPTS_SET([CONSOLE_MINOR],[*],[SMC2_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],[mbx860_005b],[SMC1_MINOR])
+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.])
+
+RTEMS_BSPOPTS_SET([PRINTK_IO_MODE],[*],[0])
+RTEMS_BSPOPTS_HELP([PRINTK_IO_MODE],
+[(BSP--console driver)
+ Define to 0 or 1 if you want polled I/O performed by RTEMS.
+ Define to 2 if you want polled I/O performed by EPPCBug.
+ The printk() port is not configured to use termios. With EPPCBug 1.1,
+ if mode 2 is selected, PRINTK_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.
+ Printk always uses polled output.])
+
+
+RTEMS_BSPOPTS_SET([EPPCBUG_SMC1],[mbx860_005b],[])
+RTEMS_BSPOPTS_SET([EPPCBUG_SMC1],[*],[1])
+RTEMS_BSPOPTS_HELP([EPPCBUG_SMC1],
+[(BSP--console driver)
+ If defined, SMC1 is in use by EPPC-Bug. The console driver will not
+ re-initialize that port.])
+
+RTEMS_BSPOPTS_SET([EPPCBUG_VECTORS],[mbx860_005b],[])
+RTEMS_BSPOPTS_SET([EPPCBUG_VECTORS],[*],[1])
+RTEMS_BSPOPTS_HELP([EPPCBUG_VECTORS],
+[(BSP--RTEMS)
+ If defined, vectors branch to EPPCBug, except the following:
+ 0x500 (external interrupt), 0x900 (decrementer).])
+
AM_CONFIG_HEADER(include/bspopts.h)
AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes")
@@ -38,4 +123,7 @@ network/Makefile
startup/Makefile
vectors/Makefile
wrapup/Makefile])
+
+RTEMS_PPC_EXCEPTIONS([new])
+
AC_OUTPUT
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/include/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/include/Makefile.am
index 92a1884419..610e752e86 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/include/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/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/mbx8xx/vectors/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/vectors/Makefile.am
index de9c4d46f8..f8f18ac949 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/vectors/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/vectors/Makefile.am
@@ -4,8 +4,6 @@
AUTOMAKE_OPTIONS = foreign 1.4
-VPATH = @srcdir@:
-
C_FILES = vectors_init.c
C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
diff --git a/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am b/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am
index a79f007f62..e92293fa01 100644
--- a/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/mbx8xx/wrapup/Makefile.am
@@ -17,7 +17,7 @@ BSP_PIECES = clock irq 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)/mpc8xx/*/$(ARCH)/*.o)
LIB = $(ARCH)/libbsp.a