summaryrefslogtreecommitdiff
path: root/FreeRTOS
diff options
context:
space:
mode:
authorPixel <pixel@nobis-crew.org>2011-01-25 07:09:44 -0800
committerPixel <pixel@nobis-crew.org>2011-01-25 07:09:44 -0800
commita1f6f3f277f7e79bf10e196494a8d6dfa6123cfa (patch)
tree7a4ef9a0fbae765a91b95f9a4840a8382829a81f /FreeRTOS
parentd6205d3578e89b5e20757b152d3d7ad46b5c236b (diff)
More consistent makefiles includes. Adding BoardConsole for basic console output general API. Starting up console from the boot sequence.
Diffstat (limited to 'FreeRTOS')
-rw-r--r--FreeRTOS/Makefile1
-rw-r--r--FreeRTOS/config.mk2
2 files changed, 2 insertions, 1 deletions
diff --git a/FreeRTOS/Makefile b/FreeRTOS/Makefile
index 63760c5..90a54da 100644
--- a/FreeRTOS/Makefile
+++ b/FreeRTOS/Makefile
@@ -4,6 +4,7 @@ all: $(TARGET_LIB)
include $(ROOTDIR)/common.mk
include config.mk
+include $(ROOTDIR)/arch/config.mk
TARGET_SRCS = Source/croutine.c Source/list.c Source/queue.c Source/tasks.c
diff --git a/FreeRTOS/config.mk b/FreeRTOS/config.mk
index d45722a..ca7bd93 100644
--- a/FreeRTOS/config.mk
+++ b/FreeRTOS/config.mk
@@ -6,7 +6,7 @@ endif
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
+TARGET_INCLUDES += $(ROOTDIR)/config/arm/lpc1768
ifeq ($(USE_MPU),true)
TARGET_INCLUDES += $(ROOTDIR)/FreeRTOS/Source/portable/GCC/ARM_CM3_MPU
else