2 c/src/lib/libbsp/m68k/mo376/ChangeLog | 5 +
3 c/src/lib/libbsp/m68k/mo376/Makefile.am | 2
4 c/src/lib/libbsp/m68k/mo376/README | 25 ++++-----
5 c/src/lib/libbsp/m68k/mo376/clock/ckinit.c | 2
6 c/src/lib/libbsp/m68k/mo376/configure.ac | 2
7 c/src/lib/libbsp/m68k/mo376/console/sci.c | 4 -
8 c/src/lib/libbsp/m68k/mo376/include/bsp.h | 2
9 c/src/lib/libbsp/m68k/mo376/include/mo376.h | 70 ++++++++++++++++++++++++++
10 c/src/lib/libbsp/m68k/mo376/include/mrm332.h | 70 --------------------------
11 c/src/lib/libbsp/m68k/mo376/preinstall.am | 6 +-
12 c/src/lib/libbsp/m68k/mo376/start/start.S | 2
13 c/src/lib/libbsp/m68k/mo376/startup/start_c.c | 2
14 c/src/lib/libbsp/m68k/mo376/times | 6 +-
15 make/custom/mo376.cfg | 8 +-
16 14 files changed, 106 insertions(+), 100 deletions(-)
18 Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/start/start.S
19 ===================================================================
20 --- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/start/start.S 2009-11-29 01:11:56.463558538 +0100
21 +++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/start/start.S 2009-11-29 01:23:46.804588750 +0100
28 #include <rtems/asm.h>
29 #include <rtems/m68k/sim.h>
31 Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/bsp.h
32 ===================================================================
33 --- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/include/bsp.h 2007-12-11 16:49:20.000000000 +0100
34 +++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/bsp.h 2009-11-29 01:23:46.804588750 +0100
36 #include <rtems/clockdrv.h>
37 #include <rtems/console.h>
38 #include <rtems/iosupp.h>
41 #include <rtems/m68k/sim.h>
42 #include <rtems/m68k/qsm.h>
44 Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/ChangeLog
45 ===================================================================
46 --- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/ChangeLog 2008-12-08 06:15:06.000000000 +0100
47 +++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/ChangeLog 2009-11-29 01:28:09.931559632 +0100
49 +2009-11-27 Pavel Pisa <pisa@cmp.felk.cvut.cz>
51 + * MO376 BSP for PiKRON's MO_CPU1/MO_CPU2 board started
52 + as clone of MRM332 BSP.
54 2008-12-08 Ralf Corsépius <ralf.corsepius@rtems.org>
56 * bsp_specs: Backport from CVS-HEAD.
57 Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c
58 ===================================================================
59 --- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c 2008-09-06 00:05:15.000000000 +0200
60 +++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c 2009-11-29 01:23:46.808556503 +0100
64 #include <rtems/libio.h>
68 #define CLOCK_VECTOR MRM_PIV
70 Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/configure.ac
71 ===================================================================
72 --- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/configure.ac 2006-12-02 06:55:13.000000000 +0100
73 +++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/configure.ac 2009-11-29 01:23:46.808556503 +0100
75 ## $Id: configure.ac,v 1.16 2006/12/02 05:55:13 ralf Exp $
78 -AC_INIT([rtems-c-src-lib-libbsp-m68k-mrm332],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla])
79 +AC_INIT([rtems-c-src-lib-libbsp-m68k-mo376],[_RTEMS_VERSION],[http://www.rtems.org/bugzilla])
80 AC_CONFIG_SRCDIR([bsp_specs])
81 RTEMS_TOP(../../../../../..)
83 Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/README
84 ===================================================================
85 --- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/README 2009-11-29 01:11:56.471556761 +0100
86 +++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/README 2009-11-29 01:23:46.808556503 +0100
88 # $Id: README,v 1.1 2001/05/25 16:28:46 joel Exp $
94 -CPU: MC68332 @16 or 25MHz
99 +ROM: 1MiB or 2MiB flash
101 - The Mini RoboMind is a small board based on the 68332 microcontroller
102 -designed and build by Mark Castelluccio. For details, see:
103 + The mo376 BSP supports MO_CPU1/MO_CPU2 boards developed by PiKRON company.
104 +The design documentation conforms open-source mind of board authors
105 +and can be found on the company pages
107 - http://www.robominds.com
108 + http://www.pikron.com/en/main_frame_mo_cpu1.html
110 - This BSP was ported from the efi332 BSP by Matt Cross (profesor@gweep.net),
111 -the efi332 BSP was written by John S Gwynne.
112 + This BSP has been cloned from Mini RoboMind BSP written for small board based
113 +on the 68332 microcontroller designed and build by Mark Castelluccio
115 + The mrm332 BSP was ported from the efi332 BSP by Matt Cross (profesor@gweep.net),
116 +the efi332 was written by John S Gwynne.
120 -- integrate the interrupt driven stdin/stdout into RTEMS to (a) reduce
121 - the interrupt priority and (2) to prevent it from blocking.
122 -- add a timer driver for the tmtest set.
124 Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/Makefile.am
125 ===================================================================
126 --- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/Makefile.am 2008-09-29 03:47:41.000000000 +0200
127 +++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/Makefile.am 2009-11-29 01:23:46.812556872 +0100
129 nodist_include_HEADERS = include/bspopts.h
130 DISTCLEANFILES = include/bspopts.h
132 -include_HEADERS += include/mrm332.h
133 +include_HEADERS += include/mo376.h
134 nodist_include_HEADERS += ../../shared/include/coverhd.h
137 Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/console/sci.c
138 ===================================================================
139 --- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/console/sci.c 2008-08-19 12:23:15.000000000 +0200
140 +++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/console/sci.c 2009-11-29 01:23:46.812556872 +0100
143 /* system clock definitions, i dont have documentation on this... */
145 -#if 0 /* Not needed, this is provided in mrm332.h */
146 +#if 0 /* Not needed, this is provided in mo376.h */
147 #define XTAL 32768.0 /* crystal frequency in Hz */
148 #define NUMB_W 0 /* system clock parameters */
150 @@ -1215,7 +1215,7 @@
152 /* calculate the register value as a float and convert to an int */
153 /* set baud rate - you must define the system clock constant */
154 - /* see mrm332.h for an example */
155 + /* see mo376.h for an example */
157 value = ( (uint16_t) ( SYS_CLOCK / rate / 32.0 + 0.5 ) & 0x1fff );
159 Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/startup/start_c.c
160 ===================================================================
161 --- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/startup/start_c.c 2008-08-19 12:23:15.000000000 +0200
162 +++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/startup/start_c.c 2009-11-29 01:23:46.812556872 +0100
169 #include <rtems/m68k/sim.h>
172 Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/times
173 ===================================================================
174 --- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/times 2009-11-29 01:11:56.479557220 +0100
175 +++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/times 2009-11-29 01:23:46.816556473 +0100
178 -# Timing Test Suite Results for the MRM332 BSP
179 +# Timing Test Suite Results for the MO376 BSP
181 # $Id: times,v 1.2 2004/01/07 21:13:50 joel Exp $
185 TBD: MATT - update this with real times!
192 Memory Configuration: SRAM, DRAM, cache, etc
195 Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/mo376.h
196 ===================================================================
197 --- /dev/null 1970-01-01 00:00:00.000000000 +0000
198 +++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/mo376.h 2009-11-29 01:23:46.816556473 +0100
202 + * $Id: mo376.h,v 1.5 2004/04/21 16:01:35 ralf Exp $
208 +/* SIM_MM (SIM Module Mapping) determines the location of the control
209 + register block. When MM=0, register addresses range fom 0x7ff000 to
210 + 0x7FFFFF. When MM=1, register addresses range from 0xfff000 to
214 +/* Interrupt related definitions */
219 +#define ISRL_PIT 4 /* zero disables PIT */
221 +#define EFI_QIVR 66 /* 66=>SCI and 67=>QSPI interrupt */
224 +#define EFI_SPINT 24 /* spurious interrupt */
225 +#define EFI_INT1 25 /* CTS interrupt */
228 +/* System Clock definitions */
229 +#define XTAL 32768.0 /* crystal frequency in Hz */
232 +/* Default MRM clock rate (8.388688 MHz) set by CPU32: */
233 +#define MRM_W 0 /* system clock parameters */
240 +#define MRM_W 1 /* system clock parameters */
247 +#define MRM_W 1 /* system clock parameters */
252 +#define SYS_CLOCK (XTAL*4.0*(MRM_Y+1)*(1 << (2*MRM_W+MRM_X)))
253 +#define SCI_BAUD 19200 /* RS232 Baud Rate */
255 +/* macros/functions */
260 + * This prototype really should have the noreturn attribute but
261 + * that causes a warning. Not sure how to fix that.
263 +/* static void reboot(void) __attribute__ ((noreturn)); */
264 +static void reboot(void);
265 +__inline__ static void reboot() {asm("trap #15; .word 0x0063");}
269 +#endif /* _MRM_H_ */
270 Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/include/mrm332.h
271 ===================================================================
272 --- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/include/mrm332.h 2009-11-29 01:11:56.479557220 +0100
273 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000
277 - * $Id: mrm332.h,v 1.5 2004/04/21 16:01:35 ralf Exp $
283 -/* SIM_MM (SIM Module Mapping) determines the location of the control
284 - register block. When MM=0, register addresses range fom 0x7ff000 to
285 - 0x7FFFFF. When MM=1, register addresses range from 0xfff000 to
289 -/* Interrupt related definitions */
294 -#define ISRL_PIT 4 /* zero disables PIT */
296 -#define EFI_QIVR 66 /* 66=>SCI and 67=>QSPI interrupt */
299 -#define EFI_SPINT 24 /* spurious interrupt */
300 -#define EFI_INT1 25 /* CTS interrupt */
303 -/* System Clock definitions */
304 -#define XTAL 32768.0 /* crystal frequency in Hz */
307 -/* Default MRM clock rate (8.388688 MHz) set by CPU32: */
308 -#define MRM_W 0 /* system clock parameters */
315 -#define MRM_W 1 /* system clock parameters */
322 -#define MRM_W 1 /* system clock parameters */
327 -#define SYS_CLOCK (XTAL*4.0*(MRM_Y+1)*(1 << (2*MRM_W+MRM_X)))
328 -#define SCI_BAUD 19200 /* RS232 Baud Rate */
330 -/* macros/functions */
335 - * This prototype really should have the noreturn attribute but
336 - * that causes a warning. Not sure how to fix that.
338 -/* static void reboot(void) __attribute__ ((noreturn)); */
339 -static void reboot(void);
340 -__inline__ static void reboot() {asm("trap #15; .word 0x0063");}
344 -#endif /* _MRM_H_ */
345 Index: rtems-4.9.3/make/custom/mo376.cfg
346 ===================================================================
347 --- rtems-4.9.3.orig/make/custom/mo376.cfg 2009-11-29 01:21:43.173939736 +0100
348 +++ rtems-4.9.3/make/custom/mo376.cfg 2009-11-29 01:25:58.227563597 +0100
351 -# Config file for the mrm332 BSP
352 +# Config file for the mo376 BSP
354 -# $Id: mrm332.cfg,v 1.18 2008/06/11 08:17:27 ccj Exp $
355 +# $Id: mo376.cfg,v 1.18 2008/06/11 08:17:27 ccj Exp $
358 include $(RTEMS_ROOT)/make/custom/default.cfg
360 RTEMS_CPU_MODEL=m68332
362 # This is the actual bsp directory used during the build process.
363 -RTEMS_BSP_FAMILY=mrm332
364 +RTEMS_BSP_FAMILY=mo376
366 # This contains the compiler options necessary to select the CPU model
367 # and (hopefully) optimize for it.
369 ifeq ($(MRM_IN_ROM),yes)
370 # Build a rommable image - move the .data section after the .text section
372 -CPU_CFLAGS += -qnolinkcmds -T $(exec_prefix)/mrm332/lib/linkcmds_ROM
373 +CPU_CFLAGS += -qnolinkcmds -T $(exec_prefix)/mo376/lib/linkcmds_ROM
376 ifeq ($(MRM_IN_ROM),yes)
377 Index: rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/preinstall.am
378 ===================================================================
379 --- rtems-4.9.3.orig/c/src/lib/libbsp/m68k/mo376/preinstall.am 2009-11-29 01:11:56.483556820 +0100
380 +++ rtems-4.9.3/c/src/lib/libbsp/m68k/mo376/preinstall.am 2009-11-29 01:23:46.816556473 +0100
382 $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
383 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
385 -$(PROJECT_INCLUDE)/mrm332.h: include/mrm332.h $(PROJECT_INCLUDE)/$(dirstamp)
386 - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mrm332.h
387 -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mrm332.h
388 +$(PROJECT_INCLUDE)/mo376.h: include/mo376.h $(PROJECT_INCLUDE)/$(dirstamp)
389 + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mo376.h
390 +PREINSTALL_FILES += $(PROJECT_INCLUDE)/mo376.h
392 $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
393 $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h