From 0548317683f2dacce4c895f2460c0f7762ee8b40 Mon Sep 17 00:00:00 2001 From: chrysn Date: Thu, 18 Oct 2012 18:54:52 +0200 Subject: [PATCH] fix bug resulting from equally named files the local vector.o files shadowed the ../cm3/vector.c from VPATH, resulting in empty reset vectors. --- lib/cm3/vector.c | 2 +- lib/dispatch/{vector.c => vector_chipset.c} | 4 ++-- lib/lpc43xx/{vector.c => vector_chipset.c} | 0 lib/stm32/f4/{vector.c => vector_chipset.c} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename lib/dispatch/{vector.c => vector_chipset.c} (52%) rename lib/lpc43xx/{vector.c => vector_chipset.c} (100%) rename lib/stm32/f4/{vector.c => vector_chipset.c} (100%) diff --git a/lib/cm3/vector.c b/lib/cm3/vector.c index a6d2e934..b049526b 100644 --- a/lib/cm3/vector.c +++ b/lib/cm3/vector.c @@ -21,7 +21,7 @@ #include /* 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 similarity index 52% rename from lib/dispatch/vector.c rename to lib/dispatch/vector_chipset.c index baab436c..796276c0 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 similarity index 100% rename from lib/lpc43xx/vector.c rename to lib/lpc43xx/vector_chipset.c diff --git a/lib/stm32/f4/vector.c b/lib/stm32/f4/vector_chipset.c similarity index 100% rename from lib/stm32/f4/vector.c rename to lib/stm32/f4/vector_chipset.c