alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

freertos: updated the location of FreeRTOSConfig.h

Browse Source 
Moved FreeRTOSConfig.h from include/freertos to include/esp_additions/freertos.
Updated FreeRTOS.h file to include FreeRTOSConfig.h without the
freertos/ prefix to match with the upstream file.
Renamed architecture specific FreeRTOSConfig.h files to FreeRTOSConfig_arch.h

Signed-off-by: Sudeep Mohanty <sudeep.mohanty@espressif.com>
This commit is contained in:
Sudeep Mohanty 2021-09-08 14:23:57 +05:30
parent 220590d599
commit 0912df611f
9 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/freertos/CMakeLists.txt
View File

@ -18,7 +18,9 @@ if(CONFIG_IDF_TARGET_ARCH_XTENSA)
set(include_dirs set(include_dirs
include include
port/xtensa/include) include/esp_additions/freertos # For files with #include "FreeRTOSConfig.h"
port/xtensa/include # For including arch-specific FreeRTOSConfig_arch.h in port/<arch>/include
include/esp_additions) # For files with #include "freertos/FreeRTOSConfig.h"
set(private_include_dirs set(private_include_dirs
port/xtensa/include/freertos port/xtensa/include/freertos
@ -33,7 +35,9 @@ elseif(CONFIG_IDF_TARGET_ARCH_RISCV)
set(include_dirs set(include_dirs
include include
port/riscv/include) include/esp_additions/freertos # For files with #include "FreeRTOSConfig.h"
port/riscv/include # For including arch-specific FreeRTOSConfig_arch.h in port/<arch>/include
include/esp_additions) # For files with #include "freertos/FreeRTOSConfig.h"
set(private_include_dirs set(private_include_dirs
port/riscv/include/freertos port/riscv/include/freertos
@ -57,9 +61,6 @@ list(APPEND srcs
"FreeRTOS-openocd.c" "FreeRTOS-openocd.c"
"freertos_v8_compat.c") "freertos_v8_compat.c")
list(APPEND include_dirs
"include/esp_additions")
list(APPEND private_include_dirs list(APPEND private_include_dirs
"include/freertos") "include/freertos")

4
components/freertos/component.mk
View File

@ -6,8 +6,8 @@ ifdef CONFIG_FREERTOS_DEBUG_OCDAWARE
COMPONENT_ADD_LDFLAGS += -Wl,--undefined=uxTopUsedPriority COMPONENT_ADD_LDFLAGS += -Wl,--undefined=uxTopUsedPriority
endif endif
COMPONENT_ADD_INCLUDEDIRS := include port/xtensa/include include/esp_additions COMPONENT_ADD_INCLUDEDIRS := include include/esp_additions include/esp_additions/freertos port/xtensa/include
COMPONENT_PRIV_INCLUDEDIRS := include/freertos port/xtensa/include/freertos port/xtensa port/priv_include . COMPONENT_PRIV_INCLUDEDIRS := include/esp_additions include/esp_additions/freertos include/freertos port/xtensa/include/freertos port/xtensa port/priv_include .
COMPONENT_SRCDIRS += port port/xtensa esp_additions/ COMPONENT_SRCDIRS += port port/xtensa esp_additions/
ifndef CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY ifndef CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY

4
components/freertos/include/freertos/FreeRTOSConfig.h → components/freertos/include/esp_additions/freertos/FreeRTOSConfig.h
View File

@ -75,8 +75,8 @@
/* for likely and unlikely */ /* for likely and unlikely */
#include "esp_compiler.h" #include "esp_compiler.h"
// The arch-specific FreeRTOSConfig.h in port/<arch>/include. // The arch-specific FreeRTOSConfig_arch.h in port/<arch>/include.
#include_next "freertos/FreeRTOSConfig.h" #include "freertos/FreeRTOSConfig_arch.h"
#if !(defined(FREERTOS_CONFIG_XTENSA_H) \ #if !(defined(FREERTOS_CONFIG_XTENSA_H) \
|| defined(FREERTOS_CONFIG_RISCV_H) \ || defined(FREERTOS_CONFIG_RISCV_H) \

3
components/freertos/include/freertos/FreeRTOS.h
View File

@ -54,7 +54,8 @@
/* *INDENT-ON* */ /* *INDENT-ON* */
/* Application specific configuration options. */ /* Application specific configuration options. */
#include "freertos/FreeRTOSConfig.h" #include "FreeRTOSConfig.h"
/* Basic FreeRTOS definitions. */ /* Basic FreeRTOS definitions. */
#include "projdefs.h" #include "projdefs.h"

0
components/freertos/port/linux/include/freertos/FreeRTOSConfig.h → components/freertos/port/linux/include/freertos/FreeRTOSConfig_arch.h
View File

0
components/freertos/port/riscv/include/freertos/FreeRTOSConfig.h → components/freertos/port/riscv/include/freertos/FreeRTOSConfig_arch.h
View File

0
components/freertos/port/xtensa/include/freertos/FreeRTOSConfig.h → components/freertos/port/xtensa/include/freertos/FreeRTOSConfig_arch.h
View File

2
components/lwip/test_afl_host/Makefile
View File

@ -2,7 +2,7 @@ COMPONENTS_DIR=../..
COMPILER_ICLUDE_DIR=$(shell echo `which xtensa-esp32-elf-gcc | xargs dirname | xargs dirname`/xtensa-esp32-elf) COMPILER_ICLUDE_DIR=$(shell echo `which xtensa-esp32-elf-gcc | xargs dirname | xargs dirname`/xtensa-esp32-elf)
CFLAGS=-std=gnu99 -Og -ggdb -ffunction-sections -fdata-sections -nostdlib -Wall -Werror=all -Wno-int-to-pointer-cast -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-macro-redefined -Wno-constant-conversion -Wno-incompatible-pointer-types-discards-qualifiers -Wno-typedef-redefinition -Wno-incompatible-pointer-types -Wextra \ CFLAGS=-std=gnu99 -Og -ggdb -ffunction-sections -fdata-sections -nostdlib -Wall -Werror=all -Wno-int-to-pointer-cast -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=deprecated-declarations -Wno-macro-redefined -Wno-constant-conversion -Wno-incompatible-pointer-types-discards-qualifiers -Wno-typedef-redefinition -Wno-incompatible-pointer-types -Wextra \
-Wno-unused-parameter -Wno-sign-compare -Wno-address -Wno-unused-variable -DESP_PLATFORM -D IDF_VER=\"v3.1\" -MMD -MP -DWITH_POSIX -DLWIP_NO_CTYPE_H=1 -Wno-unused-parameter -Wno-sign-compare -Wno-address -Wno-unused-variable -DESP_PLATFORM -D IDF_VER=\"v3.1\" -MMD -MP -DWITH_POSIX -DLWIP_NO_CTYPE_H=1
INC_DIRS=-I . -I ./build/config -I $(COMPONENTS_DIR)/newlib/platform_include -I $(COMPONENTS_DIR)/newlib/include -I $(COMPONENTS_DIR)/driver/include -I $(COMPONENTS_DIR)/esp32/include -I $(COMPONENTS_DIR)/ethernet/include -I $(COMPONENTS_DIR)/freertos/include -I $(COMPONENTS_DIR)/heap/include -I $(COMPONENTS_DIR)/lwip/lwip/src/include -I $(COMPONENTS_DIR)/lwip/include/apps -I $(COMPONENTS_DIR)/lwip/lwip/src/include/netif -I $(COMPONENTS_DIR)/lwip/lwip/src/include/posix -I $(COMPONENTS_DIR)/lwip/port/esp32/include -I $(COMPONENTS_DIR)/lwip/lwip/src/include/posix -I $(COMPONENTS_DIR)/lwip/include/apps/ping -I $(COMPONENTS_DIR)/lwip/include/apps/sntp -I $(COMPONENTS_DIR)/soc/esp32/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/tcpip_adapter/include -I $(COMPONENTS_DIR)/esp_rom/include -I $(COMPONENTS_DIR)/esp_common/include -I $(COMPONENTS_DIR)/esp_hw_support/include -I $(COMPONENTS_DIR)/xtensa/include -I $(COMPONENTS_DIR)/xtensa/esp32/include -I $(COMPONENTS_DIR)/esp_wifi/include -I $(COMPONENTS_DIR)/esp_event/include -I $(COMPONENTS_DIR)/freertos/port/xtensa/include -I $(COMPONENTS_DIR)/esp_system/include -I $(COMPONENTS_DIR)/esp_timer/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/soc/src/esp32/include -I $(COMPONENTS_DIR)/soc/esp32/include -I $(COMPONENTS_DIR)/esp_netif/include -I $(COMPONENTS_DIR)/esp_eth/include -I $(COMPONENTS_DIR)/esp_netif/lwip -I $(COMPONENTS_DIR)/hal/include -I $(COMPONENTS_DIR)/hal/esp32/include -I $(COMPILER_ICLUDE_DIR)/include INC_DIRS=-I . -I ./build/config -I $(COMPONENTS_DIR)/newlib/platform_include -I $(COMPONENTS_DIR)/newlib/include -I $(COMPONENTS_DIR)/driver/include -I $(COMPONENTS_DIR)/esp32/include -I $(COMPONENTS_DIR)/ethernet/include -I $(COMPONENTS_DIR)/freertos/include/esp_additions -I $(COMPONENTS_DIR)/freertos/include/esp_additions/freertos -I $(COMPONENTS_DIR)/freertos/include -I $(COMPONENTS_DIR)/heap/include -I $(COMPONENTS_DIR)/lwip/lwip/src/include -I $(COMPONENTS_DIR)/lwip/include/apps -I $(COMPONENTS_DIR)/lwip/lwip/src/include/netif -I $(COMPONENTS_DIR)/lwip/lwip/src/include/posix -I $(COMPONENTS_DIR)/lwip/port/esp32/include -I $(COMPONENTS_DIR)/lwip/lwip/src/include/posix -I $(COMPONENTS_DIR)/lwip/include/apps/ping -I $(COMPONENTS_DIR)/lwip/include/apps/sntp -I $(COMPONENTS_DIR)/soc/esp32/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/tcpip_adapter/include -I $(COMPONENTS_DIR)/esp_rom/include -I $(COMPONENTS_DIR)/esp_common/include -I $(COMPONENTS_DIR)/esp_hw_support/include -I $(COMPONENTS_DIR)/xtensa/include -I $(COMPONENTS_DIR)/xtensa/esp32/include -I $(COMPONENTS_DIR)/esp_wifi/include -I $(COMPONENTS_DIR)/esp_event/include -I $(COMPONENTS_DIR)/freertos/port/xtensa/include -I $(COMPONENTS_DIR)/esp_system/include -I $(COMPONENTS_DIR)/esp_timer/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/soc/include -I $(COMPONENTS_DIR)/soc/src/esp32/include -I $(COMPONENTS_DIR)/soc/esp32/include -I $(COMPONENTS_DIR)/esp_netif/include -I $(COMPONENTS_DIR)/esp_eth/include -I $(COMPONENTS_DIR)/esp_netif/lwip -I $(COMPONENTS_DIR)/hal/include -I $(COMPONENTS_DIR)/hal/esp32/include -I $(COMPILER_ICLUDE_DIR)/include
TEST_NAME=test TEST_NAME=test
FUZZ=afl-fuzz FUZZ=afl-fuzz
GEN_CFG=generate_config GEN_CFG=generate_config

3
tools/mocks/freertos/CMakeLists.txt
View File

@ -6,8 +6,9 @@ idf_component_get_property(original_freertos_dir freertos COMPONENT_OVERRIDEN_DI
set(include_dirs set(include_dirs
"${original_freertos_dir}/include" "${original_freertos_dir}/include"
"${original_freertos_dir}/include/freertos" # this is due to the way includes are generated in CMock
"${original_freertos_dir}/include/esp_additions" "${original_freertos_dir}/include/esp_additions"
"${original_freertos_dir}/include/esp_additions/freertos"
"${original_freertos_dir}/include/freertos" # this is due to the way includes are generated in CMock
"${original_freertos_dir}/port/linux/include") "${original_freertos_dir}/port/linux/include")
idf_component_mock(INCLUDE_DIRS ${include_dirs} idf_component_mock(INCLUDE_DIRS ${include_dirs}