diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-06-07 07:18:23 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-06-07 07:42:35 +0200 |
| commit | 5249a4cc283af9faf17d45889a124b60784fe64d (patch) | |
| tree | a880db1cdea599d75051f0ef435b1eea92229437 /bsps | |
| parent | bsps/powerpc: Hack to fix the build (diff) | |
| download | rtems-5249a4cc283af9faf17d45889a124b60784fe64d.tar.bz2 | |
powerpc: Fix ss555 build
The mpc555 define is provided via <bspopts.h>. It must not be used in
cpukit header files.
Update #3425.
Diffstat (limited to 'bsps')
| -rw-r--r-- | bsps/powerpc/ss555/include/bsp.h | 13 | ||||
| -rw-r--r-- | bsps/powerpc/ss555/start/irq_asm.S | 2 | ||||
| -rw-r--r-- | bsps/powerpc/ss555/start/vectors.S | 1 |
3 files changed, 12 insertions, 4 deletions
diff --git a/bsps/powerpc/ss555/include/bsp.h b/bsps/powerpc/ss555/include/bsp.h index a82d10a667..3226f5eaf0 100644 --- a/bsps/powerpc/ss555/include/bsp.h +++ b/bsps/powerpc/ss555/include/bsp.h @@ -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 diff --git a/bsps/powerpc/ss555/start/irq_asm.S b/bsps/powerpc/ss555/start/irq_asm.S index 52911c48e3..eff4128bb8 100644 --- a/bsps/powerpc/ss555/start/irq_asm.S +++ b/bsps/powerpc/ss555/start/irq_asm.S @@ -27,7 +27,7 @@ #include <rtems/score/percpu.h> #include <libcpu/vectors.h> #include <libcpu/raw_exception.h> - +#include <bsp.h> #define SYNC \ sync; \ diff --git a/bsps/powerpc/ss555/start/vectors.S b/bsps/powerpc/ss555/start/vectors.S index 35d2f23a30..6df89843f3 100644 --- a/bsps/powerpc/ss555/start/vectors.S +++ b/bsps/powerpc/ss555/start/vectors.S @@ -16,6 +16,7 @@ #include <rtems/asm.h> #include <rtems/score/cpu.h> #include <libcpu/vectors.h> +#include <bsp.h> #define SYNC \ sync; \ |