eaw/esp-idf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

freertos: update freertos folder structure to match upstream

Browse Source 
The following changes have been made:
1. All FreeRTOS kernel source files are now placed in the
   freertos/FreeRTOS-Kernel folder to match with the upstream folder structure.
2. All kernel include files are now placed in freertos/FreeRTOS-Kernel/include.
3. All port files are now placed in freertos/FreeRTOS-Kernel/portable.
4. All additions/customizations are placed in freertos/esp_additions.
5. All other miscellaneous files (README, License files etc.) are moved to
   freertos/FreeRTOS-Kernel folder to match with the upstream.
6. Updated esp-cryptoauthlib to latest commit to resolve FreeRTOS
   include dependencies.

Signed-off-by: Sudeep Mohanty <sudeep.mohanty@espressif.com>
This commit is contained in:
Sudeep Mohanty
2021-09-20 11:37:03 +05:30
committed by bot
parent a3db2dd4a8
commit 4846222102
80 changed files with 157 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
tools/ci/check_copyright_ignore.txt
View File

@@ -1244,54 +1244,52 @@ components/fatfs/vfs/esp_vfs_fat.h
components/fatfs/vfs/vfs_fat_internal.h
components/fatfs/vfs/vfs_fat_sdmmc.c
components/fatfs/vfs/vfs_fat_spiflash.c
components/freertos/FreeRTOS-Kernel/croutine.c
components/freertos/FreeRTOS-Kernel/event_groups.c
components/freertos/FreeRTOS-Kernel/include/freertos/FreeRTOS.h
components/freertos/FreeRTOS-Kernel/include/freertos/StackMacros.h
components/freertos/FreeRTOS-Kernel/include/freertos/atomic.h
components/freertos/FreeRTOS-Kernel/include/freertos/croutine.h
components/freertos/FreeRTOS-Kernel/include/freertos/deprecated_definitions.h
components/freertos/FreeRTOS-Kernel/include/freertos/event_groups.h
components/freertos/FreeRTOS-Kernel/include/freertos/list.h
components/freertos/FreeRTOS-Kernel/include/freertos/message_buffer.h
components/freertos/FreeRTOS-Kernel/include/freertos/mpu_prototypes.h
components/freertos/FreeRTOS-Kernel/include/freertos/mpu_wrappers.h
components/freertos/FreeRTOS-Kernel/include/freertos/portable.h
components/freertos/FreeRTOS-Kernel/include/freertos/projdefs.h
components/freertos/FreeRTOS-Kernel/include/freertos/queue.h
components/freertos/FreeRTOS-Kernel/include/freertos/semphr.h
components/freertos/FreeRTOS-Kernel/include/freertos/stack_macros.h
components/freertos/FreeRTOS-Kernel/include/freertos/stream_buffer.h
components/freertos/FreeRTOS-Kernel/include/freertos/task.h
components/freertos/FreeRTOS-Kernel/include/freertos/timers.h
components/freertos/FreeRTOS-Kernel/list.c
components/freertos/FreeRTOS-Kernel/portable/linux/include/freertos/FreeRTOSConfig_arch.h
components/freertos/FreeRTOS-Kernel/portable/linux/include/freertos/portmacro.h
components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/FreeRTOSConfig_arch.h
components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/portbenchmark.h
components/freertos/FreeRTOS-Kernel/portable/riscv/include/freertos/portmacro.h
components/freertos/FreeRTOS-Kernel/portable/riscv/port.c
components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/FreeRTOSConfig_arch.h
components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portbenchmark.h
components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portmacro.h
components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/portmacro_priv.h
components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/xtensa_api.h
components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/xtensa_config.h
components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/xtensa_context.h
components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/xtensa_rtos.h
components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/xtensa_timer.h
components/freertos/FreeRTOS-Kernel/portable/xtensa/port.c
components/freertos/FreeRTOS-Kernel/portable/xtensa/xtensa_init.c
components/freertos/FreeRTOS-Kernel/portable/xtensa/xtensa_overlay_os_hook.c
components/freertos/FreeRTOS-Kernel/queue.c
components/freertos/FreeRTOS-Kernel/stream_buffer.c
components/freertos/FreeRTOS-Kernel/tasks.c
components/freertos/FreeRTOS-Kernel/timers.c
components/freertos/FreeRTOS-openocd.c
components/freertos/croutine.c
components/freertos/event_groups.c
components/freertos/freertos_v8_compat.c
components/freertos/include/esp_additions/freertos/FreeRTOSConfig.h
components/freertos/include/esp_additions/freertos/task_snapshot.h
components/freertos/include/esp_additions/freertos_tasks_c_additions.h
components/freertos/include/freertos/FreeRTOS.h
components/freertos/include/freertos/StackMacros.h
components/freertos/include/freertos/atomic.h
components/freertos/include/freertos/croutine.h
components/freertos/include/freertos/deprecated_definitions.h
components/freertos/include/freertos/event_groups.h
components/freertos/include/freertos/list.h
components/freertos/include/freertos/message_buffer.h
components/freertos/include/freertos/mpu_prototypes.h
components/freertos/include/freertos/mpu_wrappers.h
components/freertos/include/freertos/portable.h
components/freertos/include/freertos/projdefs.h
components/freertos/include/freertos/queue.h
components/freertos/include/freertos/semphr.h
components/freertos/include/freertos/stack_macros.h
components/freertos/include/freertos/stream_buffer.h
components/freertos/include/freertos/task.h
components/freertos/include/freertos/timers.h
components/freertos/list.c
components/freertos/port/linux/include/freertos/FreeRTOSConfig_arch.h
components/freertos/port/linux/include/freertos/portmacro.h
components/freertos/port/riscv/include/freertos/FreeRTOSConfig_arch.h
components/freertos/port/riscv/include/freertos/portbenchmark.h
components/freertos/port/riscv/include/freertos/portmacro.h
components/freertos/port/riscv/port.c
components/freertos/port/xtensa/include/freertos/FreeRTOSConfig_arch.h
components/freertos/port/xtensa/include/freertos/portbenchmark.h
components/freertos/port/xtensa/include/freertos/portmacro.h
components/freertos/port/xtensa/include/freertos/portmacro_priv.h
components/freertos/port/xtensa/include/freertos/xtensa_api.h
components/freertos/port/xtensa/include/freertos/xtensa_config.h
components/freertos/port/xtensa/include/freertos/xtensa_context.h
components/freertos/port/xtensa/include/freertos/xtensa_rtos.h
components/freertos/port/xtensa/include/freertos/xtensa_timer.h
components/freertos/port/xtensa/port.c
components/freertos/port/xtensa/xt_asm_utils.h
components/freertos/port/xtensa/xtensa_init.c
components/freertos/port/xtensa/xtensa_overlay_os_hook.c
components/freertos/queue.c
components/freertos/stream_buffer.c
components/freertos/tasks.c
components/freertos/esp_additions/include/freertos/FreeRTOSConfig.h
components/freertos/esp_additions/task_snapshot.c
components/freertos/test/test_context_save_clobber.c
components/freertos/test/test_float_in_isr.c
components/freertos/test/test_freertos_backported_functions.c
@@ -1320,7 +1318,6 @@ components/freertos/test/test_tasks_snapshot.c
components/freertos/test/test_thread_local.c
components/freertos/test/test_timers.c
components/freertos/test/test_xtensa_loadstore_handler.c
components/freertos/timers.c
components/hal/adc_hal.c
components/hal/aes_hal.c
components/hal/cpu_hal.c

