Changeset 533e2c0 in rtems


Ignore:
Timestamp:
Dec 8, 2017, 12:31:12 PM (2 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
f2969b5
Parents:
b850e7f
Message:

bsp/gensh2: Move libcpu files to BSP

Update #3254.

Location:
c/src/lib
Files:
6 edited
13 moved

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/sh/gensh2/Makefile.am

    rb850e7f r533e2c0  
    33include $(top_srcdir)/../../../../automake/compile.am
    44
     5include_shdir = $(includedir)/sh
     6include_rtems_scoredir = $(includedir)/rtems/score
    57include_bspdir = $(includedir)/bsp
    68
     
    911include_HEADERS = include/bsp.h
    1012include_HEADERS += include/tm27.h
     13
     14include_sh_HEADERS = include/sh/io_types.h
     15include_sh_HEADERS += include/sh/sci.h
     16include_sh_HEADERS += include/sh/sh7_pfc.h
     17include_sh_HEADERS += include/sh/sh7_sci.h
     18include_sh_HEADERS += include/sh/sci_termios.h
     19
     20include_rtems_score_HEADERS = include/rtems/score/ispsh7045.h
     21include_rtems_score_HEADERS += include/rtems/score/iosh7045.h
    1122
    1223nodist_include_HEADERS = include/bspopts.h
     
    4253    ../shared/bsphwinit.c
    4354libbsp_a_SOURCES += ../../shared/bspreset.c
     55libbsp_a_SOURCES += clock/ckinit.c
     56libbsp_a_SOURCES += startup/cpu_asm.c startup/ispsh7045.c
     57libbsp_a_SOURCES += timer/timer.c
    4458# scitab
    4559libbsp_a_SOURCES += scitab.c
    4660# console
    4761libbsp_a_SOURCES += ../../sh/shared/console.c console/config.c
     62libbsp_a_SOURCES += console/sci.c
     63libbsp_a_SOURCES += console/sci_termios.c
    4864# debugio
    4965libbsp_a_SOURCES += ../../shared/dummy_printk_support.c
    5066
    51 libbsp_a_LIBADD = \
    52     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \
    53     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \
    54     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/sci.rel \
    55     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score.rel \
    56     ../../../libcpu/@RTEMS_CPU@/cache.rel
     67libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/cache.rel
    5768
    5869include $(srcdir)/preinstall.am
  • c/src/lib/libbsp/sh/gensh2/make/custom/gensh2.cfg

    rb850e7f r533e2c0  
    1010
    1111RTEMS_CPU=sh
    12 RTEMS_CPU_MODEL=sh7045
    1312
    1413#  This contains the compiler options necessary to select the CPU model
  • c/src/lib/libbsp/sh/gensh2/preinstall.am

    rb850e7f r533e2c0  
    2929PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
    3030
     31$(PROJECT_INCLUDE)/sh/$(dirstamp):
     32        @$(MKDIR_P) $(PROJECT_INCLUDE)/sh
     33        @: > $(PROJECT_INCLUDE)/sh/$(dirstamp)
     34PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp)
     35
     36$(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
     37        @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
     38        @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     39PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     40
    3141$(PROJECT_INCLUDE)/bsp/$(dirstamp):
    3242        @$(MKDIR_P) $(PROJECT_INCLUDE)/bsp
     
    4555        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
    4656PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
     57
     58$(PROJECT_INCLUDE)/sh/io_types.h: include/sh/io_types.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
     59        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/io_types.h
     60PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/io_types.h
     61
     62$(PROJECT_INCLUDE)/sh/sci.h: include/sh/sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
     63        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci.h
     64PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci.h
     65
     66$(PROJECT_INCLUDE)/sh/sh7_pfc.h: include/sh/sh7_pfc.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
     67        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_pfc.h
     68PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_pfc.h
     69
     70$(PROJECT_INCLUDE)/sh/sh7_sci.h: include/sh/sh7_sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
     71        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_sci.h
     72PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_sci.h
     73
     74$(PROJECT_INCLUDE)/sh/sci_termios.h: include/sh/sci_termios.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
     75        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci_termios.h
     76PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci_termios.h
     77
     78$(PROJECT_INCLUDE)/rtems/score/ispsh7045.h: include/rtems/score/ispsh7045.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     79        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7045.h
     80PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7045.h
     81
     82$(PROJECT_INCLUDE)/rtems/score/iosh7045.h: include/rtems/score/iosh7045.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     83        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7045.h
     84PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7045.h
    4785
    4886$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
  • c/src/lib/libcpu/sh/Makefile.am

    rb850e7f r533e2c0  
    99cache_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/cache
    1010cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    11 
    12 if sh7045
    13 # NOTE: Unlike other CPUS, we install into a subdirectory to avoid
    14 #       file name conflicts
    15 include_shdir = $(includedir)/sh
    16 include_rtems_scoredir = $(includedir)/rtems/score
    17 
    18 include_sh_HEADERS = sh7045/include/io_types.h
    19 include_sh_HEADERS += sh7045/include/sci.h
    20 include_sh_HEADERS += sh7045/include/sh7_pfc.h
    21 include_sh_HEADERS += sh7045/include/sh7_sci.h
    22 include_sh_HEADERS += sh7045/include/sci_termios.h
    23 include_rtems_score_HEADERS = sh7045/include/ispsh7045.h
    24 include_rtems_score_HEADERS += sh7045/include/iosh7045.h
    25 
    26 ## sh7045/clock
    27 noinst_PROGRAMS += sh7045/clock.rel
    28 sh7045_clock_rel_SOURCES = sh7045/clock/ckinit.c
    29 sh7045_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
    30 sh7045_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    31 
    32 ## sh7045/sci
    33 noinst_PROGRAMS += sh7045/sci.rel
    34 sh7045_sci_rel_SOURCES = sh7045/sci/sci.c sh7045/sci/sci_termios.c
    35 sh7045_sci_rel_CPPFLAGS = $(AM_CPPFLAGS)
    36 sh7045_sci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    37 
    38 ## sh7045/score
    39 noinst_PROGRAMS += sh7045/score.rel
    40 sh7045_score_rel_SOURCES = sh7045/score/cpu_asm.c sh7045/score/ispsh7045.c
    41 sh7045_score_rel_CPPFLAGS = $(AM_CPPFLAGS)
    42 sh7045_score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    43 
    44 ## sh7045/timer
    45 noinst_PROGRAMS += sh7045/timer.rel
    46 sh7045_timer_rel_SOURCES = sh7045/timer/timer.c
    47 sh7045_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
    48 sh7045_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    49 endif
    5011
    5112if sh7750
  • c/src/lib/libcpu/sh/configure.ac

    rb850e7f r533e2c0  
    2020RTEMS_PROG_CCAS
    2121
    22 AM_CONDITIONAL([sh7045],[test x"$RTEMS_CPU_MODEL" = x"sh7045"])
    2322AM_CONDITIONAL([sh7750],[test x"$RTEMS_CPU_MODEL" = x"sh7750"])
    2423
  • c/src/lib/libcpu/sh/preinstall.am

    rb850e7f r533e2c0  
    1414CLEANFILES = $(PREINSTALL_FILES)
    1515
    16 if sh7045
    17 $(PROJECT_INCLUDE)/sh/$(dirstamp):
    18         @$(MKDIR_P) $(PROJECT_INCLUDE)/sh
    19         @: > $(PROJECT_INCLUDE)/sh/$(dirstamp)
    20 PREINSTALL_DIRS += $(PROJECT_INCLUDE)/sh/$(dirstamp)
    21 
    22 $(PROJECT_INCLUDE)/rtems/score/$(dirstamp):
    23         @$(MKDIR_P) $(PROJECT_INCLUDE)/rtems/score
    24         @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    25 PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    26 
    27 $(PROJECT_INCLUDE)/sh/io_types.h: sh7045/include/io_types.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
    28         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/io_types.h
    29 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/io_types.h
    30 
    31 $(PROJECT_INCLUDE)/sh/sci.h: sh7045/include/sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
    32         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci.h
    33 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci.h
    34 
    35 $(PROJECT_INCLUDE)/sh/sh7_pfc.h: sh7045/include/sh7_pfc.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
    36         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_pfc.h
    37 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_pfc.h
    38 
    39 $(PROJECT_INCLUDE)/sh/sh7_sci.h: sh7045/include/sh7_sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
    40         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_sci.h
    41 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_sci.h
    42 
    43 $(PROJECT_INCLUDE)/sh/sci_termios.h: sh7045/include/sci_termios.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
    44         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci_termios.h
    45 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci_termios.h
    46 
    47 $(PROJECT_INCLUDE)/rtems/score/ispsh7045.h: sh7045/include/ispsh7045.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    48         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7045.h
    49 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7045.h
    50 
    51 $(PROJECT_INCLUDE)/rtems/score/iosh7045.h: sh7045/include/iosh7045.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    52         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7045.h
    53 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7045.h
    54 endif
    5516if sh7750
    5617$(PROJECT_INCLUDE)/sh/$(dirstamp):
Note: See TracChangeset for help on using the changeset viewer.