From 1d9a2fc5abb83a5f37b10c63da8ccaf6ce0bda47 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 29 Nov 1999 15:45:11 +0000 Subject: Patch rtems-rc-19991123-rc-0.diff from Ralf Corsepius which (among other things) converted the mptests to automake. SUB_DIRS was used instead of SUBDIRS in some Makefile.ins (apparently a leftover from moving the start* directories) Addtional major bugs: * psxtests/include was empty (incomplete psxtests changes). * bogus handling of *.scn in itrontests (screens/sptests vs. screens/itrontests installation dirs) In addition I have added a few more changes (I couldn't resist) * automake support for itrontests * OPERATION_COUNT support in tmitrontests/ * automake support for tmitrontests * automake suppport for mptests * Some (minor) corrections to several configure.in/Makefile.ams => c/src/tests/ is completly under automake control, now. => we could start to sort out the structural issues with c/src/tests (tests/support, stubdr, tools, get "make dist" working) --- c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in | 2 +- c/src/lib/libbsp/powerpc/motorola_powerpc/console/console.c | 6 ++++-- c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in | 6 ++---- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'c/src/lib/libbsp/powerpc/motorola_powerpc') diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in index 7af8cf54bb..02639f189d 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/Makefile.in @@ -14,7 +14,7 @@ PROJECT_ROOT = @PROJECT_ROOT@ VPATH = @srcdir@:@srcdir@/../../../shared # C source names, if any, go here -- minus the .c -C_PIECES = polled_io uart console inch +C_PIECES = polled_io uart console inch console_reserve_resources C_FILES = $(C_PIECES:%=%.c) C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/console.c b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/console.c index 834f960cfc..fc50656af1 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/console/console.c +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/console/console.c @@ -45,10 +45,10 @@ extern int close(int fd); * BSP_UART_COM2 */ -int BSPConsolePort = BSP_UART_COM1; +extern int BSPConsolePort; /* int BSPConsolePort = BSP_UART_COM2; */ -int BSPBaseBaud = 115200; +extern int BSPBaseBaud; /*-------------------------------------------------------------------------+ | External Prototypes @@ -84,6 +84,7 @@ 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) @@ -93,6 +94,7 @@ void console_reserve_resources(rtems_configuration_table *conf) return; } +*/ void __assert (const char *file, int line, const char *msg) { diff --git a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in index 8a43068b83..15c5e8e9f1 100644 --- a/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in +++ b/c/src/lib/libbsp/powerpc/motorola_powerpc/wrapup/Makefile.in @@ -20,12 +20,10 @@ NETWORK = $(NETWORK_$(HAS_NETWORKING)_V) BSP_PIECES = clock console irq openpic pci residual startup $(NETWORK) \ vectors GENERIC_PIECES = -CPU_PIECES = clock # bummer; have to use $foreach since % pattern subst rules only replace 1x -OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) $(foreach \ - piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/*.o) $(foreach - piece, $(CPU_PIECES), ../../../../libcpu/powerpc/mpc750/$(piece)/$(ARCH)/*.o) +OBJS = $(foreach piece, $(BSP_PIECES), ../$(piece)/$(ARCH)/*.o) \ + $(foreach piece, $(GENERIC_PIECES), ../../../$(piece)/$(ARCH)/*.o) LIB = $(ARCH)/libbsp.a include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -- cgit v1.2.3