Merge branch 'generalizations' into efm32

2012-10-18 19:06:58 +02:00 · 2012-10-18 19:06:58 +02:00 · becfbc70e1
parent 47c69695ce 0548317683
commit becfbc70e1
4 changed files with 3 additions and 3 deletions
--- a/lib/cm3/vector.c
+++ b/lib/cm3/vector.c
@ -21,7 +21,7 @@
 #include <libopencm3/cm3/vector.h>

 /* load optional platform dependent initialization routines */
-#include "../dispatch/vector.c"
+#include "../dispatch/vector_chipset.c"
 /* load the weak symbols for IRQ_HANDLERS */
 #include "../dispatch/vector_nvic.c"

--- a/lib/dispatch/vector_chipset.c
+++ b/lib/dispatch/vector_chipset.c
@ -1,8 +1,8 @@
 #if defined(STM32F4)
-#	include "../stm32/f4/vector.c"
+#	include "../stm32/f4/vector_chipset.c"

 #elif defined(LPC43XX)
-#	include "../lpc43xx/vector.c"
+#	include "../lpc43xx/vector_chipset.c"

 #else

--- a/lib/lpc43xx/vector_chipset.c
+++ b/lib/lpc43xx/vector_chipset.c
--- a/lib/stm32/f4/vector_chipset.c
+++ b/lib/stm32/f4/vector_chipset.c