freertos: update freertos folder structure to match upstream

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>

components/freertos/CMakeLists.txt

@@ -8,64 +8,64 @@ idf_build_get_property(target IDF_TARGET)
 
 if(CONFIG_IDF_TARGET_ARCH_XTENSA)
     set(srcs
-        "port/xtensa/port.c"
-        "port/xtensa/portasm.S"
-        "port/xtensa/xtensa_context.S"
-        "port/xtensa/xtensa_init.c"
-        "port/xtensa/xtensa_overlay_os_hook.c"
-        "port/xtensa/xtensa_vector_defaults.S"
-        "port/xtensa/xtensa_vectors.S")
+        "FreeRTOS-Kernel/portable/xtensa/port.c"
+        "FreeRTOS-Kernel/portable/xtensa/portasm.S"
+        "FreeRTOS-Kernel/portable/xtensa/xtensa_context.S"
+        "FreeRTOS-Kernel/portable/xtensa/xtensa_init.c"
+        "FreeRTOS-Kernel/portable/xtensa/xtensa_overlay_os_hook.c"
+        "FreeRTOS-Kernel/portable/xtensa/xtensa_vector_defaults.S"
+        "FreeRTOS-Kernel/portable/xtensa/xtensa_vectors.S")
 
     set(include_dirs
-        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"
+        FreeRTOS-Kernel/include
+        esp_additions/include/freertos              # For files with #include "FreeRTOSConfig.h"
+        FreeRTOS-Kernel/portable/xtensa/include     # For arch-specific FreeRTOSConfig_arch.h in portable/<arch>/include
+        esp_additions/include)                      # For files with #include "freertos/FreeRTOSConfig.h"
 
     set(private_include_dirs
-        port/xtensa/include/freertos
-        port/xtensa
-        port/priv_include
+        FreeRTOS-Kernel/portable/xtensa/include/freertos
+        FreeRTOS-Kernel/portable/xtensa
+        FreeRTOS-Kernel/portable/priv_include
         .)
 
 elseif(CONFIG_IDF_TARGET_ARCH_RISCV)
     set(srcs
-        "port/riscv/port.c"
-        "port/riscv/portasm.S")
+        "FreeRTOS-Kernel/portable/riscv/port.c"
+        "FreeRTOS-Kernel/portable/riscv/portasm.S")
 
     set(include_dirs
-        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"
+        FreeRTOS-Kernel/include
+        esp_additions/include/freertos              # For files with #include "FreeRTOSConfig.h"
+        FreeRTOS-Kernel/portable/riscv/include      # For arch-specific FreeRTOSConfig_arch.h in portable/<arch>/include
+        esp_additions/include)                      # For files with #include "freertos/FreeRTOSConfig.h"
 
     set(private_include_dirs
-        port/riscv/include/freertos
-        port/riscv
-        port/priv_include
+        FreeRTOS-Kernel/portable/riscv/include/freertos
+        FreeRTOS-Kernel/portable/riscv
+        FreeRTOS-Kernel/portable/priv_include
         .)
 
 endif()
 
 list(APPEND srcs
     "esp_additions/task_snapshot.c"
-    "port/port_common.c"
-    "port/port_systick.c"
-    "croutine.c"
-    "event_groups.c"
-    "list.c"
-    "queue.c"
-    "tasks.c"
-    "timers.c"
-    "stream_buffer.c"
+    "FreeRTOS-Kernel/portable/port_common.c"
+    "FreeRTOS-Kernel/portable/port_systick.c"
+    "FreeRTOS-Kernel/croutine.c"
+    "FreeRTOS-Kernel/event_groups.c"
+    "FreeRTOS-Kernel/list.c"
+    "FreeRTOS-Kernel/queue.c"
+    "FreeRTOS-Kernel/tasks.c"
+    "FreeRTOS-Kernel/timers.c"
+    "FreeRTOS-Kernel/stream_buffer.c"
     "FreeRTOS-openocd.c"
-    "freertos_v8_compat.c")
+    "esp_additions/freertos_v8_compat.c")
 
 list(APPEND private_include_dirs
-    "include/freertos")
+    "FreeRTOS-Kernel/include/freertos")
 
 if(CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY)
