summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel@rtems.org>2018-03-15 14:49:11 (UTC)
committerJoel Sherrill <joel@rtems.org>2018-03-16 13:38:20 (UTC)
commit74fe9ceda52c5749f341f57cb9f064276ca3532b (patch)
treef489e524c5a7f3c6c122929fa9b13fc6b4c33fed
parentdce920aea8f2fa286e014ad95f74a4ddb7854469 (diff)
downloadrtems-74fe9ceda52c5749f341f57cb9f064276ca3532b.tar.bz2
rtems/bfin/bf533.h: Eliminate redefinition warning and add sanity check
Closes #3346.
-rw-r--r--cpukit/score/cpu/bfin/include/rtems/bfin/bf533.h9
1 files changed, 9 insertions, 0 deletions
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