4
tools/ci/check_public_headers_exceptions.txt
View File

@@ -6,8 +6,8 @@ components/xtensa/esp32/include/xtensa/config/
components/newlib/platform_include/
components/freertos/include/freertos/
components/freertos/port/xtensa/include/freertos/
components/freertos/FreeRTOS-Kernel/include/freertos/
components/freertos/FreeRTOS-Kernel/portable/xtensa/include/freertos/
components/log/include/esp_log_internal.h

4
tools/ci/sonar_exclude_list.txt
View File

@@ -7,8 +7,8 @@
# lines start with # will be ignored
# FreeRTOS upstream code (don't include our port files here)
components/freertos/*.c
components/freertos/include/freertos/*.h
components/freertos/FreeRTOS-Kernel/*.c
components/freertos/FreeRTOS-Kernel/include/freertos/*.h
# wpa_supplicant upstream code
components/wpa_supplicant/src/**

4
tools/ci/test_build_system.sh
View File

@@ -183,7 +183,7 @@ function run_tests()
# and therefore should rebuild
assert_rebuilt newlib/newlib_init.o
assert_rebuilt nvs_flash/src/nvs_api.o
assert_rebuilt freertos/port/xtensa/xtensa_vectors.o
assert_rebuilt freertos/FreeRTOS-Kernel/portable/xtensa/xtensa_vectors.o
print_status "Updating project Makefile triggers full recompile"
make
@@ -193,7 +193,7 @@ function run_tests()
# similar to previous test
assert_rebuilt newlib/newlib_init.o
assert_rebuilt nvs_flash/src/nvs_api.o
assert_rebuilt freertos/port/xtensa/xtensa_vectors.o
assert_rebuilt freertos/FreeRTOS-Kernel/portable/xtensa/xtensa_vectors.o
print_status "print_flash_cmd target should produce one line of output"
make

4
tools/ci/test_build_system_cmake.sh
View File

@@ -251,7 +251,7 @@ function run_tests()
# and therefore should rebuild
assert_rebuilt esp-idf/newlib/CMakeFiles/${IDF_COMPONENT_PREFIX}_newlib.dir/newlib_init.c.obj
assert_rebuilt esp-idf/nvs_flash/CMakeFiles/${IDF_COMPONENT_PREFIX}_nvs_flash.dir/src/nvs_api.cpp.obj
assert_rebuilt esp-idf/freertos/CMakeFiles/${IDF_COMPONENT_PREFIX}_freertos.dir/port/xtensa/xtensa_vectors.S.obj
assert_rebuilt esp-idf/freertos/CMakeFiles/${IDF_COMPONENT_PREFIX}_freertos.dir/FreeRTOS-Kernel/portable/xtensa/xtensa_vectors.S.obj
mv sdkconfig.bak sdkconfig
print_status "Updating project CMakeLists.txt triggers full recompile"
@@ -266,7 +266,7 @@ function run_tests()
# similar to previous test
assert_rebuilt esp-idf/newlib/CMakeFiles/${IDF_COMPONENT_PREFIX}_newlib.dir/newlib_init.c.obj
assert_rebuilt esp-idf/nvs_flash/CMakeFiles/${IDF_COMPONENT_PREFIX}_nvs_flash.dir/src/nvs_api.cpp.obj
assert_rebuilt esp-idf/freertos/CMakeFiles/${IDF_COMPONENT_PREFIX}_freertos.dir/port/xtensa/xtensa_vectors.S.obj
assert_rebuilt esp-idf/freertos/CMakeFiles/${IDF_COMPONENT_PREFIX}_freertos.dir/FreeRTOS-Kernel/portable/xtensa/xtensa_vectors.S.obj
mv sdkconfig.bak sdkconfig
print_status "Can build with Ninja (no idf.py)"

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

@@ -5,14 +5,14 @@ message(STATUS "building FREERTOS MOCKS (only task and queue)")
idf_component_get_property(original_freertos_dir freertos COMPONENT_OVERRIDEN_DIR)
set(include_dirs
"${original_freertos_dir}/include"
"${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}/FreeRTOS-Kernel/include"
"${original_freertos_dir}/esp_additions/include"
"${original_freertos_dir}/esp_additions/include/freertos"
"${original_freertos_dir}/FreeRTOS-Kernel/include/freertos" # this is due to the way includes are generated in CMock
"${original_freertos_dir}/FreeRTOS-Kernel/portable/linux/include")
idf_component_mock(INCLUDE_DIRS ${include_dirs}
REQUIRES esp_common
MOCK_HEADER_FILES
${original_freertos_dir}/include/freertos/task.h
${original_freertos_dir}/include/freertos/queue.h)
${original_freertos_dir}/FreeRTOS-Kernel/include/freertos/task.h
${original_freertos_dir}/FreeRTOS-Kernel/include/freertos/queue.h)