aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2012-11-08 16:19:47 -0500
committerMarti Bolivar <mbolivar@leaflabs.com>2012-11-08 16:20:17 -0500
commita73b01fa664aa9678a7439ca031656bac21dcc0a (patch)
tree87417f6b95d0763778237c662962adfb34d3b4af
parente55a83611d77d5a01c871b6be78b76eccc8d140b (diff)
parent043e5d86bbfa3d2b0e3dc44599e43fe7d0ba0e0a (diff)
downloadlibrambutan-a73b01fa664aa9678a7439ca031656bac21dcc0a.tar.gz
librambutan-a73b01fa664aa9678a7439ca031656bac21dcc0a.zip
Merge remote-tracking branch 'wesen/bug/high-density-irqs'
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
-rw-r--r--libmaple/stm32f1/performance/isrs.S2
-rw-r--r--libmaple/stm32f1/performance/vector_table.S2
-rw-r--r--libmaple/stm32f1/rules.mk3
3 files changed, 6 insertions, 1 deletions
diff --git a/libmaple/stm32f1/performance/isrs.S b/libmaple/stm32f1/performance/isrs.S
index a8f0709..c638078 100644
--- a/libmaple/stm32f1/performance/isrs.S
+++ b/libmaple/stm32f1/performance/isrs.S
@@ -26,6 +26,8 @@
/* STM32F1 performance line ISR weak declarations */
+#include <libmaple/stm32.h>
+
.thumb
/* Default handler for all non-overridden interrupts and exceptions */
diff --git a/libmaple/stm32f1/performance/vector_table.S b/libmaple/stm32f1/performance/vector_table.S
index b489b94..8be3fa6 100644
--- a/libmaple/stm32f1/performance/vector_table.S
+++ b/libmaple/stm32f1/performance/vector_table.S
@@ -26,6 +26,8 @@
/* STM32F1 performance line vector table */
+#include <libmaple/stm32.h>
+
.section ".stm32.interrupt_vector"
.globl __stm32_vector_table
diff --git a/libmaple/stm32f1/rules.mk b/libmaple/stm32f1/rules.mk
index 3ca0813..f1cc23e 100644
--- a/libmaple/stm32f1/rules.mk
+++ b/libmaple/stm32f1/rules.mk
@@ -6,6 +6,7 @@ BUILDDIRS += $(BUILD_PATH)/$(d)
# Local flags
CFLAGS_$(d) = -I$(d) $(LIBMAPLE_PRIVATE_INCLUDES) $(LIBMAPLE_INCLUDES) -Wall -Werror
+ASFLAGS_$(d) = -I$(d) $(LIBMAPLE_PRIVATE_INCLUDES) $(LIBMAPLE_INCLUDES) -Wall -Werror
# Extra BUILDDIRS
BUILDDIRS += $(BUILD_PATH)/$(d)/$(MCU_F1_LINE)
@@ -33,7 +34,7 @@ OBJS_$(d) := $(sFILES_$(d):%.S=$(BUILD_PATH)/%.o) \
$(cFILES_$(d):%.c=$(BUILD_PATH)/%.o)
DEPS_$(d) := $(OBJS_$(d):%.o=%.d)
-$(OBJS_$(d)): TGT_ASFLAGS :=
+$(OBJS_$(d)): TGT_ASFLAGS := $(ASFLAGS_$(d))
$(OBJS_$(d)): TGT_CFLAGS := $(CFLAGS_$(d))
TGT_BIN += $(OBJS_$(d))