diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-14 17:07:54 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-06-14 17:07:54 +0000 |
| commit | ac8154305172ebcb347f5563dd3ce17d95b4736b (patch) | |
| tree | 6f24392d14911a8911b287a8b478016c40cb3a26 /c/src/lib/libcpu/sh/sh7032/score | |
| parent | Moved PowerPC cache management code to libcpu. Also compiled (diff) | |
| download | rtems-ac8154305172ebcb347f5563dd3ce17d95b4736b.tar.bz2 | |
Patch rtems-rc-20000614-sh.tar.gz from Ralf Corsepius
<corsepiu@faw.uni-ulm.de> that migrates the SH port to
multilib'ing. This patch involved moving a number of
files in the CVS repository, adding new files, and
deleting files from their previous location. Ralf
gave good instructions (not repeated here) and here
are his notes:
Note 1: In this version, I did not change the installation points of
the headers which are moved inside of the source-tree. This is a
temporary hack for not breaking compatibility with 4.5 based BSPs,
but will probably not last once having real multilibs (We would have
include file conflicts when several BSPs/CPU_MODELS share a common
installation prefix).
Note 2: I hope not to have broken too much, but I would not be
astonished if something goes wrong.
Note 3: There are more patches to come :)
Diffstat (limited to '')
| -rw-r--r-- | c/src/lib/libcpu/sh/sh7032/score/Makefile.am | 30 | ||||
| -rw-r--r-- | c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c | 6 | ||||
| -rw-r--r-- | c/src/lib/libcpu/sh/sh7032/score/ispsh7032.c | 4 |
3 files changed, 30 insertions, 10 deletions
diff --git a/c/src/lib/libcpu/sh/sh7032/score/Makefile.am b/c/src/lib/libcpu/sh/sh7032/score/Makefile.am new file mode 100644 index 0000000000..2c4e423fbe --- /dev/null +++ b/c/src/lib/libcpu/sh/sh7032/score/Makefile.am @@ -0,0 +1,30 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +PGM = $(ARCH)/score.rel + +C_FILES = cpu_asm.c ispsh7032.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) + +OBJS = $(C_O_FILES) + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am + +# +# (OPTIONAL) Add local stuff here using += +# + +$(PGM): $(OBJS) + $(make-rel) + +all-local: $(ARCH) $(OBJS) $(PGM) + +.PRECIOUS: $(PGM) + +EXTRA_DIST = ispsh7032.c + +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c b/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c index 192c2f43d2..41c2c07475 100644 --- a/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c +++ b/c/src/lib/libcpu/sh/sh7032/score/cpu_asm.c @@ -43,14 +43,8 @@ #include <rtems/score/thread.h> #include <rtems/score/sh.h> -#if defined(sh7032) #include <rtems/score/ispsh7032.h> #include <rtems/score/iosh7032.h> -#elif defined (sh7045) -#include <rtems/score/ispsh7045.h> -#include <rtems/score/iosh7045.h> -#endif - #include <rtems/score/sh_io.h> /* from cpu_isps.c */ diff --git a/c/src/lib/libcpu/sh/sh7032/score/ispsh7032.c b/c/src/lib/libcpu/sh/sh7032/score/ispsh7032.c index 9fcc9badbf..b8e443ea00 100644 --- a/c/src/lib/libcpu/sh/sh7032/score/ispsh7032.c +++ b/c/src/lib/libcpu/sh/sh7032/score/ispsh7032.c @@ -32,10 +32,6 @@ #include <rtems/score/shtypes.h> #include <rtems/score/ispsh7032.h> -#if !defined(sh7032) -#error Wrong CPU MODEL -#endif - /* * This is an exception vector table * |