aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--examples/MB525/fancyblink/fancyblink.c5
-rw-r--r--examples/STM32-H103/fancyblink/fancyblink.c5
-rw-r--r--examples/STM32-H103/miniblink/miniblink.c5
-rw-r--r--examples/STM32-H103/usart/usart.c5
-rw-r--r--lib/Makefile2
-rw-r--r--lib/libopenstm32.ld3
-rw-r--r--lib/vector.c28
7 files changed, 32 insertions, 21 deletions
diff --git a/examples/MB525/fancyblink/fancyblink.c b/examples/MB525/fancyblink/fancyblink.c
index 5912bb2..9c5e581 100644
--- a/examples/MB525/fancyblink/fancyblink.c
+++ b/examples/MB525/fancyblink/fancyblink.c
@@ -84,8 +84,3 @@ int main(void)
return 0;
}
-
-u32 *vector_table[2] __attribute__ ((section(".vectors"))) = {
- (u32 *) 0x20000800, /* Use 2 KB stack (0x800 bytes). */
- (u32 *) main, /* Use main() as reset vector for now. */
-};
diff --git a/examples/STM32-H103/fancyblink/fancyblink.c b/examples/STM32-H103/fancyblink/fancyblink.c
index 910255b..aad1879 100644
--- a/examples/STM32-H103/fancyblink/fancyblink.c
+++ b/examples/STM32-H103/fancyblink/fancyblink.c
@@ -66,8 +66,3 @@ int main(void)
return 0;
}
-
-u32 *vector_table[2] __attribute__ ((section(".vectors"))) = {
- (u32 *)0x20000800, /* Use 2 KB stack (0x800 bytes). */
- (u32 *)main, /* Use main() as reset vector for now. */
-};
diff --git a/examples/STM32-H103/miniblink/miniblink.c b/examples/STM32-H103/miniblink/miniblink.c
index 7584acb..a8d253c 100644
--- a/examples/STM32-H103/miniblink/miniblink.c
+++ b/examples/STM32-H103/miniblink/miniblink.c
@@ -63,8 +63,3 @@ int main(void)
return 0;
}
-
-u32 *vector_table[2] __attribute__ ((section(".vectors"))) = {
- (u32 *)0x20000800, /* Use 2 KB stack (0x800 bytes). */
- (u32 *)main, /* Use main() as reset vector for now. */
-};
diff --git a/examples/STM32-H103/usart/usart.c b/examples/STM32-H103/usart/usart.c
index 922ec89..52a158d 100644
--- a/examples/STM32-H103/usart/usart.c
+++ b/examples/STM32-H103/usart/usart.c
@@ -94,8 +94,3 @@ int main(void)
return 0;
}
-
-u32 *vector_table[2] __attribute__ ((section(".vectors"))) = {
- (u32 *)0x20000800, /* Use 2 KB stack (0x800 bytes). */
- (u32 *)main, /* Use main() as reset vector for now. */
-};
diff --git a/lib/Makefile b/lib/Makefile
index 383fa93..909fcac 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -27,7 +27,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../include -fno-common \
-mcpu=cortex-m3 -mthumb -Wstrict-prototypes
# ARFLAGS = rcsv
ARFLAGS = rcs
-OBJS = rcc.o gpio.o usart.o adc.o spi.o flash.o nvic.o rtc.o
+OBJS = vector.o rcc.o gpio.o usart.o adc.o spi.o flash.o nvic.o rtc.o
# Be silent per default, but 'make V=1' will show all compiler calls.
ifneq ($(V),1)
diff --git a/lib/libopenstm32.ld b/lib/libopenstm32.ld
index 96687a5..910b350 100644
--- a/lib/libopenstm32.ld
+++ b/lib/libopenstm32.ld
@@ -21,6 +21,9 @@
/* Memory regions must be defined in the ld script which includes this one. */
+/* Enforce emmition of the vector table */
+EXTERN (vector_table)
+
/* Define sections. */
SECTIONS
{
diff --git a/lib/vector.c b/lib/vector.c
new file mode 100644
index 0000000..bff7893
--- /dev/null
+++ b/lib/vector.c
@@ -0,0 +1,28 @@
+/*
+ * This file is part of the libopenstm32 project.
+ *
+ * Copyright (C) 2010 Piotr Esden-Tempski <piotr@esden.net>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <libopenstm32.h>
+
+void main(void);
+
+void (*const vector_table[]) (void)
+ __attribute__ ((section(".vectors"))) = {
+ (void *)0x20000800, /* Use 2KB stack (0x800 bytes). */
+ main, /* Use main() as reset vector for now. */
+};