Changeset 5249a4c in rtems


Ignore:
Timestamp:
Jun 7, 2018, 5:18:23 AM (11 months ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
master
Children:
3248137
Parents:
07c5976
git-author:
Sebastian Huber <sebastian.huber@…> (06/07/18 05:18:23)
git-committer:
Sebastian Huber <sebastian.huber@…> (06/07/18 05:42:35)
Message:

powerpc: Fix ss555 build

The mpc555 define is provided via <bspopts.h>. It must not be used in
cpukit header files.

Update #3425.

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • bsps/powerpc/ss555/include/bsp.h

    r07c5976 r5249a4c  
    2020#define LIBBSP_POWERPC_SS555_BSP_H
    2121
    22 #ifndef ASM
     22#include <bspopts.h>
    2323
    24 #include <bspopts.h>
     24#ifdef ASM
     25
     26#define eie     0x050   /* External Interrupt Enable Register */
     27#define eid     0x051   /* External Interrupt Disable Register */
     28#define nri     0x052   /* Non-Recoverable Interrupt Register */
     29
     30#else /* !ASM */
     31
    2532#include <bsp/default-initial-extension.h>
    2633
     
    4047
    4148#define BSP_CRYSTAL_HZ   4000000        /* crystal frequency, Hz */
    42 #define BSP_CLOCK_HZ    40000000        /* CPU clock frequency, Hz
     49#define BSP_CLOCK_HZ    40000000        /* CPU clock frequency, Hz */
    4350
    4451/*
  • bsps/powerpc/ss555/start/irq_asm.S

    r07c5976 r5249a4c  
    2828#include <libcpu/vectors.h>
    2929#include <libcpu/raw_exception.h>
    30 
     30#include <bsp.h>
    3131
    3232#define SYNC \
  • bsps/powerpc/ss555/start/vectors.S

    r07c5976 r5249a4c  
    1717#include <rtems/score/cpu.h>
    1818#include <libcpu/vectors.h>
     19#include <bsp.h>
    1920
    2021#define SYNC \
  • cpukit/score/cpu/powerpc/include/rtems/asm.h

    r07c5976 r5249a4c  
    241241/* end of IBM400 series register definitions */
    242242
    243 #elif defined(mpc555)
    244 /* The following registers are for the MPC5xx */
    245 #define eie     0x050   /* External Interrupt Enable Register */
    246 #define eid     0x051   /* External Interrupt Disable Register */
    247 #define nri     0x052   /* Non-Recoverable Interrupt Register */
    248 
    249243#elif defined(mpc860) || defined(mpc821)
    250244/* The following registers are for the MPC8x0 */
Note: See TracChangeset for help on using the changeset viewer.