Changeset bb22a3f3 in rtems


Ignore:
Timestamp:
Mar 21, 2018, 5:27:24 AM (17 months ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
3f3f246a
Parents:
f3a51d62
git-author:
Sebastian Huber <sebastian.huber@…> (03/21/18 05:27:24)
git-committer:
Sebastian Huber <sebastian.huber@…> (03/22/18 06:01:36)
Message:

bsp/powerpc: Move libcpu timer to bsps

Use only one timer driver variant based on the standard PowerPC time
base.

This patch is a part of the BSP source reorganization.

Update #3285.

Files:
5 deleted
23 edited
1 moved

Legend:

Unmodified
Added
Removed
  • bsps/powerpc/shared/ppc-dec-timer.c

    rf3a51d62 rbb22a3f3  
    2121#include <assert.h>
    2222#include <libcpu/powerpc-utility.h>
     23
     24#ifndef BSP_Convert_decrementer
     25#define BSP_Convert_decrementer(value) (value)
     26#endif
    2327
    2428uint64_t   Timer_driver_Start_time;
  • c/src/lib/libbsp/powerpc/beatnik/Makefile.am

    rf3a51d62 rbb22a3f3  
    166166libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
    167167libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
     168libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
    168169
    169170libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \
    170171    ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
    171     ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel \
    172172    ../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel
    173173
  • c/src/lib/libbsp/powerpc/gen5200/Makefile.am

    rf3a51d62 rbb22a3f3  
    112112
    113113libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
     114libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
    114115
    115 libbsp_a_LIBADD =  ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
    116         ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel
     116libbsp_a_LIBADD =  ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel
    117117
    118118include $(top_srcdir)/../../../../automake/local.am
  • c/src/lib/libbsp/powerpc/gen83xx/Makefile.am

    rf3a51d62 rbb22a3f3  
    7575
    7676libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
     77libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
    7778
    7879libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel   \
    79         ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel \
    8080        ../../../libcpu/@RTEMS_CPU@/mpc83xx/i2c.rel  \
    8181        ../../../libcpu/@RTEMS_CPU@/mpc83xx/spi.rel \
  • c/src/lib/libbsp/powerpc/haleakala/Makefile.am

    rf3a51d62 rbb22a3f3  
    4545libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
    4646libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
     47libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
    4748
    48 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \
    49     ../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel
     49libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel
    5050
    5151include $(top_srcdir)/../../../../automake/local.am
  • c/src/lib/libbsp/powerpc/haleakala/startup/bspstart.c

    rf3a51d62 rbb22a3f3  
    7676/* Expected by clock.c */
    7777uint32_t    bsp_clicks_per_usec;
    78 uint32_t    bsp_timer_least_valid;
    79 uint32_t    bsp_timer_average_overhead;
    8078
    8179/*-------------------- Haleakala-specific UART setup -------------------------*/
     
    183181  rtems_counter_initialize_converter(bsp_clicks_per_usec * 1000000);
    184182
    185   bsp_timer_average_overhead = 2;
    186   bsp_timer_least_valid = 3;
    187 
    188183  /*
    189184   * Initialize default raw exception handlers.
  • c/src/lib/libbsp/powerpc/motorola_powerpc/Makefile.am

    rf3a51d62 rbb22a3f3  
    117117libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
    118118libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
     119libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
    119120
    120121libbsp_a_LIBADD = \
     
    122123    ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \
    123124    ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
    124     ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel \
    125125    ../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel
    126126
  • c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am

    rf3a51d62 rbb22a3f3  
    108108
    109109libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
     110libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
    110111
    111112libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/misc.rel \
     
    114115    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/edma.rel \
    115116    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/emios.rel \
    116     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/dspi.rel \
    117     ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/timer.rel
     117    ../../../libcpu/@RTEMS_CPU@/@RTEMS_CPU_MODEL@/dspi.rel
    118118
    119119include $(top_srcdir)/../../../../automake/local.am
  • c/src/lib/libbsp/powerpc/mpc8260ads/Makefile.am

    rf3a51d62 rbb22a3f3  
    5656
    5757libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
     58libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
    5859
    5960libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc8260/console-generic.rel \
    6061    ../../../libcpu/@RTEMS_CPU@/mpc8260/cpm.rel \
    61     ../../../libcpu/@RTEMS_CPU@/mpc8260/mmu.rel \
    62     ../../../libcpu/@RTEMS_CPU@/mpc8260/timer.rel
     62    ../../../libcpu/@RTEMS_CPU@/mpc8260/mmu.rel
    6363
    6464EXTRA_DIST += times
  • c/src/lib/libbsp/powerpc/mpc8260ads/startup/bspstart.c

    rf3a51d62 rbb22a3f3  
    6969bool       bsp_serial_cts_rts;
    7070uint32_t   bsp_serial_rate;
    71 uint32_t   bsp_timer_average_overhead; /* Average overhead of timer in ticks */
    72 uint32_t   bsp_timer_least_valid;      /* Least valid number from timer      */
    7371
    7472extern char IntrStack_start [];
     
    173171  bsp_serial_cts_rts         = 0;
    174172  bsp_serial_rate            = 9600;
    175   bsp_timer_average_overhead = 3;
    176   bsp_timer_least_valid    = 3;
    177173  bsp_clock_speed          = 40000000;
    178174  rtems_counter_initialize_converter(bsp_clock_speed);
  • c/src/lib/libbsp/powerpc/mvme3100/Makefile.am

    rf3a51d62 rbb22a3f3  
    108108libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
    109109libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
     110libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
    110111
    111112libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/e500/clock.rel \
    112     ../../../libcpu/@RTEMS_CPU@/e500/timer.rel \
    113113    ../../../libcpu/@RTEMS_CPU@/e500/mmu.rel
    114114
  • c/src/lib/libbsp/powerpc/mvme5500/Makefile.am

    rf3a51d62 rbb22a3f3  
    8686libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
    8787libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
     88libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
    8889
    8990libbsp_a_LIBADD = \
    9091    ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \
    9192    ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
    92     ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel\
    9393    ../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel
    9494
  • c/src/lib/libbsp/powerpc/psim/Makefile.am

    rf3a51d62 rbb22a3f3  
    6363libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
    6464libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/irq/ppc-irq-legacy.c
     65libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
    6566
    6667libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc6xx/clock.rel \
    6768    ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
    68     ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel \
    6969    ../../../libcpu/@RTEMS_CPU@/mpc6xx/altivec.rel
    7070
  • c/src/lib/libbsp/powerpc/qemuppc/Makefile.am

    rf3a51d62 rbb22a3f3  
    5353
    5454libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
     55libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
    5556
    56 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel \
    57     ../../../libcpu/@RTEMS_CPU@/mpc6xx/timer.rel
     57libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/mpc6xx/mmu.rel
    5858
    5959include $(top_srcdir)/../../../../automake/local.am
  • c/src/lib/libbsp/powerpc/ss555/Makefile.am

    rf3a51d62 rbb22a3f3  
    3838libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
    3939libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/exceptions/ppc_exc_print.c
     40libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
    4041libbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/dev/clock.c
    4142libbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/dev/console-generic.c
    42 libbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/dev/timer.c
    4343libbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/irq_asm.S
    4444libbsp_a_SOURCES += ../../../../../../bsps/powerpc/ss555/start/irq.c
  • c/src/lib/libbsp/powerpc/ss555/startup/bspstart.c

    rf3a51d62 rbb22a3f3  
    4040uint32_t   bsp_clicks_per_usec;
    4141uint32_t   bsp_clock_speed;            /* Serial clocks per second */
    42 uint32_t   bsp_timer_least_valid;
    43 uint32_t   bsp_timer_average_overhead;
    4442
    4543/*
     
    9189  bsp_clicks_per_usec = BSP_CRYSTAL_HZ / 4 / 1000000;
    9290  bsp_clock_speed     = BSP_CLOCK_HZ;   /* for SCI baud rate generator */
    93   bsp_timer_least_valid      = 0;
    94   bsp_timer_average_overhead = 0;
    9591  rtems_counter_initialize_converter(BSP_CRYSTAL_HZ / 4);
    9692
  • c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am

    rf3a51d62 rbb22a3f3  
    6464
    6565libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
     66libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
    6667
    6768libbsp_a_LIBADD = \
     
    6970    ../../../libcpu/@RTEMS_CPU@/mpc8xx/cpm.rel \
    7071    ../../../libcpu/@RTEMS_CPU@/mpc8xx/clock.rel \
    71     ../../../libcpu/@RTEMS_CPU@/mpc8xx/mmu.rel \
    72     ../../../libcpu/@RTEMS_CPU@/mpc8xx/timer.rel
     72    ../../../libcpu/@RTEMS_CPU@/mpc8xx/mmu.rel
    7373
    7474include $(top_srcdir)/../../../../automake/local.am
  • c/src/lib/libbsp/powerpc/tqm8xx/startup/bspstart.c

    rf3a51d62 rbb22a3f3  
    4646/* Legacy */
    4747uint32_t bsp_clicks_per_usec; /* for PIT driver: OSCCLK */
    48 
    49 /* for timer: */
    50 uint32_t   bsp_timer_average_overhead; /* Average overhead of timer in ticks */
    51 uint32_t   bsp_timer_least_valid;      /* Least valid number from timer      */
    5248
    5349static const char *bsp_tqm_get_cib_string( const char *cib_id)
     
    146142  bsp_time_base_frequency = BSP_bus_frequency / 16;
    147143  bsp_clicks_per_usec = bsp_time_base_frequency / 1000000;
    148   bsp_timer_least_valid = 3;
    149   bsp_timer_average_overhead = 3;
    150144  rtems_counter_initialize_converter(bsp_time_base_frequency);
    151145
  • c/src/lib/libbsp/powerpc/virtex/Makefile.am

    rf3a51d62 rbb22a3f3  
    6363endif
    6464
    65 # timer
    66 libbsp_a_SOURCES += timer/timer-config.c
    67 libbsp_a_LIBADD += ../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel
    68 
    6965libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
     66libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
    7067
    7168include $(top_srcdir)/../../../../automake/local.am
  • c/src/lib/libbsp/powerpc/virtex4/Makefile.am

    rf3a51d62 rbb22a3f3  
    4747
    4848libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
     49libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
    4950
    50 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel \
    51                   ../../../libcpu/@RTEMS_CPU@/ppc403/timer.rel
     51libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/ppc403/clock.rel
    5252
    5353EXTRA_DIST += times
  • c/src/lib/libbsp/powerpc/virtex4/startup/bspstart.c

    rf3a51d62 rbb22a3f3  
    9797/* Expected by clock.c */
    9898uint32_t    bsp_clicks_per_usec;
    99 uint32_t    bsp_timer_least_valid;
    100 uint32_t    bsp_timer_average_overhead;
    10199
    102100
     
    168166  /* Timebase register ticks/microsecond;  The application may override these */
    169167  bsp_clicks_per_usec        = 350;
    170   bsp_timer_average_overhead = 2;
    171   bsp_timer_least_valid      = 3;
    172168  rtems_counter_initialize_converter(bsp_clicks_per_usec * 1000000);
    173169
  • c/src/lib/libbsp/powerpc/virtex5/Makefile.am

    rf3a51d62 rbb22a3f3  
    4949
    5050libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/cache/cache.c
     51libbsp_a_SOURCES += ../../../../../../bsps/powerpc/shared/ppc-dec-timer.c
    5152
    52 libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/e500/clock.rel \
    53                   ../../../libcpu/@RTEMS_CPU@/e500/timer.rel
     53libbsp_a_LIBADD = ../../../libcpu/@RTEMS_CPU@/e500/clock.rel
    5454
    5555EXTRA_DIST += times
  • c/src/lib/libbsp/powerpc/virtex5/startup/bspstart.c

    rf3a51d62 rbb22a3f3  
    9898/* Expected by clock.c */
    9999uint32_t    bsp_clicks_per_usec;
    100 uint32_t    bsp_timer_least_valid;
    101 uint32_t    bsp_timer_average_overhead;
    102100
    103101/*
     
    190188    BSP_bus_frequency / (BSP_time_base_divisor / 1000)
    191189  );
    192   bsp_timer_average_overhead = 2;
    193   bsp_timer_least_valid      = 3;
    194190
    195191  /*
  • c/src/lib/libcpu/powerpc/Makefile.am

    rf3a51d62 rbb22a3f3  
    2525ppc403_console_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    2626
    27 # ppc403/timer
    28 noinst_PROGRAMS += ppc403/timer.rel
    29 ppc403_timer_rel_SOURCES = ppc403/timer/timer.c
    30 ppc403_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
    31 ppc403_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    32 
    3327# ppc403/tty_drv
    3428if ppc405
     
    6256mpc6xx_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    6357
    64 # mpc6xx/timer
    65 noinst_PROGRAMS += mpc6xx/timer.rel
    66 mpc6xx_timer_rel_SOURCES = mpc6xx/timer/timer.c
    67 mpc6xx_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
    68 mpc6xx_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    69 
    7058# mpc6xx/altivec
    7159noinst_PROGRAMS += mpc6xx/altivec.rel
     
    8270e500_clock_rel_CPPFLAGS = $(AM_CPPFLAGS)
    8371e500_clock_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    84 endif
    85 
    86 # e500/timer
    87 if e500_timer
    88 noinst_PROGRAMS += e500/timer.rel
    89 e500_timer_rel_SOURCES = mpc6xx/timer/timer.c
    90 e500_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
    91 e500_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    9272endif
    9373
     
    125105mpc8xx_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS)
    126106mpc8xx_mmu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    127 
    128 # mpc8xx/timer
    129 noinst_PROGRAMS += mpc8xx/timer.rel
    130 mpc8xx_timer_rel_SOURCES = mpc8xx/timer/timer.c
    131 mpc8xx_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
    132 mpc8xx_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    133107endif
    134108
     
    155129mpc8260_mmu_rel_CPPFLAGS = $(AM_CPPFLAGS)
    156130mpc8260_mmu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    157 
    158 # mpc8260/timer
    159 noinst_PROGRAMS += mpc8260/timer.rel
    160 mpc8260_timer_rel_SOURCES = mpc8260/timer/timer.c
    161 mpc8260_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
    162 mpc8260_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    163131endif
    164132
     
    210178mpc55xx_irq_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    211179
    212 # mpc6xx/timer
    213 noinst_PROGRAMS += mpc55xx/timer.rel
    214 mpc55xx_timer_rel_SOURCES = mpc6xx/timer/timer.c
    215 mpc55xx_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
    216 mpc55xx_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
    217 
    218180# FEC
    219181noinst_PROGRAMS += mpc55xx/fec.rel
Note: See TracChangeset for help on using the changeset viewer.