-    list(APPEND srcs "port/xtensa/xtensa_loadstore_handler.S")
+    list(APPEND srcs "FreeRTOS-Kernel/portable/xtensa/xtensa_loadstore_handler.S")
 endif()
 
 # esp_timer is required by FreeRTOS because we use esp_tiemr_get_time() to do profiling

components/freertos/port/xtensa/xt_asm_utils.h → components/freertos/FreeRTOS-Kernel/portable/xtensa/xt_asm_utils.h

@@ -4,19 +4,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-/* Copyright 2015-2018 Espressif Systems (Shanghai) PTE LTD
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
+/*
+ * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * SPDX-License-Identifier: Apache-2.0
  */
 
 /* File adapted to use on IDF FreeRTOS component, extracted

components/freertos/component.mk

@@ -6,9 +6,9 @@ ifdef CONFIG_FREERTOS_DEBUG_OCDAWARE
 	COMPONENT_ADD_LDFLAGS += -Wl,--undefined=uxTopUsedPriority
 endif
 
-COMPONENT_ADD_INCLUDEDIRS := include include/esp_additions include/esp_additions/freertos port/xtensa/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_ADD_INCLUDEDIRS := FreeRTOS-Kernel/include esp_additions/include esp_additions/include/freertos FreeRTOS-Kernel/portable/xtensa/include
+COMPONENT_PRIV_INCLUDEDIRS := esp_additions/include esp_additions/include/freertos FreeRTOS-Kernel/include/freertos FreeRTOS-Kernel/portable/xtensa/include/freertos FreeRTOS-Kernel/portable/xtensa FreeRTOS-Kernel/portable/priv_include .
+COMPONENT_SRCDIRS += FreeRTOS-Kernel FreeRTOS-Kernel/portable FreeRTOS-Kernel/portable/xtensa esp_additions/
 
 ifndef CONFIG_ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY
 	COMPONENT_OBJEXCLUDE := xtensa/xtensa_loadstore_handler.o

components/freertos/esp_additions/freertos_v8_compat.c

@@ -0,0 +1,25 @@
+/*
+ * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+#include "FreeRTOS.h"
+#include "queue.h"
+#include "semphr.h"
+
+/* This API is kept for backward ABI compatibility with prebuilt libraries against FreeRTOS v8/v9 in ESP-IDF */
+BaseType_t xQueueGenericReceive( QueueHandle_t xQueue, void * const pvBuffer, TickType_t xTicksToWait, const BaseType_t xPeek )
+{
+	if ( xPeek == pdTRUE )
+	{
+		return xQueuePeek( xQueue, pvBuffer, xTicksToWait );
+	}
+
+	if ( pvBuffer == NULL )
+	{
+		return xQueueSemaphoreTake( xQueue, xTicksToWait );
+	}
+
+	return xQueueReceive( xQueue, pvBuffer, xTicksToWait );
+}

components/freertos/include/esp_additions/freertos/task_snapshot.h → components/freertos/esp_additions/include/freertos/task_snapshot.h

@@ -1,16 +1,8 @@
-// Copyright 2015-2021 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #pragma once
 

components/freertos/include/esp_additions/freertos_tasks_c_additions.h → components/freertos/esp_additions/include/freertos_tasks_c_additions.h

@@ -1,16 +1,8 @@
-// Copyright 2015-2021 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 
 #pragma once
 

components/freertos/freertos_v8_compat.c

@@ -1,33 +0,0 @@
-// Copyright 2020 Espressif Systems (Shanghai) Co., Ltd.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#include "FreeRTOS.h"
-#include "queue.h"
-#include "semphr.h"
-
-/* This API is kept for backward ABI compatibility with prebuilt libraries against FreeRTOS v8/v9 in ESP-IDF */
-BaseType_t xQueueGenericReceive( QueueHandle_t xQueue, void * const pvBuffer, TickType_t xTicksToWait, const BaseType_t xPeek )
-{
-	if ( xPeek == pdTRUE )
-	{
-		return xQueuePeek( xQueue, pvBuffer, xTicksToWait );
-	}
-
-	if ( pvBuffer == NULL )
-	{
-		return xQueueSemaphoreTake( xQueue, xTicksToWait );
-	}
-
-	return xQueueReceive( xQueue, pvBuffer, xTicksToWait );
-}

