diff options
| author | Joel Sherrill <joel.sherrill@oarcorp.com> | 2012-02-02 14:08:08 -0600 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@oarcorp.com> | 2012-02-02 14:19:11 -0600 |
| commit | c75430cd4146455f30fac193edaf26d6b0fde703 (patch) | |
| tree | 3391045658b7256e89db2dd45eb57c904cbfd27d /c/src/lib/libbsp/m68k/mvme162/startup | |
| parent | PR 1962/bsps - MVME162 Console Corrections and Improvements (diff) | |
| download | rtems-c75430cd4146455f30fac193edaf26d6b0fde703.tar.bz2 | |
PR 1962/bsps - MVME162 Console Corrections and Improvements
* console/console.c: char_ready() was never returning true so console
never processed input data
* console/console.c: added printk() support to default device
* include/bsp.h: Added #define for MOT_162BUG_VEC_ADDRESS
* startup/bspclean.c: Modified to use MOT_162BUG_VEC_ADDRESS
* startup/bspstart.c: Modified to use MOT_162BUG_VEC_ADDRESS
* make/custom/mvme162.cfg: Modified to use "RTEMS_CPU_MODEL=68lc040"
and "CPU_CFLAGS = -mcpu=68040 -msoft-float" so BSP will always
work with all board variations.
* README: Added notes on user required configuration changes and
information about board models and variants
* README.models: New file that contains a detailed list of MVME162
models and variants.
Signed-off-by: Vic Hoover <victor.hoover.ctr@navy.mil>
Diffstat (limited to 'c/src/lib/libbsp/m68k/mvme162/startup')
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c | 8 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c | 12 |
2 files changed, 3 insertions, 17 deletions
diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c b/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c index baa153690e..07adb1e1a0 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c +++ b/c/src/lib/libbsp/m68k/mvme162/startup/bspclean.c @@ -29,12 +29,8 @@ void bsp_return_to_monitor_trap(void) { page_table_teardown(); - lcsr->intr_ena = 0; /* disable interrupts */ -#if defined(mvme162lx) - m68k_set_vbr(0x00000000); /* restore 162Bug vectors */ -#else - m68k_set_vbr(0xFFE00000); /* restore 162Bug vectors */ -#endif + lcsr->intr_ena = 0; /* disable interrupts */ + m68k_set_vbr(MOT_162BUG_VEC_ADDRESS); /* restore 162Bug vectors */ __asm__ volatile( "trap #15" ); /* trap to 162Bug */ __asm__ volatile( ".short 0x63" ); /* return to 162Bug (.RETURN) */ diff --git a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c index a5c980a1a1..7e23b53f8f 100644 --- a/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c +++ b/c/src/lib/libbsp/m68k/mvme162/startup/bspstart.c @@ -34,17 +34,7 @@ void bsp_start( void ) m68k_isr_entry *monitors_vector_table; int index; - /* - * 162Bug Vectors are at 0xFFE00000 - * 162Bug Vectors on LX are at 0x00000000 - */ - -#if defined(mvme162lx) - monitors_vector_table = (m68k_isr_entry *)0x00000000; -#else - monitors_vector_table = (m68k_isr_entry *)0xFFE00000; -#endif - + monitors_vector_table = (m68k_isr_entry *)MOT_162BUG_VEC_ADDRESS; m68k_set_vbr( monitors_vector_table ); for ( index=2 ; index<=255 ; index++ ) |