Changeset 5249a4c in rtems

Timestamp:

Jun 7, 2018, 5:18:23 AM (3 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, 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:

• bsps/powerpc/ss555/include/bsp.h (modified) (2 diffs)
• bsps/powerpc/ss555/start/irq_asm.S (modified) (1 diff)
• bsps/powerpc/ss555/start/vectors.S (modified) (1 diff)
• cpukit/score/cpu/powerpc/include/rtems/asm.h (modified) (1 diff)

bsps/powerpc/ss555/include/bsp.h

@@ -20 +20 @@
 #define LIBBSP_POWERPC_SS555_BSP_H
 
-#ifndef ASM
+#include <bspopts.h>
 
-#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>
 
@@ -40 +47 @@
 
 #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 */
 
 /*

bsps/powerpc/ss555/start/irq_asm.S

@@ -28 +28 @@
 #include <libcpu/vectors.h>
 #include <libcpu/raw_exception.h>
-
+#include <bsp.h>
 
 #define SYNC \

bsps/powerpc/ss555/start/vectors.S

@@ -17 +17 @@
 #include <rtems/score/cpu.h>
 #include <libcpu/vectors.h>
+#include <bsp.h>
 
 #define SYNC \

cpukit/score/cpu/powerpc/include/rtems/asm.h

@@ -241 +241 @@
 /* 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 */