From 6c17623845a0d42285d77bdd8bbf177badf5b9f6 Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Mon, 24 Jan 2011 06:20:27 +0100
Subject: Shuffled a few configuration items around, and added a barebone demo
 source code.

---
 FreeRTOS/Makefile  |  5 +----
 FreeRTOS/config.mk | 12 ++++++++++++
 2 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 FreeRTOS/config.mk

(limited to 'FreeRTOS')

diff --git a/FreeRTOS/Makefile b/FreeRTOS/Makefile
index e5df2a8..dc19136 100644
--- a/FreeRTOS/Makefile
+++ b/FreeRTOS/Makefile
@@ -3,24 +3,21 @@ TARGET_LIB = libFreeRTOS.a
 all: $(TARGET_LIB)
 
 include $(ROOTDIR)/common.mk
+include config.mk
 
 ifeq ($(USE_MPU),true)
 TARGET_CPPFLAGS += -DportUSING_MPU_WRAPPERS=1
 endif
 
 TARGET_SRCS = Source/croutine.c Source/list.c Source/queue.c Source/tasks.c
-TARGET_INCLUDES = Source/include
 
 ifeq ($(CPU),arm)
 ifeq ($(CPU_FLAVOR),lpc1768)
 TARGET_SRCS += Source/portable/MemMang/heap_3.c
-TARGET_INCLUDES += $(ROOTDIR)/config/arm/lpc1768 $(ROOTDIR)/arch/arm/lpc17xx/Core/CM3/DeviceSupport/NXP/LPC17xx $(ROOTDIR)/arch/arm/lpc17xx/Core/CM3/CoreSupport
 ifeq ($(USE_MPU),true)
 TARGET_SRCS += Source/portable/GCC/ARM_CM3_MPU/port.c
-TARGET_INCLUDES += Source/portable/GCC/ARM_CM3_MPU
 else
 TARGET_SRCS += Source/portable/GCC/ARM_CM3/port.c
-TARGET_INCLUDES += Source/portable/GCC/ARM_CM3
 endif
 endif
 endif
diff --git a/FreeRTOS/config.mk b/FreeRTOS/config.mk
new file mode 100644
index 0000000..81248d9
--- /dev/null
+++ b/FreeRTOS/config.mk
@@ -0,0 +1,12 @@
+TARGET_INCLUDES = $(ROOTDIR)/FreeRTOS/Source/include
+
+ifeq ($(CPU),arm)
+ifeq ($(CPU_FLAVOR),lpc1768)
+TARGET_INCLUDES += $(ROOTDIR)/config/arm/lpc1768 $(ROOTDIR)/arch/arm/lpc17xx/Core/CM3/DeviceSupport/NXP/LPC17xx $(ROOTDIR)/arch/arm/lpc17xx/Core/CM3/CoreSupport
+ifeq ($(USE_MPU),true)
+TARGET_INCLUDES += $(ROOTDIR)/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU
+else
+TARGET_INCLUDES += $(ROOTDIR)/FreeRTOS/Source/portable/GCC/ARM_CM3
+endif
+endif
+endif
-- 
cgit v1.2.3