Changeset e9d6114 in rtems


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

bsp/gumstix: Move libcpu files to BSP

Update #3254.

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

Legend:

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

    r102fd7c9 re9d6114  
    1010include_HEADERS = include/bsp.h
    1111include_HEADERS += include/tm27.h
     12include_HEADERS += include/pxa255.h
     13include_HEADERS += include/ffuart.h
    1214
    1315include_bsp_HEADERS =
     
    3638libbsp_a_SOURCES += ../../shared/cpucounterread.c
    3739libbsp_a_SOURCES += ../../shared/cpucounterdiff.c
     40libbsp_a_SOURCES += clock/clock.c
     41libbsp_a_SOURCES += timer/timer.c
    3842
    3943#console
     
    4145  ../../shared/console_select.c  ../../shared/console_control.c \
    4246  ../../shared/console_read.c ../../shared/console_write.c
     47libbsp_a_SOURCES += console/ffuart.c
    4348# IRQ
    4449include_bsp_HEADERS += ../../shared/include/irq-generic.h \
    4550        ../../shared/include/irq-info.h
     51include_bsp_HEADERS += include/bsp/irq.h
    4652libbsp_a_SOURCES += ../../shared/src/irq-default-handler.c
    4753libbsp_a_SOURCES += ../../shared/src/irq-generic.c
     
    5056libbsp_a_SOURCES += ../../shared/src/irq-server.c
    5157libbsp_a_SOURCES += ../../shared/src/irq-shell.c
     58libbsp_a_SOURCES += irq/irq.c
    5259
    5360# Cache
     
    6875endif
    6976
    70 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel \
    71     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/clock.rel \
    72     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel \
    73     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/ffuart.rel \
    74     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/irq.rel
     77libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/shared/arm920.rel
    7578
    7679if ON_SKYEYE
  • c/src/lib/libbsp/arm/gumstix/make/custom/gumstix.cfg

    r102fd7c9 re9d6114  
    66
    77RTEMS_CPU=arm
    8 RTEMS_CPU_MODEL=pxa255
     8RTEMS_CPU_MODEL=shared
    99
    1010#  This contains the compiler options necessary to select the CPU model
  • c/src/lib/libbsp/arm/gumstix/preinstall.am

    r102fd7c9 re9d6114  
    4646PREINSTALL_FILES += $(PROJECT_INCLUDE)/tm27.h
    4747
     48$(PROJECT_INCLUDE)/pxa255.h: include/pxa255.h $(PROJECT_INCLUDE)/$(dirstamp)
     49        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pxa255.h
     50PREINSTALL_FILES += $(PROJECT_INCLUDE)/pxa255.h
     51
     52$(PROJECT_INCLUDE)/ffuart.h: include/ffuart.h $(PROJECT_INCLUDE)/$(dirstamp)
     53        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ffuart.h
     54PREINSTALL_FILES += $(PROJECT_INCLUDE)/ffuart.h
     55
    4856$(PROJECT_INCLUDE)/bspopts.h: include/bspopts.h $(PROJECT_INCLUDE)/$(dirstamp)
    4957        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bspopts.h
     
    7078PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
    7179
     80$(PROJECT_INCLUDE)/bsp/irq.h: include/bsp/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     81        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
     82PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
     83
    7284if ON_SKYEYE
    7385endif
  • c/src/lib/libcpu/arm/Makefile.am

    r102fd7c9 re9d6114  
    2424shared_arm920_rel_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/shared/src
    2525shared_arm920_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    26 endif
    27 
    28 if pxa255
    29 include_HEADERS = pxa255/include/pxa255.h pxa255/include/ffuart.h
    30 
    31 ## pxa255/clock
    32 noinst_PROGRAMS += pxa255/clock.rel
    33 pxa255_clock_rel_SOURCES = pxa255/clock/clock.c
    34 pxa255_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
    35 pxa255_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    36 
    37 ## pxa255/timer
    38 noinst_PROGRAMS += pxa255/timer.rel
    39 pxa255_timer_rel_SOURCES = pxa255/timer/timer.c
    40 pxa255_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
    41 pxa255_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    42 
    43 ## pxa255/ffuart
    44 noinst_PROGRAMS += pxa255/ffuart.rel
    45 pxa255_ffuart_rel_SOURCES = pxa255/ffuart/ffuart.c
    46 pxa255_ffuart_rel_CPPFLAGS = $(AM_CPPFLAGS)
    47 pxa255_ffuart_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    48 
    49 ## pxa255/interrupt
    50 include_bsp_HEADERS += pxa255/irq/irq.h
    51 noinst_PROGRAMS += pxa255/irq.rel
    52 pxa255_irq_rel_SOURCES = pxa255/irq/irq.c \
    53     pxa255/irq/irq.h
    54 pxa255_irq_rel_CPPFLAGS = $(AM_CPPFLAGS)
    55 pxa255_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    5626endif
    5727
  • c/src/lib/libcpu/arm/configure.ac

    r102fd7c9 re9d6114  
    2525                       test "$RTEMS_CPU_MODEL" = "s3c2410" || \
    2626                       test "$RTEMS_CPU_MODEL" = "s3c2400" || \
    27                        test "$RTEMS_CPU_MODEL" = "pxa255")
     27                       test "$RTEMS_CPU_MODEL" = "shared")
    2828
    2929AM_CONDITIONAL(at91rm9200, test "$RTEMS_CPU_MODEL" = "at91rm9200")
    3030AM_CONDITIONAL(mc9328mxl, test "$RTEMS_CPU_MODEL" = "mc9328mxl")
    3131AM_CONDITIONAL(lpc22xx, test "$RTEMS_CPU_MODEL" = "lpc22xx")
    32 AM_CONDITIONAL(pxa255, test "$RTEMS_CPU_MODEL" = "pxa255")
    3332AM_CONDITIONAL(s3c24xx, test "$RTEMS_CPU_MODEL" = "s3c2400" ||\
    3433                        test "$RTEMS_CPU_MODEL" = "s3c2410")
  • c/src/lib/libcpu/arm/preinstall.am

    r102fd7c9 re9d6114  
    3737        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/arm-cp15.h
    3838PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/arm-cp15.h
    39 endif
    40 if pxa255
    41 $(PROJECT_INCLUDE)/pxa255.h: pxa255/include/pxa255.h $(PROJECT_INCLUDE)/$(dirstamp)
    42         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/pxa255.h
    43 PREINSTALL_FILES += $(PROJECT_INCLUDE)/pxa255.h
    44 
    45 $(PROJECT_INCLUDE)/ffuart.h: pxa255/include/ffuart.h $(PROJECT_INCLUDE)/$(dirstamp)
    46         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ffuart.h
    47 PREINSTALL_FILES += $(PROJECT_INCLUDE)/ffuart.h
    48 
    49 $(PROJECT_INCLUDE)/bsp/irq.h: pxa255/irq/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
    50         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
    51 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
    5239endif
    5340if at91rm9200
Note: See TracChangeset for help on using the changeset viewer.