From 90e6243abe68a2bf9b50e7e8b83a63406de1345b Mon Sep 17 00:00:00 2001 From: Wu Jian Gang Date: Wed, 4 Apr 2018 19:58:05 +0800 Subject: [PATCH 1/3] feat(freertos): Move freertos to components --- {include => components/freertos/include}/freertos/FreeRTOS.h | 0 .../freertos/include}/freertos/FreeRTOSConfig.h | 0 {include => components/freertos/include}/freertos/StackMacros.h | 0 {include => components/freertos/include}/freertos/croutine.h | 0 {include => components/freertos/include}/freertos/list.h | 0 {include => components/freertos/include}/freertos/mpu_wrappers.h | 0 {include => components/freertos/include}/freertos/portable.h | 0 {include => components/freertos/include}/freertos/portmacro.h | 0 {include => components/freertos/include}/freertos/projdefs.h | 0 {include => components/freertos/include}/freertos/queue.h | 0 {include => components/freertos/include}/freertos/semphr.h | 0 {include => components/freertos/include}/freertos/task.h | 0 {include => components/freertos/include}/freertos/timers.h | 0 .../freertos/include}/freertos/xtensa_context.h | 0 {include => components/freertos/include}/freertos/xtensa_rtos.h | 0 {include => components/freertos/include}/freertos/xtensa_timer.h | 0 {third_party/freertos => components/freertos/library}/Makefile | 0 {third_party/freertos => components/freertos/library}/croutine.c | 0 {third_party/freertos => components/freertos/library}/heap_5.c | 0 {third_party/freertos => components/freertos/library}/list.c | 0 {third_party/freertos => components/freertos/library}/port.c | 0 {third_party/freertos => components/freertos/library}/queue.c | 0 {third_party/freertos => components/freertos/library}/readme.txt | 0 {third_party/freertos => components/freertos/library}/tasks.c | 0 {third_party/freertos => components/freertos/library}/timers.c | 0 25 files changed, 0 insertions(+), 0 deletions(-) rename {include => components/freertos/include}/freertos/FreeRTOS.h (100%) rename {include => components/freertos/include}/freertos/FreeRTOSConfig.h (100%) rename {include => components/freertos/include}/freertos/StackMacros.h (100%) rename {include => components/freertos/include}/freertos/croutine.h (100%) rename {include => components/freertos/include}/freertos/list.h (100%) rename {include => components/freertos/include}/freertos/mpu_wrappers.h (100%) rename {include => components/freertos/include}/freertos/portable.h (100%) rename {include => components/freertos/include}/freertos/portmacro.h (100%) rename {include => components/freertos/include}/freertos/projdefs.h (100%) rename {include => components/freertos/include}/freertos/queue.h (100%) rename {include => components/freertos/include}/freertos/semphr.h (100%) rename {include => components/freertos/include}/freertos/task.h (100%) rename {include => components/freertos/include}/freertos/timers.h (100%) rename {include => components/freertos/include}/freertos/xtensa_context.h (100%) rename {include => components/freertos/include}/freertos/xtensa_rtos.h (100%) rename {include => components/freertos/include}/freertos/xtensa_timer.h (100%) rename {third_party/freertos => components/freertos/library}/Makefile (100%) rename {third_party/freertos => components/freertos/library}/croutine.c (100%) rename {third_party/freertos => components/freertos/library}/heap_5.c (100%) rename {third_party/freertos => components/freertos/library}/list.c (100%) rename {third_party/freertos => components/freertos/library}/port.c (100%) rename {third_party/freertos => components/freertos/library}/queue.c (100%) rename {third_party/freertos => components/freertos/library}/readme.txt (100%) rename {third_party/freertos => components/freertos/library}/tasks.c (100%) rename {third_party/freertos => components/freertos/library}/timers.c (100%) diff --git a/include/freertos/FreeRTOS.h b/components/freertos/include/freertos/FreeRTOS.h similarity index 100% rename from include/freertos/FreeRTOS.h rename to components/freertos/include/freertos/FreeRTOS.h diff --git a/include/freertos/FreeRTOSConfig.h b/components/freertos/include/freertos/FreeRTOSConfig.h similarity index 100% rename from include/freertos/FreeRTOSConfig.h rename to components/freertos/include/freertos/FreeRTOSConfig.h diff --git a/include/freertos/StackMacros.h b/components/freertos/include/freertos/StackMacros.h similarity index 100% rename from include/freertos/StackMacros.h rename to components/freertos/include/freertos/StackMacros.h diff --git a/include/freertos/croutine.h b/components/freertos/include/freertos/croutine.h similarity index 100% rename from include/freertos/croutine.h rename to components/freertos/include/freertos/croutine.h diff --git a/include/freertos/list.h b/components/freertos/include/freertos/list.h similarity index 100% rename from include/freertos/list.h rename to components/freertos/include/freertos/list.h diff --git a/include/freertos/mpu_wrappers.h b/components/freertos/include/freertos/mpu_wrappers.h similarity index 100% rename from include/freertos/mpu_wrappers.h rename to components/freertos/include/freertos/mpu_wrappers.h diff --git a/include/freertos/portable.h b/components/freertos/include/freertos/portable.h similarity index 100% rename from include/freertos/portable.h rename to components/freertos/include/freertos/portable.h diff --git a/include/freertos/portmacro.h b/components/freertos/include/freertos/portmacro.h similarity index 100% rename from include/freertos/portmacro.h rename to components/freertos/include/freertos/portmacro.h diff --git a/include/freertos/projdefs.h b/components/freertos/include/freertos/projdefs.h similarity index 100% rename from include/freertos/projdefs.h rename to components/freertos/include/freertos/projdefs.h diff --git a/include/freertos/queue.h b/components/freertos/include/freertos/queue.h similarity index 100% rename from include/freertos/queue.h rename to components/freertos/include/freertos/queue.h diff --git a/include/freertos/semphr.h b/components/freertos/include/freertos/semphr.h similarity index 100% rename from include/freertos/semphr.h rename to components/freertos/include/freertos/semphr.h diff --git a/include/freertos/task.h b/components/freertos/include/freertos/task.h similarity index 100% rename from include/freertos/task.h rename to components/freertos/include/freertos/task.h diff --git a/include/freertos/timers.h b/components/freertos/include/freertos/timers.h similarity index 100% rename from include/freertos/timers.h rename to components/freertos/include/freertos/timers.h diff --git a/include/freertos/xtensa_context.h b/components/freertos/include/freertos/xtensa_context.h similarity index 100% rename from include/freertos/xtensa_context.h rename to components/freertos/include/freertos/xtensa_context.h diff --git a/include/freertos/xtensa_rtos.h b/components/freertos/include/freertos/xtensa_rtos.h similarity index 100% rename from include/freertos/xtensa_rtos.h rename to components/freertos/include/freertos/xtensa_rtos.h diff --git a/include/freertos/xtensa_timer.h b/components/freertos/include/freertos/xtensa_timer.h similarity index 100% rename from include/freertos/xtensa_timer.h rename to components/freertos/include/freertos/xtensa_timer.h diff --git a/third_party/freertos/Makefile b/components/freertos/library/Makefile similarity index 100% rename from third_party/freertos/Makefile rename to components/freertos/library/Makefile diff --git a/third_party/freertos/croutine.c b/components/freertos/library/croutine.c similarity index 100% rename from third_party/freertos/croutine.c rename to components/freertos/library/croutine.c diff --git a/third_party/freertos/heap_5.c b/components/freertos/library/heap_5.c similarity index 100% rename from third_party/freertos/heap_5.c rename to components/freertos/library/heap_5.c diff --git a/third_party/freertos/list.c b/components/freertos/library/list.c similarity index 100% rename from third_party/freertos/list.c rename to components/freertos/library/list.c diff --git a/third_party/freertos/port.c b/components/freertos/library/port.c similarity index 100% rename from third_party/freertos/port.c rename to components/freertos/library/port.c diff --git a/third_party/freertos/queue.c b/components/freertos/library/queue.c similarity index 100% rename from third_party/freertos/queue.c rename to components/freertos/library/queue.c diff --git a/third_party/freertos/readme.txt b/components/freertos/library/readme.txt similarity index 100% rename from third_party/freertos/readme.txt rename to components/freertos/library/readme.txt diff --git a/third_party/freertos/tasks.c b/components/freertos/library/tasks.c similarity index 100% rename from third_party/freertos/tasks.c rename to components/freertos/library/tasks.c diff --git a/third_party/freertos/timers.c b/components/freertos/library/timers.c similarity index 100% rename from third_party/freertos/timers.c rename to components/freertos/library/timers.c From 02b22162cad8725bcbb9ddc1ad5e9eb2b9e1f27e Mon Sep 17 00:00:00 2001 From: Dong Heng Date: Wed, 4 Apr 2018 17:06:13 +0800 Subject: [PATCH 2/3] feat(freertos): add 'freertos' to components --- components/freertos/component.mk | 6 ++++ components/freertos/library/Makefile | 50 ---------------------------- 2 files changed, 6 insertions(+), 50 deletions(-) create mode 100644 components/freertos/component.mk delete mode 100644 components/freertos/library/Makefile diff --git a/components/freertos/component.mk b/components/freertos/component.mk new file mode 100644 index 00000000..b470ed48 --- /dev/null +++ b/components/freertos/component.mk @@ -0,0 +1,6 @@ +# +# Component Makefile +# +COMPONENT_ADD_INCLUDEDIRS := include + +COMPONENT_SRCDIRS := library diff --git a/components/freertos/library/Makefile b/components/freertos/library/Makefile deleted file mode 100644 index ce7d3cf3..00000000 --- a/components/freertos/library/Makefile +++ /dev/null @@ -1,50 +0,0 @@ - -############################################################# -# Required variables for each makefile -# Discard this section from all parent makefiles -# Expected variables (with automatic defaults): -# CSRCS (all "C" files in the dir) -# SUBDIRS (all subdirs with a Makefile) -# GEN_LIBS - list of libs to be generated () -# GEN_IMAGES - list of images to be generated () -# COMPONENTS_xxx - a list of libs/objs in the form -# subdir/lib to be extracted and rolled up into -# a generated lib/image xxx.a () -# -ifndef PDIR - -GEN_LIBS = libfreertos.a - -endif - - -############################################################# -# Configuration i.e. compile options etc. -# Target specific stuff (defines etc.) goes in here! -# Generally values applying to a tree are captured in the -# makefile at its root level - these are then overridden -# for a subtree within the makefile rooted therein -# -# MEMLEAK_DEBUG must be defined for FreeRTOS. -DEFINES += -DMEMLEAK_DEBUG -DICACHE_FLASH - -############################################################# -# Recursion Magic - Don't touch this!! -# -# Each subtree potentially has an include directory -# corresponding to the common APIs applicable to modules -# rooted at that subtree. Accordingly, the INCLUDE PATH -# of a module can only contain the include directories up -# its parent path, and not its siblings -# -# Required for each makefile to inherit from the parent -# - -INCLUDES := $(INCLUDES) -I $(PDIR)include -INCLUDES += -I ./ -INCLUDES += -I ../../rom/include -INCLUDES += -I ../../include/ets -INCLUDES += -I ./include -I $(PDIR)include/freertos -PDIR := ../$(PDIR) -sinclude $(PDIR)Makefile - From 7f5ea0f39763de374dc1a0941f2442d4ecb03468 Mon Sep 17 00:00:00 2001 From: Wu Jian Gang Date: Wed, 4 Apr 2018 20:01:01 +0800 Subject: [PATCH 3/3] fix(ci): Just a hack to pass ci firstly Will remove these when refactor finish. --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 1e0d22e8..093e66a6 100644 --- a/Makefile +++ b/Makefile @@ -426,3 +426,4 @@ INCLUDES += -I $(SDK_PATH)/include/ssl INCLUDES += -I $(SDK_PATH)/include/json INCLUDES += -I $(SDK_PATH)/include/openssl INCLUDES += -I $(SDK_PATH)/include/mqtt +INCLUDES += -I $(SDK_PATH)/components/freertos/include