From e2f92fa2e57627612e6c5d08797ad1ac4411eb8f Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Sun, 29 Nov 2009 02:59:39 +0100 Subject: [PATCH] rtems patches updated for rtems-4.9.3 --- .../arm-csb336/rtems/arm-rtems-sys.cfg | 4 +- rtems-build/arm-csb336/rtems/control | 6 +- rtems-patches/control | 6 +- .../current/rtems-clone-mrm332-to-mo376.patch | 471 +++++++++--------- .../current/rtems-clone-ss555-to-ec555.patch | 338 +++++++------ .../current/rtems-ec555-add-to-configs.patch | 12 +- .../rtems-inttypes-wcs-disable-fix.patch | 15 - .../rtems-m9328-pimx1-baud-19200.patch | 23 +- .../rtems-m9328-pimx1-mapping-change.patch | 10 +- .../current/rtems-m9328-pimx1-syncmclk.patch | 12 +- .../current/rtems-m9328-pimx1-uart1to3.patch | 23 +- .../current/rtems-mo376-add-to-configs.patch | 12 +- .../current/rtems-mo376-m68376-updates.patch | 64 +-- .../current/rtems-readlink-type-fix.patch | 21 - .../rtems-update-mrm332-to-mo376.patch | 117 +++-- ...ms-update-ss555-to-ec555-cpld-remove.patch | 34 +- .../current/rtems-update-ss555-to-ec555.patch | 52 +- .../current/rtems-usleep-type-fix.patch | 19 - rtems-patches/current/series | 4 - 19 files changed, 631 insertions(+), 612 deletions(-) delete mode 100644 rtems-patches/current/rtems-inttypes-wcs-disable-fix.patch delete mode 100644 rtems-patches/current/rtems-readlink-type-fix.patch delete mode 100644 rtems-patches/current/rtems-usleep-type-fix.patch diff --git a/rtems-build/arm-csb336/rtems/arm-rtems-sys.cfg b/rtems-build/arm-csb336/rtems/arm-rtems-sys.cfg index 3f8b50e..e658c23 100755 --- a/rtems-build/arm-csb336/rtems/arm-rtems-sys.cfg +++ b/rtems-build/arm-csb336/rtems/arm-rtems-sys.cfg @@ -1,6 +1,6 @@ -../../../rtems/configure --target=arm-rtems --prefix=/opt/rtems \ +../../../rtems/configure --target=arm-rtems4.9 --prefix=/opt/rtems4.9 \ --enable-rtems-inlines --disable-multiprocessing --enable-cxx \ - --disable-rdbg --enable-maintainer-mode --disable-tests \ + --enable-rdbg --enable-maintainer-mode --disable-tests \ --enable-networking --enable-posix --enable-itron --disable-ada \ --disable-expada --disable-multilib --disable-docs \ --enable-rtemsbsp=csb336 diff --git a/rtems-build/arm-csb336/rtems/control b/rtems-build/arm-csb336/rtems/control index 129f2f6..a4c2ceb 100644 --- a/rtems-build/arm-csb336/rtems/control +++ b/rtems-build/arm-csb336/rtems/control @@ -1,7 +1,7 @@ -Package: rtems-csb336 -Version: 4.7.1 +Package: rtems4.9-csb336 +Version: 4.9.3 Architecture: all -Source: rtems-4.7.1 +Source: rtems-4.9.3 Section: cross-dev Priority: extra Maintainer: Pavel Pisa diff --git a/rtems-patches/control b/rtems-patches/control index 11f2aea..17e2ec3 100644 --- a/rtems-patches/control +++ b/rtems-patches/control @@ -1,7 +1,7 @@ -Package: rtems-common -Version: 4.7.1 +Package: rtems4.9-common +Version: 4.9.3 Architecture: amd64 -Source: rtems-4.7.1 +Source: rtems-4.9.3 Section: cross-dev Priority: extra Maintainer: Pavel Pisa diff --git a/rtems-patches/current/rtems-clone-mrm332-to-mo376.patch b/rtems-patches/current/rtems-clone-mrm332-to-mo376.patch index 9453f0c..982b7ef 100644 --- a/rtems-patches/current/rtems-clone-mrm332-to-mo376.patch +++ b/rtems-patches/current/rtems-clone-mrm332-to-mo376.patch @@ -1,14 +1,14 @@ --- - c/src/lib/libbsp/m68k/mo376/ChangeLog | 455 +++ - c/src/lib/libbsp/m68k/mo376/Makefile.am | 68 + c/src/lib/libbsp/m68k/mo376/ChangeLog | 567 ++++ + c/src/lib/libbsp/m68k/mo376/Makefile.am | 50 c/src/lib/libbsp/m68k/mo376/README | 24 - c/src/lib/libbsp/m68k/mo376/bsp_specs | 16 - c/src/lib/libbsp/m68k/mo376/clock/ckinit.c | 128 + + c/src/lib/libbsp/m68k/mo376/bsp_specs | 13 + c/src/lib/libbsp/m68k/mo376/clock/ckinit.c | 96 c/src/lib/libbsp/m68k/mo376/configure.ac | 20 - c/src/lib/libbsp/m68k/mo376/console/console.c | 174 + + c/src/lib/libbsp/m68k/mo376/console/console.c | 171 + c/src/lib/libbsp/m68k/mo376/console/sci.c | 1596 ++++++++++++++ c/src/lib/libbsp/m68k/mo376/console/sci.h | 234 ++ - c/src/lib/libbsp/m68k/mo376/include/bsp.h | 139 + + c/src/lib/libbsp/m68k/mo376/include/bsp.h | 131 + c/src/lib/libbsp/m68k/mo376/include/bspopts.h.in | 16 c/src/lib/libbsp/m68k/mo376/include/mrm332.h | 70 c/src/lib/libbsp/m68k/mo376/include/tm27.h | 34 @@ -19,25 +19,25 @@ c/src/lib/libbsp/m68k/mo376/spurious/spinit.c | 105 c/src/lib/libbsp/m68k/mo376/start/start.S | 150 + c/src/lib/libbsp/m68k/mo376/startup/bspclean.c | 27 - c/src/lib/libbsp/m68k/mo376/startup/bspstart.c | 82 + c/src/lib/libbsp/m68k/mo376/startup/bspstart.c | 59 c/src/lib/libbsp/m68k/mo376/startup/except_vect_332_ROM.S | 293 ++ c/src/lib/libbsp/m68k/mo376/startup/linkcmds | 164 + c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM | 200 + c/src/lib/libbsp/m68k/mo376/startup/start_c.c | 125 + - c/src/lib/libbsp/m68k/mo376/timer/timer.c | 81 + c/src/lib/libbsp/m68k/mo376/timer/timer.c | 61 c/src/lib/libbsp/m68k/mo376/times | 195 + - make/custom/mo376.cfg | 67 - 28 files changed, 4659 insertions(+) + make/custom/mo376.cfg | 55 + 28 files changed, 4652 insertions(+) Index: rtems/make/custom/mo376.cfg =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/make/custom/mo376.cfg 2007-08-14 17:20:30.000000000 +0200 -@@ -0,0 +1,67 @@ ++++ rtems/make/custom/mo376.cfg 2009-11-29 01:21:43.173939736 +0100 +@@ -0,0 +1,55 @@ +# +# Config file for the mrm332 BSP +# -+# $Id: mrm332.cfg,v 1.9.2.3 2007/01/18 11:27:07 ralf Exp $ ++# $Id: mrm332.cfg,v 1.18 2008/06/11 08:17:27 ccj Exp $ +# + +include $(RTEMS_ROOT)/make/custom/default.cfg @@ -50,26 +50,19 @@ Index: rtems/make/custom/mo376.cfg + +# This contains the compiler options necessary to select the CPU model +# and (hopefully) optimize for it. -+CPU_CFLAGS = -mcpu32 ++CPU_CFLAGS = -mcpu=cpu32 + +# optimize flag: typically -O2 +CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer + -+# The following are definitions of make-exe which will work using ld as -+# is currently required. -+ +ifeq ($(MRM_IN_ROM),yes) +# Build a rommable image - move the .data section after the .text section +# in the image. +CPU_CFLAGS += -qnolinkcmds -T $(exec_prefix)/mrm332/lib/linkcmds_ROM ++endif + -+# This is a good way to get debug information. The output file is large -+# though and greatly slows the build process so only do this if needed. -+# $(OBJDUMP) -dxC $(basename $@).nxe > $(basename $@).dump -+ -+define make-exe -+ $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).pxe \ -+ $(LINK_OBJS) $(LINK_LIBS) ++ifeq ($(MRM_IN_ROM),yes) ++define bsp-post-link + $(OBJCOPY) --adjust-section-vma \ + .data=`m68k-rtems-objdump --section-headers $(basename $@).pxe | \ + awk 'function h2d(x) { x=toupper(x); digits=length(x); s=0 ; \ @@ -79,32 +72,27 @@ Index: rtems/make/custom/mo376.cfg + return s } ;\ + /\.text/ { base = $$4 ; size = $$3 };\ + END { printf("0x%x", h2d(base) + h2d(size)) }'\ -+ ` $(basename $@).pxe $(basename $@).nxe -+ $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).srec ++ ` $(basename $@).pxe $(basename $@).exe ++ $(OBJCOPY) -O srec $(basename $@).exe $(basename $@).srec + sed -e 's/.$$//' -e '/^S0/d' $(basename $@).srec | \ -+ $(PACKHEX) > $(basename $@).exe ++ $(PACKHEX) > $(basename $@)$(DOWNEXT) + $(NM) -g -n $(basename $@).pxe > $(basename $@).pnum -+ $(NM) -g -n $(basename $@).nxe > $(basename $@).num -+ $(SIZE) $(basename $@).nxe ++ rm -f $(basename $@).srec $(basename $@).srec ++ $(default-bsp-post-link) +endef +else -+define make-exe -+ $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) -o $(basename $@).nxe \ -+ $(LINK_OBJS) $(LINK_LIBS) -+ $(OBJCOPY) -O srec $(basename $@).nxe $(basename $@).srec -+# m68k-rtems-objdump -dxC $(basename $@).nxe > $(basename $@).dump ++define bsp-post-link ++ $(OBJCOPY) -O srec $(basename $@).exe $(basename $@).srec + sed -e 's/.$$//' -e '/^S0/d' $(basename $@).srec | \ -+ $(PACKHEX) > $(basename $@).exe -+ $(NM) -g -n $(basename $@).nxe > $(basename $@).num -+ $(SIZE) $(basename $@).nxe ++ $(PACKHEX) > $(basename $@)$(DOWNEXT) ++ rm -f $(basename $@).srec ++ $(default-bsp-post-link) +endef +endif -+ -+# Miscellaneous additions go here Index: rtems/c/src/lib/libbsp/m68k/mo376/console/sci.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/console/sci.h 2007-08-14 17:20:30.000000000 +0200 ++++ rtems/c/src/lib/libbsp/m68k/mo376/console/sci.h 2006-09-11 23:43:55.000000000 +0200 @@ -0,0 +1,234 @@ +/**************************************************************************** +* File: sci.h @@ -343,11 +331,11 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/console/sci.h Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM 2007-08-14 17:20:30.000000000 +0200 ++++ rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM 2008-03-04 00:06:30.000000000 +0100 @@ -0,0 +1,200 @@ +/* linkcmds + * -+ * $Id: linkcmds_ROM,v 1.4 2006/02/08 12:25:24 joel Exp $ ++ * $Id: linkcmds_ROM,v 1.5 2008/03/03 23:06:30 joel Exp $ + */ + +OUTPUT_ARCH(m68k) @@ -508,7 +496,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM + _sdata = . ; + *(.data) + *(.gnu.linkonce.d*) -+ *(.gcc_except_table) ++ *(.gcc_except_table*) + *(.jcr) + + CONSTRUCTORS @@ -548,7 +536,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/except_vect_332_ROM.S =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/startup/except_vect_332_ROM.S 2007-08-14 17:20:30.000000000 +0200 ++++ rtems/c/src/lib/libbsp/m68k/mo376/startup/except_vect_332_ROM.S 2004-04-21 18:01:35.000000000 +0200 @@ -0,0 +1,293 @@ +/* + * $Id: except_vect_332_ROM.S,v 1.3 2004/04/21 16:01:35 ralf Exp $ @@ -846,8 +834,8 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/except_vect_332_ROM.S Index: rtems/c/src/lib/libbsp/m68k/mo376/console/console.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/console/console.c 2007-08-14 17:20:30.000000000 +0200 -@@ -0,0 +1,174 @@ ++++ rtems/c/src/lib/libbsp/m68k/mo376/console/console.c 2008-05-12 20:43:28.000000000 +0200 +@@ -0,0 +1,171 @@ +/* + * This file contains the generic console driver shell used + * by all console drivers using libchip. @@ -861,7 +849,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/console/console.c + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * -+ * $Id: console.c,v 1.8 2006/09/11 21:43:53 joel Exp $ ++ * $Id: console.c,v 1.9 2008/05/12 18:43:28 joel Exp $ + */ + +#include @@ -874,9 +862,6 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/console/console.c + * console_open + * + * open a port as a termios console. -+ * -+ * the console is opened in bsp_postdriver_hook() in bsppost.c -+ * + */ + +rtems_device_driver console_open( @@ -1025,7 +1010,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/console/console.c Index: rtems/c/src/lib/libbsp/m68k/mo376/start/start.S =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/start/start.S 2007-08-14 17:20:30.000000000 +0200 ++++ rtems/c/src/lib/libbsp/m68k/mo376/start/start.S 2009-11-29 01:11:56.463558538 +0100 @@ -0,0 +1,150 @@ +/* + * $Id @@ -1180,7 +1165,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/start/start.S Index: rtems/c/src/lib/libbsp/m68k/mo376/misc/dotests =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/misc/dotests 2007-08-14 17:20:30.000000000 +0200 ++++ rtems/c/src/lib/libbsp/m68k/mo376/misc/dotests 2009-11-29 01:11:56.463558538 +0100 @@ -0,0 +1,15 @@ +#! /bin/bash +# @@ -1200,8 +1185,8 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/misc/dotests Index: rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h 2007-08-14 17:20:30.000000000 +0200 -@@ -0,0 +1,139 @@ ++++ rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h 2007-12-11 16:49:20.000000000 +0100 +@@ -0,0 +1,131 @@ +/* bsp.h + * + * This include file contains all mrm board IO definitions. @@ -1213,7 +1198,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * -+ * $Id: bsp.h,v 1.14 2006/03/17 10:11:36 ralf Exp $ ++ * $Id: bsp.h,v 1.17 2007/12/11 15:49:20 joel Exp $ + */ + +#ifndef _BSP_H @@ -1242,7 +1227,6 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h + +#define CONSOLE_SCI +/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ -+/* #define CONFIGURE_INTERRUPT_STACK_MEMORY (TBD * 1024) */ + +/* + * Simple spin delay in microsecond units for device drivers. @@ -1296,12 +1280,9 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h + +/* miscellaneous stuff assumed to exist */ + -+extern rtems_configuration_table BSP_Configuration; -+ +extern m68k_isr_entry M68Kvec[]; /* vector table address */ + +extern int stack_size; -+ +extern int stack_start; + +/* @@ -1326,14 +1307,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h + int type +); + -+void console_init(void); -+ +void Spurious_Initialize(void); + +void _UART_flush(void); + -+void Clock_exit(void); -+ +void outbyte(char); + +#ifdef __cplusplus @@ -1344,7 +1321,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h Index: rtems/c/src/lib/libbsp/m68k/mo376/misc/interr.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/misc/interr.c 2007-08-14 17:20:30.000000000 +0200 ++++ rtems/c/src/lib/libbsp/m68k/mo376/misc/interr.c 2008-09-06 19:09:08.000000000 +0200 @@ -0,0 +1,99 @@ +/* + * Internal Error Handler @@ -1356,7 +1333,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/misc/interr.c + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * -+ * $Id: interr.c,v 1.3 2004/03/31 04:37:05 ralf Exp $ ++ * $Id: interr.c,v 1.5 2008/09/06 17:09:08 ralf Exp $ + */ + +#include @@ -1414,14 +1391,14 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/misc/interr.c + +void volatile _Internal_error_Occurred( + Internal_errors_Source the_source, -+ boolean is_internal, ++ bool is_internal, + uint32_t the_error +) +{ + -+ Internal_errors_What_happened.the_source = the_source; -+ Internal_errors_What_happened.is_internal = is_internal; -+ Internal_errors_What_happened.the_error = the_error; ++ _Internal_errors_What_happened.the_source = the_source; ++ _Internal_errors_What_happened.is_internal = is_internal; ++ _Internal_errors_What_happened.the_error = the_error; + + _User_extensions_Fatal( the_source, is_internal, the_error ); + @@ -1448,19 +1425,131 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/misc/interr.c Index: rtems/c/src/lib/libbsp/m68k/mo376/ChangeLog =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/ChangeLog 2007-08-14 17:20:30.000000000 +0200 -@@ -0,0 +1,455 @@ ++++ rtems/c/src/lib/libbsp/m68k/mo376/ChangeLog 2008-12-08 06:15:06.000000000 +0100 +@@ -0,0 +1,567 @@ ++2008-12-08 Ralf Corsépius ++ ++ * bsp_specs: Backport from CVS-HEAD. ++ ++2008-09-30 Joel Sherrill ++ ++ * timer/timer.c: Eliminate uses of old benchmark timer names. ++ ++2008-09-29 Ralf Corsépius ++ ++ * Makefile.am: Remove noinst_PROGRAMS (Unused). ++ ++2008-09-06 Ralf Corsépius ++ ++ * misc/interr.c: Convert to "bool". ++ ++2008-09-05 Joel Sherrill ++ ++ * clock/ckinit.c: The Shared Memory Driver no longer requires the ++ special IOCTL in Clock_control. This was a hack which has existed ++ since before the Classic API Timer Manager was implemented. All ++ implementations of and references to Clock_control were removed. ++ ++2008-09-05 Ralf Corsépius ++ ++ * timer/timer.c: Convert to "bool". ++ ++2008-08-31 Joel Sherrill ++ ++ * timer/timer.c: Eliminate empty function from every benchmark timer ++ driver. Fix spelling. ++ ++2008-08-31 Joel Sherrill ++ ++ * timer/timer.c: Rename timer driver methods to follow RTEMS ++ programming conventions. ++ ++2008-08-19 Ralf Corsépius ++ ++ * console/sci.c, startup/bspstart.c, startup/start_c.c, ++ timer/timer.c: Add missing prototypes. ++ ++2008-06-02 Joel Sherrill ++ ++ * misc/interr.c: Convention calls for leading underscore on private ++ RTEMS variables. ++ ++2008-05-14 Joel Sherrill ++ ++ * Makefile.am: Rework to avoid .rel files. ++ ++2008-05-12 Joel Sherrill ++ ++ * console/console.c, startup/bspstart.c: Refactored and renamed ++ initialization routines to rtems_initialize_data_structures, ++ rtems_initialize_before_drivers, rtems_initialize_device_drivers, and ++ rtems_initialize_start_multitasking. This opened the sequence up so ++ that bootcard() could provide a more robust and flexible framework ++ which is easier to explain and understand. This also lays the ++ groundwork for sharing the division of available memory between the ++ RTEMS workspace and heap and the C library initialization across all ++ BSPs. ++ ++2008-03-03 Joel Sherrill ++ ++ * startup/linkcmds, startup/linkcmds_ROM: Add wildcard to ++ gcc_except_table section so programs compiled with gcc 4.3.x can ++ link. ++ ++2007-12-11 Joel Sherrill ++ ++ * clock/ckinit.c, include/bsp.h, startup/bspstart.c: Eliminate copies ++ of the Configuration Table. Use the RTEMS provided accessor macros to ++ obtain configuration fields. ++ ++2007-12-04 Joel Sherrill ++ ++ * include/bsp.h, startup/bspstart.c: Move interrupt_stack_size field ++ from CPU Table to Configuration Table. Eliminate CPU Table from all ++ ports. Delete references to CPU Table in all forms. ++ ++2007-12-03 Joel Sherrill ++ ++ * startup/bspstart.c: Moved most of the remaining CPU Table fields to ++ the Configuration Table. This included pretasking_hook, ++ predriver_hook, postdriver_hook, idle_task, do_zero_of_workspace, ++ extra_mpci_receive_server_stack, stack_allocate_hook, and ++ stack_free_hook. As a side-effect of this effort some multiprocessing ++ code was made conditional and some style clean up occurred. ++ ++2007-11-26 Joel Sherrill ++ ++ * startup/bspstart.c: Eliminate the interrupt_vector_table field in the ++ m68k CPU Table since it is never read. ++ ++2007-05-03 Joel Sherrill ++ ++ * startup/linkcmds: Handle .data.* sections ++ ++2007-04-12 Ralf Corsépius ++ ++ * bsp_specs: Remove qrtems_debug. ++ ++2007-03-13 Joel Sherrill ++ ++ * include/bsp.h: Remove redundant prototypes. ++ +2006-12-02 Ralf Corsépius + + * configure.ac: New BUG-REPORT address. + -+2006-10-20 Ralf Corsépius ++2006-11-15 Joel Sherrill ++ ++ * Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a ++ file and simplified initialization. ++ ++2006-10-17 Ralf Corsépius + + * Makefile.am: Remove superfluous -DASM. + -+2006-10-19 Ralf Corsépius ++2006-10-17 Ralf Corsépius + -+ * configure.ac: Require automake-1.10. Require autoconf-2.60. ++ * configure.ac: Require autoconf-2.60. Require automake-1.10. + +2006-09-11 Joel Sherrill + @@ -1908,7 +1997,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/ChangeLog Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/bspclean.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/startup/bspclean.c 2007-08-14 17:20:30.000000000 +0200 ++++ rtems/c/src/lib/libbsp/m68k/mo376/startup/bspclean.c 2006-09-11 23:43:56.000000000 +0200 @@ -0,0 +1,27 @@ +/* bsp_cleanup() + * @@ -1940,19 +2029,9 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/bspclean.c Index: rtems/c/src/lib/libbsp/m68k/mo376/timer/timer.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/timer/timer.c 2007-08-14 17:20:30.000000000 +0200 -@@ -0,0 +1,81 @@ -+/* Timer_init() -+ * -+ * This routine is not implemented for this BSP. -+ * -+ * Input parameters: NONE -+ * -+ * Output parameters: NONE -+ * -+ * NOTE: It is important that the timer start/stop overhead be -+ * determined when porting or modifying this code. -+ * ++++ rtems/c/src/lib/libbsp/m68k/mo376/timer/timer.c 2008-09-30 18:28:07.000000000 +0200 +@@ -0,0 +1,61 @@ ++/* + * COPYRIGHT (c) 1989-1999. + * On-Line Applications Research Corporation (OAR). + * @@ -1960,21 +2039,21 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/timer/timer.c + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * -+ * $Id: timer.c,v 1.6 2004/04/21 16:01:35 ralf Exp $ ++ * $Id: timer.c,v 1.10.2.1 2008/09/30 16:28:07 joel Exp $ + */ + +#include + -+rtems_boolean Timer_driver_Find_average_overhead; ++bool benchmark_timer_find_average_overhead; + -+extern rtems_isr Clock_isr(); ++extern rtems_isr Clock_isr(void); + -+void Timer_initialize( void ) ++void benchmark_timer_initialize( void ) +{ +} + +/* -+ * The following controls the behavior of Read_timer(). ++ * The following controls the behavior of benchmark_timer_read(). + * + * FIND_AVG_OVERHEAD * instructs the routine to return the "raw" count. + * @@ -1993,12 +2072,12 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/timer/timer.c +/* + * Return timer value in 1/2-microsecond units + */ -+int Read_timer( void ) ++int benchmark_timer_read( void ) +{ + uint32_t total; + total = 0; + -+ if ( Timer_driver_Find_average_overhead == 1 ) ++ if ( benchmark_timer_find_average_overhead == true ) + return total; /* in XXX microsecond units */ + + if ( total < LEAST_VALID ) @@ -2007,27 +2086,17 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/timer/timer.c + return (total - AVG_OVERHEAD); +} + -+/* -+ * Empty function call used in loops to measure basic cost of looping -+ * in Timing Test Suite. -+ */ -+ -+rtems_status_code Empty_function(void) -+{ -+ return RTEMS_SUCCESSFUL; -+} -+ -+void Set_find_average_overhead( -+ rtems_boolean find_flag ++void benchmark_timer_disable_subtracting_average_overhead( ++ bool find_flag +) +{ -+ Timer_driver_Find_average_overhead = find_flag; ++ benchmark_timer_find_average_overhead = find_flag; +} Index: rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c 2007-08-14 17:20:30.000000000 +0200 -@@ -0,0 +1,128 @@ ++++ rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c 2008-09-06 00:05:15.000000000 +0200 +@@ -0,0 +1,96 @@ +/* Clock_init() + * + * This routine initailizes the periodic interrupt timer on @@ -2044,7 +2113,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * -+ * $Id: ckinit.c,v 1.5 2004/04/21 10:42:52 ralf Exp $ ++ * $Id: ckinit.c,v 1.7 2008/09/05 22:05:15 joel Exp $ + */ + +#include @@ -2074,7 +2143,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c + + if ( Clock_isrs == 1 ) { + rtems_clock_tick(); -+ Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000; ++ Clock_isrs = rtems_configuration_get_microseconds_per_tick() / 1000; + } + else + Clock_isrs -= 1; @@ -2085,7 +2154,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c +) +{ + Clock_driver_ticks = 0; -+ Clock_isrs = BSP_Configuration.microseconds_per_tick / 1000; ++ Clock_isrs = rtems_configuration_get_microseconds_per_tick() / 1000; + + Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 ); + @@ -2124,42 +2193,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c + + return RTEMS_SUCCESSFUL; +} -+ -+rtems_device_driver Clock_control( -+ rtems_device_major_number major, -+ rtems_device_minor_number minor, -+ void *pargp -+) -+{ -+ uint32_t isrlevel; -+ rtems_libio_ioctl_args_t *args = pargp; -+ -+ if (args == 0) -+ goto done; -+ -+ /* -+ * This is hokey, but until we get a defined interface -+ * to do this, it will just be this simple... -+ */ -+ -+ if (args->command == rtems_build_name('I', 'S', 'R', ' ')) -+ { -+ Clock_isr(CLOCK_VECTOR); -+ } -+ else if (args->command == rtems_build_name('N', 'E', 'W', ' ')) -+ { -+ rtems_interrupt_disable( isrlevel ); -+ (void) set_vector( args->buffer, CLOCK_VECTOR, 1 ); -+ rtems_interrupt_enable( isrlevel ); -+ } -+ -+done: -+ return RTEMS_SUCCESSFUL; -+} Index: rtems/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68 =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68 2007-08-14 17:20:30.000000000 +0200 ++++ rtems/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68 2009-11-29 01:11:56.471556761 +0100 @@ -0,0 +1,16 @@ +# +# $Id: gdbinit68,v 1.1 2001/05/25 16:28:46 joel Exp $ @@ -2180,11 +2217,11 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68 Index: rtems/c/src/lib/libbsp/m68k/mo376/configure.ac =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/configure.ac 2007-08-14 17:20:30.000000000 +0200 ++++ rtems/c/src/lib/libbsp/m68k/mo376/configure.ac 2006-12-02 06:55:13.000000000 +0100 @@ -0,0 +1,20 @@ +## Process this file with autoconf to produce a configure script. +## -+## $Id: configure.ac,v 1.14.2.2 2006/12/02 06:04:46 ralf Exp $ ++## $Id: configure.ac,v 1.16 2006/12/02 05:55:13 ralf Exp $ + +AC_PREREQ(2.60) +AC_INIT([rtems-c-src-lib-libbsp-m68k-mrm332],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla]) @@ -2205,7 +2242,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/configure.ac Index: rtems/c/src/lib/libbsp/m68k/mo376/README =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/README 2007-08-14 17:20:30.000000000 +0200 ++++ rtems/c/src/lib/libbsp/m68k/mo376/README 2009-11-29 01:11:56.471556761 +0100 @@ -0,0 +1,24 @@ +# +# $Id: README,v 1.1 2001/05/25 16:28:46 joel Exp $ @@ -2234,10 +2271,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/README Index: rtems/c/src/lib/libbsp/m68k/mo376/Makefile.am =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/Makefile.am 2007-08-14 17:20:30.000000000 +0200 -@@ -0,0 +1,68 @@ ++++ rtems/c/src/lib/libbsp/m68k/mo376/Makefile.am 2008-09-29 03:47:41.000000000 +0200 +@@ -0,0 +1,50 @@ +## -+## $Id: Makefile.am,v 1.24.2.1 2006/10/20 11:54:57 ralf Exp $ ++## $Id: Makefile.am,v 1.27.2.1 2008/09/29 01:47:41 ralf Exp $ +## + +ACLOCAL_AMFLAGS = -I ../../../../aclocal @@ -2252,7 +2289,6 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/Makefile.am + +nodist_include_HEADERS = include/bspopts.h +DISTCLEANFILES = include/bspopts.h -+noinst_PROGRAMS = + +include_HEADERS += include/mrm332.h +nodist_include_HEADERS += ../../shared/include/coverhd.h @@ -2267,39 +2303,22 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/Makefile.am + +dist_project_lib_DATA += startup/linkcmds startup/linkcmds_ROM + -+noinst_PROGRAMS += startup.rel -+startup_rel_SOURCES = startup/start_c.c ../../shared/bsplibc.c \ ++startup_SOURCES = startup/start_c.c ../../shared/bsplibc.c \ + ../../shared/bsppost.c startup/bspstart.c startup/bspclean.c \ + ../../shared/bootcard.c ../../m68k/shared/m68kpretaskinghook.c \ -+ ../../shared/main.c ../../shared/sbrk.c ../../m68k/shared/setvec.c \ ++ ../../shared/sbrk.c ../../m68k/shared/setvec.c \ + ../../shared/gnatinstallhandler.c startup/except_vect_332_ROM.S -+startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -+startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -+ -+noinst_PROGRAMS += clock.rel -+clock_rel_SOURCES = clock/ckinit.c -+clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -+clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -+ -+noinst_PROGRAMS += console.rel -+console_rel_SOURCES = console/console.c console/sci.c console/sci.h -+console_rel_CPPFLAGS = $(AM_CPPFLAGS) -+console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -+ -+noinst_PROGRAMS += spurious.rel -+spurious_rel_SOURCES = spurious/spinit.c -+spurious_rel_CPPFLAGS = $(AM_CPPFLAGS) -+spurious_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -+ -+noinst_PROGRAMS += timer.rel -+timer_rel_SOURCES = timer/timer.c -+timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -+timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) ++clock_SOURCES = clock/ckinit.c ++console_SOURCES = console/console.c console/sci.c console/sci.h ++spurious_SOURCES = spurious/spinit.c ++timer_SOURCES = timer/timer.c + +noinst_LIBRARIES = libbsp.a -+libbsp_a_SOURCES = -+libbsp_a_LIBADD = startup.rel clock.rel console.rel spurious.rel timer.rel -+libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ ++libbsp_a_SOURCES = $(startup_SOURCES) $(clock_SOURCES) $(console_SOURCES) \ ++ $(spurious_SOURCES) $(timer_SOURCES) ++ ++libbsp_a_LIBADD = \ ++ ../../../libcpu/@RTEMS_CPU@/shared/cache.rel \ + ../../../libcpu/@RTEMS_CPU@/shared/misc.rel + +include $(srcdir)/preinstall.am @@ -2307,7 +2326,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/Makefile.am Index: rtems/c/src/lib/libbsp/m68k/mo376/console/sci.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/console/sci.c 2007-08-14 17:20:30.000000000 +0200 ++++ rtems/c/src/lib/libbsp/m68k/mo376/console/sci.c 2008-08-19 12:23:15.000000000 +0200 @@ -0,0 +1,1596 @@ +/***************************************************************************** +* File: sci.c @@ -2344,7 +2363,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/console/sci.c +* +* Note: See bsp.h,confdefs.h,system.h for installing drivers into RTEMS. +* -+* $Id: sci.c,v 1.11 2006/09/11 21:43:53 joel Exp $ ++* $Id: sci.c,v 1.12 2008/08/19 10:23:15 ralf Exp $ +* +*****************************************************************************/ + @@ -2502,14 +2521,14 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/console/sci.c + +void SciSendBreak( void ); /* test routine */ + -+static int8_t SciRcvBufGetChar(); /* circular rcv buf */ ++static int8_t SciRcvBufGetChar(void); /* circular rcv buf */ +static void SciRcvBufPutChar( uint8_t); /* circular rcv buf */ +#if 0 +static void SciRcvBufFlush( void ); /* unused routine */ +#endif + -+void SciUnitTest(); /* test routine */ -+void SciPrintStats(); /* test routine */ ++void SciUnitTest(void); /* test routine */ ++void SciPrintStats(void); /* test routine */ + + +/***************************************************************************** @@ -2546,7 +2565,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/console/sci.c +/* cvs id string so you can use the unix ident command on the object */ + +#ifdef ID_STRINGS -+static const char SciIdent[]="$Id: sci.c,v 1.11 2006/09/11 21:43:53 joel Exp $"; ++static const char SciIdent[]="$Id: sci.c,v 1.12 2008/08/19 10:23:15 ralf Exp $"; +#endif + + @@ -2727,7 +2746,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/console/sci.c +* Scope: private +****************************************************************************/ + -+static int8_t SciRcvBufGetChar() ++static int8_t SciRcvBufGetChar(void) +{ + rtems_interrupt_level level; + uint8_t ch; @@ -3908,8 +3927,8 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/console/sci.c Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/bspstart.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/startup/bspstart.c 2007-08-14 17:20:30.000000000 +0200 -@@ -0,0 +1,82 @@ ++++ rtems/c/src/lib/libbsp/m68k/mo376/startup/bspstart.c 2008-08-19 12:23:15.000000000 +0200 +@@ -0,0 +1,59 @@ +/* + * This routine starts the application. It includes application, + * board, and monitor specific initialization and configuration. @@ -3923,7 +3942,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/bspstart.c + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * -+ * $Id: bspstart.c,v 1.7 2004/04/21 10:42:52 ralf Exp $ ++ * $Id: bspstart.c,v 1.13 2008/08/19 10:23:15 ralf Exp $ + */ + +#include @@ -3932,22 +3951,9 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/bspstart.c +#include + +/* -+ * The original table from the application and our copy of it with -+ * some changes. -+ */ -+ -+extern rtems_configuration_table Configuration; -+rtems_configuration_table BSP_Configuration; -+ -+rtems_cpu_table Cpu_table; -+ -+char *rtems_progname; -+ -+/* + * Use the shared implementations of the following routines + */ + -+void bsp_postdriver_hook(void); +void bsp_libc_init( void *, uint32_t, int ); +void bsp_pretasking_hook(void); /* m68k version */ + @@ -3958,7 +3964,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/bspstart.c + +void bsp_predriver_hook(void) +{ -+ void Spurious_Initialize(); ++ extern void Spurious_Initialize(void); + Spurious_Initialize(); +} + @@ -3975,27 +3981,17 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/bspstart.c + extern void *_RamSize; + extern unsigned long _M68k_Ramsize; + -+ _M68k_Ramsize = (unsigned long)&_RamSize; /* RAM size set in linker script */ -+ -+ /* -+ * we only use a hook to get the C library initialized. -+ */ -+ -+ Cpu_table.pretasking_hook = bsp_pretasking_hook; -+ Cpu_table.predriver_hook = bsp_predriver_hook; -+ Cpu_table.postdriver_hook = bsp_postdriver_hook; ++ /* RAM size set in linker script */ ++ _M68k_Ramsize = (unsigned long)&_RamSize; + + m68k_get_vbr( vbr ); -+ Cpu_table.interrupt_vector_table = vbr; + -+ BSP_Configuration.work_space_start = (void *) &_WorkspaceBase; -+ -+ /* Clock_exit is done as an atexit() function */ ++ Configuration.work_space_start = (void *) &_WorkspaceBase; +} Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/start_c.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/startup/start_c.c 2007-08-14 17:20:30.000000000 +0200 ++++ rtems/c/src/lib/libbsp/m68k/mo376/startup/start_c.c 2008-08-19 12:23:15.000000000 +0200 @@ -0,0 +1,125 @@ +/* + * $Id @@ -4017,9 +4013,9 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/start_c.c + * that causes a warning. Not sure how to fix that. + */ +/* void dumby_start () __attribute__ ((noreturn)); */ -+void start_c (); ++void start_c(void); + -+void start_c() { ++void start_c(void) { + + /* Synthesizer Control Register */ + /* see section(s) 4.8 */ @@ -4125,7 +4121,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/start_c.c Index: rtems/c/src/lib/libbsp/m68k/mo376/include/tm27.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/include/tm27.h 2007-08-14 17:20:30.000000000 +0200 ++++ rtems/c/src/lib/libbsp/m68k/mo376/include/tm27.h 2009-11-29 01:11:56.475557339 +0100 @@ -0,0 +1,34 @@ +/* + * tm27.h @@ -4164,7 +4160,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/include/tm27.h Index: rtems/c/src/lib/libbsp/m68k/mo376/times =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/times 2007-08-14 17:20:30.000000000 +0200 ++++ rtems/c/src/lib/libbsp/m68k/mo376/times 2009-11-29 01:11:56.479557220 +0100 @@ -0,0 +1,195 @@ +# +# Timing Test Suite Results for the MRM332 BSP @@ -4364,7 +4360,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/times Index: rtems/c/src/lib/libbsp/m68k/mo376/include/mrm332.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/include/mrm332.h 2007-08-14 17:20:30.000000000 +0200 ++++ rtems/c/src/lib/libbsp/m68k/mo376/include/mrm332.h 2009-11-29 01:11:56.479557220 +0100 @@ -0,0 +1,70 @@ +/* mrm332.h + * @@ -4439,7 +4435,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/include/mrm332.h Index: rtems/c/src/lib/libbsp/m68k/mo376/include/bspopts.h.in =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/include/bspopts.h.in 2007-08-14 17:20:30.000000000 +0200 ++++ rtems/c/src/lib/libbsp/m68k/mo376/include/bspopts.h.in 2009-11-29 01:11:56.479557220 +0100 @@ -0,0 +1,16 @@ +/* include/bspopts.h.in. Generated from configure.ac by autoheader. */ + @@ -4460,7 +4456,7 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/include/bspopts.h.in Index: rtems/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c 2007-08-14 17:20:30.000000000 +0200 ++++ rtems/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c 2009-11-29 01:11:56.479557220 +0100 @@ -0,0 +1,105 @@ +/* Spurious_driver + * @@ -4570,11 +4566,11 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds 2007-08-14 17:20:30.000000000 +0200 ++++ rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds 2008-03-04 00:06:30.000000000 +0100 @@ -0,0 +1,164 @@ +/* linkcmds + * -+ * $Id: linkcmds,v 1.6 2006/02/08 12:25:24 joel Exp $ ++ * $Id: linkcmds,v 1.8 2008/03/03 23:06:30 joel Exp $ + */ + +OUTPUT_ARCH(m68k) @@ -4713,9 +4709,9 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds + } >ram + .data : { + PROVIDE (_copy_start = .); -+ *(.data) ++ *(.data*) + *(.gnu.linkonce.d*) -+ *(.gcc_except_table) ++ *(.gcc_except_table*) + *(.jcr) + . = ALIGN (16); + PROVIDE (_edata = .); @@ -4739,28 +4735,25 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds Index: rtems/c/src/lib/libbsp/m68k/mo376/bsp_specs =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/bsp_specs 2007-08-14 17:20:30.000000000 +0200 -@@ -0,0 +1,16 @@ ++++ rtems/c/src/lib/libbsp/m68k/mo376/bsp_specs 2008-12-08 06:15:06.000000000 +0100 +@@ -0,0 +1,13 @@ +%rename endfile old_endfile +%rename startfile old_startfile +%rename link old_link + +*startfile: -+%{!qrtems: %(old_startfile)} %{!nostdlib: %{qrtems: \ -+%{!qrtems_debug: start.o%s} \ -+%{qrtems_debug: start_g.o%s} \ -+crti.o%s crtbegin.o%s}} ++%{!qrtems: %(old_startfile)} \ ++%{!nostdlib: %{qrtems: start.o%s crti.o%s crtbegin.o%s -e start}} + +*link: -+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N -e start} ++%{!qrtems: %(old_link)} %{qrtems: -dc -dp -N} + +*endfile: +%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s} -+ Index: rtems/c/src/lib/libbsp/m68k/mo376/preinstall.am =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/preinstall.am 2007-08-14 17:20:30.000000000 +0200 ++++ rtems/c/src/lib/libbsp/m68k/mo376/preinstall.am 2009-11-29 01:11:56.483556820 +0100 @@ -0,0 +1,66 @@ +## Automatically generated by ampolish3 - Do not edit + diff --git a/rtems-patches/current/rtems-clone-ss555-to-ec555.patch b/rtems-patches/current/rtems-clone-ss555-to-ec555.patch index be62d51..55e5c56 100644 --- a/rtems-patches/current/rtems-clone-ss555-to-ec555.patch +++ b/rtems-patches/current/rtems-clone-ss555-to-ec555.patch @@ -1,30 +1,119 @@ --- - c/src/lib/libbsp/powerpc/ec555/ChangeLog | 131 +++++++ - c/src/lib/libbsp/powerpc/ec555/Makefile.am | 65 +++ + c/src/lib/libbsp/powerpc/ec555/ChangeLog | 225 ++++++++++++ + c/src/lib/libbsp/powerpc/ec555/Makefile.am | 50 ++ c/src/lib/libbsp/powerpc/ec555/README | 262 ++++++++++++++ c/src/lib/libbsp/powerpc/ec555/bsp_specs | 13 c/src/lib/libbsp/powerpc/ec555/clock/p_clock.c | 69 +++ c/src/lib/libbsp/powerpc/ec555/configure.ac | 52 ++ c/src/lib/libbsp/powerpc/ec555/console/console.c | 368 +++++++++++++++++++ - c/src/lib/libbsp/powerpc/ec555/include/bsp.h | 114 ++++++ + c/src/lib/libbsp/powerpc/ec555/include/bsp.h | 112 +++++ c/src/lib/libbsp/powerpc/ec555/include/coverhd.h | 116 ++++++ c/src/lib/libbsp/powerpc/ec555/include/tm27.h | 54 ++ c/src/lib/libbsp/powerpc/ec555/irq/irq.h | 55 ++ c/src/lib/libbsp/powerpc/ec555/preinstall.am | 58 +++ - c/src/lib/libbsp/powerpc/ec555/startup/bspstart.c | 201 ++++++++++ + c/src/lib/libbsp/powerpc/ec555/startup/bspstart.c | 177 +++++++++ c/src/lib/libbsp/powerpc/ec555/startup/iss555.c | 148 +++++++ c/src/lib/libbsp/powerpc/ec555/startup/linkcmds | 319 +++++++++++++++++ c/src/lib/libbsp/powerpc/ec555/startup/start.S | 411 ++++++++++++++++++++++ c/src/lib/libbsp/powerpc/ec555/startup/tm27supp.c | 29 + c/src/lib/libbsp/powerpc/ec555/times | 189 ++++++++++ - make/custom/ec555.cfg | 41 ++ - 19 files changed, 2695 insertions(+) + make/custom/ec555.cfg | 38 ++ + 19 files changed, 2745 insertions(+) -Index: rtems/c/src/lib/libbsp/powerpc/ec555/ChangeLog +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/ChangeLog =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/powerpc/ec555/ChangeLog 2007-08-14 17:51:38.000000000 +0200 -@@ -0,0 +1,131 @@ ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/ChangeLog 2008-12-08 06:15:50.000000000 +0100 +@@ -0,0 +1,225 @@ ++2008-12-08 Ralf Corsépius ++ ++ * bsp_specs: Backport from CVS-HEAD. ++ ++2008-09-29 Ralf Corsépius ++ ++ * Makefile.am: Remove noinst_PROGRAMS (Unused). ++ ++2008-05-15 Joel Sherrill ++ ++ * startup/bspstart.c: Add capability for bootcard.c BSP Initialization ++ Framework to ask the BSP where it has memory for the RTEMS Workspace ++ and C Program Heap. These collectively are referred to as work area. ++ If the BSP supports this, then it does not have to include code to ++ split the available memory between the two areas. This reduces the ++ amount of code in the BSP specific bspstart.c file. Additionally, the ++ shared framework can initialize the C Library, call ++ rtems_debug_enable(), and dirty the work area memory. Until most/all ++ BSPs support this new capability, if the BSP supports this, it should ++ call RTEMS_BSP_BOOTCARD_HANDLES_RAM_ALLOCATION from its configure.ac. ++ When the transition is complete, this autoconf macro can be removed. ++ ++2008-05-14 Joel Sherrill ++ ++ * Makefile.am: Rework to avoid .rel files. ++ ++2008-05-12 Joel Sherrill ++ ++ * startup/bspstart.c: Refactored and renamed initialization routines to ++ rtems_initialize_data_structures, rtems_initialize_before_drivers, ++ rtems_initialize_device_drivers, and ++ rtems_initialize_start_multitasking. This opened the sequence up so ++ that bootcard() could provide a more robust and flexible framework ++ which is easier to explain and understand. This also lays the ++ groundwork for sharing the division of available memory between the ++ RTEMS workspace and heap and the C library initialization across all ++ BSPs. ++ ++2008-04-23 Joel Sherrill ++ ++ * startup/bspstart.c: Remove all references to ++ console_reserve_resources and termios_reserve_resources. ++ ++2008-03-03 Joel Sherrill ++ ++ * startup/linkcmds: Add wildcard to gcc_except_table section so ++ programs compiled with gcc 4.3.x can link. ++ ++2008-01-18 David Erickson ++ ++ * startup/bspstart.c: Add semicolon. ++ ++2008-01-11 Joel Sherrill ++ ++ * startup/bspstart.c: Add bsp_timer_least_valid and ++ bsp_timer_average_overhead so tmtests link. ++ ++2007-12-11 Joel Sherrill ++ ++ * include/bsp.h, startup/bspstart.c: Eliminate copies of the ++ Configuration Table. Use the RTEMS provided accessor macros to obtain ++ configuration fields. ++ ++2007-12-04 Joel Sherrill ++ ++ * startup/bspstart.c: Move interrupt_stack_size field from CPU Table to ++ Configuration Table. Eliminate CPU Table from all ports. Delete ++ references to CPU Table in all forms. ++ ++2007-12-03 Joel Sherrill ++ ++ * Makefile.am, startup/bspstart.c: Moved most of the remaining CPU ++ Table fields to the Configuration Table. This included ++ pretasking_hook, predriver_hook, postdriver_hook, idle_task, ++ do_zero_of_workspace, extra_mpci_receive_server_stack, ++ stack_allocate_hook, and stack_free_hook. As a side-effect of this ++ effort some multiprocessing code was made conditional and some style ++ clean up occurred. ++ ++2007-11-28 Joel Sherrill ++ ++ * startup/bspstart.c: Eliminate PowerPC specific elements from the CPU ++ Table. They have been replaced with variables named bsp_XXX as ++ needed. ++ ++2007-04-12 Ralf Corsépius ++ ++ * bsp_specs: Remove qrtems_debug. ++ +2007-04-06 Ralf Corsépius + + * bsp_specs: Remove lib (Now expected to exist in GCC). @@ -33,9 +122,14 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/ChangeLog + + * configure.ac: New BUG-REPORT address. + -+2006-10-19 Ralf Corsépius ++2006-11-15 Joel Sherrill ++ ++ * Makefile.am: Merge c_rtems_main() into boot_card(). This eliminated a ++ file and simplified initialization. + -+ * configure.ac: Require automake-1.10. Require autoconf-2.60. ++2006-10-17 Ralf Corsépius ++ ++ * configure.ac: Require autoconf-2.60. Require automake-1.10. + +2006-03-08 Joel Sherrill + @@ -156,13 +250,13 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/ChangeLog + startup/iss555.c, startup/linkcmds, startup/start.S, + wrapup/.cvsignore, wrapup/Makefile.am: New files. + -Index: rtems/c/src/lib/libbsp/powerpc/ec555/Makefile.am +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/Makefile.am =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/powerpc/ec555/Makefile.am 2007-08-14 17:51:38.000000000 +0200 -@@ -0,0 +1,65 @@ ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/Makefile.am 2008-09-29 03:47:53.000000000 +0200 +@@ -0,0 +1,50 @@ +## -+## $Id: Makefile.am,v 1.10 2006/01/12 10:12:30 ralf Exp $ ++## $Id: Makefile.am,v 1.13.2.1 2008/09/29 01:47:53 ralf Exp $ +## + +ACLOCAL_AMFLAGS = -I ../../../../aclocal @@ -178,8 +272,6 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/Makefile.am +nodist_include_HEADERS = include/bspopts.h +DISTCLEANFILES = include/bspopts.h + -+noinst_PROGRAMS = -+ +include_bspdir = $(includedir)/bsp + +include_HEADERS += include/coverhd.h @@ -189,33 +281,20 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/Makefile.am + +dist_project_lib_DATA += startup/linkcmds + -+noinst_PROGRAMS += pclock.rel -+pclock_rel_SOURCES = clock/p_clock.c -+pclock_rel_CPPFLAGS = $(AM_CPPFLAGS) -+pclock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -+ -+noinst_PROGRAMS += console.rel -+console_rel_SOURCES = console/console.c -+console_rel_CPPFLAGS = $(AM_CPPFLAGS) -+console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -+ -+noinst_PROGRAMS += startup.rel -+startup_rel_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ -+ ../../shared/bsppost.c startup/bspstart.c ../../shared/bootcard.c \ -+ startup/iss555.c ../../shared/main.c ../../shared/sbrk.c \ -+ ../../shared/gnatinstallhandler.c startup/start.S -+startup_rel_CPPFLAGS = $(AM_CPPFLAGS) -+startup_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -+ -+noinst_PROGRAMS += tm27supp.rel -+tm27supp_rel_SOURCES = startup/tm27supp.c -+tm27supp_rel_CPPFLAGS = $(AM_CPPFLAGS) -+tm27supp_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) ++pclock_SOURCES = clock/p_clock.c ++console_SOURCES = console/console.c ++startup_SOURCES = ../../shared/bspclean.c ../../shared/bsplibc.c \ ++ ../../shared/bsppost.c ../../shared/bsppredriverhook.c \ ++ startup/bspstart.c ../../shared/bootcard.c startup/iss555.c \ ++ ../../shared/sbrk.c ../../shared/gnatinstallhandler.c startup/start.S ++tm27supp_SOURCES = startup/tm27supp.c + +noinst_LIBRARIES = libbsp.a -+libbsp_a_SOURCES = -+libbsp_a_LIBADD = pclock.rel console.rel startup.rel tm27supp.rel -+libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ ++libbsp_a_SOURCES = $(pclock_SOURCES) $(console_SOURCES) $(startup_SOURCES) \ ++ $(tm27supp_SOURCES) ++ ++libbsp_a_LIBADD = \ ++ ../../../libcpu/@RTEMS_CPU@/shared/cpuIdent.rel \ + ../../../libcpu/@RTEMS_CPU@/@exceptions@/rtems-cpu.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc5xx/clock.rel \ + ../../../libcpu/@RTEMS_CPU@/mpc5xx/console-generic.rel \ @@ -226,10 +305,10 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/Makefile.am + +include $(srcdir)/preinstall.am +include $(top_srcdir)/../../../../automake/local.am -Index: rtems/c/src/lib/libbsp/powerpc/ec555/README +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/README =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/powerpc/ec555/README 2007-08-14 17:51:38.000000000 +0200 ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/README 2009-11-29 01:38:37.608590025 +0100 @@ -0,0 +1,262 @@ +# +# $Id: README,v 1.1 2004/04/12 21:52:13 joel Exp $ @@ -493,28 +572,28 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/README + - The loopback, fileio, unilimited, and pppd tests fail due to memory + limitations. + - The paranoia program dies on a floating-point assist exception. -Index: rtems/c/src/lib/libbsp/powerpc/ec555/bsp_specs +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/bsp_specs =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/powerpc/ec555/bsp_specs 2007-08-14 17:51:38.000000000 +0200 ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/bsp_specs 2008-12-08 06:15:50.000000000 +0100 @@ -0,0 +1,13 @@ +%rename endfile old_endfile +%rename startfile old_startfile +%rename link old_link + +*startfile: -+%{!qrtems: %(old_startfile)} %{!nostdlib: %{qrtems: ecrti%O%s}} ++%{!qrtems: %(old_startfile)} \ ++%{!nostdlib: %{qrtems: ecrti%O%s -u __vectors -N -u start -e start}} + +*endfile: +%{!qrtems: %(old_endfile)} %{qrtems: ecrtn%O%s} + +*link: -+%{!qrtems: %(old_link)} %{qrtems: -dc -dp -u __vectors -N -u start -e start} -+ -Index: rtems/c/src/lib/libbsp/powerpc/ec555/clock/p_clock.c ++%{!qrtems: %(old_link)} %{qrtems: -dc -dp} +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/clock/p_clock.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/powerpc/ec555/clock/p_clock.c 2007-08-14 17:51:38.000000000 +0200 ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/clock/p_clock.c 2009-11-29 01:38:37.612589905 +0100 @@ -0,0 +1,69 @@ +/* + * Clock Tick interrupt conexion code. @@ -585,14 +664,14 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/clock/p_clock.c + + return BSP_install_rtems_irq_handler (&clockIrqData); +} -Index: rtems/c/src/lib/libbsp/powerpc/ec555/configure.ac +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/configure.ac =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/powerpc/ec555/configure.ac 2007-08-14 17:51:38.000000000 +0200 ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/configure.ac 2006-12-02 06:59:47.000000000 +0100 @@ -0,0 +1,52 @@ +## Process this file with autoconf to produce a configure script. +## -+## $Id: configure.ac,v 1.7.2.2 2006/12/02 06:06:51 ralf Exp $ ++## $Id: configure.ac,v 1.9 2006/12/02 05:59:47 ralf Exp $ + +AC_PREREQ(2.60) +AC_INIT([rtems-c-src-lib-libbsp-powerpc-mbx5xx],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla]) @@ -642,10 +721,10 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/configure.ac +RTEMS_PPC_EXCEPTIONS + +AC_OUTPUT -Index: rtems/c/src/lib/libbsp/powerpc/ec555/console/console.c +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/console/console.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/powerpc/ec555/console/console.c 2007-08-14 17:51:38.000000000 +0200 ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/console/console.c 2009-11-29 01:38:37.612589905 +0100 @@ -0,0 +1,368 @@ +/* + * console.c @@ -1015,11 +1094,11 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/console/console.c + return RTEMS_SUCCESSFUL; + #endif +} -Index: rtems/c/src/lib/libbsp/powerpc/ec555/include/bsp.h +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/include/bsp.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/powerpc/ec555/include/bsp.h 2007-08-14 17:51:38.000000000 +0200 -@@ -0,0 +1,114 @@ ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/include/bsp.h 2007-12-11 16:46:51.000000000 +0100 +@@ -0,0 +1,112 @@ +/* bsp.h + * + * This include file contains all board IO definitions. @@ -1039,7 +1118,7 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/include/bsp.h + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * -+ * $Id: bsp.h,v 1.10 2006/03/17 10:11:37 ralf Exp $ ++ * $Id: bsp.h,v 1.11 2007/12/11 15:46:51 joel Exp $ + */ + +#ifndef _BSP_H @@ -1099,8 +1178,6 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/include/bsp.h + +/* miscellaneous stuff assumed to exist */ + -+extern rtems_configuration_table BSP_Configuration; -+ +/* + * Device Driver Table Entries + */ @@ -1134,10 +1211,10 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/include/bsp.h +#endif + +#endif -Index: rtems/c/src/lib/libbsp/powerpc/ec555/include/coverhd.h +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/include/coverhd.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/powerpc/ec555/include/coverhd.h 2007-08-14 17:51:38.000000000 +0200 ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/include/coverhd.h 2009-11-29 01:38:37.612589905 +0100 @@ -0,0 +1,116 @@ +/* coverhd.h + * @@ -1255,10 +1332,10 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/include/coverhd.h +#endif + +#endif -Index: rtems/c/src/lib/libbsp/powerpc/ec555/include/tm27.h +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/include/tm27.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/powerpc/ec555/include/tm27.h 2007-08-14 17:51:38.000000000 +0200 ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/include/tm27.h 2009-11-29 01:38:37.616586852 +0100 @@ -0,0 +1,54 @@ +/* + * tm27.h @@ -1314,10 +1391,10 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/include/tm27.h +} + +#endif -Index: rtems/c/src/lib/libbsp/powerpc/ec555/irq/irq.h +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/irq/irq.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/powerpc/ec555/irq/irq.h 2007-08-14 17:51:38.000000000 +0200 ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/irq/irq.h 2009-11-29 01:38:37.616586852 +0100 @@ -0,0 +1,55 @@ +/* irq.h + * @@ -1374,11 +1451,11 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/irq/irq.h +#endif /* ASM */ + +#endif /* LIBBSP_POWERPC_SS555_IRQ_IRQ_H */ -Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/bspstart.c +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/startup/bspstart.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/powerpc/ec555/startup/bspstart.c 2007-08-14 17:51:38.000000000 +0200 -@@ -0,0 +1,201 @@ ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/startup/bspstart.c 2008-07-11 12:01:37.000000000 +0200 +@@ -0,0 +1,177 @@ +/* bspstart.c + * + * This set of routines starts the application. It includes application, @@ -1386,7 +1463,7 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/bspstart.c + * The generic CPU dependent initialization has been performed + * before this routine is invoked. + * -+ * COPYRIGHT (c) 1989-1998. ++ * COPYRIGHT (c) 1989-2007. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be @@ -1401,9 +1478,11 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/bspstart.c + * Modifications for MBX860: + * Copyright (c) 1999, National Research Council of Canada + * -+ * $Id: bspstart.c,v 1.7 2005/04/26 23:16:21 joel Exp $ ++ * $Id: bspstart.c,v 1.17 2008/07/11 10:01:37 thomas Exp $ + */ + ++#warning The interrupt disable mask is now stored in SPRG0, please verify that this is compatible to this BSP (see also bootcard.c). ++ +#include + +#include @@ -1417,29 +1496,22 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/bspstart.c +#include +#include + -+SPR_RW(SPRG0) +SPR_RW(SPRG1) + -+/* -+ * The original table from the application (in ROM) and our copy of it with -+ * some changes. Configuration is defined in . Make sure that -+ * our configuration tables are uninitialized so that they get allocated in -+ * the .bss section (RAM). -+ */ -+extern rtems_configuration_table Configuration; +extern unsigned long intrStackPtr; -+rtems_configuration_table BSP_Configuration; + -+rtems_cpu_table Cpu_table; -+ -+char *rtems_progname; ++/* ++ * Driver configuration parameters ++ */ ++uint32_t bsp_clicks_per_usec; ++uint32_t bsp_clock_speed; /* Serial clocks per second */ ++uint32_t bsp_timer_least_valid; ++uint32_t bsp_timer_average_overhead; + +/* + * Use the shared implementations of the following routines. -+ * Look in rtems/c/src/lib/libbsp/shared/bsppost.c and -+ * rtems/c/src/lib/libbsp/shared/bsplibc.c. ++ * Look in rtems/c/src/lib/libbsp/shared/bsplibc.c. + */ -+void bsp_postdriver_hook(void); +void bsp_libc_init( void *, uint32_t, int ); + +void BSP_panic(char *s) @@ -1463,11 +1535,6 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/bspstart.c + * Must not use libc (to do io) from here, since drivers are not yet + * initialized. + * -+ * Installed in the rtems_cpu_table defined in -+ * rtems/c/src/exec/score/cpu/powerpc/rtems/new-exceptions/cpu.h by main() -+ * below. Called from rtems_initialize_executive() defined in -+ * rtems/c/src/exec/sapi/src/init.c -+ * + * Input parameters: NONE + * + * Output parameters: NONE @@ -1486,16 +1553,12 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/bspstart.c + * the kernel and the application can be linked and burned into ROM + * independently of each other. + */ -+ uint8_t *_HeapStart = -+ (uint8_t *)BSP_Configuration.work_space_start -+ + BSP_Configuration.work_space_size; -+ extern uint8_t _HeapEnd[]; -+ -+ bsp_libc_init( _HeapStart, _HeapEnd - _HeapStart, 0 ); ++ uint8_t *_HeapStart = ++ (uint8_t *)Configuration.work_space_start ++ + rtems_configuration_get_work_space_size(); ++ extern uint8_t _HeapEnd[]; + -+#ifdef RTEMS_DEBUG -+ rtems_debug_enable( RTEMS_DEBUG_ALL_MASK ); -+#endif ++ bsp_libc_init( _HeapStart, _HeapEnd - _HeapStart, 0 ); +} + +/* @@ -1539,8 +1602,6 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/bspstart.c + */ + intrStack = (((unsigned char*)&intrStackPtr) - PPC_MINIMUM_STACK_FRAME_SIZE); + _write_SPRG1((unsigned int)intrStack); -+ /* signal them that we have fixed PR288 - eventually, this should go away */ -+ _write_SPRG0(PPC_BSP_HAS_FIXED_PR288); + + /* + * Install our own set of exception vectors @@ -1557,33 +1618,25 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/bspstart.c + * In this case, the memory is not malloc'ed. It is just + * "pulled from the air". + */ -+ BSP_Configuration.work_space_start = _WorkspaceBase; ++ Configuration.work_space_start = _WorkspaceBase; + + /* -+ * initialize the CPU table for this BSP ++ * initialize the device driver parameters + */ -+ Cpu_table.pretasking_hook = bsp_pretasking_hook; /* init libc, etc. */ -+ Cpu_table.postdriver_hook = bsp_postdriver_hook; -+ if( Cpu_table.interrupt_stack_size < 4 * 1024 ) -+ Cpu_table.interrupt_stack_size = 4 * 1024; -+ -+ Cpu_table.clicks_per_usec = BSP_CRYSTAL_HZ / 4 / 1000000; -+ Cpu_table.clock_speed = BSP_CLOCK_HZ; /* for SCI baud rate generator */ -+ -+ /* -+ * Call this in case we use TERMIOS for console I/O -+ */ -+ m5xx_uart_reserve_resources( &BSP_Configuration ); ++ bsp_clicks_per_usec = BSP_CRYSTAL_HZ / 4 / 1000000; ++ bsp_clock_speed = BSP_CLOCK_HZ; /* for SCI baud rate generator */ ++ bsp_timer_least_valid = 0; ++ bsp_timer_average_overhead = 0; + + /* + * Initalize RTEMS IRQ system + */ + BSP_rtems_irq_mng_init(0); +} -Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/iss555.c +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/startup/iss555.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/powerpc/ec555/startup/iss555.c 2007-08-14 17:51:38.000000000 +0200 ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/startup/iss555.c 2009-11-29 01:38:37.616586852 +0100 @@ -0,0 +1,148 @@ +/* + * iss555.c @@ -1733,10 +1786,10 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/iss555.c + msr |= MSR_IP; /* set prefix for exception relocation */ + _CPU_MSR_SET(msr); +} -Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds 2007-08-14 17:51:38.000000000 +0200 ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds 2008-03-04 00:07:19.000000000 +0100 @@ -0,0 +1,319 @@ +/* + * Linker command file for Intec SS555 board @@ -1757,7 +1810,7 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds + * RTEMS_DEBUG symbol is defined in the bsp_specs file whenever make(1) is + * invoked with VARIANT=DEBUG. + * -+ * $Id: linkcmds,v 1.3 2006/03/08 18:50:12 joel Exp $ ++ * $Id: linkcmds,v 1.4 2008/03/03 23:07:19 joel Exp $ + */ + +OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc") @@ -1903,7 +1956,7 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds + PROVIDE (__SDATA_END__ = .); + + PROVIDE (__EXCEPT_START__ = .); -+ *(.gcc_except_table) ++ *(.gcc_except_table*) + PROVIDE (__EXCEPT_END__ = .); + + PROVIDE(__GOT_START__ = .); @@ -2057,10 +2110,10 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds + .debug_varnames 0 : { *(.debug_varnames) } + /* These must appear regardless of . */ +} -Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/start.S +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/startup/start.S =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/powerpc/ec555/startup/start.S 2007-08-14 17:51:38.000000000 +0200 ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/startup/start.S 2009-11-29 01:38:37.620589246 +0100 @@ -0,0 +1,411 @@ +/* start.S + * @@ -2473,10 +2526,10 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/start.S + blr /* return */ + +.L_text_e: -Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/tm27supp.c +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/startup/tm27supp.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/powerpc/ec555/startup/tm27supp.c 2007-08-14 17:51:38.000000000 +0200 ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/startup/tm27supp.c 2009-11-29 01:38:37.620589246 +0100 @@ -0,0 +1,29 @@ +/* + * Support routines for TM27 @@ -2507,10 +2560,10 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/tm27supp.c + (rtems_irq_is_enabled)tm27IsOn +}; + -Index: rtems/c/src/lib/libbsp/powerpc/ec555/times +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/times =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/powerpc/ec555/times 2007-08-14 17:51:38.000000000 +0200 ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/times 2009-11-29 01:38:37.620589246 +0100 @@ -0,0 +1,189 @@ +# +# Timing Test Suite Results for the Intec SS555 @@ -2701,11 +2754,11 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/times + rtems_rate_monotonic_delete: inactive 18 + rtems_rate_monotonic_delete: active 20 + rtems_rate_monotonic_period: conclude periods -- caller blocks 36 -Index: rtems/make/custom/ec555.cfg +Index: rtems-4.9.3/make/custom/ec555.cfg =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/make/custom/ec555.cfg 2007-08-14 17:51:38.000000000 +0200 -@@ -0,0 +1,41 @@ ++++ rtems-4.9.3/make/custom/ec555.cfg 2009-11-29 01:43:49.127556601 +0100 +@@ -0,0 +1,38 @@ +# +# Config file for an Intec Automation SS555 MPC555-based card +# @@ -2715,6 +2768,8 @@ Index: rtems/make/custom/ec555.cfg +# Config file for a PowerPC 403 based helas403 card +# Config file for MPC860 based Ethernet Comm Board +# ++# $Id: ss555.cfg,v 1.11 2008/03/11 20:50:58 joel Exp $ ++# + +include $(RTEMS_ROOT)/make/custom/default.cfg + @@ -2733,24 +2788,19 @@ Index: rtems/make/custom/ec555.cfg +# optimize flag: typically -O2 +CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions + -+define make-exe -+ $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) $(SS555_LDFLAGS) \ -+ -o $(basename $@)_sym.exe $(LINK_OBJS) $(LINK_LIBS) -+ $(NM) -g -n $(basename $@)_sym.exe > $(basename $@).nm -+ cp $(basename $@)_sym.exe $(basename $@).exe -+ $(STRIP) $(basename $@).exe -+ $(SIZE) $(basename $@)_sym.exe ++define bsp-post-link ++ $(default-bsp-post-link) ++ cp $(basename $@).exe $(basename $@)$(DOWNEXT) ++ $(STRIP) $(basename $@)$(DOWNEXT) +endef + -+# Miscellaneous additions go here -+ +# Override default start file +START_BASE= + -Index: rtems/c/src/lib/libbsp/powerpc/ec555/preinstall.am +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/preinstall.am =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/powerpc/ec555/preinstall.am 2007-08-14 17:51:38.000000000 +0200 ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/preinstall.am 2009-11-29 01:38:37.620589246 +0100 @@ -0,0 +1,58 @@ +## Automatically generated by ampolish3 - Do not edit + diff --git a/rtems-patches/current/rtems-ec555-add-to-configs.patch b/rtems-patches/current/rtems-ec555-add-to-configs.patch index c0adcbc..f3a8dd9 100644 --- a/rtems-patches/current/rtems-ec555-add-to-configs.patch +++ b/rtems-patches/current/rtems-ec555-add-to-configs.patch @@ -1,7 +1,11 @@ -Index: rtems-051009/c/src/lib/libbsp/powerpc/acinclude.m4 +--- + c/src/lib/libbsp/powerpc/acinclude.m4 | 2 ++ + 1 file changed, 2 insertions(+) + +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/acinclude.m4 =================================================================== ---- rtems.orig/c/src/lib/libbsp/powerpc/acinclude.m4 -+++ rtems/c/src/lib/libbsp/powerpc/acinclude.m4 +--- rtems-4.9.3.orig/c/src/lib/libbsp/powerpc/acinclude.m4 2008-09-08 18:16:09.000000000 +0200 ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/acinclude.m4 2009-11-29 01:44:17.840570005 +0100 @@ -2,6 +2,8 @@ AC_DEFUN([RTEMS_CHECK_BSPDIR], [ @@ -10,4 +14,4 @@ Index: rtems-051009/c/src/lib/libbsp/powerpc/acinclude.m4 + AC_CONFIG_SUBDIRS([ec555]);; ep1a ) AC_CONFIG_SUBDIRS([ep1a]);; - gen405 ) + gen5200 ) diff --git a/rtems-patches/current/rtems-inttypes-wcs-disable-fix.patch b/rtems-patches/current/rtems-inttypes-wcs-disable-fix.patch deleted file mode 100644 index 570afd1..0000000 --- a/rtems-patches/current/rtems-inttypes-wcs-disable-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: rtems/cpukit/libcsupport/include/inttypes.h -=================================================================== ---- rtems.orig/cpukit/libcsupport/include/inttypes.h -+++ rtems/cpukit/libcsupport/include/inttypes.h -@@ -281,8 +281,8 @@ extern intmax_t imaxabs(intmax_t j); - extern imaxdiv_t imaxdiv(intmax_t numer, intmax_t denomer); - extern intmax_t strtoimax(const char *__restrict, char **__restrict, int); - extern uintmax_t strtoumax(const char *__restrict, char **__restrict, int); --extern intmax_t wcstoimax(const wchar_t *__restrict, wchar_t **__restrict, int); --extern uintmax_t wcstoumax(const wchar_t *__restrict, wchar_t **__restrict, int); -+//extern intmax_t wcstoimax(const wchar_t *__restrict, wchar_t **__restrict, int); -+//extern uintmax_t wcstoumax(const wchar_t *__restrict, wchar_t **__restrict, int); - - #ifdef __cplusplus - } diff --git a/rtems-patches/current/rtems-m9328-pimx1-baud-19200.patch b/rtems-patches/current/rtems-m9328-pimx1-baud-19200.patch index 03648f6..68d8964 100644 --- a/rtems-patches/current/rtems-m9328-pimx1-baud-19200.patch +++ b/rtems-patches/current/rtems-m9328-pimx1-baud-19200.patch @@ -1,9 +1,14 @@ -Index: rtems-051009/c/src/lib/libbsp/arm/csb336/console/uart.c +--- + c/src/lib/libbsp/arm/csb336/console/uart.c | 2 +- + cpukit/libcsupport/src/termios.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: rtems/c/src/lib/libbsp/arm/csb336/console/uart.c =================================================================== ---- rtems.orig/c/src/lib/libbsp/arm/csb336/console/uart.c -+++ rtems/c/src/lib/libbsp/arm/csb336/console/uart.c -@@ -237,7 +237,7 @@ static void imx_uart_init(int minor) - MC9328MXL_UART_FCR_RFDIV_1 | +--- rtems.orig/c/src/lib/libbsp/arm/csb336/console/uart.c 2009-11-29 01:10:27.148556296 +0100 ++++ rtems/c/src/lib/libbsp/arm/csb336/console/uart.c 2009-11-29 01:11:05.632590072 +0100 +@@ -238,7 +238,7 @@ + MC9328MXL_UART_FCR_RFDIV_1 | MC9328MXL_UART_FCR_RXTL(1)); - imx_uart_set_baud(minor, 38400); @@ -11,11 +16,11 @@ Index: rtems-051009/c/src/lib/libbsp/arm/csb336/console/uart.c } -Index: rtems-051009/cpukit/libcsupport/src/termios.c +Index: rtems/cpukit/libcsupport/src/termios.c =================================================================== ---- rtems.orig/cpukit/libcsupport/src/termios.c -+++ rtems/cpukit/libcsupport/src/termios.c -@@ -271,7 +271,7 @@ rtems_termios_open ( +--- rtems.orig/cpukit/libcsupport/src/termios.c 2009-11-29 01:10:27.116591056 +0100 ++++ rtems/cpukit/libcsupport/src/termios.c 2009-11-29 01:11:05.632590072 +0100 +@@ -271,7 +271,7 @@ */ tty->termios.c_iflag = BRKINT | ICRNL | IXON | IMAXBEL; tty->termios.c_oflag = OPOST | ONLCR | XTABS; diff --git a/rtems-patches/current/rtems-m9328-pimx1-mapping-change.patch b/rtems-patches/current/rtems-m9328-pimx1-mapping-change.patch index 393b5e2..ac2dd83 100644 --- a/rtems-patches/current/rtems-m9328-pimx1-mapping-change.patch +++ b/rtems-patches/current/rtems-m9328-pimx1-mapping-change.patch @@ -1,8 +1,12 @@ +--- + c/src/lib/libbsp/arm/csb336/startup/memmap.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + Index: rtems/c/src/lib/libbsp/arm/csb336/startup/memmap.c =================================================================== ---- rtems.orig/c/src/lib/libbsp/arm/csb336/startup/memmap.c -+++ rtems/c/src/lib/libbsp/arm/csb336/startup/memmap.c -@@ -21,8 +21,12 @@ mmu_sect_map_t mem_map[] = { +--- rtems.orig/c/src/lib/libbsp/arm/csb336/startup/memmap.c 2009-11-29 01:10:27.268556195 +0100 ++++ rtems/c/src/lib/libbsp/arm/csb336/startup/memmap.c 2009-11-29 01:10:29.860557175 +0100 +@@ -21,8 +21,12 @@ /* */ {0x08200000, 0x00000000, 1, MMU_CACHE_NONE}, /* Mirror of SDRAM */ {0x00100000, 0x00100000, 1, MMU_CACHE_NONE}, /* Bootstrap ROM */ diff --git a/rtems-patches/current/rtems-m9328-pimx1-syncmclk.patch b/rtems-patches/current/rtems-m9328-pimx1-syncmclk.patch index 90cf04f..34a30a8 100644 --- a/rtems-patches/current/rtems-m9328-pimx1-syncmclk.patch +++ b/rtems-patches/current/rtems-m9328-pimx1-syncmclk.patch @@ -1,8 +1,12 @@ +--- + c/src/lib/libbsp/arm/csb336/startup/bspstart.c | 2 ++ + 1 file changed, 2 insertions(+) + Index: rtems/c/src/lib/libbsp/arm/csb336/startup/bspstart.c =================================================================== ---- rtems/c/src/lib/libbsp/arm/csb336/startup/bspstart.c -+++ rtems/c/src/lib/libbsp/arm/csb336/startup/bspstart.c -@@ -89,6 +89,7 @@ void bsp_pretasking_hook(void) +--- rtems.orig/c/src/lib/libbsp/arm/csb336/startup/bspstart.c 2009-11-29 01:10:27.024557077 +0100 ++++ rtems/c/src/lib/libbsp/arm/csb336/startup/bspstart.c 2009-11-29 01:11:06.963557071 +0100 +@@ -76,6 +76,7 @@ void mmu_set_cpu_async_mode(void); void bsp_start_default( void ) { @@ -10,7 +14,7 @@ Index: rtems/c/src/lib/libbsp/arm/csb336/startup/bspstart.c int i; /* Set the MCU prescaler to divide by 1 */ -@@ -104,6 +105,7 @@ void bsp_start_default( void ) +@@ -91,6 +92,7 @@ /* Set the CPU to asynchrous clock mode, so it uses its fastest clock */ mmu_set_cpu_async_mode(); diff --git a/rtems-patches/current/rtems-m9328-pimx1-uart1to3.patch b/rtems-patches/current/rtems-m9328-pimx1-uart1to3.patch index 81c72d7..51d08fe 100644 --- a/rtems-patches/current/rtems-m9328-pimx1-uart1to3.patch +++ b/rtems-patches/current/rtems-m9328-pimx1-uart1to3.patch @@ -1,7 +1,12 @@ -Index: rtems/c/src/lib/libbsp/arm/csb336/console/uart.c +--- + c/src/lib/libbsp/arm/csb336/console/uart.c | 42 +++++++++++++++++++++ + c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h | 41 ++++++++++++++++++++ + 2 files changed, 83 insertions(+) + +Index: rtems-4.9.3/c/src/lib/libbsp/arm/csb336/console/uart.c =================================================================== ---- rtems.orig/c/src/lib/libbsp/arm/csb336/console/uart.c -+++ rtems/c/src/lib/libbsp/arm/csb336/console/uart.c +--- rtems-4.9.3.orig/c/src/lib/libbsp/arm/csb336/console/uart.c 2009-11-29 01:11:05.632590072 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/arm/csb336/console/uart.c 2009-11-29 01:55:20.304585047 +0100 @@ -24,6 +24,13 @@ /* Define this to use interrupt driver UART driver */ #define USE_INTERRUPTS 1 @@ -16,7 +21,7 @@ Index: rtems/c/src/lib/libbsp/arm/csb336/console/uart.c /* How many serial ports? */ #define NUM_DEVS 2 #define poll_write(c) imx_uart_poll_write_char(0, c) -@@ -185,6 +192,41 @@ static void imx_uart_init(int minor) +@@ -185,6 +192,41 @@ imx_uart_data[minor].len = 0; imx_uart_data[minor].idx = 0; @@ -58,10 +63,10 @@ Index: rtems/c/src/lib/libbsp/arm/csb336/console/uart.c if (minor == 0) { #if defined(USE_INTERRUPTS) imx_uart_tx_isr_data[minor].name = BSP_INT_UART1_TX; -Index: rtems/c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h +Index: rtems-4.9.3/c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h =================================================================== ---- rtems.orig/c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h -+++ rtems/c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h +--- rtems-4.9.3.orig/c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h 2007-03-12 12:17:07.000000000 +0100 ++++ rtems-4.9.3/c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h 2009-11-29 01:55:20.324565870 +0100 @@ -31,6 +31,7 @@ #define MC9328MXL_LCDC_BASE 0x00205000 #define MC9328MXL_UART1_BASE 0x00206000 @@ -101,7 +106,7 @@ Index: rtems/c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h typedef struct { volatile uint32_t rxd; volatile uint32_t _res0[15]; -@@ -274,6 +299,12 @@ typedef struct { +@@ -274,6 +299,12 @@ #define MC9328MXL_PLL_SPCTL1 (*((volatile uint32_t *)((MC9328MXL_PLL_BASE) + 0x10))) #define MC9328MXL_PLL_PCDR (*((volatile uint32_t *)((MC9328MXL_PLL_BASE) + 0x20))) @@ -114,7 +119,7 @@ Index: rtems/c/src/lib/libcpu/arm/mc9328mxl/include/mc9328mxl.h #define MC9328MXL_PLL_CSCR_CLKOSEL_PERCLK1 (0 << 29) #define MC9328MXL_PLL_CSCR_CLKOSEL_HCLK (1 << 29) #define MC9328MXL_PLL_CSCR_CLKOSEL_CLK48M (2 << 29) -@@ -304,6 +335,16 @@ typedef struct { +@@ -304,6 +335,16 @@ #define MC9328MXL_PLL_PCDR_PCLK3_MASK (0x007f0000) #define MC9328MXL_PLL_PCDR_PCLK3_SHIFT (16) diff --git a/rtems-patches/current/rtems-mo376-add-to-configs.patch b/rtems-patches/current/rtems-mo376-add-to-configs.patch index c247240..826a569 100644 --- a/rtems-patches/current/rtems-mo376-add-to-configs.patch +++ b/rtems-patches/current/rtems-mo376-add-to-configs.patch @@ -2,14 +2,14 @@ c/src/lib/libbsp/m68k/acinclude.m4 | 2 ++ 1 file changed, 2 insertions(+) -Index: rtems/c/src/lib/libbsp/m68k/acinclude.m4 +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/acinclude.m4 =================================================================== ---- rtems.orig/c/src/lib/libbsp/m68k/acinclude.m4 2007-08-14 18:59:45.000000000 +0200 -+++ rtems/c/src/lib/libbsp/m68k/acinclude.m4 2007-08-14 19:04:40.000000000 +0200 -@@ -20,6 +20,8 @@ - AC_CONFIG_SUBDIRS([mcf5206elite]);; - mcf5235 ) +--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/acinclude.m4 2008-08-30 22:29:11.000000000 +0200 ++++ rtems-4.9.3/c/src/lib/libbsp/m68k/acinclude.m4 2009-11-29 01:35:52.795572383 +0100 +@@ -24,6 +24,8 @@ AC_CONFIG_SUBDIRS([mcf5235]);; + mcf5329 ) + AC_CONFIG_SUBDIRS([mcf5329]);; + mo376 ) + AC_CONFIG_SUBDIRS([mo376]);; mrm332 ) diff --git a/rtems-patches/current/rtems-mo376-m68376-updates.patch b/rtems-patches/current/rtems-mo376-m68376-updates.patch index 22ea2ff..aa38e2a 100644 --- a/rtems-patches/current/rtems-mo376-m68376-updates.patch +++ b/rtems-patches/current/rtems-mo376-m68376-updates.patch @@ -10,10 +10,10 @@ make/custom/mo376.cfg | 10 9 files changed, 455 insertions(+), 48 deletions(-) -Index: rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/bsp.h =================================================================== ---- rtems.orig/c/src/lib/libbsp/m68k/mo376/include/bsp.h 2007-08-14 17:24:09.000000000 +0200 -+++ rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h 2007-08-14 17:36:35.000000000 +0200 +--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/include/bsp.h 2009-11-29 01:23:46.804588750 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/bsp.h 2009-11-29 01:36:40.412590325 +0100 @@ -1,6 +1,6 @@ /* bsp.h * @@ -22,8 +22,8 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h * * COPYRIGHT (c) 1989-1999. * On-Line Applications Research Corporation (OAR). -@@ -41,6 +41,30 @@ - /* #define CONFIGURE_INTERRUPT_STACK_MEMORY (TBD * 1024) */ +@@ -40,6 +40,30 @@ + /* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ /* + * Network driver configuration @@ -53,10 +53,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h * Simple spin delay in microsecond units for device drivers. * This is very dependent on the clock speed of the target. */ -Index: rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c =================================================================== ---- rtems.orig/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c 2007-08-14 17:24:09.000000000 +0200 -+++ rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c 2007-08-14 17:36:35.000000000 +0200 +--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c 2009-11-29 01:23:46.808556503 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c 2009-11-29 01:36:40.412590325 +0100 @@ -60,7 +60,7 @@ Old_ticker = (rtems_isr_entry) set_vector( clock_isr, CLOCK_VECTOR, 1 ); @@ -66,10 +66,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c *PICR = (unsigned short int) /* enable interrupt */ ( SAM(ISRL_PIT,8,PIRQL) | SAM(CLOCK_VECTOR,0,PIV) ); -Index: rtems/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68 +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68 =================================================================== ---- rtems.orig/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68 2007-08-14 17:20:30.000000000 +0200 -+++ rtems/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68 2007-08-14 17:36:35.000000000 +0200 +--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68 2009-11-29 01:11:56.471556761 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68 2009-11-29 01:36:40.412590325 +0100 @@ -1,16 +1,399 @@ # # $Id: gdbinit68,v 1.1 2001/05/25 16:28:46 joel Exp $ @@ -476,10 +476,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/misc/gdbinit68 +#b main + +run -Index: rtems/c/src/lib/libbsp/m68k/mo376/include/mo376.h +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/mo376.h =================================================================== ---- rtems.orig/c/src/lib/libbsp/m68k/mo376/include/mo376.h 2007-08-14 17:24:09.000000000 +0200 -+++ rtems/c/src/lib/libbsp/m68k/mo376/include/mo376.h 2007-08-14 17:36:35.000000000 +0200 +--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/include/mo376.h 2009-11-29 01:23:46.816556473 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/mo376.h 2009-11-29 01:36:40.416589786 +0100 @@ -26,31 +26,22 @@ #define EFI_INT1 25 /* CTS interrupt */ #define ISRL_SCI 6 @@ -521,10 +521,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/include/mo376.h #define SCI_BAUD 19200 /* RS232 Baud Rate */ /* macros/functions */ -Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM =================================================================== ---- rtems.orig/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM 2007-08-14 17:20:30.000000000 +0200 -+++ rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM 2007-08-14 17:36:35.000000000 +0200 +--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM 2008-03-04 00:06:30.000000000 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM 2009-11-29 01:36:40.416589786 +0100 @@ -4,7 +4,8 @@ */ @@ -561,10 +561,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds_ROM /* * -Index: rtems/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c =================================================================== ---- rtems.orig/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c 2007-08-14 17:20:30.000000000 +0200 -+++ rtems/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c 2007-08-14 17:45:18.000000000 +0200 +--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c 2009-11-29 01:11:56.479557220 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c 2009-11-29 01:36:40.416589786 +0100 @@ -33,8 +33,8 @@ rtems_vector_number vector ) @@ -606,10 +606,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/spurious/spinit.c default: (void) set_vector( Spurious_Isr, vector, 1 ); -Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/startup/linkcmds =================================================================== ---- rtems.orig/c/src/lib/libbsp/m68k/mo376/startup/linkcmds 2007-08-14 17:20:30.000000000 +0200 -+++ rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds 2007-08-14 17:36:35.000000000 +0200 +--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/startup/linkcmds 2008-03-04 00:06:30.000000000 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/startup/linkcmds 2009-11-29 01:36:40.416589786 +0100 @@ -33,15 +33,15 @@ /* * Declare some sizes. @@ -631,13 +631,13 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/linkcmds } _copy_data_from_rom = 0; -Index: rtems/make/custom/mo376.cfg +Index: rtems-4.9.3/make/custom/mo376.cfg =================================================================== ---- rtems.orig/make/custom/mo376.cfg 2007-08-14 17:24:09.000000000 +0200 -+++ rtems/make/custom/mo376.cfg 2007-08-14 17:41:03.000000000 +0200 +--- rtems-4.9.3.orig/make/custom/mo376.cfg 2009-11-29 01:25:58.227563597 +0100 ++++ rtems-4.9.3/make/custom/mo376.cfg 2009-11-29 01:36:40.416589786 +0100 @@ -16,8 +16,14 @@ # and (hopefully) optimize for it. - CPU_CFLAGS = -mcpu32 + CPU_CFLAGS = -mcpu=cpu32 -# optimize flag: typically -O2 -CFLAGS_OPTIMIZE_V = -O2 -g -fomit-frame-pointer @@ -650,12 +650,12 @@ Index: rtems/make/custom/mo376.cfg +CFLAGS_OPTIMIZE_V=-O2 -fomit-frame-pointer -ggdb +CXXFLAGS_OPTIMIZE_V=-O2 -ggdb - # The following are definitions of make-exe which will work using ld as - # is currently required. -Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/start_c.c + ifeq ($(MRM_IN_ROM),yes) + # Build a rommable image - move the .data section after the .text section +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/startup/start_c.c =================================================================== ---- rtems.orig/c/src/lib/libbsp/m68k/mo376/startup/start_c.c 2007-08-14 17:24:09.000000000 +0200 -+++ rtems/c/src/lib/libbsp/m68k/mo376/startup/start_c.c 2007-08-14 17:36:35.000000000 +0200 +--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/startup/start_c.c 2009-11-29 01:23:46.812556872 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/startup/start_c.c 2009-11-29 01:36:40.432570032 +0100 @@ -60,12 +60,12 @@ /* Port E and F Data Direction Register */ diff --git a/rtems-patches/current/rtems-readlink-type-fix.patch b/rtems-patches/current/rtems-readlink-type-fix.patch deleted file mode 100644 index 1bed335..0000000 --- a/rtems-patches/current/rtems-readlink-type-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- - cpukit/libcsupport/src/readlink.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: rtems/cpukit/libcsupport/src/readlink.c -=================================================================== ---- rtems.orig/cpukit/libcsupport/src/readlink.c 2007-08-15 01:54:35.000000000 +0200 -+++ rtems/cpukit/libcsupport/src/readlink.c 2007-08-15 01:56:45.000000000 +0200 -@@ -18,10 +18,10 @@ - #include - #include - --int readlink( -+ssize_t readlink( - const char *pathname, - char *buf, -- int bufsize -+ size_t bufsize - ) - { - rtems_filesystem_location_info_t loc; diff --git a/rtems-patches/current/rtems-update-mrm332-to-mo376.patch b/rtems-patches/current/rtems-update-mrm332-to-mo376.patch index 9388467..4fff5d7 100644 --- a/rtems-patches/current/rtems-update-mrm332-to-mo376.patch +++ b/rtems-patches/current/rtems-update-mrm332-to-mo376.patch @@ -12,13 +12,13 @@ c/src/lib/libbsp/m68k/mo376/start/start.S | 2 c/src/lib/libbsp/m68k/mo376/startup/start_c.c | 2 c/src/lib/libbsp/m68k/mo376/times | 6 +- - make/custom/mo376.cfg | 4 - - 14 files changed, 104 insertions(+), 98 deletions(-) + make/custom/mo376.cfg | 8 +- + 14 files changed, 106 insertions(+), 100 deletions(-) -Index: rtems/c/src/lib/libbsp/m68k/mo376/start/start.S +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/start/start.S =================================================================== ---- rtems.orig/c/src/lib/libbsp/m68k/mo376/start/start.S 2007-08-14 17:20:30.000000000 +0200 -+++ rtems/c/src/lib/libbsp/m68k/mo376/start/start.S 2007-08-14 17:24:09.000000000 +0200 +--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/start/start.S 2009-11-29 01:11:56.463558538 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/start/start.S 2009-11-29 01:23:46.804588750 +0100 @@ -2,7 +2,7 @@ * $Id */ @@ -28,10 +28,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/start/start.S #include #include -Index: rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/bsp.h =================================================================== ---- rtems.orig/c/src/lib/libbsp/m68k/mo376/include/bsp.h 2007-08-14 17:20:30.000000000 +0200 -+++ rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h 2007-08-14 17:24:09.000000000 +0200 +--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/include/bsp.h 2007-12-11 16:49:20.000000000 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/bsp.h 2009-11-29 01:23:46.804588750 +0100 @@ -26,7 +26,7 @@ #include #include @@ -41,26 +41,23 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h #include #include -Index: rtems/c/src/lib/libbsp/m68k/mo376/ChangeLog +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/ChangeLog =================================================================== ---- rtems.orig/c/src/lib/libbsp/m68k/mo376/ChangeLog 2007-08-14 17:20:30.000000000 +0200 -+++ rtems/c/src/lib/libbsp/m68k/mo376/ChangeLog 2007-08-14 17:24:09.000000000 +0200 -@@ -29,6 +29,11 @@ - - * include/bsp.h: New header guard. - -+2005-04-08 Pavel Pisa +--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/ChangeLog 2008-12-08 06:15:06.000000000 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/ChangeLog 2009-11-29 01:28:09.931559632 +0100 +@@ -1,3 +1,8 @@ ++2009-11-27 Pavel Pisa + + * MO376 BSP for PiKRON's MO_CPU1/MO_CPU2 board started + as clone of MRM332 BSP. + - 2005-01-07 Ralf Corsepius + 2008-12-08 Ralf Corsépius - * Makefile.am: Eliminate CFLAGS_OPTIMIZE_V. -Index: rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c + * bsp_specs: Backport from CVS-HEAD. +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c =================================================================== ---- rtems.orig/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c 2007-08-14 17:20:30.000000000 +0200 -+++ rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c 2007-08-14 17:24:09.000000000 +0200 +--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c 2008-09-06 00:05:15.000000000 +0200 ++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c 2009-11-29 01:23:46.808556503 +0100 @@ -20,7 +20,7 @@ #include #include @@ -70,12 +67,12 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c #define CLOCK_VECTOR MRM_PIV -Index: rtems/c/src/lib/libbsp/m68k/mo376/configure.ac +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/configure.ac =================================================================== ---- rtems.orig/c/src/lib/libbsp/m68k/mo376/configure.ac 2007-08-14 17:20:30.000000000 +0200 -+++ rtems/c/src/lib/libbsp/m68k/mo376/configure.ac 2007-08-14 17:26:26.000000000 +0200 +--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/configure.ac 2006-12-02 06:55:13.000000000 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/configure.ac 2009-11-29 01:23:46.808556503 +0100 @@ -3,7 +3,7 @@ - ## $Id: configure.ac,v 1.14.2.2 2006/12/02 06:04:46 ralf Exp $ + ## $Id: configure.ac,v 1.16 2006/12/02 05:55:13 ralf Exp $ AC_PREREQ(2.60) -AC_INIT([rtems-c-src-lib-libbsp-m68k-mrm332],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla]) @@ -83,10 +80,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/configure.ac AC_CONFIG_SRCDIR([bsp_specs]) RTEMS_TOP(../../../../../..) -Index: rtems/c/src/lib/libbsp/m68k/mo376/README +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/README =================================================================== ---- rtems.orig/c/src/lib/libbsp/m68k/mo376/README 2007-08-14 17:20:30.000000000 +0200 -+++ rtems/c/src/lib/libbsp/m68k/mo376/README 2007-08-14 17:24:09.000000000 +0200 +--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/README 2009-11-29 01:11:56.471556761 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/README 2009-11-29 01:23:46.808556503 +0100 @@ -2,23 +2,24 @@ # $Id: README,v 1.1 2001/05/25 16:28:46 joel Exp $ # @@ -124,23 +121,23 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/README - the interrupt priority and (2) to prevent it from blocking. -- add a timer driver for the tmtest set. -Index: rtems/c/src/lib/libbsp/m68k/mo376/Makefile.am +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/Makefile.am =================================================================== ---- rtems.orig/c/src/lib/libbsp/m68k/mo376/Makefile.am 2007-08-14 17:20:30.000000000 +0200 -+++ rtems/c/src/lib/libbsp/m68k/mo376/Makefile.am 2007-08-14 17:24:09.000000000 +0200 -@@ -16,7 +16,7 @@ +--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/Makefile.am 2008-09-29 03:47:41.000000000 +0200 ++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/Makefile.am 2009-11-29 01:23:46.812556872 +0100 +@@ -15,7 +15,7 @@ + nodist_include_HEADERS = include/bspopts.h DISTCLEANFILES = include/bspopts.h - noinst_PROGRAMS = -include_HEADERS += include/mrm332.h +include_HEADERS += include/mo376.h nodist_include_HEADERS += ../../shared/include/coverhd.h EXTRA_DIST = times -Index: rtems/c/src/lib/libbsp/m68k/mo376/console/sci.c +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/console/sci.c =================================================================== ---- rtems.orig/c/src/lib/libbsp/m68k/mo376/console/sci.c 2007-08-14 17:20:30.000000000 +0200 -+++ rtems/c/src/lib/libbsp/m68k/mo376/console/sci.c 2007-08-14 17:31:42.000000000 +0200 +--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/console/sci.c 2008-08-19 12:23:15.000000000 +0200 ++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/console/sci.c 2009-11-29 01:23:46.812556872 +0100 @@ -105,7 +105,7 @@ /* system clock definitions, i dont have documentation on this... */ @@ -159,10 +156,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/console/sci.c value = ( (uint16_t) ( SYS_CLOCK / rate / 32.0 + 0.5 ) & 0x1fff ); -Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/start_c.c +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/startup/start_c.c =================================================================== ---- rtems.orig/c/src/lib/libbsp/m68k/mo376/startup/start_c.c 2007-08-14 17:20:30.000000000 +0200 -+++ rtems/c/src/lib/libbsp/m68k/mo376/startup/start_c.c 2007-08-14 17:24:09.000000000 +0200 +--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/startup/start_c.c 2008-08-19 12:23:15.000000000 +0200 ++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/startup/start_c.c 2009-11-29 01:23:46.812556872 +0100 @@ -2,7 +2,7 @@ * $Id */ @@ -172,10 +169,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/start_c.c #include #define __START_C__ #include "bsp.h" -Index: rtems/c/src/lib/libbsp/m68k/mo376/times +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/times =================================================================== ---- rtems.orig/c/src/lib/libbsp/m68k/mo376/times 2007-08-14 17:20:30.000000000 +0200 -+++ rtems/c/src/lib/libbsp/m68k/mo376/times 2007-08-14 17:24:09.000000000 +0200 +--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/times 2009-11-29 01:11:56.479557220 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/times 2009-11-29 01:23:46.816556473 +0100 @@ -1,5 +1,5 @@ # -# Timing Test Suite Results for the MRM332 BSP @@ -195,10 +192,10 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/times Memory Configuration: SRAM, DRAM, cache, etc Wait States: -Index: rtems/c/src/lib/libbsp/m68k/mo376/include/mo376.h +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/mo376.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ rtems/c/src/lib/libbsp/m68k/mo376/include/mo376.h 2007-08-14 17:24:09.000000000 +0200 ++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/mo376.h 2009-11-29 01:23:46.816556473 +0100 @@ -0,0 +1,70 @@ +/* mo376.h + * @@ -270,9 +267,9 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/include/mo376.h +#endif /* ASM */ + +#endif /* _MRM_H_ */ -Index: rtems/c/src/lib/libbsp/m68k/mo376/include/mrm332.h +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/mrm332.h =================================================================== ---- rtems.orig/c/src/lib/libbsp/m68k/mo376/include/mrm332.h 2007-08-14 17:20:30.000000000 +0200 +--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/include/mrm332.h 2009-11-29 01:11:56.479557220 +0100 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -/* mrm332.h @@ -345,10 +342,20 @@ Index: rtems/c/src/lib/libbsp/m68k/mo376/include/mrm332.h -#endif /* ASM */ - -#endif /* _MRM_H_ */ -Index: rtems/make/custom/mo376.cfg +Index: rtems-4.9.3/make/custom/mo376.cfg =================================================================== ---- rtems.orig/make/custom/mo376.cfg 2007-08-14 17:20:30.000000000 +0200 -+++ rtems/make/custom/mo376.cfg 2007-08-14 17:24:09.000000000 +0200 +--- rtems-4.9.3.orig/make/custom/mo376.cfg 2009-11-29 01:21:43.173939736 +0100 ++++ rtems-4.9.3/make/custom/mo376.cfg 2009-11-29 01:25:58.227563597 +0100 +@@ -1,7 +1,7 @@ + # +-# Config file for the mrm332 BSP ++# Config file for the mo376 BSP + # +-# $Id: mrm332.cfg,v 1.18 2008/06/11 08:17:27 ccj Exp $ ++# $Id: mo376.cfg,v 1.18 2008/06/11 08:17:27 ccj Exp $ + # + + include $(RTEMS_ROOT)/make/custom/default.cfg @@ -10,7 +10,7 @@ RTEMS_CPU_MODEL=m68332 @@ -358,19 +365,19 @@ Index: rtems/make/custom/mo376.cfg # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. -@@ -25,7 +25,7 @@ +@@ -22,7 +22,7 @@ ifeq ($(MRM_IN_ROM),yes) # Build a rommable image - move the .data section after the .text section # in the image. -CPU_CFLAGS += -qnolinkcmds -T $(exec_prefix)/mrm332/lib/linkcmds_ROM +CPU_CFLAGS += -qnolinkcmds -T $(exec_prefix)/mo376/lib/linkcmds_ROM + endif - # This is a good way to get debug information. The output file is large - # though and greatly slows the build process so only do this if needed. -Index: rtems/c/src/lib/libbsp/m68k/mo376/preinstall.am + ifeq ($(MRM_IN_ROM),yes) +Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/preinstall.am =================================================================== ---- rtems.orig/c/src/lib/libbsp/m68k/mo376/preinstall.am 2007-08-14 17:20:30.000000000 +0200 -+++ rtems/c/src/lib/libbsp/m68k/mo376/preinstall.am 2007-08-14 17:24:09.000000000 +0200 +--- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/preinstall.am 2009-11-29 01:11:56.483556820 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/preinstall.am 2009-11-29 01:23:46.816556473 +0100 @@ -44,9 +44,9 @@ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/rtems-patches/current/rtems-update-ss555-to-ec555-cpld-remove.patch b/rtems-patches/current/rtems-update-ss555-to-ec555-cpld-remove.patch index b63ef48..a5cdd9c 100644 --- a/rtems-patches/current/rtems-update-ss555-to-ec555-cpld-remove.patch +++ b/rtems-patches/current/rtems-update-ss555-to-ec555-cpld-remove.patch @@ -1,8 +1,14 @@ -Index: rtems/c/src/lib/libbsp/powerpc/ec555/include/bsp.h +--- + c/src/lib/libbsp/powerpc/ec555/include/bsp.h | 31 ------------------------ + c/src/lib/libbsp/powerpc/ec555/startup/iss555.c | 5 +++ + c/src/lib/libbsp/powerpc/ec555/startup/linkcmds | 8 ------ + 3 files changed, 5 insertions(+), 39 deletions(-) + +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/include/bsp.h =================================================================== ---- rtems/c/src/lib/libbsp/powerpc/ec555/include/bsp.h -+++ rtems/c/src/lib/libbsp/powerpc/ec555/include/bsp.h -@@ -44,37 +44,6 @@ extern "C" { +--- rtems-4.9.3.orig/c/src/lib/libbsp/powerpc/ec555/include/bsp.h 2007-12-11 16:46:51.000000000 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/include/bsp.h 2009-11-29 01:52:21.559557050 +0100 +@@ -44,37 +44,6 @@ #define BSP_CRYSTAL_HZ 4000000 /* crystal frequency, Hz */ #define BSP_CLOCK_HZ 40000000 /* CPU clock frequency, Hz @@ -39,12 +45,12 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/include/bsp.h - /* miscellaneous stuff assumed to exist */ - extern rtems_configuration_table BSP_Configuration; -Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/iss555.c + /* +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/startup/iss555.c =================================================================== ---- rtems/c/src/lib/libbsp/powerpc/ec555/startup/iss555.c -+++ rtems/c/src/lib/libbsp/powerpc/ec555/startup/iss555.c -@@ -96,6 +96,8 @@ void _InitSS555 (void) +--- rtems-4.9.3.orig/c/src/lib/libbsp/powerpc/ec555/startup/iss555.c 2009-11-29 01:38:37.616586852 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/startup/iss555.c 2009-11-29 01:52:21.559557050 +0100 +@@ -96,6 +96,8 @@ */ extern char int_ram_top[]; /* top of internal ram */ @@ -53,7 +59,7 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/iss555.c usiu.memc[0]._or = USIU_MEMC_OR_512K /* bank size */ | USIU_MEMC_OR_SCY(0) /* wait states in first beat of burst */ -@@ -127,6 +129,9 @@ void _InitSS555 (void) +@@ -127,6 +129,9 @@ | USIU_MEMC_BR_BI /* inhibit bursting */ | USIU_MEMC_BR_V; /* base register valid */ @@ -63,11 +69,11 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/iss555.c /* * Disable show cycles and serialization so that burst accesses will work * properly. A different value, such as 0x0, may be more appropriate for -Index: rtems/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds =================================================================== ---- rtems/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds -+++ rtems/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds -@@ -268,14 +268,6 @@ SECTIONS +--- rtems-4.9.3.orig/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds 2008-03-04 00:07:19.000000000 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/startup/linkcmds 2009-11-29 01:52:21.559557050 +0100 +@@ -268,14 +268,6 @@ sram = .; } diff --git a/rtems-patches/current/rtems-update-ss555-to-ec555.patch b/rtems-patches/current/rtems-update-ss555-to-ec555.patch index 1dbf184..3b3fb3f 100644 --- a/rtems-patches/current/rtems-update-ss555-to-ec555.patch +++ b/rtems-patches/current/rtems-update-ss555-to-ec555.patch @@ -5,23 +5,23 @@ make/custom/ec555.cfg | 6 +++--- 4 files changed, 18 insertions(+), 13 deletions(-) -Index: rtems/c/src/lib/libbsp/powerpc/ec555/ChangeLog +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/ChangeLog =================================================================== ---- rtems.orig/c/src/lib/libbsp/powerpc/ec555/ChangeLog 2007-08-14 17:51:38.000000000 +0200 -+++ rtems/c/src/lib/libbsp/powerpc/ec555/ChangeLog 2007-08-14 17:56:57.000000000 +0200 +--- rtems-4.9.3.orig/c/src/lib/libbsp/powerpc/ec555/ChangeLog 2008-12-08 06:15:50.000000000 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/ChangeLog 2009-11-29 01:49:00.499560796 +0100 @@ -1,3 +1,8 @@ -+2007-08-14 Pavel Pisa ++2009-11-27 Pavel Pisa + + * EC555 BSP for Wuerz-elektronik EC555 board started + as clone of SS555 BSP. + - 2007-04-06 Ralf Corsépius + 2008-12-08 Ralf Corsépius - * bsp_specs: Remove lib (Now expected to exist in GCC). -Index: rtems/c/src/lib/libbsp/powerpc/ec555/README + * bsp_specs: Backport from CVS-HEAD. +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/README =================================================================== ---- rtems.orig/c/src/lib/libbsp/powerpc/ec555/README 2007-08-14 17:51:38.000000000 +0200 -+++ rtems/c/src/lib/libbsp/powerpc/ec555/README 2007-08-14 17:53:52.000000000 +0200 +--- rtems-4.9.3.orig/c/src/lib/libbsp/powerpc/ec555/README 2009-11-29 01:38:37.608590025 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/README 2009-11-29 01:47:01.416556469 +0100 @@ -2,9 +2,9 @@ # $Id: README,v 1.1 2004/04/12 21:52:13 joel Exp $ # @@ -90,12 +90,12 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/README All tests run cleanly, except for tm26, which gives a "PANIC 12" after it exits. This doesn't seem to cause a problem otherwise. -Index: rtems/c/src/lib/libbsp/powerpc/ec555/configure.ac +Index: rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/configure.ac =================================================================== ---- rtems.orig/c/src/lib/libbsp/powerpc/ec555/configure.ac 2007-08-14 17:51:38.000000000 +0200 -+++ rtems/c/src/lib/libbsp/powerpc/ec555/configure.ac 2007-08-14 17:55:32.000000000 +0200 +--- rtems-4.9.3.orig/c/src/lib/libbsp/powerpc/ec555/configure.ac 2006-12-02 06:59:47.000000000 +0100 ++++ rtems-4.9.3/c/src/lib/libbsp/powerpc/ec555/configure.ac 2009-11-29 01:47:01.416556469 +0100 @@ -3,7 +3,7 @@ - ## $Id: configure.ac,v 1.7.2.2 2006/12/02 06:06:51 ralf Exp $ + ## $Id: configure.ac,v 1.9 2006/12/02 05:59:47 ralf Exp $ AC_PREREQ(2.60) -AC_INIT([rtems-c-src-lib-libbsp-powerpc-mbx5xx],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla]) @@ -103,10 +103,10 @@ Index: rtems/c/src/lib/libbsp/powerpc/ec555/configure.ac AC_CONFIG_SRCDIR([bsp_specs]) RTEMS_TOP(../../../../../..) -Index: rtems/make/custom/ec555.cfg +Index: rtems-4.9.3/make/custom/ec555.cfg =================================================================== ---- rtems.orig/make/custom/ec555.cfg 2007-08-14 17:51:38.000000000 +0200 -+++ rtems/make/custom/ec555.cfg 2007-08-14 17:53:52.000000000 +0200 +--- rtems-4.9.3.orig/make/custom/ec555.cfg 2009-11-29 01:43:49.127556601 +0100 ++++ rtems-4.9.3/make/custom/ec555.cfg 2009-11-29 01:51:19.435599101 +0100 @@ -1,5 +1,5 @@ # -# Config file for an Intec Automation SS555 MPC555-based card @@ -114,7 +114,16 @@ Index: rtems/make/custom/ec555.cfg # # This file is derived from: # -@@ -15,7 +15,7 @@ +@@ -7,7 +7,7 @@ + # Config file for a PowerPC 403 based helas403 card + # Config file for MPC860 based Ethernet Comm Board + # +-# $Id: ss555.cfg,v 1.11 2008/03/11 20:50:58 joel Exp $ ++# $Id: ec555.cfg,v 1.11 2008/03/11 20:50:58 joel Exp $ + # + + include $(RTEMS_ROOT)/make/custom/default.cfg +@@ -17,7 +17,7 @@ RTEMS_CPU_MODEL=mpc555 # This is the actual bsp directory used during the build process. @@ -123,12 +132,3 @@ Index: rtems/make/custom/ec555.cfg # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. -@@ -26,7 +26,7 @@ - CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions - - define make-exe -- $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) $(SS555_LDFLAGS) \ -+ $(LINK.c) $(AM_CFLAGS) $(AM_LDFLAGS) $(EC555_LDFLAGS) \ - -o $(basename $@)_sym.exe $(LINK_OBJS) $(LINK_LIBS) - $(NM) -g -n $(basename $@)_sym.exe > $(basename $@).nm - cp $(basename $@)_sym.exe $(basename $@).exe diff --git a/rtems-patches/current/rtems-usleep-type-fix.patch b/rtems-patches/current/rtems-usleep-type-fix.patch deleted file mode 100644 index 26726ac..0000000 --- a/rtems-patches/current/rtems-usleep-type-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- - cpukit/posix/src/usleep.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: rtems/cpukit/posix/src/usleep.c -=================================================================== ---- rtems.orig/cpukit/posix/src/usleep.c 2007-08-15 01:51:58.000000000 +0200 -+++ rtems/cpukit/posix/src/usleep.c 2007-08-15 01:50:38.000000000 +0200 -@@ -15,8 +15,8 @@ - #include - - --unsigned usleep( -- unsigned int useconds -+int usleep( -+ useconds_t useconds - ) - { - struct timespec tp; diff --git a/rtems-patches/current/series b/rtems-patches/current/series index 894cea2..3b202e7 100644 --- a/rtems-patches/current/series +++ b/rtems-patches/current/series @@ -1,4 +1,3 @@ -#rtems-inttypes-wcs-disable-fix.patch rtems-m9328-pimx1-mapping-change.patch rtems-m9328-pimx1-baud-19200.patch rtems-m9328-pimx1-syncmclk.patch @@ -10,8 +9,5 @@ rtems-clone-ss555-to-ec555.patch rtems-ec555-add-to-configs.patch rtems-update-ss555-to-ec555.patch rtems-update-ss555-to-ec555-cpld-remove.patch -rtems-usleep-type-fix.patch -rtems-readlink-type-fix.patch rtems-m9328-pimx1-uart1to3.patch #rtems-m5235bcc-changes.patch -rtems-m9328-pimx1-uart1to3.patch -- 2.39.2