Merged of mcp750 and mvme2307 BSP by Eric Valette <valette@crf.canon.fr>.

As part of this effort, the mpc750 libcpu code is now shared with the
ppc6xx.

15 files changed, 40 insertions, 126 deletions

diff --git a/c/src/lib/libbsp/powerpc/mcp750/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/Makefile.in
index 584bb31e28..6813a48f92 100644
--- a/c/src/lib/libbsp/powerpc/mcp750/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/mcp750/Makefile.in
@@ -29,7 +29,7 @@ NETWORK = $(NETWORK_$(HAS_NETWORKING)_V)
 # wrapup is the one that actually builds and installs the library
 #  from the individual .rel files built in other directories
 SUBDIRS = clock console include pci residual openpic irq vectors start \
-    startup bootloader $(NETWORK) wrapup
+    startup bootloader $(NETWORK) motorola wrapup
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/powerpc/mcp750/bootloader/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/bootloader/Makefile.in
index e0ee75873b..86ca29151d 100644
--- a/c/src/lib/libbsp/powerpc/mcp750/bootloader/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/mcp750/bootloader/Makefile.in
@@ -11,7 +11,7 @@ subdir = powerpc/mcp750/bootloader
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../console
+VPATH = @srcdir@:@srcdir@/../../../shared:@srcdir@/../../shared/console:@srcdir@/../../shared/bootloader
 
 # C source names, if any, go here -- minus the .c
 C_PIECES = misc pci zlib mm em86 polled_io lib
@@ -77,7 +77,7 @@ CLOBBER_ADDITIONS += $(IMAGES)
 #
 bootloader : ${OBJS} $(IMAGES) $(BINARY_LOADED) ppcboot.lds
 	$(LD) -o bootloader $(OBJS) --just-symbols=$(BINARY_LOADED) \
-	-b binary $(IMAGES) -T @srcdir@/ppcboot.lds \
+	-b binary $(IMAGES) -T @srcdir@/../../shared/bootloader/ppcboot.lds \
 	 -Map bootloader.map
 
 check_unresolved : ${OBJS}
diff --git a/c/src/lib/libbsp/powerpc/mcp750/clock/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/clock/Makefile.in
index b1af70d442..4490d4b392 100644
--- a/c/src/lib/libbsp/powerpc/mcp750/clock/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/mcp750/clock/Makefile.in
@@ -11,9 +11,7 @@ subdir = powerpc/mcp750/clock
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-VPATH = @srcdir@
-
-PGM = ${ARCH}/clock.rel
+VPATH = @srcdir@:@srcdir@/../../shared/clock
 
 # C source names, if any, go here -- minus the .c
 C_PIECES = p_clock
@@ -58,10 +56,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-$(PGM): ${OBJS}
-	$(make-rel)
-
-all: ${ARCH} $(SRCS) $(PGM)
+all: ${ARCH} $(SRCS) $(OBJS)
 
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
 install: all
diff --git a/c/src/lib/libbsp/powerpc/mcp750/console/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/console/Makefile.in
index 02639f189d..95b8c27b57 100644
--- a/c/src/lib/libbsp/powerpc/mcp750/console/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/mcp750/console/Makefile.in
@@ -1,5 +1,5 @@
 #
-#  $Id: 
+#  $Id$
 #
 
 @SET_MAKE@
@@ -11,14 +11,14 @@ subdir = powerpc/mcp750/console
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-VPATH = @srcdir@:@srcdir@/../../../shared
+VPATH = @srcdir@:@srcdir@/../../shared/console:@srcdir@/../../../shared
 
 # C source names, if any, go here -- minus the .c
-C_PIECES = polled_io uart console inch console_reserve_resources
+C_PIECES = polled_io uart console inch
 C_FILES = $(C_PIECES:%=%.c)
 C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 
-H_FILES = $(srcdir)/consoleIo.h $(srcdir)/keyboard.h $(srcdir)/uart.h
+H_FILES = $(srcdir)/../../shared/console/consoleIo.h $(srcdir)/../../shared/console/keyboard.h $(srcdir)/../../shared/console/uart.h
 
 # Assembly source names, if any, go here -- minus the .s
 S_PIECES =
@@ -48,6 +48,7 @@ CC_O_FILES = $(CC_PIECES:%=${ARCH}/%.o)
 #
 
 CPPFLAGS += -DSTATIC_LOG_ALLOC
+CFLAGS +=
 #
 # Add your list of files to delete here.  The config files
 #  already know how to delete some stuff, so you may want
@@ -56,11 +57,7 @@ CPPFLAGS += -DSTATIC_LOG_ALLOC
 #  'make clobber' already includes 'make clean'
 #
 
