summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2000-02-29 16:35:45 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2000-02-29 16:35:45 +0000
commit8eacefcc8b6411ea7c32199b09578590b6926e05 (patch)
tree75d1595ab925561a47726894eeda5f3f38864fd4
parent6f645ff33ad20374c1b719f250bc1cef91a39833 (diff)
downloadrtems-8eacefcc8b6411ea7c32199b09578590b6926e05.tar.bz2
BSP now compiles and links with CAVSL board information. This includes
linkcmds updated, simio references removed, and switch to libchip for serial ports from simio. Added a MEMORY_MAP file to capture information about the various addresses on this board. In addition, many of the beta patches are now included.
-rw-r--r--c/src/exec/score/cpu/c4x/rtems/score/c4x.h6
-rw-r--r--c/src/lib/libbsp/c4x/c4xsim/README4
-rw-r--r--c/src/lib/libbsp/c4x/c4xsim/include/Makefile.am4
-rw-r--r--c/src/lib/libbsp/c4x/shared/bspspuriousinit.c1
-rw-r--r--cpukit/score/cpu/c4x/rtems/score/c4x.h6
-rw-r--r--make/custom/c3xsim.cfg2
-rw-r--r--make/custom/c4xsim.cfg2
7 files changed, 10 insertions, 15 deletions
diff --git a/c/src/exec/score/cpu/c4x/rtems/score/c4x.h b/c/src/exec/score/cpu/c4x/rtems/score/c4x.h
index fe1d2cd139..d3ef758693 100644
--- a/c/src/exec/score/cpu/c4x/rtems/score/c4x.h
+++ b/c/src/exec/score/cpu/c4x/rtems/score/c4x.h
@@ -329,7 +329,7 @@ static inline void * c4x_get_ittp(void)
register unsigned int _if_value;
__asm__( "ldi if, %0" : "=r" (_if_value) );
- return (void *)((_if_value & 0xffff) >> 8);
+ return (void *)((_if_value & 0xffff0000) >> 8);
}
static inline void c4x_set_ittp(void *_ittp_value)
@@ -343,8 +343,8 @@ static inline void c4x_set_ittp(void *_ittp_value)
_if_value = c3x_get_if();
#endif
_if_value &= 0xffff;
- _ittp_field = (((unsigned int) _ittp_value) << 8);
- _if_value |= _ittp_field;
+ _ittp_field = (((unsigned int) _ittp_value) >> 8);
+ _if_value |= _ittp_field << 16 ;
#ifdef _TMS320C40
c4x_set_iif( _if_value );
#else
diff --git a/c/src/lib/libbsp/c4x/c4xsim/README b/c/src/lib/libbsp/c4x/c4xsim/README
index 8bb3beda0d..4bb72fe8d9 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/README
+++ b/c/src/lib/libbsp/c4x/c4xsim/README
@@ -5,7 +5,7 @@
BSP NAME: c4xsim
BOARD: Simulator in GDB
BUS: N/A
-CPU FAMILY: ppc
+CPU FAMILY: C3X/C4X
CPU: C32 and others
COPROCESSORS: N/A
MODE: 32 bit mode
@@ -14,7 +14,7 @@ DEBUG MONITOR: gdb simulator
PERIPHERALS
===========
-TIMERS: PPC internal Timebase register
+TIMERS: Internal Timer
RESOLUTION: ???
SERIAL PORTS: simulated via
REAL-TIME CLOCK: ???
diff --git a/c/src/lib/libbsp/c4x/c4xsim/include/Makefile.am b/c/src/lib/libbsp/c4x/c4xsim/include/Makefile.am
index 4175fb0d1b..ffaffc58e4 100644
--- a/c/src/lib/libbsp/c4x/c4xsim/include/Makefile.am
+++ b/c/src/lib/libbsp/c4x/c4xsim/include/Makefile.am
@@ -26,7 +26,3 @@ all-local: $(PREINSTALL_FILES)
EXTRA_DIST = bsp.h
include $(top_srcdir)/../../../../../../automake/local.am
-
-H_FILES = $(srcdir)/../../../shared/include/coverhd.h \
- $(srcdir)/bsp.h $(srcdir)/simio.h $(srcdir)/../../../shared/include/bspIo.h
-
diff --git a/c/src/lib/libbsp/c4x/shared/bspspuriousinit.c b/c/src/lib/libbsp/c4x/shared/bspspuriousinit.c
index 9573b6bfcc..6c82b5c9f6 100644
--- a/c/src/lib/libbsp/c4x/shared/bspspuriousinit.c
+++ b/c/src/lib/libbsp/c4x/shared/bspspuriousinit.c
@@ -16,7 +16,6 @@
#include <bsp.h>
#include <bspIo.h>
-#include <simio.h>
/*
* bsp_spurious_initialize
diff --git a/cpukit/score/cpu/c4x/rtems/score/c4x.h b/cpukit/score/cpu/c4x/rtems/score/c4x.h
index fe1d2cd139..d3ef758693 100644
--- a/cpukit/score/cpu/c4x/rtems/score/c4x.h
+++ b/cpukit/score/cpu/c4x/rtems/score/c4x.h
@@ -329,7 +329,7 @@ static inline void * c4x_get_ittp(void)
register unsigned int _if_value;
__asm__( "ldi if, %0" : "=r" (_if_value) );
- return (void *)((_if_value & 0xffff) >> 8);
+ return (void *)((_if_value & 0xffff0000) >> 8);
}
static inline void c4x_set_ittp(void *_ittp_value)
@@ -343,8 +343,8 @@ static inline void c4x_set_ittp(void *_ittp_value)
_if_value = c3x_get_if();
#endif
_if_value &= 0xffff;
- _ittp_field = (((unsigned int) _ittp_value) << 8);
- _if_value |= _ittp_field;
+ _ittp_field = (((unsigned int) _ittp_value) >> 8);
+ _if_value |= _ittp_field << 16 ;
#ifdef _TMS320C40
c4x_set_iif( _if_value );
#else
diff --git a/make/custom/c3xsim.cfg b/make/custom/c3xsim.cfg
index c3fc60993a..51541a9df6 100644
--- a/make/custom/c3xsim.cfg
+++ b/make/custom/c3xsim.cfg
@@ -4,7 +4,7 @@
# $Id$
#
-RTEMS_BSP=c3sxim
+RTEMS_BSP=c3xsim
RTEMS_CPU_MODEL=c32
CPU_CFLAGS = -mcpu=32
diff --git a/make/custom/c4xsim.cfg b/make/custom/c4xsim.cfg
index bf7a04dffe..6f2c10be50 100644
--- a/make/custom/c4xsim.cfg
+++ b/make/custom/c4xsim.cfg
@@ -1,5 +1,5 @@
#
-# Config file for the "bare" BSP
+# Configuration file for the GDB C4x simulator
#
# $Id$
#