Changeset f2969b5 in rtems


Ignore:
Timestamp:
Dec 8, 2017, 12:37:19 PM (3 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
5, master
Children:
2f91de2d
Parents:
533e2c0
git-author:
Sebastian Huber <sebastian.huber@…> (12/08/17 12:37:19)
git-committer:
Sebastian Huber <sebastian.huber@…> (12/08/17 12:44:17)
Message:

bsp/gensh4: Move libcpu files to BSP

Update #3254.

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

Legend:

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

    r533e2c0 rf2969b5  
    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/sh4uart.h
     15
     16include_rtems_score_HEADERS = include/rtems/score/sh7750_regs.h
     17include_rtems_score_HEADERS += include/rtems/score/ipl.h
     18include_rtems_score_HEADERS += include/rtems/score/iosh7750.h
     19include_rtems_score_HEADERS += include/rtems/score/ispsh7750.h
     20include_rtems_score_HEADERS += include/rtems/score/sh4_regs.h
    1121
    1222nodist_include_HEADERS = include/bspopts.h
     
    3444    ../../shared/gnatinstallhandler.c ../shared/bsphwinit.c
    3545libbsp_a_SOURCES += ../../shared/bspreset.c
     46libbsp_a_SOURCES += startup/cpu_asm.c startup/ispsh7750.c
     47libbsp_a_SOURCES += clock/ckinit.c
     48libbsp_a_SOURCES += timer/timer.c
    3649# console
    3750libbsp_a_SOURCES += console/console.c ../../shared/dummy_printk_support.c
     51libbsp_a_SOURCES += console/sh4uart.c
    3852# hw_init
    3953libbsp_a_SOURCES += hw_init/hw_init.c
    4054
    41 libbsp_a_LIBADD = \
    42     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \
    43     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \
    44     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/sci.rel \
    45     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/score.rel \
    46     ../../../libcpu/@RTEMS_CPU@/cache.rel
     55libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/cache.rel
    4756
    4857EXTRA_DIST = times
  • c/src/lib/libbsp/sh/gensh4/make/custom/gensh4.cfg

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

    r533e2c0 rf2969b5  
    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/sh4uart.h: include/sh/sh4uart.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
     59        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh4uart.h
     60PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh4uart.h
     61
     62$(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h: include/rtems/score/sh7750_regs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     63        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h
     64PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h
     65
     66$(PROJECT_INCLUDE)/rtems/score/ipl.h: include/rtems/score/ipl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     67        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ipl.h
     68PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ipl.h
     69
     70$(PROJECT_INCLUDE)/rtems/score/iosh7750.h: include/rtems/score/iosh7750.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     71        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7750.h
     72PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7750.h
     73
     74$(PROJECT_INCLUDE)/rtems/score/ispsh7750.h: include/rtems/score/ispsh7750.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     75        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7750.h
     76PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7750.h
     77
     78$(PROJECT_INCLUDE)/rtems/score/sh4_regs.h: include/rtems/score/sh4_regs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
     79        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h
     80PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h
    4781
    4882$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
  • c/src/lib/libcpu/sh/Makefile.am

    r533e2c0 rf2969b5  
    1010cache_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    1111
    12 if sh7750
    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 = sh7750/include/sh/sh4uart.h
    19 include_rtems_score_HEADERS = sh7750/include/rtems/score/sh7750_regs.h
    20 include_rtems_score_HEADERS += sh7750/include/rtems/score/ipl.h
    21 include_rtems_score_HEADERS += sh7750/include/rtems/score/iosh7750.h
    22 include_rtems_score_HEADERS += sh7750/include/rtems/score/ispsh7750.h
    23 include_rtems_score_HEADERS += sh7750/include/rtems/score/sh4_regs.h
    24 
    25 ## sh7750/clock
    26 noinst_PROGRAMS += sh7750/clock.rel
    27 sh7750_clock_rel_SOURCES = sh7750/clock/ckinit.c
    28 sh7750_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
    29 sh7750_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    30 
    31 ## sh7750/sci
    32 noinst_PROGRAMS += sh7750/sci.rel
    33 sh7750_sci_rel_SOURCES = sh7750/sci/sh4uart.c
    34 sh7750_sci_rel_CPPFLAGS = $(AM_CPPFLAGS)
    35 sh7750_sci_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    36 
    37 ## sh7750/score
    38 noinst_PROGRAMS += sh7750/score.rel
    39 sh7750_score_rel_SOURCES = sh7750/score/cpu_asm.c sh7750/score/ispsh7750.c
    40 sh7750_score_rel_CPPFLAGS = $(AM_CPPFLAGS)
    41 sh7750_score_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    42 
    43 ## sh7750/timer
    44 noinst_PROGRAMS += sh7750/timer.rel
    45 sh7750_timer_rel_SOURCES = sh7750/timer/timer.c
    46 sh7750_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
    47 sh7750_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    48 endif
    49 
    5012include $(srcdir)/preinstall.am
    5113include $(top_srcdir)/../../../automake/local.am
  • c/src/lib/libcpu/sh/configure.ac

    r533e2c0 rf2969b5  
    2020RTEMS_PROG_CCAS
    2121
    22 AM_CONDITIONAL([sh7750],[test x"$RTEMS_CPU_MODEL" = x"sh7750"])
    23 
    2422RTEMS_AMPOLISH3
    2523
  • c/src/lib/libcpu/sh/preinstall.am

    r533e2c0 rf2969b5  
    66endif
    77
    8 PREINSTALL_DIRS =
    9 DISTCLEANFILES = $(PREINSTALL_DIRS)
    10 
    11 all-am: $(PREINSTALL_FILES)
    12 
    13 PREINSTALL_FILES =
    14 CLEANFILES = $(PREINSTALL_FILES)
    15 
    16 if sh7750
    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/sh4uart.h: sh7750/include/sh/sh4uart.h $(PROJECT_INCLUDE)/sh/$(dirstamp)
    28         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sh/sh4uart.h
    29 PREINSTALL_FILES += $(PROJECT_INCLUDE)/sh/sh4uart.h
    30 
    31 $(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h: sh7750/include/rtems/score/sh7750_regs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    32         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h
    33 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh7750_regs.h
    34 
    35 $(PROJECT_INCLUDE)/rtems/score/ipl.h: sh7750/include/rtems/score/ipl.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    36         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ipl.h
    37 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ipl.h
    38 
    39 $(PROJECT_INCLUDE)/rtems/score/iosh7750.h: sh7750/include/rtems/score/iosh7750.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    40         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/iosh7750.h
    41 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/iosh7750.h
    42 
    43 $(PROJECT_INCLUDE)/rtems/score/ispsh7750.h: sh7750/include/rtems/score/ispsh7750.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    44         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ispsh7750.h
    45 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ispsh7750.h
    46 
    47 $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h: sh7750/include/rtems/score/sh4_regs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp)
    48         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h
    49 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/sh4_regs.h
    50 endif
Note: See TracChangeset for help on using the changeset viewer.