Changeset b748dffe in rtems


Ignore:
Timestamp:
Dec 8, 2017, 7:05:04 AM (2 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
604f080c
Parents:
a1460043
git-author:
Sebastian Huber <sebastian.huber@…> (12/08/17 07:05:04)
git-committer:
Sebastian Huber <sebastian.huber@…> (12/08/17 12:03:50)
Message:

bsp/csb337: Move libcpu files to BSP

Update #3254.

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

Legend:

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

    ra1460043 rb748dffe  
    99include_HEADERS = include/bsp.h
    1010include_HEADERS += include/tm27.h
     11include_HEADERS += include/at91rm9200_dbgu.h
     12include_HEADERS += include/at91rm9200_emac.h
     13include_HEADERS += include/at91rm9200_gpio.h
     14include_HEADERS += include/at91rm9200.h
     15include_HEADERS += include/at91rm9200_mem.h
     16include_HEADERS += include/at91rm9200_pmc.h
     17include_HEADERS += include/at91rm9200_usart.h
     18include_HEADERS += include/bits.h
     19
    1120if ENABLE_LCD
    1221include_HEADERS += include/sed1356.h
     
    6069libbsp_a_SOURCES += ../../shared/cpucounterread.c
    6170libbsp_a_SOURCES += ../../shared/cpucounterdiff.c
     71libbsp_a_SOURCES += startup/pmc.c
     72libbsp_a_SOURCES += clock/clock.c
     73libbsp_a_SOURCES += timer/timer.c
    6274# console
    6375libbsp_a_SOURCES += ../../shared/console.c console/uarts.c \
    6476    ../../shared/console_select.c  ../../shared/console_control.c \
    6577    ../../shared/console_read.c ../../shared/console_write.c
     78libbsp_a_SOURCES += console/dbgu.c
     79libbsp_a_SOURCES += console/usart.c
    6680# IRQ
    6781include_bsp_HEADERS += ../../shared/include/irq-generic.h \
    6882        ../../shared/include/irq-info.h
     83include_bsp_HEADERS += include/bsp/irq.h
    6984libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
    7085libbsp_a_SOURCES += ../../shared/src/irq-generic.c
     
    7388libbsp_a_SOURCES += ../../shared/src/irq-server.c
    7489libbsp_a_SOURCES += ../../shared/src/irq-shell.c
     90libbsp_a_SOURCES += irq/irq.c
    7591if ENABLE_LCD
    7692libbsp_a_SOURCES += console/sed1356.c console/fbcons.c
     
    100116endif
    101117
    102 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \
    103     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \
    104     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/dbgu.rel \
    105     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/usart.rel \
    106     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \
    107     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/pmc.rel \
    108     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq.rel
     118libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel
    109119if HAS_NETWORKING
    110120libbsp_a_LIBADD += network.rel
  • c/src/lib/libbsp/arm/csb337/make/custom/csb337.cfg

    ra1460043 rb748dffe  
    66
    77RTEMS_CPU=arm
    8 RTEMS_CPU_MODEL=at91rm9200
     8RTEMS_CPU_MODEL=shared
    99
    1010#  This contains the compiler options necessary to select the CPU model
  • c/src/lib/libbsp/arm/csb337/preinstall.am

    ra1460043 rb748dffe  
    4545        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/tm27.h
    4646PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
     47
     48$(PROJECT_INCLUDE)/at91rm9200_dbgu.h: include/at91rm9200_dbgu.h $(PROJECT_INCLUDE)/$(dirstamp)
     49        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_dbgu.h
     50PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_dbgu.h
     51
     52$(PROJECT_INCLUDE)/at91rm9200_emac.h: include/at91rm9200_emac.h $(PROJECT_INCLUDE)/$(dirstamp)
     53        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_emac.h
     54PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_emac.h
     55
     56$(PROJECT_INCLUDE)/at91rm9200_gpio.h: include/at91rm9200_gpio.h $(PROJECT_INCLUDE)/$(dirstamp)
     57        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_gpio.h
     58PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_gpio.h
     59
     60$(PROJECT_INCLUDE)/at91rm9200.h: include/at91rm9200.h $(PROJECT_INCLUDE)/$(dirstamp)
     61        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200.h
     62PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200.h
     63
     64$(PROJECT_INCLUDE)/at91rm9200_mem.h: include/at91rm9200_mem.h $(PROJECT_INCLUDE)/$(dirstamp)
     65        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_mem.h
     66PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_mem.h
     67
     68$(PROJECT_INCLUDE)/at91rm9200_pmc.h: include/at91rm9200_pmc.h $(PROJECT_INCLUDE)/$(dirstamp)
     69        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_pmc.h
     70PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_pmc.h
     71
     72$(PROJECT_INCLUDE)/at91rm9200_usart.h: include/at91rm9200_usart.h $(PROJECT_INCLUDE)/$(dirstamp)
     73        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_usart.h
     74PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_usart.h
     75
     76$(PROJECT_INCLUDE)/bits.h: include/bits.h $(PROJECT_INCLUDE)/$(dirstamp)
     77        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bits.h
     78PREINSTALL_FILES += $(PROJECT_INCLUDE)/bits.h
    4779
    4880if ENABLE_LCD
     
    111143PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
    112144
     145$(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     146        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
     147PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
     148
  • c/src/lib/libcpu/arm/Makefile.am

    ra1460043 rb748dffe  
    2626endif
    2727
    28 if at91rm9200
    29 include_HEADERS = at91rm9200/include/at91rm9200.h at91rm9200/include/at91rm9200_dbgu.h \
    30     at91rm9200/include/at91rm9200_emac.h at91rm9200/include/at91rm9200_gpio.h \
    31     at91rm9200/include/at91rm9200_mem.h at91rm9200/include/at91rm9200_pmc.h \
    32     at91rm9200/include/bits.h at91rm9200/include/at91rm9200_usart.h
    33 
    34 ## at91rm9200/clock
    35 noinst_PROGRAMS += at91rm9200/clock.rel
    36 at91rm9200_clock_rel_SOURCES = at91rm9200/clock/clock.c
    37 at91rm9200_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
    38 at91rm9200_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    39 
    40 ## at91rm9200/dbgu
    41 noinst_PROGRAMS += at91rm9200/dbgu.rel
    42 at91rm9200_dbgu_rel_SOURCES = at91rm9200/dbgu/dbgu.c
    43 at91rm9200_dbgu_rel_CPPFLAGS = $(AM_CPPFLAGS)
    44 at91rm9200_dbgu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    45 
    46 ## at91rm9200/usart
    47 noinst_PROGRAMS += at91rm9200/usart.rel
    48 at91rm9200_usart_rel_SOURCES = at91rm9200/usart/usart.c
    49 at91rm9200_usart_rel_CPPFLAGS = $(AM_CPPFLAGS)
    50 at91rm9200_usart_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    51 
    52 ## at91rm9200/timer
    53 noinst_PROGRAMS += at91rm9200/timer.rel
    54 at91rm9200_timer_rel_SOURCES = at91rm9200/timer/timer.c
    55 at91rm9200_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
    56 at91rm9200_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    57 
    58 ## at91rm9200/pmc
    59 noinst_PROGRAMS += at91rm9200/pmc.rel
    60 at91rm9200_pmc_rel_SOURCES = at91rm9200/pmc/pmc.c
    61 at91rm9200_pmc_rel_CPPFLAGS = $(AM_CPPFLAGS)
    62 at91rm9200_pmc_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    63 
    64 ## at91rm9200/interrupt
    65 include_bsp_HEADERS += at91rm9200/irq/irq.h
    66 
    67 noinst_PROGRAMS += at91rm9200/irq.rel
    68 at91rm9200_irq_rel_SOURCES = at91rm9200/irq/irq.c \
    69     at91rm9200/irq/irq.h
    70 at91rm9200_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
    71 at91rm9200_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    72 endif
    73 
    7428include $(srcdir)/preinstall.am
    7529include $(top_srcdir)/../../../automake/local.am
  • c/src/lib/libcpu/arm/configure.ac

    ra1460043 rb748dffe  
    2121
    2222AM_CONDITIONAL(shared, test "$RTEMS_CPU_MODEL" = "arm1136" || \
    23                        test "$RTEMS_CPU_MODEL" = "at91rm9200" || \
    2423                       test "$RTEMS_CPU_MODEL" = "shared")
    25 
    26 AM_CONDITIONAL(at91rm9200, test "$RTEMS_CPU_MODEL" = "at91rm9200")
    2724
    2825RTEMS_AMPOLISH3
  • c/src/lib/libcpu/arm/preinstall.am

    ra1460043 rb748dffe  
    1313PREINSTALL_FILES =
    1414CLEANFILES = $(PREINSTALL_FILES)
    15 
    16 $(PROJECT_INCLUDE)/$(dirstamp):
    17         @$(MKDIR_P) $(PROJECT_INCLUDE)
    18         @: > $(PROJECT_INCLUDE)/$(dirstamp)
    19 PREINSTALL_DIRS += $(PROJECT_INCLUDE)/$(dirstamp)
    2015
    2116$(PROJECT_INCLUDE)/bsp/$(dirstamp):
     
    3833PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/arm-cp15.h
    3934endif
    40 if at91rm9200
    41 $(PROJECT_INCLUDE)/at91rm9200.h: at91rm9200/include/at91rm9200.h $(PROJECT_INCLUDE)/$(dirstamp)
    42         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200.h
    43 PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200.h
    44 
    45 $(PROJECT_INCLUDE)/at91rm9200_dbgu.h: at91rm9200/include/at91rm9200_dbgu.h $(PROJECT_INCLUDE)/$(dirstamp)
    46         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_dbgu.h
    47 PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_dbgu.h
    48 
    49 $(PROJECT_INCLUDE)/at91rm9200_emac.h: at91rm9200/include/at91rm9200_emac.h $(PROJECT_INCLUDE)/$(dirstamp)
    50         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_emac.h
    51 PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_emac.h
    52 
    53 $(PROJECT_INCLUDE)/at91rm9200_gpio.h: at91rm9200/include/at91rm9200_gpio.h $(PROJECT_INCLUDE)/$(dirstamp)
    54         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_gpio.h
    55 PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_gpio.h
    56 
    57 $(PROJECT_INCLUDE)/at91rm9200_mem.h: at91rm9200/include/at91rm9200_mem.h $(PROJECT_INCLUDE)/$(dirstamp)
    58         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_mem.h
    59 PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_mem.h
    60 
    61 $(PROJECT_INCLUDE)/at91rm9200_pmc.h: at91rm9200/include/at91rm9200_pmc.h $(PROJECT_INCLUDE)/$(dirstamp)
    62         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_pmc.h
    63 PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_pmc.h
    64 
    65 $(PROJECT_INCLUDE)/bits.h: at91rm9200/include/bits.h $(PROJECT_INCLUDE)/$(dirstamp)
    66         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bits.h
    67 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bits.h
    68 
    69 $(PROJECT_INCLUDE)/at91rm9200_usart.h: at91rm9200/include/at91rm9200_usart.h $(PROJECT_INCLUDE)/$(dirstamp)
    70         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/at91rm9200_usart.h
    71 PREINSTALL_FILES += $(PROJECT_INCLUDE)/at91rm9200_usart.h
    72 
    73 $(PROJECT_INCLUDE)/bsp/irq.h: at91rm9200/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
    74         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
    75 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
    76 endif
Note: See TracChangeset for help on using the changeset viewer.