Changeset 88919d0 in rtems


Ignore:
Timestamp:
Apr 7, 2010, 2:19:55 PM (10 years ago)
Author:
Thomas Doerfler <Thomas.Doerfler@…>
Branches:
4.10, 4.11, master
Children:
456d9b2
Parents:
9a66caae
Message:

renamed MPC55XX_CHIP_DERIVATE to MPC55XX_CHIP_TYPE

Location:
c/src/lib
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/powerpc/mpc55xxevb/ChangeLog

    r9a66caae r88919d0  
     12010-04-07      Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
     2
     3        * configure.ac, startup/bspstart.c:
     4        renamed MPC55XX_CHIP_DERIVATE to MPC55XX_CHIP_TYPE
     5
    162010-04-07      Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
    27        * Makefile.am, configure.ac, preinstall.am, clock/clock-config.c,
  • c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac

    r9a66caae r88919d0  
    8888[Must be defined to set the EMIOS prescaler])
    8989
    90 RTEMS_BSPOPTS_SET([MPC55XX_CHIP_DERIVATE],[mpc5566evb],[5566])
    91 RTEMS_BSPOPTS_SET([MPC55XX_CHIP_DERIVATE],[gwlcfm]    ,[5516])
    92 RTEMS_BSPOPTS_SET([MPC55XX_CHIP_DERIVATE],[*]         ,[5554])
    93 RTEMS_BSPOPTS_HELP([MPC55XX_CHIP_DERIVATE],
    94 [specifies the chip derivate in use (e.g. 5554 for MPC5554)])
     90RTEMS_BSPOPTS_SET([MPC55XX_CHIP_TYPE],[mpc5566evb],[5566])
     91RTEMS_BSPOPTS_SET([MPC55XX_CHIP_TYPE],[gwlcfm]    ,[5516])
     92RTEMS_BSPOPTS_SET([MPC55XX_CHIP_TYPE],[*]         ,[5554])
     93RTEMS_BSPOPTS_HELP([MPC55XX_CHIP_TYPE],
     94[specifies the chip type in use (e.g. 5554 for MPC5554)])
    9595
    9696RTEMS_BSPOPTS_SET([BOARD_GWLCFM],[gwlcfm],[1])
  • c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c

    r9a66caae r88919d0  
    9393}
    9494
    95 #if ((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517))
     95#if ((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517))
    9696/*
    9797 * define init values for FMPLL ESYNCRx
     
    137137  };
    138138
    139 #else /* ((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517)) */
     139#else /* ((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517)) */
    140140
    141141const struct fmpll_syncr_vals_t {
     
    158158  };
    159159
    160 #endif /* ((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517)) */
     160#endif /* ((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517)) */
    161161
    162162#if defined(BOARD_GWLCFM)
  • c/src/lib/libcpu/powerpc/ChangeLog

    r9a66caae r88919d0  
     12010-04-07      Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
     2
     3        * shared/include/cpuIdent.c, shared/include/cpuIdent.h: skip
     4        version nibble when detecting e200 processor version
     5        * mpc55xx/edma/edma.c, mpc55xx/include/irq.h,
     6        mpc55xx/include/reg-defs.h, mpc55xx/include/regs.h,
     7        mpc55xx/misc/copy.S, mpc55xx/misc/fmpll.S:
     8        renamed MPC55XX_CHIP_DERIVATE to MPC55XX_CHIP_TYPE
     9
    1102010-04-07      Thomas Doerfler <Thomas.Doerfler@embedded-brains.de>
    211
  • c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c

    r9a66caae r88919d0  
    3232#include <rtems/status-checks.h>
    3333
    34 #if   ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))
     34#if   ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))
    3535#define MPC55XX_EDMA_CHANNEL_COUNT 16U
    36 #else /* ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517)) */
     36#else /* ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517)) */
    3737#define MPC55XX_EDMA_CHANNEL_COUNT 64U
    38 #endif /* ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517)) */
     38#endif /* ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517)) */
    3939
    4040#define MPC55XX_EDMA_INVALID_CHANNEL MPC55XX_EDMA_CHANNEL_COUNT
  • c/src/lib/libcpu/powerpc/mpc55xx/include/irq.h

    r9a66caae r88919d0  
    4848#define MPC55XX_IRQ_SOFTWARE_NUMBER (MPC55XX_IRQ_SOFTWARE_MAX + 1U)
    4949
    50 #if ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))
    51 #else  /*((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))*/
    52 #endif /*((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))*/
     50#if ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))
     51#else  /*((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))*/
     52#endif /*((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))*/
    5353
    54 #if ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))
     54#if ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))
    5555
    5656/* eDMA interrupts */
     
    7979  ((c) + MPC55XX_IRQ_EMIOS_REQUEST_LOW_MIN)
    8080
    81 #else  /*((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))*/
     81#else  /*((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))*/
    8282
    8383/* eDMA interrupts */
     
    122122   : ((c) + MPC55XX_IRQ_EMIOS_REQUEST_LOW_MIN))
    123123
    124 #endif /*((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))*/
     124#endif /*((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))*/
    125125
    126126/* Checks */
  • c/src/lib/libcpu/powerpc/mpc55xx/include/reg-defs.h

    r9a66caae r88919d0  
    2626 * Register addresses
    2727 */
    28 #if ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))
     28#if ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))
    2929
    3030#define FMPLL_SYNSR   0xFFFF0004
     
    4444#define SIU_SYSCLK_SYSCLKSEL_PLL  0x80000000
    4545
    46 #else /* ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))*/
     46#else /* ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))*/
    4747
    4848#define FMPLL_SYNCR 0xC3F80000
     
    5252#define SIU_SRCR 0xC3F90010
    5353
    54 #endif /*((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))*/
     54#endif /*((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))*/
    5555/*
    5656 * Special purpose registers
  • c/src/lib/libcpu/powerpc/mpc55xx/include/regs.h

    r9a66caae r88919d0  
    43914391    };
    43924392
    4393 #if ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))
     4393#if ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))
    43944394/* Define memories */
    43954395
     
    44394439#define FLASH     (*(volatile struct FLASH_tag *)     0xFFFF8000)
    44404440
    4441 #else /* ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517)) */
     4441#else /* ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517)) */
    44424442/* Define memories */
    44434443
  • c/src/lib/libcpu/powerpc/mpc55xx/misc/copy.S

    r9a66caae r88919d0  
    3333 * The SPE operations @b evxor, @b evlddx and @b evstddx will be used.
    3434 */
    35 #if       ((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517))
     35#if       ((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517))
    3636GLOBAL_FUNCTION mpc55xx_copy_8
    37 #endif /* ((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517)) */
     37#endif /* ((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517)) */
    3838GLOBAL_FUNCTION mpc55xx_copy_4
    3939        /* Loop counter = data size / 4 */
     
    5151        blr
    5252
    53 #if  !((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517))
     53#if  !((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517))
    5454/**
    5555 * @fn int mpc55xx_copy_8( const void *src, void *dest, size_t n)
     
    7878        /* Return */
    7979        blr
    80 #endif /*!((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517))*/
     80#endif /*!((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517))*/
    8181
    8282/**
     
    8888 * must be evenly divisible by 4.  No SPE operations are used.
    8989 */
    90 #if       ((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517))
     90#if       ((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517))
    9191GLOBAL_FUNCTION mpc55xx_zero_32
    9292GLOBAL_FUNCTION mpc55xx_zero_8
    93 #endif /* ((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517)) */
     93#endif /* ((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517)) */
    9494GLOBAL_FUNCTION mpc55xx_zero_4
    9595        /* Create zero */
     
    122122        /* Return */
    123123        blr
    124 #if      !((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517))
     124#if      !((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517))
    125125/**
    126126 * @fn int mpc55xx_zero_8( void *dest, size_t n)
     
    221221        /* Return */
    222222        blr
    223 #endif  /*  !((MPC55XX_CHIP_DERIVATE>=5510) && (MPC55XX_CHIP_DERIVATE<=5517)) */
     223#endif  /*  !((MPC55XX_CHIP_TYPE>=5510) && (MPC55XX_CHIP_TYPE<=5517)) */
  • c/src/lib/libcpu/powerpc/mpc55xx/misc/fmpll.S

    r9a66caae r88919d0  
    4545        mflr r9
    4646
    47 #if ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))
     47#if ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))
    4848        /*
    4949         * for MPC5510: pass in ptr to array with:
     
    132132 */
    133133GLOBAL_FUNCTION mpc55xx_get_system_clock
    134 #if ((MPC55XX_CHIP_DERIVATE >= 5510) && (MPC55XX_CHIP_DERIVATE <= 5517))
     134#if ((MPC55XX_CHIP_TYPE >= 5510) && (MPC55XX_CHIP_TYPE <= 5517))
    135135        LA r4, FMPLL_ESYNCR1
    136136        lwz r3, 0(r4)
Note: See TracChangeset for help on using the changeset viewer.