diff options
| author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2011-01-24 06:20:27 +0100 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2011-01-24 06:29:12 +0100 |
| commit | 6c17623845a0d42285d77bdd8bbf177badf5b9f6 (patch) | |
| tree | 3db8b0fa214264ac089d16bbcf4a3c533b8d7629 /FreeRTOS | |
| parent | e9b4b3d26eae1a07c9c2d948e51250792beea075 (diff) | |
Shuffled a few configuration items around, and added a barebone demo source code.
Diffstat (limited to 'FreeRTOS')
| -rw-r--r-- | FreeRTOS/Makefile | 5 | ||||
| -rw-r--r-- | FreeRTOS/config.mk | 12 |
2 files changed, 13 insertions, 4 deletions
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 |