diff options
| author | Marti Bolivar <mbolivar@leaflabs.com> | 2012-11-08 16:19:47 -0500 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@leaflabs.com> | 2012-11-08 16:20:17 -0500 |
| commit | 4faf11574e56b237a1d95dab07364b0c16dd26f4 (patch) | |
| tree | 87417f6b95d0763778237c662962adfb34d3b4af | |
| parent | 8e14e7ff7752d90e8d15fef417a3dc49bb0af886 (diff) | |
| parent | ec9a59bef84ab019a6a50f4220dbf0597028c33b (diff) | |
Merge remote-tracking branch 'wesen/bug/high-density-irqs'
Signed-off-by: Marti Bolivar <mbolivar@leaflabs.com>
| -rw-r--r-- | libmaple/stm32f1/performance/isrs.S | 2 | ||||
| -rw-r--r-- | libmaple/stm32f1/performance/vector_table.S | 2 | ||||
| -rw-r--r-- | libmaple/stm32f1/rules.mk | 3 |
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)) |