Permalink
Browse files

Merge remote-tracking branch 'wesen/bug/high-density-irqs'

Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
  • Loading branch information...
2 parents 8e14e7f + ec9a59b commit 4faf11574e56b237a1d95dab07364b0c16dd26f4 Marti Bolivar committed Nov 8, 2012
@@ -26,6 +26,8 @@
/* STM32F1 performance line ISR weak declarations */
+#include <libmaple/stm32.h>
+
.thumb
/* Default handler for all non-overridden interrupts and exceptions */
@@ -26,6 +26,8 @@
/* STM32F1 performance line vector table */
+#include <libmaple/stm32.h>
+
.section ".stm32.interrupt_vector"
.globl __stm32_vector_table
@@ -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))

0 comments on commit 4faf115

Please sign in to comment.