-preinstall: 
-	@$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
-	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
-
-all: ${ARCH} $(SRCS) preinstall ${OBJS}
+all: ${ARCH} $(SRCS) ${OBJS}
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	cd $(top_builddir) \
diff --git a/c/src/lib/libbsp/powerpc/mcp750/console/console_reserve_resources.c b/c/src/lib/libbsp/powerpc/mcp750/console/console_reserve_resources.c
deleted file mode 100644
index 2ec22746dd..0000000000
--- a/c/src/lib/libbsp/powerpc/mcp750/console/console_reserve_resources.c
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  console.c  -- console I/O package
- *
- *  Copyright (C) 1999 Eric Valette. valette@crf.canon.fr
- *
- * This code is based on the pc386 BSP console.c so the following
- * copyright also applies :
- *
- * (C) Copyright 1997 -
- * - NavIST Group - Real-Time Distributed Systems and Industrial Automation
- *
- * http://pandora.ist.utl.pt
- *
- * Instituto Superior Tecnico * Lisboa * PORTUGAL
- *  The license and distribution terms for this file may be
- *  found in found in the file LICENSE in this distribution or at
- *  http://www.OARcorp.com/rtems/license.html.
- *
- * $Id$
- */
-  
-#include <stdlib.h>
-#include <assert.h>
-#include <stdlib.h>
-
-#undef __assert
-void __assert (const char *file, int line, const char *msg);
-extern int close(int fd);
-
-#include <bsp.h>
-#include <bsp/irq.h>
-#include <rtems/libio.h>
-#include <termios.h>
-#include <bsp/uart.h>
-#include <bsp/consoleIo.h>
-
-/* Definitions for BSPConsolePort */
-#define BSP_CONSOLE_PORT_CONSOLE (-1)
-#define BSP_CONSOLE_PORT_COM1    (BSP_UART_COM1)
-#define BSP_CONSOLE_PORT_COM2    (BSP_UART_COM2)
-/*
- * Possible value for console input/output :
- *	BSP_CONSOLE_PORT_CONSOLE
- *	BSP_UART_COM1
- *	BSP_UART_COM2
- */
-
-int BSPConsolePort = BSP_UART_COM1;
-
-/* int BSPConsolePort = BSP_UART_COM2;  */
-int BSPBaseBaud    = 115200;
-
-void console_reserve_resources(rtems_configuration_table *conf)
-{
-    if(BSPConsolePort != BSP_CONSOLE_PORT_CONSOLE)
-    {
-      rtems_termios_reserve_resources(conf, 1);
-    }
-   
-  return;
-}
diff --git a/c/src/lib/libbsp/powerpc/mcp750/include/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/include/Makefile.in
index 26345294f6..cb3d87abd3 100644
--- a/c/src/lib/libbsp/powerpc/mcp750/include/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/mcp750/include/Makefile.in
@@ -13,7 +13,13 @@ PROJECT_ROOT = @PROJECT_ROOT@
 
 VPATH = @srcdir@
 
-H_FILES = $(srcdir)/nvram.h $(srcdir)/bsp.h
+H_FILES = $(srcdir)/../../shared/include/nvram.h \
+    $(srcdir)/../../shared/include/bsp.h
+
+BSP_H_FILES = $(srcdir)/../../shared/console/consoleIo.h \
+    $(srcdir)/../../shared/console/uart.h \
+    $(srcdir)/../../shared/irq/irq.h \
+    $(srcdir)/../../shared/motorola/motorola.h
 
 #
 #  Equate files are for including from assembly preprocessed by
@@ -43,7 +49,9 @@ CLOBBER_ADDITIONS +=
 
 preinstall: 
 	$(mkinstalldirs) $(PROJECT_INCLUDE)
+	$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
 	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)
+	@$(INSTALL_CHANGE) -m 644 $(BSP_H_FILES) $(PROJECT_INCLUDE)/bsp
 
 all: $(SRCS) preinstall
 
diff --git a/c/src/lib/libbsp/powerpc/mcp750/irq/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/irq/Makefile.in
index a44fecdfa9..2f9bb6ae04 100644
--- a/c/src/lib/libbsp/powerpc/mcp750/irq/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/mcp750/irq/Makefile.in
@@ -11,14 +11,14 @@ subdir = powerpc/mcp750/irq
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-VPATH = @srcdir@
+VPATH = @srcdir@:@srcdir@/../../shared/irq
 
 # C source names, if any, go here -- minus the .c
 C_PIECES = irq_init i8259 irq
 C_FILES = $(C_PIECES:%=%.c)
 C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 
