Changeset b850e7f in rtems


Ignore:
Timestamp:
Dec 8, 2017, 12:23:41 PM (2 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
533e2c0
Parents:
604f080c
Message:

bsp/gensh1: Move libcpu files to BSP

Update #3254.

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

Legend:

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

    r604f080c rb850e7f  
    33include $(top_srcdir)/../../../../automake/compile.am
    44
     5include_shdir = $(includedir)/sh
     6include_rtems_scoredir = $(includedir)/rtems/score
    57include_bspdir = $(includedir)/bsp
    68
    79dist_project_lib_DATA = bsp_specs
     10
     11include_sh_HEADERS = include/sh/sci.h
     12include_sh_HEADERS += include/sh/sh7_pfc.h
     13include_sh_HEADERS += include/sh/sh7_sci.h
     14
     15include_rtems_score_HEADERS = include/rtems/score/ispsh7032.h
     16include_rtems_score_HEADERS += include/rtems/score/iosh7032.h
    817
    918include_HEADERS = include/bsp.h
     
    3948    ../../shared/getentropy-cpucounter.c \
    4049    ../../shared/gnatinstallhandler.c
     50libbsp_a_SOURCES += clock/ckinit.c
     51libbsp_a_SOURCES += clock/delay.c
     52libbsp_a_SOURCES += startup/cpu_asm.c startup/ispsh7032.c
     53libbsp_a_SOURCES += timer/timer.c
    4154# scitab
    4255libbsp_a_SOURCES += scitab.c
    4356# console
    4457libbsp_a_SOURCES += ../../sh/shared/console.c
     58libbsp_a_SOURCES += console/sci.c
    4559# debugio
    4660libbsp_a_SOURCES += ../../shared/dummy_printk_support.c
    4761
    48 libbsp_a_LIBADD = \
    49     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \
    50     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \
    51     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/sci.rel \
    52     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/delay.rel \
    53     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score.rel \
    54     ../../../libcpu/@RTEMS_CPU@/cache.rel
     62libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/cache.rel
    5563
    5664EXTRA_DIST = times
  • c/src/lib/libbsp/sh/gensh1/make/custom/gensh1.cfg

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

    r604f080c rb850e7f  
    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
     
    3747        $(INSTALL_DATA) $< $(PROJECT_LIB)/bsp_specs
    3848PREINSTALL_FILES += $(PROJECT_LIB)/bsp_specs
     49
     50$(PROJECT_INCLUDE)/sh/sci.h: include/sh/sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
     51        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci.h
     52PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci.h
     53
     54$(PROJECT_INCLUDE)/sh/sh7_pfc.h: include/sh/sh7_pfc.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
     55        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_pfc.h
     56PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_pfc.h
     57
     58$(PROJECT_INCLUDE)/sh/sh7_sci.h: include/sh/sh7_sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
     59        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_sci.h
     60PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_sci.h
     61
     62$(PROJECT_INCLUDE)/rtems/score/ispsh7032.h: include/rtems/score/ispsh7032.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     63        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7032.h
     64PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7032.h
     65
     66$(PROJECT_INCLUDE)/rtems/score/iosh7032.h: include/rtems/score/iosh7032.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     67        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7032.h
     68PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7032.h
    3969
    4070$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
  • c/src/lib/libcpu/sh/Makefile.am

    r604f080c rb850e7f  
    99cache_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/cache
    1010cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    11 
    12 if sh7032
    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 = sh7032/include/sci.h
    19 include_sh_HEADERS += sh7032/include/sh7_pfc.h
    20 include_sh_HEADERS += sh7032/include/sh7_sci.h
    21 include_rtems_score_HEADERS = sh7032/include/ispsh7032.h
    22 include_rtems_score_HEADERS += sh7032/include/iosh7032.h
    23 
    24 ## sh7032/clock
    25 noinst_PROGRAMS += sh7032/clock.rel
    26 sh7032_clock_rel_SOURCES = sh7032/clock/ckinit.c
    27 sh7032_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
    28 sh7032_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    29 
    30 ## sh7032/delay
    31 noinst_PROGRAMS += sh7032/delay.rel
    32 sh7032_delay_rel_SOURCES = sh7032/delay/delay.c
    33 sh7032_delay_rel_CPPFLAGS = $(AM_CPPFLAGS)
    34 sh7032_delay_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    35 
    36 ## sh7032/sci
    37 noinst_PROGRAMS += sh7032/sci.rel
    38 sh7032_sci_rel_SOURCES = sh7032/sci/sci.c
    39 sh7032_sci_rel_CPPFLAGS = $(AM_CPPFLAGS)
    40 sh7032_sci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    41 
    42 ## sh7032/score
    43 noinst_PROGRAMS += sh7032/score.rel
    44 sh7032_score_rel_SOURCES = sh7032/score/cpu_asm.c sh7032/score/ispsh7032.c
    45 sh7032_score_rel_CPPFLAGS = $(AM_CPPFLAGS)
    46 sh7032_score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    47 
    48 ### sh7032/timer
    49 noinst_PROGRAMS += sh7032/timer.rel
    50 sh7032_timer_rel_SOURCES = sh7032/timer/timer.c
    51 sh7032_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
    52 sh7032_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    53 endif
    5411
    5512if sh7045
  • c/src/lib/libcpu/sh/configure.ac

    r604f080c rb850e7f  
    33AC_PREREQ([2.69])
    44AC_INIT([rtems-c-src-lib-libcpu-sh],[_RTEMS_VERSION],[https://devel.rtems.org/newticket])
    5 AC_CONFIG_SRCDIR([sh7032])
     5AC_CONFIG_SRCDIR([cache])
    66RTEMS_TOP([../../../../..],[../../..])
    77
     
    2020RTEMS_PROG_CCAS
    2121
    22 AM_CONDITIONAL([sh7032],[test x"$RTEMS_CPU_MODEL" = x"sh7032"])
    2322AM_CONDITIONAL([sh7045],[test x"$RTEMS_CPU_MODEL" = x"sh7045"])
    2423AM_CONDITIONAL([sh7750],[test x"$RTEMS_CPU_MODEL" = x"sh7750"])
  • c/src/lib/libcpu/sh/preinstall.am

    r604f080c rb850e7f  
    1414CLEANFILES = $(PREINSTALL_FILES)
    1515
    16 if sh7032
    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/sci.h: sh7032/include/sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
    28         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sci.h
    29 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sci.h
    30 
    31 $(PROJECT_INCLUDE)/sh/sh7_pfc.h: sh7032/include/sh7_pfc.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
    32         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_pfc.h
    33 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_pfc.h
    34 
    35 $(PROJECT_INCLUDE)/sh/sh7_sci.h: sh7032/include/sh7_sci.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
    36         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh7_sci.h
    37 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh7_sci.h
    38 
    39 $(PROJECT_INCLUDE)/rtems/score/ispsh7032.h: sh7032/include/ispsh7032.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    40         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7032.h
    41 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7032.h
    42 
    43 $(PROJECT_INCLUDE)/rtems/score/iosh7032.h: sh7032/include/iosh7032.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    44         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7032.h
    45 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7032.h
    46 endif
    4716if sh7045
    4817$(PROJECT_INCLUDE)/sh/$(dirstamp):
Note: See TracChangeset for help on using the changeset viewer.