aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorFergus Noble2011-09-15 16:26:39 -0700
committerStephen Caudle2011-10-12 22:17:16 -0400
commit4d02d36d6b16e96eda731c9adbbbadd694371700 (patch)
tree1a3e9ed7ccdb17ad87a7a79db766c21e4621581c /lib
parent010ee532982ae8329f712967e7e3759fa432ce76 (diff)
Moving nvic code to common, adding F1 and F2 specific user interrupt definition headers.
Diffstat (limited to 'lib')
-rw-r--r--lib/stm32_common/nvic.c (renamed from lib/stm32f1/nvic.c)2
-rw-r--r--lib/stm32f2/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/stm32f1/nvic.c b/lib/stm32_common/nvic.c
index f45b601..cf77cc3 100644
--- a/lib/stm32f1/nvic.c
+++ b/lib/stm32_common/nvic.c
@@ -17,7 +17,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <libopencm3/stm32/f1/nvic.h>
+#include <libopencm3/stm32/nvic.h>
void nvic_enable_irq(u8 irqn)
{
diff --git a/lib/stm32f2/Makefile b/lib/stm32f2/Makefile
index ba0ae04..cd50c4b 100644
--- a/lib/stm32f2/Makefile
+++ b/lib/stm32f2/Makefile
@@ -28,7 +28,7 @@ CFLAGS = -Os -g -Wall -Wextra -I../../include -fno-common \
-ffunction-sections -fdata-sections -MD -DSTM32F2
# ARFLAGS = rcsv
ARFLAGS = rcs
-OBJS = vector.o gpio.o systick.o i2c.o spi.o
+OBJS = vector.o gpio.o systick.o i2c.o spi.o nvic.o
#VPATH += ../usb
VPATH += ../stm32_common