aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchrysn2012-10-18 18:54:52 +0200
committerchrysn2012-10-18 18:54:52 +0200
commit0548317683f2dacce4c895f2460c0f7762ee8b40 (patch)
treecc56798bbdcc3b717c26849e343f2d38632a6250
parent771f504757e0ac5553c95308ce66412b417fa8d1 (diff)
fix bug resulting from equally named files
the local vector.o files shadowed the ../cm3/vector.c from VPATH, resulting in empty reset vectors.
-rw-r--r--lib/cm3/vector.c2
-rw-r--r--lib/dispatch/vector_chipset.c (renamed from lib/dispatch/vector.c)4
-rw-r--r--lib/lpc43xx/vector_chipset.c (renamed from lib/lpc43xx/vector.c)0
-rw-r--r--lib/stm32/f4/vector_chipset.c (renamed from lib/stm32/f4/vector.c)0
4 files changed, 3 insertions, 3 deletions
diff --git a/lib/cm3/vector.c b/lib/cm3/vector.c
index a6d2e93..b049526 100644
--- 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"
diff --git a/lib/dispatch/vector.c b/lib/dispatch/vector_chipset.c
index baab436..796276c 100644
--- a/lib/dispatch/vector.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
diff --git a/lib/lpc43xx/vector.c b/lib/lpc43xx/vector_chipset.c
index 0463a65..0463a65 100644
--- a/lib/lpc43xx/vector.c
+++ b/lib/lpc43xx/vector_chipset.c
diff --git a/lib/stm32/f4/vector.c b/lib/stm32/f4/vector_chipset.c
index 5304299..5304299 100644
--- a/lib/stm32/f4/vector.c
+++ b/lib/stm32/f4/vector_chipset.c