diff options
-rw-r--r-- | c/src/lib/libbsp/sh/gensh2/Makefile.am | 23 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh2/clock/ckinit.c (renamed from c/src/lib/libcpu/sh/sh7045/clock/ckinit.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh2/console/sci.c (renamed from c/src/lib/libcpu/sh/sh7045/sci/sci.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh2/console/sci_termios.c (renamed from c/src/lib/libcpu/sh/sh7045/sci/sci_termios.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh2/include/rtems/score/iosh7045.h (renamed from c/src/lib/libcpu/sh/sh7045/include/iosh7045.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh2/include/rtems/score/ispsh7045.h (renamed from c/src/lib/libcpu/sh/sh7045/include/ispsh7045.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh2/include/sh/io_types.h (renamed from c/src/lib/libcpu/sh/sh7045/include/io_types.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh2/include/sh/sci.h (renamed from c/src/lib/libcpu/sh/sh7045/include/sci.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh2/include/sh/sci_termios.h (renamed from c/src/lib/libcpu/sh/sh7045/include/sci_termios.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh2/include/sh/sh7_pfc.h (renamed from c/src/lib/libcpu/sh/sh7045/include/sh7_pfc.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh2/include/sh/sh7_sci.h (renamed from c/src/lib/libcpu/sh/sh7045/include/sh7_sci.h) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh2/make/custom/gensh2.cfg | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh2/preinstall.am | 38 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh2/startup/cpu_asm.c (renamed from c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh2/startup/ispsh7045.c (renamed from c/src/lib/libcpu/sh/sh7045/score/ispsh7045.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libbsp/sh/gensh2/timer/timer.c (renamed from c/src/lib/libcpu/sh/sh7045/timer/timer.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libcpu/sh/Makefile.am | 39 | ||||
-rw-r--r-- | c/src/lib/libcpu/sh/configure.ac | 1 | ||||
-rw-r--r-- | c/src/lib/libcpu/sh/preinstall.am | 39 |
19 files changed, 55 insertions, 86 deletions
diff --git a/c/src/lib/libbsp/sh/gensh2/Makefile.am b/c/src/lib/libbsp/sh/gensh2/Makefile.am index dd8fb2d752..2ca4e76b05 100644 --- a/c/src/lib/libbsp/sh/gensh2/Makefile.am +++ b/c/src/lib/libbsp/sh/gensh2/Makefile.am @@ -2,6 +2,8 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal include $(top_srcdir)/../../../../automake/compile.am +include_shdir = $(includedir)/sh +include_rtems_scoredir = $(includedir)/rtems/score include_bspdir = $(includedir)/bsp dist_project_lib_DATA = bsp_specs @@ -9,6 +11,15 @@ dist_project_lib_DATA = bsp_specs include_HEADERS = include/bsp.h include_HEADERS += include/tm27.h +include_sh_HEADERS = include/sh/io_types.h +include_sh_HEADERS += include/sh/sci.h +include_sh_HEADERS += include/sh/sh7_pfc.h +include_sh_HEADERS += include/sh/sh7_sci.h +include_sh_HEADERS += include/sh/sci_termios.h + +include_rtems_score_HEADERS = include/rtems/score/ispsh7045.h +include_rtems_score_HEADERS += include/rtems/score/iosh7045.h + nodist_include_HEADERS = include/bspopts.h nodist_include_bsp_HEADERS = ../../shared/include/bootcard.h DISTCLEANFILES = include/bspopts.h @@ -41,19 +52,19 @@ libbsp_a_SOURCES += startup/hw_init.c \ ../../shared/gnatinstallhandler.c ../../shared/bspclean.c \ ../shared/bsphwinit.c libbsp_a_SOURCES += ../../shared/bspreset.c +libbsp_a_SOURCES += clock/ckinit.c +libbsp_a_SOURCES += startup/cpu_asm.c startup/ispsh7045.c +libbsp_a_SOURCES += timer/timer.c # scitab libbsp_a_SOURCES += scitab.c # console libbsp_a_SOURCES += ../../sh/shared/console.c console/config.c +libbsp_a_SOURCES += console/sci.c +libbsp_a_SOURCES += console/sci_termios.c # debugio libbsp_a_SOURCES += ../../shared/dummy_printk_support.c -libbsp_a_LIBADD = \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/sci.rel \ - ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score.rel \ - ../../../libcpu/@RTEMS_CPU@/cache.rel +libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/cache.rel include $(srcdir)/preinstall.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libcpu/sh/sh7045/clock/ckinit.c b/c/src/lib/libbsp/sh/gensh2/clock/ckinit.c index 5120b594eb..5120b594eb 100644 --- a/c/src/lib/libcpu/sh/sh7045/clock/ckinit.c +++ b/c/src/lib/libbsp/sh/gensh2/clock/ckinit.c diff --git a/c/src/lib/libcpu/sh/sh7045/sci/sci.c b/c/src/lib/libbsp/sh/gensh2/console/sci.c index 143fc1bb94..143fc1bb94 100644 --- a/c/src/lib/libcpu/sh/sh7045/sci/sci.c +++ b/c/src/lib/libbsp/sh/gensh2/console/sci.c diff --git a/c/src/lib/libcpu/sh/sh7045/sci/sci_termios.c b/c/src/lib/libbsp/sh/gensh2/console/sci_termios.c index 5d588065af..5d588065af 100644 --- a/c/src/lib/libcpu/sh/sh7045/sci/sci_termios.c +++ b/c/src/lib/libbsp/sh/gensh2/console/sci_termios.c diff --git a/c/src/lib/libcpu/sh/sh7045/include/iosh7045.h b/c/src/lib/libbsp/sh/gensh2/include/rtems/score/iosh7045.h index db3252b72d..db3252b72d 100644 --- a/c/src/lib/libcpu/sh/sh7045/include/iosh7045.h +++ b/c/src/lib/libbsp/sh/gensh2/include/rtems/score/iosh7045.h diff --git a/c/src/lib/libcpu/sh/sh7045/include/ispsh7045.h b/c/src/lib/libbsp/sh/gensh2/include/rtems/score/ispsh7045.h index fb9f5297ae..fb9f5297ae 100644 --- a/c/src/lib/libcpu/sh/sh7045/include/ispsh7045.h +++ b/c/src/lib/libbsp/sh/gensh2/include/rtems/score/ispsh7045.h diff --git a/c/src/lib/libcpu/sh/sh7045/include/io_types.h b/c/src/lib/libbsp/sh/gensh2/include/sh/io_types.h index 1dab885672..1dab885672 100644 --- a/c/src/lib/libcpu/sh/sh7045/include/io_types.h +++ b/c/src/lib/libbsp/sh/gensh2/include/sh/io_types.h diff --git a/c/src/lib/libcpu/sh/sh7045/include/sci.h b/c/src/lib/libbsp/sh/gensh2/include/sh/sci.h index dc34371d48..dc34371d48 100644 --- a/c/src/lib/libcpu/sh/sh7045/include/sci.h +++ b/c/src/lib/libbsp/sh/gensh2/include/sh/sci.h diff --git a/c/src/lib/libcpu/sh/sh7045/include/sci_termios.h b/c/src/lib/libbsp/sh/gensh2/include/sh/sci_termios.h index 63750c9461..63750c9461 100644 --- a/c/src/lib/libcpu/sh/sh7045/include/sci_termios.h +++ b/c/src/lib/libbsp/sh/gensh2/include/sh/sci_termios.h diff --git a/c/src/lib/libcpu/sh/sh7045/include/sh7_pfc.h b/c/src/lib/libbsp/sh/gensh2/include/sh/sh7_pfc.h index b56433a9e2..b56433a9e2 100644 --- a/c/src/lib/libcpu/sh/sh7045/include/sh7_pfc.h +++ b/c/src/lib/libbsp/sh/gensh2/include/sh/sh7_pfc.h diff --git a/c/src/lib/libcpu/sh/sh7045/include/sh7_sci.h b/c/src/lib/libbsp/sh/gensh2/include/sh/sh7_sci.h index 7218313704..7218313704 100644 --- a/c/src/lib/libcpu/sh/sh7045/include/sh7_sci.h +++ b/c/src/lib/libbsp/sh/gensh2/include/sh/sh7_sci.h diff --git a/c/src/lib/libbsp/sh/gensh2/make/custom/gensh2.cfg b/c/src/lib/libbsp/sh/gensh2/make/custom/gensh2.cfg index 40038e6b9b..49cf0850d2 100644 --- a/c/src/lib/libbsp/sh/gensh2/make/custom/gensh2.cfg +++ b/c/src/lib/libbsp/sh/gensh2/make/custom/gensh2.cfg @@ -9,7 +9,6 @@ include $(RTEMS_ROOT)/make/custom/default.cfg RTEMS_CPU=sh -RTEMS_CPU_MODEL=sh7045 # This contains the compiler options necessary to select the CPU model # and (hopefully) optimize for it. diff --git a/c/src/lib/libbsp/sh/gensh2/preinstall.am b/c/src/lib/libbsp/sh/gensh2/preinstall.am index 2570e1a313..742998fee3 100644 --- a/c/src/lib/libbsp/sh/gensh2/preinstall.am +++ b/c/src/lib/libbsp/sh/gensh2/preinstall.am @@ -28,6 +28,16 @@ $(PROJECT_INCLUDE)/$(dirstamp): @: > $(PROJECT_INCLUDE)/$(dirstamp) PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp) +$(PROJECT_INCLUDE)/sh/$(dirstamp): + @$(MKDIR_P) $(PROJECT_INCLUDE)/sh + @: > $(PROJECT_INCLUDE)/sh/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp) + +$(PROJECT_INCLUDE)/rtems/score/$(dirstamp): + @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score + @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + $(PROJECT_INCLUDE)/bsp/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp @: > $(PROJECT_INCLUDE)/bsp/$(dirstamp) @@ -45,6 +55,34 @@ $(PROJECT_INCLUDE)/tm27.h: include/tm27.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h +$(PROJECT_INCLUDE)/sh/io_types.h: include/sh/io_types.h $(PROJECT_INCLUDE)/sh/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/io_types.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/io_types.h + +$(PROJECT_INCLUDE)/sh/sci.h: include/sh/sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci.h + +$(PROJECT_INCLUDE)/sh/sh7_pfc.h: include/sh/sh7_pfc.h $(PROJECT_INCLUDE)/sh/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_pfc.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_pfc.h + +$(PROJECT_INCLUDE)/sh/sh7_sci.h: include/sh/sh7_sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_sci.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_sci.h + +$(PROJECT_INCLUDE)/sh/sci_termios.h: include/sh/sci_termios.h $(PROJECT_INCLUDE)/sh/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci_termios.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci_termios.h + +$(PROJECT_INCLUDE)/rtems/score/ispsh7045.h: include/rtems/score/ispsh7045.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7045.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7045.h + +$(PROJECT_INCLUDE)/rtems/score/iosh7045.h: include/rtems/score/iosh7045.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7045.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7045.h + $(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/bspopts.h diff --git a/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c b/c/src/lib/libbsp/sh/gensh2/startup/cpu_asm.c index 47bc859dbd..47bc859dbd 100644 --- a/c/src/lib/libcpu/sh/sh7045/score/cpu_asm.c +++ b/c/src/lib/libbsp/sh/gensh2/startup/cpu_asm.c diff --git a/c/src/lib/libcpu/sh/sh7045/score/ispsh7045.c b/c/src/lib/libbsp/sh/gensh2/startup/ispsh7045.c index bb0f9dc666..bb0f9dc666 100644 --- a/c/src/lib/libcpu/sh/sh7045/score/ispsh7045.c +++ b/c/src/lib/libbsp/sh/gensh2/startup/ispsh7045.c diff --git a/c/src/lib/libcpu/sh/sh7045/timer/timer.c b/c/src/lib/libbsp/sh/gensh2/timer/timer.c index 152c99b1aa..152c99b1aa 100644 --- a/c/src/lib/libcpu/sh/sh7045/timer/timer.c +++ b/c/src/lib/libbsp/sh/gensh2/timer/timer.c diff --git a/c/src/lib/libcpu/sh/Makefile.am b/c/src/lib/libcpu/sh/Makefile.am index 3422fd7032..0566cace11 100644 --- a/c/src/lib/libcpu/sh/Makefile.am +++ b/c/src/lib/libcpu/sh/Makefile.am @@ -9,45 +9,6 @@ cache_rel_SOURCES = ../shared/src/cache_manager.c cache_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/cache cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -if sh7045 -# NOTE: Unlike other CPUS, we install into a subdirectory to avoid -# file name conflicts -include_shdir = $(includedir)/sh -include_rtems_scoredir = $(includedir)/rtems/score - -include_sh_HEADERS = sh7045/include/io_types.h -include_sh_HEADERS += sh7045/include/sci.h -include_sh_HEADERS += sh7045/include/sh7_pfc.h -include_sh_HEADERS += sh7045/include/sh7_sci.h -include_sh_HEADERS += sh7045/include/sci_termios.h -include_rtems_score_HEADERS = sh7045/include/ispsh7045.h -include_rtems_score_HEADERS += sh7045/include/iosh7045.h - -## sh7045/clock -noinst_PROGRAMS += sh7045/clock.rel -sh7045_clock_rel_SOURCES = sh7045/clock/ckinit.c -sh7045_clock_rel_CPPFLAGS = $(AM_CPPFLAGS) -sh7045_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## sh7045/sci -noinst_PROGRAMS += sh7045/sci.rel -sh7045_sci_rel_SOURCES = sh7045/sci/sci.c sh7045/sci/sci_termios.c -sh7045_sci_rel_CPPFLAGS = $(AM_CPPFLAGS) -sh7045_sci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## sh7045/score -noinst_PROGRAMS += sh7045/score.rel -sh7045_score_rel_SOURCES = sh7045/score/cpu_asm.c sh7045/score/ispsh7045.c -sh7045_score_rel_CPPFLAGS = $(AM_CPPFLAGS) -sh7045_score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -## sh7045/timer -noinst_PROGRAMS += sh7045/timer.rel -sh7045_timer_rel_SOURCES = sh7045/timer/timer.c -sh7045_timer_rel_CPPFLAGS = $(AM_CPPFLAGS) -sh7045_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -endif - if sh7750 # NOTE: Unlike other CPUS, we install into a subdirectory to avoid # file name conflicts diff --git a/c/src/lib/libcpu/sh/configure.ac b/c/src/lib/libcpu/sh/configure.ac index 105f695d02..4eb571731a 100644 --- a/c/src/lib/libcpu/sh/configure.ac +++ b/c/src/lib/libcpu/sh/configure.ac @@ -19,7 +19,6 @@ AM_PROG_CC_C_O RTEMS_CANONICALIZE_TOOLS RTEMS_PROG_CCAS -AM_CONDITIONAL([sh7045],[test x"$RTEMS_CPU_MODEL" = x"sh7045"]) AM_CONDITIONAL([sh7750],[test x"$RTEMS_CPU_MODEL" = x"sh7750"]) RTEMS_AMPOLISH3 diff --git a/c/src/lib/libcpu/sh/preinstall.am b/c/src/lib/libcpu/sh/preinstall.am index 163813ac13..62de4d75b0 100644 --- a/c/src/lib/libcpu/sh/preinstall.am +++ b/c/src/lib/libcpu/sh/preinstall.am @@ -13,45 +13,6 @@ all-am: $(PREINSTALL_FILES) PREINSTALL_FILES = CLEANFILES = $(PREINSTALL_FILES) -if sh7045 -$(PROJECT_INCLUDE)/sh/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/sh - @: > $(PROJECT_INCLUDE)/sh/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp) - -$(PROJECT_INCLUDE)/rtems/score/$(dirstamp): - @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score - @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) -PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - -$(PROJECT_INCLUDE)/sh/io_types.h: sh7045/include/io_types.h $(PROJECT_INCLUDE)/sh/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/io_types.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/io_types.h - -$(PROJECT_INCLUDE)/sh/sci.h: sh7045/include/sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci.h - -$(PROJECT_INCLUDE)/sh/sh7_pfc.h: sh7045/include/sh7_pfc.h $(PROJECT_INCLUDE)/sh/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_pfc.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_pfc.h - -$(PROJECT_INCLUDE)/sh/sh7_sci.h: sh7045/include/sh7_sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_sci.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_sci.h - -$(PROJECT_INCLUDE)/sh/sci_termios.h: sh7045/include/sci_termios.h $(PROJECT_INCLUDE)/sh/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci_termios.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci_termios.h - -$(PROJECT_INCLUDE)/rtems/score/ispsh7045.h: sh7045/include/ispsh7045.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7045.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7045.h - -$(PROJECT_INCLUDE)/rtems/score/iosh7045.h: sh7045/include/iosh7045.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7045.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7045.h -endif if sh7750 $(PROJECT_INCLUDE)/sh/$(dirstamp): @$(MKDIR_P) $(PROJECT_INCLUDE)/sh |