diff options
Diffstat (limited to 'c/src/lib/libcpu/sh')
23 files changed, 182 insertions, 66 deletions
diff --git a/c/src/lib/libcpu/sh/Makefile.am b/c/src/lib/libcpu/sh/Makefile.am index 8de599ce50..a5932e55dd 100644 --- a/c/src/lib/libcpu/sh/Makefile.am +++ b/c/src/lib/libcpu/sh/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -SUBDIRS = @RTEMS_CPU_MODEL@ +SUBDIRS = @subdirs@ include $(top_srcdir)/../../../../../automake/subdirs.am include $(top_srcdir)/../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/configure.in b/c/src/lib/libcpu/sh/configure.in index fbf6fbca9e..664b64f105 100644 --- a/c/src/lib/libcpu/sh/configure.in +++ b/c/src/lib/libcpu/sh/configure.in @@ -20,25 +20,14 @@ RTEMS_CANONICAL_HOST RTEMS_PROJECT_ROOT -RTEMS_PROG_CC_FOR_TARGET -RTEMS_CANONICALIZE_TOOLS - RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) +if test -d ${srcdir}/$RTEMS_CPU_MODEL; then +RTEMS_CPU_MODEL_SUBDIR="$RTEMS_CPU_MODEL" +fi +AC_CONFIG_SUBDIRS($RTEMS_CPU_MODEL_SUBDIR) + # Explicitly list all Makefiles here AC_OUTPUT( -Makefile -sh7032/Makefile -sh7032/null/Makefile -sh7032/clock/Makefile -sh7032/delay/Makefile -sh7032/include/Makefile -sh7032/timer/Makefile -sh7032/sci/Makefile -sh7045/Makefile -sh7045/clock/Makefile -sh7045/include/Makefile -sh7045/null/Makefile -sh7045/sci/Makefile -sh7045/timer/Makefile) +Makefile) diff --git a/c/src/lib/libcpu/sh/sh7032/Makefile.am b/c/src/lib/libcpu/sh/sh7032/Makefile.am index ad159e941c..1784127471 100644 --- a/c/src/lib/libcpu/sh/sh7032/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7032/Makefile.am @@ -3,8 +3,9 @@ ## AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -SUBDIRS = include clock timer null sci delay +SUBDIRS = include score clock timer null sci delay -include $(top_srcdir)/../../../../../automake/subdirs.am -include $(top_srcdir)/../../../../../automake/local.am +include $(top_srcdir)/../../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7032/clock/Makefile.am b/c/src/lib/libcpu/sh/sh7032/clock/Makefile.am index 10ae91df8f..141e462aa2 100644 --- a/c/src/lib/libcpu/sh/sh7032/clock/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7032/clock/Makefile.am @@ -12,7 +12,7 @@ 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 +include $(top_srcdir)/../../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += @@ -27,4 +27,4 @@ all-local: $(ARCH) $(OBJS) $(PGM) EXTRA_DIST = ckinit.c -include $(top_srcdir)/../../../../../automake/local.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7032/configure.in b/c/src/lib/libcpu/sh/sh7032/configure.in new file mode 100644 index 0000000000..af39508c83 --- /dev/null +++ b/c/src/lib/libcpu/sh/sh7032/configure.in @@ -0,0 +1,38 @@ +dnl Process this file with autoconf to produce a configure script. +dnl +dnl $Id$ + +AC_PREREQ(2.13) +AC_INIT(include) +RTEMS_TOP(../../../../../..) +AC_CONFIG_AUX_DIR(../../../../../..) + +RTEMS_CANONICAL_TARGET_CPU + +AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-sh-sh7032,$RTEMS_VERSION,no) +AM_MAINTAINER_MODE + +RTEMS_ENABLE_BARE +RTEMS_ENV_RTEMSBSP + +RTEMS_CHECK_CPU +RTEMS_CANONICAL_HOST + +RTEMS_PROJECT_ROOT + +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS + +RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) +RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) + +# Explicitly list all Makefiles here +AC_OUTPUT( +Makefile +null/Makefile +clock/Makefile +delay/Makefile +include/Makefile +score/Makefile +timer/Makefile +sci/Makefile) diff --git a/c/src/lib/libcpu/sh/sh7032/delay/Makefile.am b/c/src/lib/libcpu/sh/sh7032/delay/Makefile.am index 44ff144b86..a67cc2c112 100644 --- a/c/src/lib/libcpu/sh/sh7032/delay/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7032/delay/Makefile.am @@ -12,7 +12,7 @@ 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 +include $(top_srcdir)/../../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += @@ -27,4 +27,4 @@ all-local: $(ARCH) $(OBJS) $(PGM) EXTRA_DIST = delay.c -include $(top_srcdir)/../../../../../automake/local.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7032/include/Makefile.am b/c/src/lib/libcpu/sh/sh7032/include/Makefile.am index 7d26513f10..b44d68d5c3 100644 --- a/c/src/lib/libcpu/sh/sh7032/include/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7032/include/Makefile.am @@ -5,6 +5,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 H_FILES = null.h sci.h sh7_pfc.h sh7_sci.h +SCORE_H_FILES= ispsh7032.h iosh7032.h # NOTE: Unlike other CPUS, we install into a subdirectory to avoid # file name conflicts @@ -15,11 +16,15 @@ $(PROJECT_INCLUDE)/sh: $(PROJECT_INCLUDE)/sh/%.h: %.h $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/rtems/score/%.h: %.h + $(INSTALL_DATA) $< $@ + TMPINSTALL_FILES += $(PROJECT_INCLUDE)/sh \ - $(H_FILES:%=$(PROJECT_INCLUDE)/sh/%) + $(H_FILES:%.h=$(PROJECT_INCLUDE)/sh/%.h) \ + $(SCORE_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) all-local: $(TMPINSTALL_FILES) EXTRA_DIST = null.h sci.h sh7_pfc.h sh7_sci.h -include $(top_srcdir)/../../../../../automake/local.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7032/null/Makefile.am b/c/src/lib/libcpu/sh/sh7032/null/Makefile.am index 2e6baea4a3..81c3843a69 100644 --- a/c/src/lib/libcpu/sh/sh7032/null/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7032/null/Makefile.am @@ -12,7 +12,7 @@ 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 +include $(top_srcdir)/../../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += @@ -27,4 +27,4 @@ all-local: $(ARCH) $(OBJS) $(PGM) EXTRA_DIST = close.c cntrl.c init.c open.c read.c write.c -include $(top_srcdir)/../../../../../automake/local.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7032/sci/Makefile.am b/c/src/lib/libcpu/sh/sh7032/sci/Makefile.am index aef7e13b3b..4a0da51e27 100644 --- a/c/src/lib/libcpu/sh/sh7032/sci/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7032/sci/Makefile.am @@ -12,7 +12,7 @@ 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 +include $(top_srcdir)/../../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += @@ -27,4 +27,4 @@ all-local: $(ARCH) $(OBJS) $(PGM) EXTRA_DIST = sci.c -include $(top_srcdir)/../../../../../automake/local.am +include $(top_srcdir)/../../../../../../automake/local.am 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 * diff --git a/c/src/lib/libcpu/sh/sh7032/timer/Makefile.am b/c/src/lib/libcpu/sh/sh7032/timer/Makefile.am index 5a164c0d4c..a32b9f1c7b 100644 --- a/c/src/lib/libcpu/sh/sh7032/timer/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7032/timer/Makefile.am @@ -12,7 +12,7 @@ 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 +include $(top_srcdir)/../../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += @@ -27,4 +27,4 @@ all-local: $(ARCH) $(OBJS) $(PGM) EXTRA_DIST = timer.c -include $(top_srcdir)/../../../../../automake/local.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7045/Makefile.am b/c/src/lib/libcpu/sh/sh7045/Makefile.am index 5452a07131..3384644485 100644 --- a/c/src/lib/libcpu/sh/sh7045/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/Makefile.am @@ -3,8 +3,9 @@ ## AUTOMAKE_OPTIONS = foreign 1.4 +ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal -SUBDIRS = include clock sci timer null +SUBDIRS = include score clock sci timer null -include $(top_srcdir)/../../../../../automake/subdirs.am -include $(top_srcdir)/../../../../../automake/local.am +include $(top_srcdir)/../../../../../../automake/subdirs.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am b/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am index 10ae91df8f..141e462aa2 100644 --- a/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/clock/Makefile.am @@ -12,7 +12,7 @@ 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 +include $(top_srcdir)/../../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += @@ -27,4 +27,4 @@ all-local: $(ARCH) $(OBJS) $(PGM) EXTRA_DIST = ckinit.c -include $(top_srcdir)/../../../../../automake/local.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7045/configure.in b/c/src/lib/libcpu/sh/sh7045/configure.in new file mode 100644 index 0000000000..604255d64f --- /dev/null +++ b/c/src/lib/libcpu/sh/sh7045/configure.in @@ -0,0 +1,37 @@ +dnl Process this file with autoconf to produce a configure script. +dnl +dnl $Id$ + +AC_PREREQ(2.13) +AC_INIT(include) +RTEMS_TOP(../../../../../..) +AC_CONFIG_AUX_DIR(../../../../../..) + +RTEMS_CANONICAL_TARGET_CPU + +AM_INIT_AUTOMAKE(rtems-c-src-lib-libcpu-sh-sh7045,$RTEMS_VERSION,no) +AM_MAINTAINER_MODE + +RTEMS_ENABLE_BARE +RTEMS_ENV_RTEMSBSP + +RTEMS_CHECK_CPU +RTEMS_CANONICAL_HOST + +RTEMS_PROJECT_ROOT + +RTEMS_PROG_CC_FOR_TARGET +RTEMS_CANONICALIZE_TOOLS + +RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) +RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) + +# Explicitly list all Makefiles here +AC_OUTPUT( +Makefile +clock/Makefile +include/Makefile +score/Makefile +null/Makefile +sci/Makefile +timer/Makefile) diff --git a/c/src/lib/libcpu/sh/sh7045/include/Makefile.am b/c/src/lib/libcpu/sh/sh7045/include/Makefile.am index 8a424d634f..4a311c6547 100644 --- a/c/src/lib/libcpu/sh/sh7045/include/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/include/Makefile.am @@ -5,6 +5,7 @@ AUTOMAKE_OPTIONS = foreign 1.4 H_FILES = io_types.h null.h sci.h sh7_pfc.h sh7_sci.h +SCORE_H_FILES = ispsh7045.h iosh7045.h # NOTE: Unlike other CPUS, we install into a subdirectory to avoid # file name conflicts @@ -15,11 +16,15 @@ $(PROJECT_INCLUDE)/sh: $(PROJECT_INCLUDE)/sh/%.h: %.h $(INSTALL_DATA) $< $@ +$(PROJECT_INCLUDE)/rtems/score/%.h: %.h + $(INSTALL_DATA) $< $@ + TMPINSTALL_FILES += $(PROJECT_INCLUDE)/sh \ - $(H_FILES:%=$(PROJECT_INCLUDE)/sh/%) + $(H_FILES:%.h=$(PROJECT_INCLUDE)/sh/%.h) \ + $(SCORE_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) all-local: $(TMPINSTALL_FILES) EXTRA_DIST = io_types.h null.h sci.h sh7_pfc.h sh7_sci.h -include $(top_srcdir)/../../../../../automake/local.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7045/null/Makefile.am b/c/src/lib/libcpu/sh/sh7045/null/Makefile.am index 2e6baea4a3..81c3843a69 100644 --- a/c/src/lib/libcpu/sh/sh7045/null/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/null/Makefile.am @@ -12,7 +12,7 @@ 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 +include $(top_srcdir)/../../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += @@ -27,4 +27,4 @@ all-local: $(ARCH) $(OBJS) $(PGM) EXTRA_DIST = close.c cntrl.c init.c open.c read.c write.c -include $(top_srcdir)/../../../../../automake/local.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am b/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am index aef7e13b3b..4a0da51e27 100644 --- a/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/sci/Makefile.am @@ -12,7 +12,7 @@ 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 +include $(top_srcdir)/../../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += @@ -27,4 +27,4 @@ all-local: $(ARCH) $(OBJS) $(PGM) EXTRA_DIST = sci.c -include $(top_srcdir)/../../../../../automake/local.am +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7045/score/Makefile.am b/c/src/lib/libcpu/sh/sh7045/score/Makefile.am new file mode 100644 index 0000000000..fc26b10368 --- /dev/null +++ b/c/src/lib/libcpu/sh/sh7045/score/Makefile.am @@ -0,0 +1,30 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +PGM = $(ARCH)/score.rel + +C_FILES = cpu_asm.c ispsh7045.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 = ispsh7045.c + +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c b/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c index 192c2f43d2..6453105bdb 100644 --- a/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c +++ b/c/src/lib/libcpu/sh/sh7045/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/sh7045/score/ispsh7045.c b/c/src/lib/libcpu/sh/sh7045/score/ispsh7045.c index 4009ea152a..44aeaff8f1 100644 --- a/c/src/lib/libcpu/sh/sh7045/score/ispsh7045.c +++ b/c/src/lib/libcpu/sh/sh7045/score/ispsh7045.c @@ -43,10 +43,6 @@ #include <rtems/system.h> #include <rtems/score/shtypes.h> -#if !defined (sh7045) -#error Wrong CPU MODEL -#endif - /* * This is a exception vector table * diff --git a/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am b/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am index 5a164c0d4c..a32b9f1c7b 100644 --- a/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am +++ b/c/src/lib/libcpu/sh/sh7045/timer/Makefile.am @@ -12,7 +12,7 @@ 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 +include $(top_srcdir)/../../../../../../automake/lib.am # # (OPTIONAL) Add local stuff here using += @@ -27,4 +27,4 @@ all-local: $(ARCH) $(OBJS) $(PGM) EXTRA_DIST = timer.c -include $(top_srcdir)/../../../../../automake/local.am +include $(top_srcdir)/../../../../../../automake/local.am |