X-Git-Url: http://rtime.felk.cvut.cz/gitweb/rtems-devel.git/blobdiff_plain/b43d26bd4d8cb9dda0fe9be21883dffde1f775af..e3003e37814bd44142fd2965a72b8f8b9c95dfb4:/rtems-patches/current/rtems-update-mrm332-to-mo376.patch diff --git a/rtems-patches/current/rtems-update-mrm332-to-mo376.patch b/rtems-patches/current/rtems-update-mrm332-to-mo376.patch deleted file mode 100644 index 4fff5d7..0000000 --- a/rtems-patches/current/rtems-update-mrm332-to-mo376.patch +++ /dev/null @@ -1,393 +0,0 @@ ---- - c/src/lib/libbsp/m68k/mo376/ChangeLog | 5 + - c/src/lib/libbsp/m68k/mo376/Makefile.am | 2 - c/src/lib/libbsp/m68k/mo376/README | 25 ++++----- - c/src/lib/libbsp/m68k/mo376/clock/ckinit.c | 2 - c/src/lib/libbsp/m68k/mo376/configure.ac | 2 - c/src/lib/libbsp/m68k/mo376/console/sci.c | 4 - - c/src/lib/libbsp/m68k/mo376/include/bsp.h | 2 - c/src/lib/libbsp/m68k/mo376/include/mo376.h | 70 ++++++++++++++++++++++++++ - c/src/lib/libbsp/m68k/mo376/include/mrm332.h | 70 -------------------------- - c/src/lib/libbsp/m68k/mo376/preinstall.am | 6 +- - 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 | 8 +- - 14 files changed, 106 insertions(+), 100 deletions(-) - -Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/start/start.S -=================================================================== ---- 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 - */ - --#include "mrm332.h" -+#include "mo376.h" - #include - #include - -Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/bsp.h -=================================================================== ---- 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 - #include --#include -+#include - #include - #include - -Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/ChangeLog -=================================================================== ---- 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. -+ - 2008-12-08 Ralf Corsépius - - * bsp_specs: Backport from CVS-HEAD. -Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c -=================================================================== ---- 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 - #include --#include -+#include - - #define CLOCK_VECTOR MRM_PIV - -Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/configure.ac -=================================================================== ---- 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.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]) -+AC_INIT([rtems-c-src-lib-libbsp-m68k-mo376],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla]) - AC_CONFIG_SRCDIR([bsp_specs]) - RTEMS_TOP(../../../../../..) - -Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/README -=================================================================== ---- 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 $ - # - --Description: mrm332 -+Description: mo376 - ============ --CPU: MC68332 @16 or 25MHz --RAM: 32k or 512k --ROM: 512k flash -+CPU: MC68376 @21MHz -+RAM: 1MiB or 2MiB -+ROM: 1MiB or 2MiB flash - -- The Mini RoboMind is a small board based on the 68332 microcontroller --designed and build by Mark Castelluccio. For details, see: -+ The mo376 BSP supports MO_CPU1/MO_CPU2 boards developed by PiKRON company. -+The design documentation conforms open-source mind of board authors -+and can be found on the company pages - -- http://www.robominds.com -+ http://www.pikron.com/en/main_frame_mo_cpu1.html - -- This BSP was ported from the efi332 BSP by Matt Cross (profesor@gweep.net), --the efi332 BSP was written by John S Gwynne. -+ This BSP has been cloned from Mini RoboMind BSP written for small board based -+on the 68332 microcontroller designed and build by Mark Castelluccio -+ -+ The mrm332 BSP was ported from the efi332 BSP by Matt Cross (profesor@gweep.net), -+the efi332 was written by John S Gwynne. - - TODO: - ===== --- integrate the interrupt driven stdin/stdout into RTEMS to (a) reduce -- the interrupt priority and (2) to prevent it from blocking. --- add a timer driver for the tmtest set. - -Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/Makefile.am -=================================================================== ---- 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 - --include_HEADERS += include/mrm332.h -+include_HEADERS += include/mo376.h - nodist_include_HEADERS += ../../shared/include/coverhd.h - - EXTRA_DIST = times -Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/console/sci.c -=================================================================== ---- 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... */ - --#if 0 /* Not needed, this is provided in mrm332.h */ -+#if 0 /* Not needed, this is provided in mo376.h */ - #define XTAL 32768.0 /* crystal frequency in Hz */ - #define NUMB_W 0 /* system clock parameters */ - #define NUMB_X 1 -@@ -1215,7 +1215,7 @@ - - /* calculate the register value as a float and convert to an int */ - /* set baud rate - you must define the system clock constant */ -- /* see mrm332.h for an example */ -+ /* see mo376.h for an example */ - - value = ( (uint16_t) ( SYS_CLOCK / rate / 32.0 + 0.5 ) & 0x1fff ); - -Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/startup/start_c.c -=================================================================== ---- 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 - */ - --#include -+#include - #include - #define __START_C__ - #include "bsp.h" -Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/times -=================================================================== ---- 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 -+# Timing Test Suite Results for the MO376 BSP - # - # $Id: times,v 1.2 2004/01/07 21:13:50 joel Exp $ - # -@@ -8,9 +8,9 @@ - - TBD: MATT - update this with real times! - --Board: MRM332 -+Board: MO376 - CPU: 68332 --Clock Speed: 20 Mhz -+Clock Speed: 21 Mhz - Memory Configuration: SRAM, DRAM, cache, etc - Wait States: - -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-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 -+ * -+ * $Id: mo376.h,v 1.5 2004/04/21 16:01:35 ralf Exp $ -+ */ -+ -+#ifndef _MO376_H_ -+#define _MO376_H_ -+ -+/* SIM_MM (SIM Module Mapping) determines the location of the control -+ register block. When MM=0, register addresses range fom 0x7ff000 to -+ 0x7FFFFF. When MM=1, register addresses range from 0xfff000 to -+ 0xffffff. */ -+#define SIM_MM 1 -+ -+/* Interrupt related definitions */ -+#define SIM_IARB 15 -+#define QSM_IARB 10 -+ -+#define MRM_PIV 64 -+#define ISRL_PIT 4 /* zero disables PIT */ -+ -+#define EFI_QIVR 66 /* 66=>SCI and 67=>QSPI interrupt */ -+#define ISRL_QSPI 0 -+ -+#define EFI_SPINT 24 /* spurious interrupt */ -+#define EFI_INT1 25 /* CTS interrupt */ -+#define ISRL_SCI 6 -+ -+/* System Clock definitions */ -+#define XTAL 32768.0 /* crystal frequency in Hz */ -+ -+#if 0 -+/* Default MRM clock rate (8.388688 MHz) set by CPU32: */ -+#define MRM_W 0 /* system clock parameters */ -+#define MRM_X 0 -+#define MRM_Y 0x3f -+#endif -+ -+#if 1 -+/* 16.77722 MHz: */ -+#define MRM_W 1 /* system clock parameters */ -+#define MRM_X 1 -+#define MRM_Y 0x0f -+#endif -+ -+#if 0 -+/* 25.16582 MHz: */ -+#define MRM_W 1 /* system clock parameters */ -+#define MRM_X 1 -+#define MRM_Y 0x17 -+#endif -+ -+#define SYS_CLOCK (XTAL*4.0*(MRM_Y+1)*(1 << (2*MRM_W+MRM_X))) -+#define SCI_BAUD 19200 /* RS232 Baud Rate */ -+ -+/* macros/functions */ -+ -+#ifndef ASM -+ -+/* -+ * This prototype really should have the noreturn attribute but -+ * that causes a warning. Not sure how to fix that. -+ */ -+/* static void reboot(void) __attribute__ ((noreturn)); */ -+static void reboot(void); -+__inline__ static void reboot() {asm("trap #15; .word 0x0063");} -+ -+#endif /* ASM */ -+ -+#endif /* _MRM_H_ */ -Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/mrm332.h -=================================================================== ---- 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 -- * -- * $Id: mrm332.h,v 1.5 2004/04/21 16:01:35 ralf Exp $ -- */ -- --#ifndef _MRM332_H_ --#define _MRM332_H_ -- --/* SIM_MM (SIM Module Mapping) determines the location of the control -- register block. When MM=0, register addresses range fom 0x7ff000 to -- 0x7FFFFF. When MM=1, register addresses range from 0xfff000 to -- 0xffffff. */ --#define SIM_MM 1 -- --/* Interrupt related definitions */ --#define SIM_IARB 15 --#define QSM_IARB 10 -- --#define MRM_PIV 64 --#define ISRL_PIT 4 /* zero disables PIT */ -- --#define EFI_QIVR 66 /* 66=>SCI and 67=>QSPI interrupt */ --#define ISRL_QSPI 0 -- --#define EFI_SPINT 24 /* spurious interrupt */ --#define EFI_INT1 25 /* CTS interrupt */ --#define ISRL_SCI 6 -- --/* System Clock definitions */ --#define XTAL 32768.0 /* crystal frequency in Hz */ -- --#if 0 --/* Default MRM clock rate (8.388688 MHz) set by CPU32: */ --#define MRM_W 0 /* system clock parameters */ --#define MRM_X 0 --#define MRM_Y 0x3f --#endif -- --#if 1 --/* 16.77722 MHz: */ --#define MRM_W 1 /* system clock parameters */ --#define MRM_X 1 --#define MRM_Y 0x0f --#endif -- --#if 0 --/* 25.16582 MHz: */ --#define MRM_W 1 /* system clock parameters */ --#define MRM_X 1 --#define MRM_Y 0x17 --#endif -- --#define SYS_CLOCK (XTAL*4.0*(MRM_Y+1)*(1 << (2*MRM_W+MRM_X))) --#define SCI_BAUD 19200 /* RS232 Baud Rate */ -- --/* macros/functions */ -- --#ifndef ASM -- --/* -- * This prototype really should have the noreturn attribute but -- * that causes a warning. Not sure how to fix that. -- */ --/* static void reboot(void) __attribute__ ((noreturn)); */ --static void reboot(void); --__inline__ static void reboot() {asm("trap #15; .word 0x0063");} -- --#endif /* ASM */ -- --#endif /* _MRM_H_ */ -Index: rtems-4.9.3/make/custom/mo376.cfg -=================================================================== ---- 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 - - # This is the actual bsp directory used during the build process. --RTEMS_BSP_FAMILY=mrm332 -+RTEMS_BSP_FAMILY=mo376 - - # This contains the compiler options necessary to select the CPU model - # and (hopefully) optimize for it. -@@ -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 - - ifeq ($(MRM_IN_ROM),yes) -Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/preinstall.am -=================================================================== ---- 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 - --$(PROJECT_INCLUDE)/mrm332.h: include/mrm332.h $(PROJECT_INCLUDE)/$(dirstamp) -- $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mrm332.h --PREINSTALL_FILES += $(PROJECT_INCLUDE)/mrm332.h -+$(PROJECT_INCLUDE)/mo376.h: include/mo376.h $(PROJECT_INCLUDE)/$(dirstamp) -+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mo376.h -+PREINSTALL_FILES += $(PROJECT_INCLUDE)/mo376.h - - $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h