Fix build for CF1 and fix make target to display gcc defines

bitcraze · Feb 8, 2016 · 3294255 · 3294255
1 parent 3bab819
commit 3294255
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -349,7 +349,7 @@ trace:
 
 #Print preprocessor #defines
 prep:
-	@$(CC) -dD
+	@$(CC) $(CFLAGS) -dM -E - < /dev/null
 
 check_submodules:
 	@$(PYTHON2) tools/make/check-for-submodules.py

diff --git a/modules/src/console.c b/modules/src/console.c
@@ -32,7 +32,14 @@
 
 #include "crtp.h"
 
-#include "stm32fxxx.h"
+#ifdef STM32F40_41xxx
+#include "stm32f4xx.h"
+#else
+#include "stm32f10x.h"
+#ifndef SCB_ICSR_VECTACTIVE_Msk
+#define SCB_ICSR_VECTACTIVE_Msk 0x1FFUL
+#endif
+#endif
 
 CRTPPacket messageToPrint;
 xSemaphoreHandle synch = NULL;