-H_FILES = $(srcdir)/irq.h
+H_FILES = $(srcdir)/../../shared/irq/irq.h
 
 # Assembly source names, if any, go here -- minus the .s
 S_PIECES = irq_asm
@@ -61,11 +61,7 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-preinstall: 
-	@$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
-	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
-
-all: ${ARCH} $(SRCS) preinstall ${OBJS}
+all: ${ARCH} $(SRCS) ${OBJS}
 
 install: all
 
diff --git a/c/src/lib/libbsp/powerpc/mcp750/openpic/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/openpic/Makefile.in
index 3b4fc9856b..2f3e2c2c23 100644
--- a/c/src/lib/libbsp/powerpc/mcp750/openpic/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/mcp750/openpic/Makefile.in
@@ -11,16 +11,14 @@ subdir = powerpc/mcp750/openpic
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-VPATH = @srcdir@
-
-PGM = ${ARCH}/openpic.rel
+VPATH = @srcdir@:@srcdir@/../../shared/openpic
 
 # C source names, if any, go here -- minus the .c
 C_PIECES = $(OPENPIC_C_PIECES)
 C_FILES = $(C_PIECES:%=%.c)
 C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 
-H_FILES = $(srcdir)/openpic.h
+H_FILES = $(srcdir)/../../shared/openpic/openpic.h
 
 SRCS = $(C_FILES) $(H_FILES)
 OBJS = $(C_O_FILES)
@@ -60,14 +58,11 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-$(PGM): ${OBJS}
-	$(make-rel)
-
 preinstall: 
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
 	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
 
-all: ${ARCH} $(SRCS) preinstall $(PGM)
+all: ${ARCH} $(SRCS) preinstall $(OBJS)
 
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
 install: all
diff --git a/c/src/lib/libbsp/powerpc/mcp750/pci/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/pci/Makefile.in
index b09f066481..b2192fb262 100644
--- a/c/src/lib/libbsp/powerpc/mcp750/pci/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/mcp750/pci/Makefile.in
@@ -11,16 +11,14 @@ subdir = powerpc/mcp750/pci
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-VPATH = @srcdir@
-
-PGM = ${ARCH}/pci.rel
+VPATH = @srcdir@:@srcdir@/../../shared/pci
 
 # C source names, if any, go here -- minus the .c
-C_PIECES = $(PCI_C_PIECES)
+C_PIECES = pci
 C_FILES = $(C_PIECES:%=%.c)
 C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 
-H_FILES = $(srcdir)/pci.h
+H_FILES = $(srcdir)/../../shared/pci/pci.h
 
 SRCS = $(C_FILES) $(H_FILES)
 OBJS = $(C_O_FILES)
@@ -36,8 +34,6 @@ INSTALLDIRS = $(PROJECT_INCLUDE)/bsp
 $(INSTALLDIRS):
 	@$(mkinstalldirs) $(INSTALLDIRS)
 
-PCI_C_PIECES = pci
-
 #
 # (OPTIONAL) Add local stuff here using +=
 #
@@ -60,14 +56,11 @@ LDFLAGS +=
 CLEAN_ADDITIONS +=
 CLOBBER_ADDITIONS +=
 
-$(PGM): ${OBJS}
-	$(make-rel)
-
 preinstall: 
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
 	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
 
-all: ${ARCH} $(SRCS) preinstall $(PGM)
+all: ${ARCH} $(SRCS) preinstall $(OBJS)
 
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
 install: all
diff --git a/c/src/lib/libbsp/powerpc/mcp750/residual/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/residual/Makefile.in
index d1b0ec1475..af74498505 100644
--- a/c/src/lib/libbsp/powerpc/mcp750/residual/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/mcp750/residual/Makefile.in
@@ -11,16 +11,14 @@ subdir = powerpc/mcp750/residual
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-VPATH = @srcdir@
-
-PGM = ${ARCH}/residual.rel
+VPATH = @srcdir@:@srcdir@/../../shared/residual
 
 # C source names, if any, go here -- minus the .c
 C_PIECES = $(RESIDUAL_C_PIECES)
 C_FILES = $(C_PIECES:%=%.c)
 C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 
-H_FILES = $(srcdir)/pnp.h $(srcdir)/residual.h
+H_FILES = $(srcdir)/../../shared/residual/pnp.h $(srcdir)/../../shared/residual/residual.h
 
 SRCS = $(C_FILES) $(H_FILES)
 OBJS = $(C_O_FILES)
@@ -64,10 +62,7 @@ preinstall:
 	@$(mkinstalldirs) $(PROJECT_INCLUDE)/bsp
 	@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/bsp
 
