Skip to content

Commit 11e1aff

Browse files
hathachhathach
committed
update freeRTOS kernel to latest for library cmake
add per family freeRTOSConfig.h also make changes to build with freertos_kernel cmake - hard coded configPRIO_BITS based on family - change configSUPPORT_STATIC_ALLOCATION to 0, configSUPPORT_DYNAMIC_ALLOCATION to 1 - enable configRECORD_STACK_HIGH_ADDRESS for tracing - enable INCLUDE_xTaskGetCurrentTaskHandle which is required to compile stream_buffer (although we don't use it).
1 parent 6daa135 commit 11e1aff

File tree

5 files changed

+219
-5
lines changed

5 files changed

+219
-5
lines changed

‎examples/device/cdc_msc_freertos/CMakeLists.txt

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,41 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/../../../hw/bsp/family_support.cmake)
55
# gets PROJECT name for the example (e.g. <BOARD>-<DIR_NAME>)
66
family_get_project_name(PROJECT ${CMAKE_CURRENT_LIST_DIR})
77

8-
project(${PROJECT})
8+
project(${PROJECT} C CXX ASM)
99

1010
# Checks this example is valid for the family and initializes the project
1111
family_initialize_project(${PROJECT} ${CMAKE_CURRENT_LIST_DIR})
1212

13-
# Check for -DFAMILY=
14-
if(NOT FAMILY STREQUAL "espressif")
15-
message(FATAL_ERROR "Invalid FAMILY specified: ${FAMILY}")
13+
# Espressif has its own cmake build system
14+
if(FAMILY STREQUAL "espressif")
15+
return()
1616
endif()
17+
18+
add_executable(${PROJECT})
19+
20+
set(freertos_path ${CMAKE_CURRENT_SOURCE_DIR}/../../../lib/FreeRTOS-Kernel)
21+
22+
# Example source
23+
target_sources(${PROJECT} PUBLIC
24+
${CMAKE_CURRENT_SOURCE_DIR}/src/freertos_hook.c
25+
${CMAKE_CURRENT_SOURCE_DIR}/src/main.c
26+
${CMAKE_CURRENT_SOURCE_DIR}/src/msc_disk.c
27+
${CMAKE_CURRENT_SOURCE_DIR}/src/usb_descriptors.c
28+
)
29+
30+
# Example include
31+
target_include_directories(${PROJECT} PUBLIC
32+
${CMAKE_CURRENT_SOURCE_DIR}/src
33+
${freertos_path}/include
34+
)
35+
36+
# Configure compilation flags and libraries for the example... see the corresponding function
37+
# in hw/bsp/FAMILY/family.cmake for details.
38+
family_configure_device_example(${PROJECT})
39+
40+
family_add_freertos_config(${PROJECT})
41+
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../../../lib/FreeRTOS-Kernel lib/FreeRTOS-Kernel)
42+
43+
target_link_libraries(${PROJECT} PUBLIC
44+
freertos_kernel
45+
)

‎examples/device/cdc_msc_freertos/src/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# This file is for ESP-IDF only
12
idf_component_register(SRCS "main.c" "usb_descriptors.c" "msc_disk.c"
23
INCLUDE_DIRS "."
34
REQUIRES boards tinyusb_src)

‎hw/bsp/imxrt/FreeRTOSConfig/FreeRTOSConfig.h