components/lwip/test_afl_host/Makefile

@@ -2,7 +2,7 @@ COMPONENTS_DIR=../..
 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 \
 -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/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
+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/esp_additions/include -I $(COMPONENTS_DIR)/freertos/esp_additions/include/freertos -I $(COMPONENTS_DIR)/freertos/FreeRTOS-Kernel/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/FreeRTOS-Kernel/portable/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
 FUZZ=afl-fuzz
 GEN_CFG=generate_config

components/mdns/test_afl_fuzz_host/Makefile

@@ -18,9 +18,9 @@ CFLAGS=-g -Wno-unused-value -Wno-missing-declarations -Wno-pointer-bool-conversi
                  -I$(COMPONENTS_DIR)/esp_system/include \
                  -I$(COMPONENTS_DIR)/esp_timer/include \
                  -I$(COMPONENTS_DIR)/esp_wifi/include \
-                 -I$(COMPONENTS_DIR)/freertos \
-                 -I$(COMPONENTS_DIR)/freertos/include \
-                 -I$(COMPONENTS_DIR)/freertos/port/xtensa/include \
+                 -I$(COMPONENTS_DIR)/freertos/FreeRTOS-Kernel \
+                 -I$(COMPONENTS_DIR)/freertos/FreeRTOS-Kernel/include \
+                 -I$(COMPONENTS_DIR)/freertos/FreeRTOS-Kernel/portable/xtensa/include \
                  -I$(COMPONENTS_DIR)/hal/include \
                  -I$(COMPONENTS_DIR)/hal/esp32/include \
                  -I$(COMPONENTS_DIR)/heap/include \

components/mqtt/CMakeLists.txt

@@ -57,9 +57,9 @@ idf_component_get_property(mbedtls_dir mbedtls COMPONENT_DIR)
      ${esp_hw_support_dir}/include/esp_random.h
      ${esp_system_dir}/include/esp_system.h
      ${esp_tls_dir}/esp_tls.h
-     ${freertos_dir}/include/freertos/queue.h
-     ${freertos_dir}/include/freertos/task.h
-     ${freertos_dir}/include/freertos/event_groups.h
+     ${freertos_dir}/FreeRTOS-Kernel/include/freertos/queue.h
+     ${freertos_dir}/FreeRTOS-Kernel/include/freertos/task.h
+     ${freertos_dir}/FreeRTOS-Kernel/include/freertos/event_groups.h
      ${log_dir}/include/esp_log.h
      ${nghttp_dir}/port/include/http_parser.h
      )
@@ -103,7 +103,7 @@ idf_component_get_property(mbedtls_dir mbedtls COMPONENT_DIR)
     ${CMAKE_CURRENT_SOURCE_DIR}/host_test/mocks/include
     ${tcp_transport_dir}/include
     ${esp_tls_dir}
-    ${freertos_dir}/include
+    ${freertos_dir}/FreeRTOS-Kernel/include
     ${esp_event_dir}/include
     ${esp_system_dir}/include
     ${esp_common_dir}/include
@@ -115,7 +115,7 @@ idf_component_get_property(mbedtls_dir mbedtls COMPONENT_DIR)
     ${mbedtls_dir}/port/include
     ${nghttp_dir}/port/include
     ${mbedtls_dir}/mbedtls/include
-    ${freertos_dir}/include/freertos
+    ${freertos_dir}/FreeRTOS-Kernel/include/freertos
     esp-mqtt/lib/include
     ${MOCK_GEN_DIR}
     )

components/tinyusb/CMakeLists.txt

@@ -37,7 +37,7 @@ if(CONFIG_TINYUSB)
         "tinyusb/src/"
         "additions/include"
         # The FreeRTOS API include convention in tinyusb is different from esp-idf