-$(PGM): ${OBJS}
-	$(make-rel)
-
-all: ${ARCH} $(SRCS) preinstall $(PGM)
+all: ${ARCH} $(SRCS) preinstall $(OBJS)
 
 # the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
 install: all
diff --git a/c/src/lib/libbsp/powerpc/mcp750/start/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/start/Makefile.in
index 16b61c2e02..704bfeb8e8 100644
--- a/c/src/lib/libbsp/powerpc/mcp750/start/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/mcp750/start/Makefile.in
@@ -11,7 +11,7 @@ subdir = powerpc/mcp750/start
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-VPATH = @srcdir@
+VPATH = @srcdir@:@srcdir@/../../shared/start
 
 PGM = ${ARCH}/start.o
 
diff --git a/c/src/lib/libbsp/powerpc/mcp750/startup/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/startup/Makefile.in
index 0a246d35a2..faf523d8c4 100644
--- a/c/src/lib/libbsp/powerpc/mcp750/startup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/mcp750/startup/Makefile.in
@@ -11,7 +11,7 @@ subdir = powerpc/mcp750/startup
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-VPATH = @srcdir@:@srcdir@/../console:@srcdir@/../../../shared
+VPATH = @srcdir@:@srcdir@/../console:@srcdir@/../../../shared:@srcdir@/../../shared/startup
 
 # C source names, if any, go here -- minus the .c
 C_PIECES = bootcard main bspstart bsppost bsplibc sbrk bspclean \
diff --git a/c/src/lib/libbsp/powerpc/mcp750/vectors/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/vectors/Makefile.in
index e37ed7230c..33e1b3cefa 100644
--- a/c/src/lib/libbsp/powerpc/mcp750/vectors/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/mcp750/vectors/Makefile.in
@@ -11,16 +11,14 @@ subdir = powerpc/mcp750/vectors
 RTEMS_ROOT = @RTEMS_ROOT@
 PROJECT_ROOT = @PROJECT_ROOT@
 
-VPATH = @srcdir@:@srcdir@/../console:
-
-PGM = ${ARCH}/vectors.rel
+VPATH = @srcdir@:@srcdir@/../console:@srcdir@/../../shared/vectors
 
 # C source names, if any, go here -- minus the .c
 C_PIECES = vectors_init
 C_FILES = $(C_PIECES:%=%.c)
 C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
 
-H_FILES = $(srcdir)/vectors.h
+H_FILES = $(srcdir)/../../shared/vectors/vectors.h
 
 # Assembly source names, if any, go here -- minus the .s
 S_PIECES = vectors
diff --git a/c/src/lib/libbsp/powerpc/mcp750/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/mcp750/wrapup/Makefile.in
index 15c5e8e9f1..4380a59cbd 100644
--- a/c/src/lib/libbsp/powerpc/mcp750/wrapup/Makefile.in
+++ b/c/src/lib/libbsp/powerpc/mcp750/wrapup/Makefile.in
@@ -18,7 +18,7 @@ NETWORK_yes_V = dec21140
 NETWORK = $(NETWORK_$(HAS_NETWORKING)_V)
 
 BSP_PIECES = clock console irq openpic pci residual startup $(NETWORK) \
-    vectors
+    vectors motorola
 GENERIC_PIECES =
 
 # bummer; have to use $foreach since % pattern subst rules only replace 1x
diff --git a/c/src/lib/libbsp/powerpc/mcp750/console/console.c b/c/src/lib/libbsp/powerpc/shared/console/console.c
index fc50656af1..834f960cfc 100644
--- a/c/src/lib/libbsp/powerpc/mcp750/console/console.c
+++ b/c/src/lib/libbsp/powerpc/shared/console/console.c
@@ -45,10 +45,10 @@ extern int close(int fd);
  *	BSP_UART_COM2
  */
 
-extern int BSPConsolePort;
+int BSPConsolePort = BSP_UART_COM1;
 
 /* int BSPConsolePort = BSP_UART_COM2;  */
-extern int BSPBaseBaud;
+int BSPBaseBaud    = 115200;
 
 /*-------------------------------------------------------------------------+
 | External Prototypes
@@ -84,7 +84,6 @@ isr_is_on(const rtems_irq_connect_data *irq)
   return BSP_irq_enabled_at_i8259s(irq->name);
 }
 
-/*
 void console_reserve_resources(rtems_configuration_table *conf)
 {
     if(BSPConsolePort != BSP_CONSOLE_PORT_CONSOLE)
@@ -94,7 +93,6 @@ void console_reserve_resources(rtems_configuration_table *conf)
    
   return;
 }
-*/
 
 void __assert (const char *file, int line, const char *msg)
 {