Lines changed: 166 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
1+
/*
2+
* FreeRTOS Kernel V10.0.0
3+
* Copyright (C) 2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
*
5+
* Permission is hereby granted, free of charge, to any person obtaining a copy of
6+
* this software and associated documentation files (the "Software"), to deal in
7+
* the Software without restriction, including without limitation the rights to
8+
* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
9+
* the Software, and to permit persons to whom the Software is furnished to do so,
10+
* subject to the following conditions:
11+
*
12+
* The above copyright notice and this permission notice shall be included in all
13+
* copies or substantial portions of the Software. If you wish to use our Amazon
14+
* FreeRTOS name, please do so in a fair use way that does not cause confusion.
15+
*
16+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
18+
* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
19+
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
20+
* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
21+
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
22+
*
23+
* http://www.FreeRTOS.org
24+
* http://aws.amazon.com/freertos
25+
*
26+
* 1 tab == 4 spaces!
27+
*/
28+
29+
30+
#ifndef FREERTOS_CONFIG_H
31+
#define FREERTOS_CONFIG_H
32+
33+
/*-----------------------------------------------------------
34+
* Application specific definitions.
35+
*
36+
* These definitions should be adjusted for your particular hardware and
37+
* application requirements.
38+
*
39+
* THESE PARAMETERS ARE DESCRIBED WITHIN THE 'CONFIGURATION' SECTION OF THE
40+
* FreeRTOS API DOCUMENTATION AVAILABLE ON THE FreeRTOS.org WEB SITE.
41+
*
42+
* See http://www.freertos.org/a00110.html.
43+
*----------------------------------------------------------*/
44+
45+
// skip if included from IAR assembler
46+
#ifndef __IASMARM__
47+
// FIXME cause redundant-decls warnings
48+
extern uint32_t SystemCoreClock;
49+
#endif
50+
51+
/* Cortex M23/M33 port configuration. */
52+
#define configENABLE_MPU 0
53+
#define configENABLE_FPU 1
54+
#define configENABLE_TRUSTZONE 0
55+
#define configMINIMAL_SECURE_STACK_SIZE ( 1024 )
56+
57+
#define configUSE_PREEMPTION 1
58+
#define configUSE_PORT_OPTIMISED_TASK_SELECTION 0
59+
#define configCPU_CLOCK_HZ SystemCoreClock
60+
#define configTICK_RATE_HZ ( 1000 )
61+
#define configMAX_PRIORITIES ( 5 )
62+
#define configMINIMAL_STACK_SIZE ( 128 )
63+
#define configTOTAL_HEAP_SIZE ( configSUPPORT_DYNAMIC_ALLOCATION*4*1024 )
64+
#define configMAX_TASK_NAME_LEN 16
65+
#define configUSE_16_BIT_TICKS 0
66+
#define configIDLE_SHOULD_YIELD 1
67+
#define configUSE_MUTEXES 1
68+
#define configUSE_RECURSIVE_MUTEXES 1
69+
#define configUSE_COUNTING_SEMAPHORES 1
70+
#define configQUEUE_REGISTRY_SIZE 2
71+
#define configUSE_QUEUE_SETS 0
72+
#define configUSE_TIME_SLICING 0
73+
#define configUSE_NEWLIB_REENTRANT 0
74+
#define configENABLE_BACKWARD_COMPATIBILITY 1
75+
#define configSTACK_ALLOCATION_FROM_SEPARATE_HEAP 0
76+
77+
#define configSUPPORT_STATIC_ALLOCATION 0
78+
#define configSUPPORT_DYNAMIC_ALLOCATION 1
79+
80+
/* Hook function related definitions. */
81+
#define configUSE_IDLE_HOOK 0
82+
#define configUSE_TICK_HOOK 0
83+
#define configUSE_MALLOC_FAILED_HOOK 0 // cause nested extern warning
84+
#define configCHECK_FOR_STACK_OVERFLOW 2
85+
86+
/* Run time and task stats gathering related definitions. */
87+
#define configGENERATE_RUN_TIME_STATS 0
88+
#define configRECORD_STACK_HIGH_ADDRESS 1
89+
#define configUSE_TRACE_FACILITY 1 // legacy trace
90+
#define configUSE_STATS_FORMATTING_FUNCTIONS 0
91+
92+
/* Co-routine definitions. */
93+
#define configUSE_CO_ROUTINES 0
94+
#define configMAX_CO_ROUTINE_PRIORITIES 2
95+
96+
/* Software timer related definitions. */
97+
#define configUSE_TIMERS 1
98+
#define configTIMER_TASK_PRIORITY (configMAX_PRIORITIES-2)
99+
#define configTIMER_QUEUE_LENGTH 32
100+
#define configTIMER_TASK_STACK_DEPTH configMINIMAL_STACK_SIZE
101+
102+
/* Optional functions - most linkers will remove unused functions anyway. */
103+
#define INCLUDE_vTaskPrioritySet 0
104+
#define INCLUDE_uxTaskPriorityGet 0
105+
#define INCLUDE_vTaskDelete 0
106+
#define INCLUDE_vTaskSuspend 1 // required for queue, semaphore, mutex to be blocked indefinitely with portMAX_DELAY
107+
#define INCLUDE_xResumeFromISR 0
108+
#define INCLUDE_vTaskDelayUntil 1
109+
#define INCLUDE_vTaskDelay 1
110+
#define INCLUDE_xTaskGetSchedulerState 0
111+
#define INCLUDE_xTaskGetCurrentTaskHandle 1
112+
#define INCLUDE_uxTaskGetStackHighWaterMark 0
113+
#define INCLUDE_xTaskGetIdleTaskHandle 0
114+
#define INCLUDE_xTimerGetTimerDaemonTaskHandle 0
115+
#define INCLUDE_pcTaskGetTaskName 0
116+
#define INCLUDE_eTaskGetState 0
117+
#define INCLUDE_xEventGroupSetBitFromISR 0
118+
#define INCLUDE_xTimerPendFunctionCall 0
119+
120+
/* Define to trap errors during development. */
121+
// Halt CPU (breakpoint) when hitting error, only apply for Cortex M3, M4, M7
122+
#if defined(__ARM_ARCH_7M__) || defined (__ARM_ARCH_7EM__)
123+
#define configASSERT(_exp) \
124+
do {\
125+
if ( !(_exp) ) { \
126+
volatile uint32_t* ARM_CM_DHCSR = ((volatile uint32_t*) 0xE000EDF0UL); /* Cortex M CoreDebug->DHCSR */ \
127+
if ( (*ARM_CM_DHCSR) & 1UL ) { /* Only halt mcu if debugger is attached */ \
128+
taskDISABLE_INTERRUPTS(); \
129+
__asm("BKPT #0\n"); \
130+
}\
131+
}\
132+
} while(0)
133+
#else
134+
#define configASSERT( x )
135+
#endif
136+
137+
/* FreeRTOS hooks to NVIC vectors */
138+
#define xPortPendSVHandler PendSV_Handler
139+
#define xPortSysTickHandler SysTick_Handler
140+
#define vPortSVCHandler SVC_Handler
141+
142+
//--------------------------------------------------------------------+
143+
// Interrupt nesting behavior configuration.
144+
//--------------------------------------------------------------------+
145+
146+
// For Cortex-M specific: __NVIC_PRIO_BITS is defined in mcu header
147+
#define configPRIO_BITS 4
148+
149+
/* The lowest interrupt priority that can be used in a call to a "set priority" function. */
150+
#define configLIBRARY_LOWEST_INTERRUPT_PRIORITY ((1<<configPRIO_BITS) - 1)
151+
152+
/* The highest interrupt priority that can be used by any interrupt service
153+
routine that makes calls to interrupt safe FreeRTOS API functions. DO NOT CALL
154+
INTERRUPT SAFE FREERTOS API FUNCTIONS FROM ANY INTERRUPT THAT HAS A HIGHER
155+
PRIORITY THAN THIS! (higher priorities are lower numeric values. */
156+
#define configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY 2
157+
158+
/* Interrupt priorities used by the kernel port layer itself. These are generic
159+
to all Cortex-M ports, and do not rely on any particular library functions. */
160+
#define configKERNEL_INTERRUPT_PRIORITY ( configLIBRARY_LOWEST_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
161+
162+
/* !!!! configMAX_SYSCALL_INTERRUPT_PRIORITY must not be set to zero !!!!
163+
See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */
164+
#define configMAX_SYSCALL_INTERRUPT_PRIORITY ( configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )
165+
166+
#endif /* __FREERTOS_CONFIG__H */

