[rtems commit] rtems/bfin/bf533.h: Eliminate redefinition warning and add sanity check

[Joel Sherrill]

Module:    rtems
Branch:    master
Commit:    74fe9ceda52c5749f341f57cb9f064276ca3532b
Changeset: http://git.rtems.org/rtems/commit/?id=74fe9ceda52c5749f341f57cb9f064276ca3532b

Author:    Joel Sherrill <joel at rtems.org>
Date:      Thu Mar 15 09:49:11 2018 -0500

rtems/bfin/bf533.h: Eliminate redefinition warning and add sanity check

Closes #3346.

---

 cpukit/score/cpu/bfin/include/rtems/bfin/bf533.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/cpukit/score/cpu/bfin/include/rtems/bfin/bf533.h b/cpukit/score/cpu/bfin/include/rtems/bfin/bf533.h
index 682aad4..2b2f97c 100644
--- a/cpukit/score/cpu/bfin/include/rtems/bfin/bf533.h
+++ b/cpukit/score/cpu/bfin/include/rtems/bfin/bf533.h
@@ -331,9 +331,18 @@ extern "C" {
 #define TIMER2_PERIOD          0xFFC00628L
 #define TIMER2_WIDTH           0xFFC0062CL
 
+/*
+ * These are defined in bsps/bfin/include/bf52x.h. Ensure those definitions
+ * are consistent with our expectations.
 #define TIMER_ENABLE           0xFFC00640L
 #define TIMER_DISABLE          0xFFC00644L
 #define TIMER_STATUS           0xFFC00648L
+*/
+#if ((TIMER_ENABLE != 0xFFC00640L) || \
+     (TIMER_DISABLE != 0xFFC00644L) || \
+     (TIMER_STATUS != 0xFFC00648L))
+#error "Timer register addresses are inconsistent"
+#endif
 
 /* Real Time Clock          Chapter 16 */
 #define RTC_STAT               0xFFC00300L