Mercurial > nand-ecoscentric

changeset 3076:a532b7c12094

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* include/hal_io.h: conditional VTOR setting. [ Bugzilla 1001117 ]
author sergeig
date Wed, 19 Jan 2011 18:59:15 +0000
parents f04f37d9c269
children a49edf752d44
files packages/hal/cortexm/arch/current/ChangeLog packages/hal/cortexm/arch/current/include/hal_io.h
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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