make reorganized

2016-08-16 14:28:08 +02:00
parent caa360625b
commit a8a4cb263d
16 changed files with 268 additions and 116 deletions
--- a/source/firmware/arch/arch.mk
+++ b/source/firmware/arch/arch.mk
@@ -1 +1,3 @@
+ifeq ($(CPU), stm32f4xx)
 include source/firmware/arch/stm32f4xx/stm32f4xx.mk
+endif
--- a/source/firmware/firmware.mk
+++ b/source/firmware/firmware.mk
@@ -1,2 +1,4 @@
+INCLUDES += source/firmware
+
 include source/firmware/arch/arch.mk
 include source/firmware/kernel/kernel.mk
--- a/source/firmware/kernel/include/ctx.h
+++ b/source/firmware/kernel/include/ctx.h
@@ -8,8 +8,8 @@
 #ifndef CTX_H_
 #define CTX_H_

-//#ifdef ARCH_STM32F4XX
+#ifdef ARCH_STM32F4XX
 #include "stm32f4xx_ctx.h"
-//#endif
+#endif

 #endif /* CTX_H_ */
--- a/source/firmware/kernel/include/irq.h
+++ b/source/firmware/kernel/include/irq.h
@@ -8,7 +8,8 @@
 #ifndef IRQ_H_
 #define IRQ_H_

-//#ifdef ARCH_STM32F4XX
+#ifdef ARCH_STM32F4XX
 #include "stm32f4xx_irq.h"
-//#endif
+#endif
+
 #endif /* IRQ_H_ */
--- a/source/firmware/kernel/include/low_power.h
+++ b/source/firmware/kernel/include/low_power.h
@@ -8,8 +8,8 @@
 #ifndef LOW_POWER_H_
 #define LOW_POWER_H_

-//#ifdef ARCH_STM32F4XX
+#ifdef ARCH_STM32F4XX
 #include "stm32f4xx_low_power.h"
-//#endif
+#endif

 #endif /* LOW_POWER_H_ */
--- a/source/firmware/kernel/include/schedule.h
+++ b/source/firmware/kernel/include/schedule.h
@@ -8,9 +8,9 @@
 #ifndef SCHEDULE_H_
 #define SCHEDULE_H_

-//#ifdef ARCH_STM32F4XX
+#ifdef ARCH_STM32F4XX
 #include "stm32f4xx_ctx.h"
-//#endif
+#endif

 #define schedule() arch_schedule()

--- a/source/firmware/kernel/include/stack.h
+++ b/source/firmware/kernel/include/stack.h
@@ -8,8 +8,8 @@
 #ifndef STACK_H_
 #define STACK_H_

-//#ifdef ARCH_STM32F4XX
+#ifdef ARCH_STM32F4XX
 #include "stm32f4xx_stack.h"
-//#endif
+#endif

 #endif /* STACK_H_ */
--- a/source/test/blinky/blinky.mk
+++ b/source/test/blinky/blinky.mk
@@ -0,0 +1 @@
+SRC_DIR += source/test/blinky
--- a/source/test/blinky/main.c
+++ b/source/test/blinky/main.c
--- a/source/test/src/src.mk
+++ b/source/test/src/src.mk
@@ -1,2 +0,0 @@
-SRC_DIR += source/test/src
-INCLUDES += source/test/src/include
--- a/source/test/test.mk
+++ b/source/test/test.mk
@@ -1,7 +1,9 @@
-#ifeq ($(TEST_APP), shell)
-#include source/test/shell/shell.mk
-#endif
-#ifeq ($(TEST_APP), pwm)
-#include source/test/pwm/pwm.mk
-#endif
-include source/src/src.mk
+ifeq ($(TEST_APP), shell)
+include source/test/shell/shell.mk
+endif
+ifeq ($(TEST_APP), pwm)
+include source/test/pwm/pwm.mk
+endif
+ifeq ($(TEST_APP), blinky)
+include source/test/blinky/blinky.mk
+endif