From 043e5d86bbfa3d2b0e3dc44599e43fe7d0ba0e0a Mon Sep 17 00:00:00 2001
From: Manuel Odendahl <wesen@ruinwesen.com>
Date: Wed, 7 Nov 2012 20:25:37 +0100
Subject: stm32f1/rules.mk: update include path for assembler files
 stm32f1/performance: load stm32.h in order to have STM32_HIGH_DENSITY when
 necessary

STM32_HIGH_DENSITY was not defined in isrs.S and vector_table.S for a high density STM32. This was because stm32.h where the flag is now defined (in contrast to being defined on the command line in an earlier version of libmaple) was not included. This led to crashes when using one of the high density peripherals.

Updated the ASFLAGS to have the correct include path in rules.mk.
Include stm32.h in the assembler files.

Signed-off-by: Manuel Odendahl <wesen@ruinwesen.com>
---
 libmaple/stm32f1/performance/isrs.S         | 2 ++
 libmaple/stm32f1/performance/vector_table.S | 2 ++
 libmaple/stm32f1/rules.mk                   | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)

(limited to 'libmaple')

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))
-- 
cgit v1.2.3