diff options
| author | Perry Hung <iperry@alum.mit.edu> | 2010-05-28 03:06:03 -0400 |
|---|---|---|
| committer | Perry Hung <iperry@alum.mit.edu> | 2010-05-28 03:06:03 -0400 |
| commit | 5b9c5d9c9388f58c0d08c398dc368ca40460830a (patch) | |
| tree | 3f9fb49a69acd4c0f2d05733b30eb32af5acb006 /libmaple/nvic.c | |
| parent | cf068bc0ac946391c940a79ee2e55e1ff87eb79a (diff) | |
| download | librambutan-5b9c5d9c9388f58c0d08c398dc368ca40460830a.tar.gz librambutan-5b9c5d9c9388f58c0d08c398dc368ca40460830a.zip | |
libcs3 refactor merge
Removed dependency on libcs3.a because Codesourcery does not provide the
source for it.
We now link against a modified libcs3-lanchon-stm32.a built from parts
in public domain from Lanchon, and a start_c.c from Codesourcery that is
licensed under a permissive license.
Also removed all of the extra linker cruft from the stm32conf directory.
The linker files now live in support/ld
The openocd scripts now live in support/openocd
The udev rules and copy-to-ide scripts now live in support/scripts
The source lives in support/ld/libcs3-lanchon-stm32.tar.gz
Diffstat (limited to 'libmaple/nvic.c')
| -rw-r--r-- | libmaple/nvic.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libmaple/nvic.c b/libmaple/nvic.c index 7e1a9b7..e540894 100644 --- a/libmaple/nvic.c +++ b/libmaple/nvic.c @@ -70,12 +70,13 @@ void nvic_enable_interrupt(uint32 n) { * @param addr Address to set the vector table at */ void nvic_init(void) { -#ifdef VECT_TAB_ROM +#ifdef VECT_TAB_FLASH nvic_set_vector_table(USER_ADDR_ROM, 0x0); #elif defined VECT_TAB_RAM nvic_set_vector_table(USER_ADDR_RAM, 0x0); -#else // VECT_TAB_BASE - /* Set the Vector Table base location at 0x08000000 */ +#elif defined VECT_TAB_BASE nvic_set_vector_table(((uint32)0x08000000), 0x0); +#else +#error "You must set a base address for the vector table!" #endif } |