diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-02-28 23:10:39 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2002-02-28 23:10:39 +0000 |
| commit | 274fa77780179280bf5809a0f45271186515ac43 (patch) | |
| tree | acb4cc15d8f8199481335a916faee1f29d1ebb45 /c/src/lib/libbsp/m68k/mrm332/include/mrm332.h | |
| parent | 2002-02-28 Victor V. Vengerov <vvv@oktet.ru> (diff) | |
| download | rtems-274fa77780179280bf5809a0f45271186515ac43.tar.bz2 | |
2002-02-28 Mike Panetta <ahuitzot@mindspring.com>
* console/sci.c, console/sci.h,
console/console.c: Added new SCI driver.
* start/start.c: Removed file.
* start/start.S: New file, the asm portion of the updated start code.
* start/configure.am: Added start.S, removed start.c
* startup/start_c.c: New file, the C portion of the updated start code. Contains most of the code that was in the old start.c.
* startup/configure.am: Added start_c.c to C_FILES.
* include/bsp.h: Added include <rtems/bspIo.h>
Diffstat (limited to '')
| -rw-r--r-- | c/src/lib/libbsp/m68k/mrm332/include/mrm332.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h b/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h index c0ef0a7d6c..c7cbbfa797 100644 --- a/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h +++ b/c/src/lib/libbsp/m68k/mrm332/include/mrm332.h @@ -33,7 +33,7 @@ /* System Clock definitions */ #define XTAL 32768.0 /* crystal frequency in Hz */ -#if 0 +#if 1 /* Default MRM clock rate (8.388688 MHz) set by CPU32: */ #define MRM_W 0 /* system clock parameters */ #define MRM_X 0 @@ -47,7 +47,7 @@ #define MRM_Y 0x0f #endif -#if 1 +#if 0 /* 25.16582 MHz: */ #define MRM_W 1 /* system clock parameters */ #define MRM_X 1 @@ -60,6 +60,8 @@ /* macros/functions */ +#ifndef ASM + /* * This prototype really should have the noreturn attribute but * that causes a warning. Not sure how to fix that. @@ -68,4 +70,6 @@ static void reboot(void); __inline__ static void reboot() {asm("trap #15; .word 0x0063");} +#endif /* ASM */ + #endif /* _MRM_H_ */ |