-        "${freertos_component_dir}/include/freertos"
+        "${freertos_component_dir}/FreeRTOS-Kernel/include/freertos"
         )
 
     list(APPEND srcs

docs/doxygen/Doxyfile

@@ -206,13 +206,13 @@ INPUT = \
     $(PROJECT_PATH)/components/efuse/include/esp_efuse.h \
     $(PROJECT_PATH)/components/bootloader_support/include/esp_app_format.h \
     $(PROJECT_PATH)/components/pthread/include/esp_pthread.h \
-    $(PROJECT_PATH)/components/freertos/include/freertos/task.h \
-    $(PROJECT_PATH)/components/freertos/include/freertos/queue.h \
-    $(PROJECT_PATH)/components/freertos/include/freertos/semphr.h \
-    $(PROJECT_PATH)/components/freertos/include/freertos/timers.h \
-    $(PROJECT_PATH)/components/freertos/include/freertos/event_groups.h \
-    $(PROJECT_PATH)/components/freertos/include/freertos/stream_buffer.h \
-    $(PROJECT_PATH)/components/freertos/include/freertos/message_buffer.h \
+    $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/task.h \
+    $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/queue.h \
+    $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/semphr.h \
+    $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/timers.h \
+    $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/event_groups.h \
+    $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/stream_buffer.h \
+    $(PROJECT_PATH)/components/freertos/FreeRTOS-Kernel/include/freertos/message_buffer.h \
     $(PROJECT_PATH)/components/esp_ringbuf/include/freertos/ringbuf.h \
     $(PROJECT_PATH)/components/esp_common/include/esp_err.h \
     $(PROJECT_PATH)/components/esp_common/include/esp_check.h \

docs/en/COPYRIGHT.rst

@@ -19,7 +19,7 @@ These third party libraries can be included into the application (firmware) prod
 
 * :component:`Xtensa header files<xtensa/include/xtensa>` are Copyright (C) 2013 Tensilica Inc and are licensed under the MIT License as reproduced in the individual header files.
 
-* Original parts of FreeRTOS_ (components/freertos) are Copyright (C) 2017 Amazon.com, Inc. or its affiliates are licensed under the MIT License, as described in :component_file:`license.txt<freertos/LICENSE.md>`.
+* Original parts of FreeRTOS_ (components/freertos) are Copyright (C) 2017 Amazon.com, Inc. or its affiliates are licensed under the MIT License, as described in :component_file:`license.txt<freertos/FreeRTOS-Kernel/LICENSE.md>`.
 
 * Original parts of LWIP_ (components/lwip) are Copyright (C) 2001, 2002 Swedish Institute of Computer Science and are licensed under the BSD License as described in :component_file:`COPYING file<lwip/lwip/COPYING>`.
 

docs/en/api-guides/freertos-smp.rst

@@ -88,7 +88,7 @@ and :cpp:func:`xTaskCreateStatic` have led to the addition of
 :cpp:func:`xTaskCreatePinnedToCore` and :cpp:func:`xTaskCreateStaticPinnedToCore` in 
 ESP-IDF FreeRTOS 
 
-For more details see :component_file:`freertos/tasks.c`
+For more details see :component_file:`freertos/FreeRTOS-Kernel/tasks.c`
 
 The ESP-IDF FreeRTOS task creation functions are nearly identical to their
 vanilla counterparts with the exception of the extra parameter known as
@@ -333,8 +333,8 @@ The ESP-IDF FreeRTOS critical section functions have been modified as follows…
    in order to be in compliance with Vanilla FreeRTOS.
 
 For more details see :component_file:`esp_hw_support/include/soc/spinlock.h`,
-:component_file:`freertos/include/freertos/task.h`,
-and :component_file:`freertos/tasks.c`
+:component_file:`freertos/FreeRTOS-Kernel/include/freertos/task.h`,
+and :component_file:`freertos/FreeRTOS-Kernel/tasks.c`
 
 It should be noted that when modifying vanilla FreeRTOS code to be ESP-IDF
 FreeRTOS compatible, it is trivial to modify the type of critical section called

tools/ci/check_copyright_ignore.txt

@@ -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

tools/ci/check_public_headers_exceptions.txt

@@ -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

tools/ci/sonar_exclude_list.txt

@@ -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/**

tools/ci/test_build_system.sh

@@ -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

tools/ci/test_build_system_cmake.sh

@@ -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)"

tools/mocks/freertos/CMakeLists.txt

@@ -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)