diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-07-12 16:20:41 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2011-07-12 16:20:41 +0000 |
| commit | 3f05b150dff6e3d5444597a2ab6f4e41ce970046 (patch) | |
| tree | 78061d0c3ef1d538fdb9bef9f34077641fcecb6a /c | |
| parent | 2011-07-12 Joel Sherrill <joel.sherrilL@OARcorp.com> (diff) | |
| download | rtems-3f05b150dff6e3d5444597a2ab6f4e41ce970046.tar.bz2 | |
2011-07-12 Joel Sherrill <joel.sherrilL@OARcorp.com>
* shared/start.S, shared/mvme/mvme16x_hw.h: Check on MVME167 at OAR
after RTC replaced.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/m68k/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h | 10 | ||||
| -rw-r--r-- | c/src/lib/libbsp/m68k/shared/start.S | 5 |
3 files changed, 11 insertions, 9 deletions
diff --git a/c/src/lib/libbsp/m68k/ChangeLog b/c/src/lib/libbsp/m68k/ChangeLog index 56c31f9f35..19d972946d 100644 --- a/c/src/lib/libbsp/m68k/ChangeLog +++ b/c/src/lib/libbsp/m68k/ChangeLog @@ -1,3 +1,8 @@ +2011-07-12 Joel Sherrill <joel.sherrilL@OARcorp.com> + + * shared/start.S, shared/mvme/mvme16x_hw.h: Check on MVME167 at OAR + after RTC replaced. + 2011-02-11 Ralf Corsépius <ralf.corsepius@rtems.org> * shared/gdbstub/m68k-stub.c: diff --git a/c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h b/c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h index 4225d28e36..31a3f9ccbd 100644 --- a/c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h +++ b/c/src/lib/libbsp/m68k/shared/mvme/mvme16x_hw.h @@ -246,13 +246,15 @@ typedef volatile struct nvram_config_ { /* * Flag to indicate if J1-4 is on (and parameters should be * sought in User Area NVRAM) + * + * NOTE: If NVRAM has bad settings, the you want to disable this + * on the MVME167. */ - #if defined(mvme167) -#define NVRAM_CONFIGURE \ - ( !( ( (unsigned char)(lcsr->vector_base & 0xFF) ) & 0x10 ) ) + #define NVRAM_CONFIGURE \ + ( !( ( (unsigned char)(lcsr->vector_base & 0xFF) ) & 0x10 ) ) #else -#define NVRAM_CONFIGURE 0 + #define NVRAM_CONFIGURE 0 #endif #ifdef __cplusplus diff --git a/c/src/lib/libbsp/m68k/shared/start.S b/c/src/lib/libbsp/m68k/shared/start.S index d4a0fbd95b..85910bb6e5 100644 --- a/c/src/lib/libbsp/m68k/shared/start.S +++ b/c/src/lib/libbsp/m68k/shared/start.S @@ -113,11 +113,6 @@ END_CODE BEGIN_DATA - PUBLIC (environ) - .align 2 -SYM (environ): - .long 0 - PUBLIC (start_frame) SYM (start_frame): .space 4,0 |