Merge branch 'feature/add_freertos_to_components' into 'refactor'

Add freertos to components See merge request sdk/ESP8266_RTOS_SDK!24
2025-06-04 04:25:41 +08:00 · 2018-04-04 20:02:38 +08:00
parent 1e1c3ff6f6 7f5ea0f397
commit 149e9d08c4
27 changed files with 7 additions and 50 deletions
--- a/1
+++ b/1
@ -427,3 +427,4 @@ INCLUDES += -I $(SDK_PATH)/components/axtls/include
 INCLUDES += -I $(SDK_PATH)/include/json
 INCLUDES += -I $(SDK_PATH)/components/openssl/include
 INCLUDES += -I $(SDK_PATH)/include/mqtt
+INCLUDES += -I $(SDK_PATH)/components/freertos/include
--- a/components/freertos/component.mk
+++ b/components/freertos/component.mk
@ -0,0 +1,6 @@
+#
+# Component Makefile
+#
+COMPONENT_ADD_INCLUDEDIRS := include
+
+COMPONENT_SRCDIRS := library
--- a/components/freertos/include/freertos/FreeRTOS.h
+++ b/components/freertos/include/freertos/FreeRTOS.h
--- a/components/freertos/include/freertos/FreeRTOSConfig.h
+++ b/components/freertos/include/freertos/FreeRTOSConfig.h
--- a/components/freertos/include/freertos/StackMacros.h
+++ b/components/freertos/include/freertos/StackMacros.h
--- a/components/freertos/include/freertos/croutine.h
+++ b/components/freertos/include/freertos/croutine.h
--- a/components/freertos/include/freertos/list.h
+++ b/components/freertos/include/freertos/list.h
--- a/components/freertos/include/freertos/mpu_wrappers.h
+++ b/components/freertos/include/freertos/mpu_wrappers.h
--- a/components/freertos/include/freertos/portable.h
+++ b/components/freertos/include/freertos/portable.h
--- a/components/freertos/include/freertos/portmacro.h
+++ b/components/freertos/include/freertos/portmacro.h
--- a/components/freertos/include/freertos/projdefs.h
+++ b/components/freertos/include/freertos/projdefs.h
--- a/components/freertos/include/freertos/queue.h
+++ b/components/freertos/include/freertos/queue.h
--- a/components/freertos/include/freertos/semphr.h
+++ b/components/freertos/include/freertos/semphr.h
--- a/components/freertos/include/freertos/task.h
+++ b/components/freertos/include/freertos/task.h
--- a/components/freertos/include/freertos/timers.h
+++ b/components/freertos/include/freertos/timers.h
--- a/components/freertos/include/freertos/xtensa_context.h
+++ b/components/freertos/include/freertos/xtensa_context.h
--- a/components/freertos/include/freertos/xtensa_rtos.h
+++ b/components/freertos/include/freertos/xtensa_rtos.h
--- a/components/freertos/include/freertos/xtensa_timer.h
+++ b/components/freertos/include/freertos/xtensa_timer.h
--- a/components/freertos/library/croutine.c
+++ b/components/freertos/library/croutine.c
--- a/components/freertos/library/heap_5.c
+++ b/components/freertos/library/heap_5.c
--- a/components/freertos/library/list.c
+++ b/components/freertos/library/list.c
--- a/components/freertos/library/port.c
+++ b/components/freertos/library/port.c
--- a/components/freertos/library/queue.c
+++ b/components/freertos/library/queue.c
--- a/components/freertos/library/readme.txt
+++ b/components/freertos/library/readme.txt
--- a/components/freertos/library/tasks.c
+++ b/components/freertos/library/tasks.c
--- a/components/freertos/library/timers.c
+++ b/components/freertos/library/timers.c
--- a/third_party/freertos/Makefile
+++ b/third_party/freertos/Makefile
@ -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
-