Changeset 94102775 in rtems


Ignore:
Timestamp:
Oct 1, 2012, 1:02:57 PM (7 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, master
Children:
245cad5
Parents:
29b1bbf
git-author:
Sebastian Huber <sebastian.huber@…> (10/01/12 13:02:57)
git-committer:
Sebastian Huber <sebastian.huber@…> (10/02/12 13:27:33)
Message:

bsp/mpc55xx: Add and use MPC55XX_CHIP_FAMILY

Location:
c/src/lib
Files:
19 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/powerpc/mpc55xxevb/clock/clock-config.c

    r29b1bbf r94102775  
    9999
    100100  /* Set control register */
    101   #if MPC55XX_CHIP_TYPE / 10 == 551
     101  #if MPC55XX_CHIP_FAMILY == 551
    102102    ccr.B.MODE = MPC55XX_EMIOS_MODE_MCB_UP_INT_CLK;
    103103  #else
  • c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac

    r29b1bbf r94102775  
    144144[specifies the chip type in use (e.g. 5554 for MPC5554)])
    145145
     146RTEMS_BSPOPTS_SET([MPC55XX_CHIP_FAMILY],[*],[(MPC55XX_CHIP_TYPE / 10)])
     147RTEMS_BSPOPTS_HELP([MPC55XX_CHIP_FAMILY],
     148[specifies the chip family in use (e.g. 555 for MPC5554)])
     149
    146150RTEMS_BSPOPTS_SET([MPC55XX_EARLY_STACK_SIZE],[*],[1024])
    147151RTEMS_BSPOPTS_HELP([MPC55XX_EARLY_STACK_SIZE],
  • c/src/lib/libbsp/powerpc/mpc55xxevb/i2c/i2c_init.c

    r29b1bbf r94102775  
    2424#include <bsp/mpc83xx_i2cdrv.h>
    2525
    26 #if MPC55XX_CHIP_TYPE / 10 == 551
     26#if MPC55XX_CHIP_FAMILY == 551
    2727  static mpc83xx_i2c_desc_t mpc55xx_i2c_bus = {
    2828    .bus_desc = {
  • c/src/lib/libbsp/powerpc/mpc55xxevb/network/smsc9218i.c

    r29b1bbf r94102775  
    16111611  pcr.B.OBE = 0;
    16121612  pcr.B.IBE = 1;
    1613 #if MPC55XX_CHIP_TYPE / 10 != 551
     1613#if MPC55XX_CHIP_FAMILY != 551
    16141614  pcr.B.DSC = 0;
    16151615#endif
     
    16241624  rtems_interrupt_disable(level);
    16251625  dirsr.R = SIU.DIRSR.R;
    1626 #if MPC55XX_CHIP_TYPE / 10 != 551
     1626#if MPC55XX_CHIP_FAMILY != 551
    16271627  dirsr.B.DIRS0 = 0;
    16281628#endif
     
    16991699  pcr.B.OBE = 1;
    17001700  pcr.B.IBE = 0;
    1701 #if MPC55XX_CHIP_TYPE / 10 != 551
     1701#if MPC55XX_CHIP_FAMILY != 551
    17021702  pcr.B.DSC = 0;
    17031703#endif
  • c/src/lib/libbsp/powerpc/mpc55xxevb/startup/bspstart.c

    r29b1bbf r94102775  
    146146void bsp_pretasking_hook(void)
    147147{
    148         #if MPC55XX_CHIP_TYPE / 10 == 564
     148        #if MPC55XX_CHIP_FAMILY == 564
    149149                _Heap_Extend(
    150150                        RTEMS_Malloc_Heap,
  • c/src/lib/libbsp/powerpc/mpc55xxevb/startup/reset.c

    r29b1bbf r94102775  
    3030{
    3131  while (true) {
    32     #if MPC55XX_CHIP_TYPE / 10 == 564
     32    #if MPC55XX_CHIP_FAMILY == 564
    3333      /* TODO */
    3434    #else
  • c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-cache.S

    r29b1bbf r94102775  
    9797
    9898        /* Save data cache settings */
    99 #if MPC55XX_CHIP_TYPE / 10 != 567
     99#if MPC55XX_CHIP_FAMILY != 567
    100100        /* FIXME: CORG??? 0x00180011 */
    101101        LWI     r6, 0x00100001
  • c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-clock.c

    r29b1bbf r94102775  
    7575      fmpll_wait_for_lock();
    7676
    77       #if MPC55XX_CHIP_TYPE / 10 == 551
     77      #if MPC55XX_CHIP_FAMILY == 551
    7878        /* System clock supplied by PLL */
    7979        SIU.SYSCLK.B.SYSCLKSEL = 2;
  • c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-clock.c

    r29b1bbf r94102775  
    7272        .LOCIRQ = 0,
    7373        .ERATE = 0,
    74         #if MPC55XX_CHIP_TYPE / 10  == 567
     74        #if MPC55XX_CHIP_FAMILY  == 567
    7575          .CLKCFG_DIS = 1,
    7676        #endif
  • c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-mmu-early.c

    r29b1bbf r94102775  
    2626BSP_START_TEXT_SECTION const struct MMU_tag
    2727  mpc55xx_start_config_mmu_early [] = {
    28 #if MPC55XX_CHIP_TYPE / 10 == 555
     28#if MPC55XX_CHIP_FAMILY == 555
    2929  /* Internal SRAM 96k */
    3030  MPC55XX_MMU_TAG_INITIALIZER(3, 0x40000000, MPC55XX_MMU_256K, 1, 1, 1, 0),
    31 #elif MPC55XX_CHIP_TYPE / 10 == 556
     31#elif MPC55XX_CHIP_FAMILY == 556
    3232  /* Internal SRAM 128k */
    3333  MPC55XX_MMU_TAG_INITIALIZER(3, 0x40000000, MPC55XX_MMU_64K, 1, 1, 1, 0),
    3434  MPC55XX_MMU_TAG_INITIALIZER(5, 0x40010000, MPC55XX_MMU_64K, 0, 1, 1, 0),
    35 #elif MPC55XX_CHIP_TYPE / 10 == 564
     35#elif MPC55XX_CHIP_FAMILY == 564
    3636  /* Internal flash 1M */
    3737  MPC55XX_MMU_TAG_INITIALIZER(0, 0x00000000, MPC55XX_MMU_1M, 1, 0, 1, 1),
     
    4242  MPC55XX_MMU_TAG_INITIALIZER(3, 0x40000000, MPC55XX_MMU_64K, 1, 1, 1, 0),
    4343  MPC55XX_MMU_TAG_INITIALIZER(4, 0x50000000, MPC55XX_MMU_64K, 0, 1, 1, 0)
    44 #elif MPC55XX_CHIP_TYPE / 10 == 567
     44#elif MPC55XX_CHIP_FAMILY == 567
    4545  /* Internal SRAM 256k */
    4646  MPC55XX_MMU_TAG_INITIALIZER(3, 0x40000000, MPC55XX_MMU_256K, 1, 1, 1, 0)
  • c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-mmu.c

    r29b1bbf r94102775  
    148148  /* Peripheral Bridge A-Registers on MMU-table pos 4 */
    149149  /* Peripheral Bridge B-Registers on MMU-table pos 0 */
    150 #elif MPC55XX_CHIP_TYPE / 10 == 564
     150#elif MPC55XX_CHIP_FAMILY == 564
    151151  /* Internal flash 1M */
    152152  MPC55XX_MMU_TAG_INITIALIZER(0, 0x00000000, MPC55XX_MMU_1M, 1, 0, 1, 0),
  • c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-flash.S

    r29b1bbf r94102775  
    3939 */
    4040GLOBAL_FUNCTION mpc55xx_start_flash
    41 #if !defined(MPC55XX_NEEDS_LOW_LEVEL_INIT) || MPC55XX_CHIP_TYPE / 10 == 564
     41#if !defined(MPC55XX_NEEDS_LOW_LEVEL_INIT) || MPC55XX_CHIP_FAMILY == 564
    4242        blr
    4343#else
  • c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start.S

    r29b1bbf r94102775  
    2525#include <libcpu/powerpc-utility.h>
    2626
    27 #if MPC55XX_CHIP_TYPE / 10 != 551
     27#if MPC55XX_CHIP_FAMILY != 551
    2828  #define HAS_SPE
    2929#endif
    3030
    31 #if MPC55XX_CHIP_TYPE / 10 == 564
     31#if MPC55XX_CHIP_FAMILY == 564
    3232  #define INIT_REGISTERS_FOR_LSM
    3333#endif
  • c/src/lib/libcpu/powerpc/mpc55xx/edma/edma.c

    r29b1bbf r94102775  
    2929#include <bsp/irq.h>
    3030
    31 #if MPC55XX_CHIP_TYPE / 10 == 551
     31#if MPC55XX_CHIP_FAMILY == 551
    3232  #define EDMA_CHANNEL_COUNT 16U
    33 #elif MPC55XX_CHIP_TYPE / 10 == 564
     33#elif MPC55XX_CHIP_FAMILY == 564
    3434  #define EDMA_CHANNEL_COUNT 16U
    35 #elif MPC55XX_CHIP_TYPE / 10 == 567
     35#elif MPC55XX_CHIP_FAMILY == 567
    3636  #define EDMA_CHANNEL_COUNT 96U
    3737#else
  • c/src/lib/libcpu/powerpc/mpc55xx/include/emios.h

    r29b1bbf r94102775  
    169169/** @} */
    170170
    171 #if MPC55XX_CHIP_TYPE / 10 == 567
     171#if MPC55XX_CHIP_FAMILY == 567
    172172  #define MPC55XX_EMIOS_CHANNEL_NUMBER 32U
    173173#else
  • c/src/lib/libcpu/powerpc/mpc55xx/include/irq.h

    r29b1bbf r94102775  
    4747#define MPC55XX_IRQ_SOFTWARE_NUMBER (MPC55XX_IRQ_SOFTWARE_MAX + 1U)
    4848
    49 #if MPC55XX_CHIP_TYPE / 10 == 551
     49#if MPC55XX_CHIP_FAMILY == 551
    5050  #define MPC55XX_IRQ_MAX 293U
    5151
     
    112112  #define MPC55XX_IRQ_FLEXRAY_BASE(mod) \
    113113    ((mod) == 0 ? 284U : MPC55XX_IRQ_INVALID)
    114 #elif MPC55XX_CHIP_TYPE / 10 == 564
     114#elif MPC55XX_CHIP_FAMILY == 564
    115115  #define MPC55XX_IRQ_MAX 255U
    116116
     
    212212  #define MPC55XX_IRQ_SWG 255U
    213213#else
    214   #if MPC55XX_CHIP_TYPE / 10 == 555
     214  #if MPC55XX_CHIP_FAMILY == 555
    215215    #define MPC55XX_IRQ_MAX 307U
    216   #elif MPC55XX_CHIP_TYPE / 10 == 556
     216  #elif MPC55XX_CHIP_FAMILY == 556
    217217    #define MPC55XX_IRQ_MAX 360U
    218   #elif MPC55XX_CHIP_TYPE / 10 == 567
     218  #elif MPC55XX_CHIP_FAMILY == 567
    219219    #define MPC55XX_IRQ_MAX 479U
    220220  #else
     
    337337
    338338/* FlexCAN */
    339 #if MPC55XX_CHIP_TYPE / 10 == 564
     339#if MPC55XX_CHIP_FAMILY == 564
    340340  #define MPC55XX_IRQ_CAN_ERR(mod) (MPC55XX_IRQ_CAN_BASE(mod) + 0U)
    341341  #define MPC55XX_IRQ_CAN_BOFF_TWRN_RWRN(mod) (MPC55XX_IRQ_CAN_BASE(mod) + 1U)
     
    376376
    377377/* FlexRay */
    378 #if MPC55XX_CHIP_TYPE / 10 == 564
     378#if MPC55XX_CHIP_FAMILY == 564
    379379  #define MPC55XX_IRQ_FLEXRAY_LRNEIF_DRNEIF(mod) (MPC55XX_IRQ_FLEXRAY_BASE(mod) + 0U)
    380380  #define MPC55XX_IRQ_FLEXRAY_LRCEIF_DRCEIF(mod) (MPC55XX_IRQ_FLEXRAY_BASE(mod) + 1U)
  • c/src/lib/libcpu/powerpc/mpc55xx/include/reg-defs.h

    r29b1bbf r94102775  
    2626#include <bspopts.h>
    2727
    28 #if MPC55XX_CHIP_TYPE / 10 == 551
     28#if MPC55XX_CHIP_FAMILY == 551
    2929  #define FLASH_BIUCR   0xFFFF801C
    3030#else
  • c/src/lib/libcpu/powerpc/mpc55xx/include/regs-edma.h

    r29b1bbf r94102775  
    6868            uint32_t R;
    6969            struct {
    70 #if MPC55XX_CHIP_TYPE / 10 == 567
     70#if MPC55XX_CHIP_FAMILY == 567
    7171                uint32_t:14;
    7272                uint32_t CX:1;
     
    7979                uint32_t GRP1PRI:2;
    8080                uint32_t GRP0PRI:2;
    81 #if MPC55XX_CHIP_TYPE / 10 == 567
     81#if MPC55XX_CHIP_FAMILY == 567
    8282                uint32_t EMLM:1;
    8383                uint32_t CLM:1;
     
    9898            struct {
    9999                uint32_t VLD:1;
    100 #if MPC55XX_CHIP_TYPE / 10 == 567
     100#if MPC55XX_CHIP_FAMILY == 567
    101101                uint32_t:14;
    102102                uint32_t ECX:1;
     
    486486        } ERL;                  /* DMA Error Low */
    487487
    488 #if MPC55XX_CHIP_TYPE / 10 == 567
     488#if MPC55XX_CHIP_FAMILY == 567
    489489        union {                  /* hardware request status high */
    490490            uint32_t R;
     
    572572            struct {
    573573                uint8_t ECP:1;
    574 #if MPC55XX_CHIP_TYPE / 10 == 567
     574#if MPC55XX_CHIP_FAMILY == 567
    575575                uint8_t DPA:1;
    576576#else
  • c/src/lib/libcpu/powerpc/mpc55xx/include/regs.h

    r29b1bbf r94102775  
    2727#include <bspopts.h>
    2828
    29 #if MPC55XX_CHIP_TYPE / 10 == 551
     29#if MPC55XX_CHIP_FAMILY == 551
    3030  #include <mpc55xx/fsl-mpc551x.h>
    3131  #define MPC55XX_HAS_EBI
     
    3434  #define MPC55XX_HAS_FMPLL_ENHANCED
    3535  #define MPC55XX_HAS_SIU
    36 #elif MPC55XX_CHIP_TYPE / 10 == 555
     36#elif MPC55XX_CHIP_FAMILY == 555
    3737  #include <mpc55xx/fsl-mpc555x.h>
    3838  #define MPC55XX_HAS_EBI
     
    4242  #define MPC55XX_HAS_UNIFIED_CACHE
    4343  #define MPC55XX_HAS_SIU
    44 #elif MPC55XX_CHIP_TYPE / 10 == 556
     44#elif MPC55XX_CHIP_FAMILY == 556
    4545  #include <mpc55xx/fsl-mpc556x.h>
    4646  #define MPC55XX_HAS_EBI
     
    5050  #define MPC55XX_HAS_UNIFIED_CACHE
    5151  #define MPC55XX_HAS_SIU
    52 #elif MPC55XX_CHIP_TYPE / 10 == 564
     52#elif MPC55XX_CHIP_FAMILY == 564
    5353  #include <mpc55xx/fsl-mpc564xL.h>
    5454  #define MPC55XX_HAS_STM
     
    5959  #define MPC55XX_HAS_SECOND_INTERNAL_RAM_AREA
    6060  #define MPC55XX_HAS_SIU_LITE
    61 #elif MPC55XX_CHIP_TYPE / 10 == 567
     61#elif MPC55XX_CHIP_FAMILY == 567
    6262  #include <mpc55xx/fsl-mpc567x.h>
    6363  #define MPC55XX_HAS_EBI
Note: See TracChangeset for help on using the changeset viewer.