RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

powerpc: Fix ss555 build

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

Update #3425.
This commit is contained in:
Sebastian Huber
2018-06-07 07:18:23 +02:00
parent 07c597636a
commit 5249a4cc28
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bsps/powerpc/ss555/include/bsp.h
View File

@@ -19,9 +19,16 @@
#ifndef LIBBSP_POWERPC_SS555_BSP_H
#define LIBBSP_POWERPC_SS555_BSP_H
#ifndef ASM
#include <bspopts.h>
#ifdef ASM
#define eie 0x050 /* External Interrupt Enable Register */
#define eid 0x051 /* External Interrupt Disable Register */
#define nri 0x052 /* Non-Recoverable Interrupt Register */
#else /* !ASM */
#include <bsp/default-initial-extension.h>
#include <rtems.h>
@@ -39,7 +46,7 @@ extern "C" {
*/
#define BSP_CRYSTAL_HZ 4000000 /* crystal frequency, Hz */
#define BSP_CLOCK_HZ 40000000 /* CPU clock frequency, Hz
#define BSP_CLOCK_HZ 40000000 /* CPU clock frequency, Hz */
/*
* I/O definitions

2
bsps/powerpc/ss555/start/irq_asm.S
View File

@@ -27,7 +27,7 @@
#include <rtems/score/percpu.h>
#include <libcpu/vectors.h>
#include <libcpu/raw_exception.h>
#include <bsp.h>
#define SYNC \
sync; \

1
bsps/powerpc/ss555/start/vectors.S
View File

@@ -16,6 +16,7 @@
#include <rtems/asm.h>
#include <rtems/score/cpu.h>
#include <libcpu/vectors.h>
#include <bsp.h>
#define SYNC \
sync; \

6
cpukit/score/cpu/powerpc/include/rtems/asm.h
View File

@@ -240,12 +240,6 @@
/* end of IBM400 series register definitions */
#elif defined(mpc555)
/* The following registers are for the MPC5xx */
#define eie 0x050 /* External Interrupt Enable Register */
#define eid 0x051 /* External Interrupt Disable Register */
#define nri 0x052 /* Non-Recoverable Interrupt Register */
#elif defined(mpc860) || defined(mpc821)
/* The following registers are for the MPC8x0 */
#define der 0x095 /* Debug Enable Register */