# HG changeset patch
# User sergeig
# Date 1295463555 0
# Node ID a532b7c120943f3c4b149fbe995cff4fc5456c74
# Parent  f04f37d9c26961d48bf5a95de99021a4da5e1876
* include/hal_io.h: conditional VTOR setting. [ Bugzilla 1001117 ]

diff --git a/packages/hal/cortexm/arch/current/ChangeLog b/packages/hal/cortexm/arch/current/ChangeLog
--- a/packages/hal/cortexm/arch/current/ChangeLog
+++ b/packages/hal/cortexm/arch/current/ChangeLog
@@ -1,3 +1,7 @@
+2010-12-28  Ilija Kocho <ilijak@siva.com.mk>
+
+	* include/hal_io.h: conditional VTOR setting.
+
 2011-01-13  John Dallaway  <john@dallaway.org.uk>
 
 	* src/vectors.S (hal_default_interrupt_vsr): Save interrupt state
diff --git a/packages/hal/cortexm/arch/current/include/hal_io.h b/packages/hal/cortexm/arch/current/include/hal_io.h
--- a/packages/hal/cortexm/arch/current/include/hal_io.h
+++ b/packages/hal/cortexm/arch/current/include/hal_io.h
@@ -179,7 +179,9 @@
 
 #define CYGARC_REG_NVIC_VTOR_TBLOFF(__o)        VALUE_(7,__o)
 #define CYGARC_REG_NVIC_VTOR_TBLBASE_CODE       0
+#ifndef CYGARC_REG_NVIC_VTOR_TBLBASE_SRAM
 #define CYGARC_REG_NVIC_VTOR_TBLBASE_SRAM       BIT_(29)
+#endif
 
 // AI/RCR