Changeset 26ff9fd6 in rtems


Ignore:
Timestamp:
Dec 8, 2017, 6:46:48 AM (2 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
7829710
Parents:
586c70ad
git-author:
Sebastian Huber <sebastian.huber@…> (12/08/17 06:46:48)
git-committer:
Sebastian Huber <sebastian.huber@…> (12/08/17 08:30:43)
Message:

bsp/csb336: Move libcpu files to BSP

Update #3254.

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

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/arm/csb336/Makefile.am

    r586c70ad r26ff9fd6  
    99include_HEADERS = include/bsp.h
    1010include_HEADERS += include/tm27.h
     11include_HEADERS += include/mc9328mxl.h
    1112
    1213include_bsp_HEADERS =
     
    3738libbsp_a_SOURCES += ../../shared/cpucounterread.c
    3839libbsp_a_SOURCES += ../../shared/cpucounterdiff.c
     40libbsp_a_SOURCES += clock/clockdrv.c
     41libbsp_a_SOURCES += timer/timer.c
    3942# console
    4043libbsp_a_SOURCES += console/uart.c
     
    4245include_bsp_HEADERS += ../../shared/include/irq-generic.h \
    4346        ../../shared/include/irq-info.h
     47include_bsp_HEADERS += include/bsp/irq.h
    4448libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
    4549libbsp_a_SOURCES += ../../shared/src/irq-generic.c
     
    4852libbsp_a_SOURCES += ../../shared/src/irq-server.c
    4953libbsp_a_SOURCES += ../../shared/src/irq-shell.c
     54libbsp_a_SOURCES += irq/irq.c
    5055
    5156# Cache
     
    6368endif
    6469
    65 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \
    66     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \
    67     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \
    68     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq.rel
     70libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel
    6971
    7072if HAS_NETWORKING
  • c/src/lib/libbsp/arm/csb336/make/custom/csb336.cfg

    r586c70ad r26ff9fd6  
    66
    77RTEMS_CPU=arm
    8 RTEMS_CPU_MODEL=mc9328mxl
     8RTEMS_CPU_MODEL=shared
    99
    1010#  This contains the compiler options necessary to select the CPU model
  • c/src/lib/libbsp/arm/csb336/preinstall.am

    r586c70ad r26ff9fd6  
    4646PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
    4747
     48$(PROJECT_INCLUDE)/mc9328mxl.h: include/mc9328mxl.h $(PROJECT_INCLUDE)/$(dirstamp)
     49        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mc9328mxl.h
     50PREINSTALL_FILES += $(PROJECT_INCLUDE)/mc9328mxl.h
     51
    4852$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
    4953        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
     
    7074PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
    7175
     76$(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     77        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
     78PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
     79
  • c/src/lib/libcpu/arm/Makefile.am

    r586c70ad r26ff9fd6  
    7272endif
    7373
    74 if mc9328mxl
    75 include_HEADERS = mc9328mxl/include/mc9328mxl.h
    76 
    77 ## mc9328mxl/clock
    78 noinst_PROGRAMS += mc9328mxl/clock.rel
    79 mc9328mxl_clock_rel_SOURCES = mc9328mxl/clock/clockdrv.c
    80 mc9328mxl_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
    81 mc9328mxl_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    82 
    83 ## mc9328mxl/timer
    84 noinst_PROGRAMS += mc9328mxl/timer.rel
    85 mc9328mxl_timer_rel_SOURCES = mc9328mxl/timer/timer.c
    86 mc9328mxl_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
    87 mc9328mxl_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    88 
    89 ## mc9328mxl/interrupt
    90 include_bsp_HEADERS += mc9328mxl/irq/irq.h
    91 
    92 noinst_PROGRAMS += mc9328mxl/irq.rel
    93 mc9328mxl_irq_rel_SOURCES = mc9328mxl/irq/irq.c \
    94     mc9328mxl/irq/irq.h
    95 mc9328mxl_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
    96 mc9328mxl_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    97 endif
    98 
    9974if s3c24xx
    10075include_HEADERS = s3c24xx/include/s3c24xx.h s3c24xx/include/s3c2400.h s3c24xx/include/s3c2410.h
  • c/src/lib/libcpu/arm/configure.ac

    r586c70ad r26ff9fd6  
    2222AM_CONDITIONAL(shared, test "$RTEMS_CPU_MODEL" = "arm1136" || \
    2323                       test "$RTEMS_CPU_MODEL" = "at91rm9200" || \
    24                        test "$RTEMS_CPU_MODEL" = "mc9328mxl" || \
    2524                       test "$RTEMS_CPU_MODEL" = "s3c2410" || \
    2625                       test "$RTEMS_CPU_MODEL" = "shared")
    2726
    2827AM_CONDITIONAL(at91rm9200, test "$RTEMS_CPU_MODEL" = "at91rm9200")
    29 AM_CONDITIONAL(mc9328mxl, test "$RTEMS_CPU_MODEL" = "mc9328mxl")
    3028AM_CONDITIONAL(lpc22xx, test "$RTEMS_CPU_MODEL" = "lpc22xx")
    3129AM_CONDITIONAL(s3c24xx, test "$RTEMS_CPU_MODEL" = "s3c2410")
  • c/src/lib/libcpu/arm/preinstall.am

    r586c70ad r26ff9fd6  
    7575PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
    7676endif
    77 if mc9328mxl
    78 $(PROJECT_INCLUDE)/mc9328mxl.h: mc9328mxl/include/mc9328mxl.h $(PROJECT_INCLUDE)/$(dirstamp)
    79         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mc9328mxl.h
    80 PREINSTALL_FILES += $(PROJECT_INCLUDE)/mc9328mxl.h
    81 
    82 $(PROJECT_INCLUDE)/bsp/irq.h: mc9328mxl/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
    83         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
    84 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
    85 endif
    8677if s3c24xx
    8778$(PROJECT_INCLUDE)/s3c24xx.h: s3c24xx/include/s3c24xx.h $(PROJECT_INCLUDE)/$(dirstamp)
Note: See TracChangeset for help on using the changeset viewer.