1 Index: rtems/c/src/lib/libbsp/m68k/mo376/start/start.S
2 ===================================================================
3 --- rtems.orig/c/src/lib/libbsp/m68k/mo376/start/start.S
4 +++ rtems/c/src/lib/libbsp/m68k/mo376/start/start.S
11 #include <rtems/asm.h>
12 #include <rtems/m68k/sim.h>
14 Index: rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h
15 ===================================================================
16 --- rtems.orig/c/src/lib/libbsp/m68k/mo376/include/bsp.h
17 +++ rtems/c/src/lib/libbsp/m68k/mo376/include/bsp.h
18 @@ -26,7 +26,7 @@ extern "C" {
19 #include <rtems/clockdrv.h>
20 #include <rtems/console.h>
21 #include <rtems/iosupp.h>
24 #include <rtems/m68k/sim.h>
25 #include <rtems/m68k/qsm.h>
27 Index: rtems/c/src/lib/libbsp/m68k/mo376/ChangeLog
28 ===================================================================
29 --- rtems.orig/c/src/lib/libbsp/m68k/mo376/ChangeLog
30 +++ rtems/c/src/lib/libbsp/m68k/mo376/ChangeLog
33 * include/bsp.h: New header guard.
35 +2005-04-08 Pavel Pisa <pisa@cmp.felk.cvut.cz>
37 + * MO376 BSP for PiKRON's MO_CPU1/MO_CPU2 board started
38 + as clone of MRM332 BSP.
40 2005-01-07 Ralf Corsepius <ralf.corsepius@rtems.org>
42 * Makefile.am: Eliminate CFLAGS_OPTIMIZE_V.
43 Index: rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c
44 ===================================================================
45 --- rtems.orig/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c
46 +++ rtems/c/src/lib/libbsp/m68k/mo376/clock/ckinit.c
50 #include <rtems/libio.h>
54 #define CLOCK_VECTOR MRM_PIV
56 Index: rtems/c/src/lib/libbsp/m68k/mo376/configure.ac
57 ===================================================================
58 --- rtems.orig/c/src/lib/libbsp/m68k/mo376/configure.ac
59 +++ rtems/c/src/lib/libbsp/m68k/mo376/configure.ac
61 ## $Id: configure.ac,v 1.14 2004/09/24 06:32:09 ralf Exp $
64 -AC_INIT([rtems-c-src-lib-libbsp-m68k-mrm332],[_RTEMS_VERSION],[rtems-bugs@rtems.com])
65 +AC_INIT([rtems-c-src-lib-libbsp-m68k-mo376],[_RTEMS_VERSION],[rtems-bugs@rtems.com])
66 AC_CONFIG_SRCDIR([bsp_specs])
67 RTEMS_TOP(../../../../../..)
69 Index: rtems/c/src/lib/libbsp/m68k/mo376/README
70 ===================================================================
71 --- rtems.orig/c/src/lib/libbsp/m68k/mo376/README
72 +++ rtems/c/src/lib/libbsp/m68k/mo376/README
74 # $Id: README,v 1.1 2001/05/25 16:28:46 joel Exp $
80 -CPU: MC68332 @16 or 25MHz
85 +ROM: 1MiB or 2MiB flash
87 - The Mini RoboMind is a small board based on the 68332 microcontroller
88 -designed and build by Mark Castelluccio. For details, see:
89 + The mo376 BSP supports MO_CPU1/MO_CPU2 boards developed by PiKRON company.
90 +The design documentation conforms open-source mind of board authors
91 +and can be found on the company pages
93 - http://www.robominds.com
94 + http://www.pikron.com/en/main_frame_mo_cpu1.html
96 - This BSP was ported from the efi332 BSP by Matt Cross (profesor@gweep.net),
97 -the efi332 BSP was written by John S Gwynne.
98 + This BSP has been cloned from Mini RoboMind BSP written for small board based
99 +on the 68332 microcontroller designed and build by Mark Castelluccio
101 + The mrm332 BSP was ported from the efi332 BSP by Matt Cross (profesor@gweep.net),
102 +the efi332 was written by John S Gwynne.
106 -- integrate the interrupt driven stdin/stdout into RTEMS to (a) reduce
107 - the interrupt priority and (2) to prevent it from blocking.
108 -- add a timer driver for the tmtest set.
110 Index: rtems/c/src/lib/libbsp/m68k/mo376/Makefile.am
111 ===================================================================
112 --- rtems.orig/c/src/lib/libbsp/m68k/mo376/Makefile.am
113 +++ rtems/c/src/lib/libbsp/m68k/mo376/Makefile.am
114 @@ -16,7 +16,7 @@ nodist_include_HEADERS = include/bspopts
115 DISTCLEANFILES = include/bspopts.h
118 -include_HEADERS += include/mrm332.h
119 +include_HEADERS += include/mo376.h
120 nodist_include_HEADERS += ../../shared/include/coverhd.h
123 Index: rtems/c/src/lib/libbsp/m68k/mo376/console/sci.c
124 ===================================================================
125 --- rtems.orig/c/src/lib/libbsp/m68k/mo376/console/sci.c
126 +++ rtems/c/src/lib/libbsp/m68k/mo376/console/sci.c
129 // system clock definitions, i dont have documentation on this...
131 -#if 0 // Not needed, this is provided in mrm332.h
132 +#if 0 // Not needed, this is provided in mo376.h
133 #define XTAL 32768.0 // crystal frequency in Hz
134 #define NUMB_W 0 // system clock parameters
136 @@ -1238,7 +1238,7 @@ static void SciSetBaud(uint32_t rate)
138 // calculate the register value as a float and convert to an int
139 // set baud rate - you must define the system clock constant
140 - // see mrm332.h for an example
141 + // see mo376.h for an example
143 value = ( (uint16_t) ( SYS_CLOCK / rate / 32.0 + 0.5 ) & 0x1fff );
145 Index: rtems/c/src/lib/libbsp/m68k/mo376/startup/start_c.c
146 ===================================================================
147 --- rtems.orig/c/src/lib/libbsp/m68k/mo376/startup/start_c.c
148 +++ rtems/c/src/lib/libbsp/m68k/mo376/startup/start_c.c
155 #include <rtems/m68k/sim.h>
158 Index: rtems/c/src/lib/libbsp/m68k/mo376/times
159 ===================================================================
160 --- rtems.orig/c/src/lib/libbsp/m68k/mo376/times
161 +++ rtems/c/src/lib/libbsp/m68k/mo376/times
164 -# Timing Test Suite Results for the MRM332 BSP
165 +# Timing Test Suite Results for the MO376 BSP
167 # $Id: times,v 1.2 2004/01/07 21:13:50 joel Exp $
169 @@ -8,9 +8,9 @@ NOTE: This BSP is user submitted and no
171 TBD: MATT - update this with real times!
178 Memory Configuration: SRAM, DRAM, cache, etc
181 Index: rtems/c/src/lib/libbsp/m68k/mo376/include/mo376.h
182 ===================================================================
184 +++ rtems/c/src/lib/libbsp/m68k/mo376/include/mo376.h
188 + * $Id: mo376.h,v 1.5 2004/04/21 16:01:35 ralf Exp $
194 +/* SIM_MM (SIM Module Mapping) determines the location of the control
195 + register block. When MM=0, register addresses range fom 0x7ff000 to
196 + 0x7FFFFF. When MM=1, register addresses range from 0xfff000 to
200 +/* Interrupt related definitions */
205 +#define ISRL_PIT 4 /* zero disables PIT */
207 +#define EFI_QIVR 66 /* 66=>SCI and 67=>QSPI interrupt */
210 +#define EFI_SPINT 24 /* spurious interrupt */
211 +#define EFI_INT1 25 /* CTS interrupt */
214 +/* System Clock definitions */
215 +#define XTAL 32768.0 /* crystal frequency in Hz */
218 +/* Default MRM clock rate (8.388688 MHz) set by CPU32: */
219 +#define MRM_W 0 /* system clock parameters */
226 +#define MRM_W 1 /* system clock parameters */
233 +#define MRM_W 1 /* system clock parameters */
238 +#define SYS_CLOCK (XTAL*4.0*(MRM_Y+1)*(1 << (2*MRM_W+MRM_X)))
239 +#define SCI_BAUD 19200 /* RS232 Baud Rate */
241 +/* macros/functions */
246 + * This prototype really should have the noreturn attribute but
247 + * that causes a warning. Not sure how to fix that.
249 +/* static void reboot(void) __attribute__ ((noreturn)); */
250 +static void reboot(void);
251 +__inline__ static void reboot() {asm("trap #15; .word 0x0063");}
255 +#endif /* _MRM_H_ */
256 Index: rtems/c/src/lib/libbsp/m68k/mo376/include/mrm332.h
257 ===================================================================
258 --- rtems.orig/c/src/lib/libbsp/m68k/mo376/include/mrm332.h
263 - * $Id: mrm332.h,v 1.5 2004/04/21 16:01:35 ralf Exp $
269 -/* SIM_MM (SIM Module Mapping) determines the location of the control
270 - register block. When MM=0, register addresses range fom 0x7ff000 to
271 - 0x7FFFFF. When MM=1, register addresses range from 0xfff000 to
275 -/* Interrupt related definitions */
280 -#define ISRL_PIT 4 /* zero disables PIT */
282 -#define EFI_QIVR 66 /* 66=>SCI and 67=>QSPI interrupt */
285 -#define EFI_SPINT 24 /* spurious interrupt */
286 -#define EFI_INT1 25 /* CTS interrupt */
289 -/* System Clock definitions */
290 -#define XTAL 32768.0 /* crystal frequency in Hz */
293 -/* Default MRM clock rate (8.388688 MHz) set by CPU32: */
294 -#define MRM_W 0 /* system clock parameters */
301 -#define MRM_W 1 /* system clock parameters */
308 -#define MRM_W 1 /* system clock parameters */
313 -#define SYS_CLOCK (XTAL*4.0*(MRM_Y+1)*(1 << (2*MRM_W+MRM_X)))
314 -#define SCI_BAUD 19200 /* RS232 Baud Rate */
316 -/* macros/functions */
321 - * This prototype really should have the noreturn attribute but
322 - * that causes a warning. Not sure how to fix that.
324 -/* static void reboot(void) __attribute__ ((noreturn)); */
325 -static void reboot(void);
326 -__inline__ static void reboot() {asm("trap #15; .word 0x0063");}
330 -#endif /* _MRM_H_ */
331 Index: rtems/make/custom/mo376.cfg
332 ===================================================================
333 --- rtems.orig/make/custom/mo376.cfg
334 +++ rtems/make/custom/mo376.cfg
337 -# Config file for the mrm332 BSP
338 +# Config file for the mo376 BSP
340 -# $Id: mrm332.cfg,v 1.8 2004/02/04 16:50:30 ralf Exp $
341 +# $Id: mo376.cfg,v 1.8 2004/02/04 16:50:30 ralf Exp $
344 include $(RTEMS_ROOT)/make/custom/default.cfg
345 @@ -10,7 +10,7 @@ RTEMS_CPU=m68k
346 RTEMS_CPU_MODEL=m68332
348 # This is the actual bsp directory used during the build process.
349 -RTEMS_BSP_FAMILY=mrm332
350 +RTEMS_BSP_FAMILY=mo376
352 # This contains the compiler options necessary to select the CPU model
353 # and (hopefully) optimize for it.
354 @@ -26,7 +26,7 @@ CFLAGS_OPTIMIZE_V=-O4 -fomit-frame-point
355 ifeq ($(MRM_IN_ROM),yes)
356 # Build a rommable image - move the .data section after the .text section
358 -CPU_CFLAGS += -qnolinkcmds -T $(exec_prefix)/mrm332/lib/linkcmds_ROM
359 +CPU_CFLAGS += -qnolinkcmds -T $(exec_prefix)/mo376/lib/linkcmds_ROM
361 # This is a good way to get debug information. The output file is large
362 # though and greatly slows the build process so only do this if needed.
363 Index: rtems/c/src/lib/libbsp/m68k/mo376/preinstall.am
364 ===================================================================
365 --- rtems.orig/c/src/lib/libbsp/m68k/mo376/preinstall.am
366 +++ rtems/c/src/lib/libbsp/m68k/mo376/preinstall.am
367 @@ -44,9 +44,9 @@ $(PROJECT_INCLUDE)/bspopts.h: include/bs
368 $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
369 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h
371 -$(PROJECT_INCLUDE)/mrm332.h: include/mrm332.h $(PROJECT_INCLUDE)/$(dirstamp)
372 - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mrm332.h
373 -PREINSTALL_FILES += $(PROJECT_INCLUDE)/mrm332.h
374 +$(PROJECT_INCLUDE)/mo376.h: include/mo376.h $(PROJECT_INCLUDE)/$(dirstamp)
375 + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mo376.h
376 +PREINSTALL_FILES += $(PROJECT_INCLUDE)/mo376.h
378 $(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
379 $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h