‎hw/bsp/imxrt/family.cmake

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,8 @@ function(family_configure_target TARGET)
5858
target_link_options(${TARGET} PUBLIC
5959
"LINKER:--script=${SDK_DIR}/devices/${MCU_VARIANT}/gcc/${MCU_VARIANT}xxxxx_flexspi_nor.ld"
6060
)
61+
else ()
62+
# TODO support IAR
6163
endif ()
6264

6365
target_include_directories(${TARGET} PUBLIC
@@ -77,6 +79,22 @@ function(family_configure_target TARGET)
7779
include(${TOP}/src/CMakeLists.txt)
7880
endfunction()
7981

82+
function(family_add_freertos_config TARGET)
83+
add_library(freertos_config INTERFACE)
84+
85+
# add path to FreeRTOSConfig.h
86+
target_include_directories(freertos_config SYSTEM INTERFACE
87+
${CMAKE_CURRENT_FUNCTION_LIST_DIR}/FreeRTOSConfig
88+
)
89+
90+
# select freertos port
91+
if (TOOLCHAIN STREQUAL "gcc")
92+
set(FREERTOS_PORT "GCC_ARM_CM7" CACHE INTERNAL "")
93+
else ()
94+
# TODO support IAR
95+
endif ()
96+
endfunction()
97+
8098
function(family_configure_device_example TARGET)
8199
family_configure_target(${TARGET})
82100
endfunction()

‎tools/get_deps.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# Mandatory Dependencies that is always fetched
77
# path, url, commit (Alphabet sorted by path)
88
deps_mandatory = {
9-
'lib/FreeRTOS-Kernel' : ['def7d2df2b0506d3d249334974f51e427c17a41c', 'https://github.com/FreeRTOS/FreeRTOS-Kernel.git' ],
9+
'lib/FreeRTOS-Kernel' : ['5f19e34f878af97810a7662a75eac59bd74d628b', 'https://github.com/FreeRTOS/FreeRTOS-Kernel.git' ],
1010
'lib/lwip' : ['159e31b689577dbf69cf0683bbaffbd71fa5ee10', 'https://github.com/lwip-tcpip/lwip.git' ],
1111
'tools/uf2' : ['19615407727073e36d81bf239c52108ba92e7660', 'https://github.com/microsoft/uf2.git' ],
1212
}

0 commit comments

Comments
 (0)