Update Cortex R4F and Cortex R5F MPU Demos (#1200)

* Set configUSE_EVENT_GROUPS to 0 in the CORTEX_MPU_R4/5F Demos.
* Update the FreeRTOS-Kernel submodule to use the latest FreeRTOS-Kernel.
This commit is contained in:
Soren Ptak 2024-03-28 12:37:03 -07:00 committed by GitHub
parent 076430b2ab
commit 4592acca4c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 53 additions and 97 deletions

View file

@ -50,19 +50,22 @@ INCLUDE(FetchContent)
FetchContent_Declare(
FreeRTOS-Kernel
GIT_REPOSITORY https://github.com/FreeRTOS/FreeRTOS-Kernel.git
GIT_TAG main
# Last tested FreeRTOS-Kernel Commit
GIT_TAG e8289dfee6e00660b5ad028e9f931ffb76c95840
SOURCE_DIR "${DEMO_DIR}/../../Source"
USES_TERMINAL_DOWNLOAD YES
USES_TERMINAL_UPDATE YES
BUILD_COMMAND "")
BUILD_COMMAND ""
)
FetchContent_GetProperties(FreeRTOS-Kernel)
if(NOT FreeRTOS-Kernel_POPULATED)
FetchContent_Populate(FreeRTOS-Kernel)
endif()
# Uncomment the following lines to use Fetch-Content to clone Kernel.
# FetchContent_GetProperties(FreeRTOS-Kernel)
# if(NOT FreeRTOS-Kernel_POPULATED)
# FetchContent_Populate(FreeRTOS-Kernel)
# endif()
# Get the absolute path to the FreeRTOS-Kernel Directory
SET(FREERTOS_KERNEL_DIR_REL "${freertos-kernel_SOURCE_DIR}")
SET(FREERTOS_KERNEL_DIR_REL "${DEMO_DIR}/../../Source")
GET_FILENAME_COMPONENT(FREERTOS_KERNEL_DIR ${FREERTOS_KERNEL_DIR_REL} ABSOLUTE)
# Get the absolute path to the Port Directory

View file

@ -97,6 +97,7 @@ extern void vMainSetupTimerInterrupt( void );
#define configUSE_CO_ROUTINES 0
#define configUSE_MUTEXES 1U
#define configUSE_RECURSIVE_MUTEXES 1U
#define configUSE_EVENT_GROUPS 0U
#define configCHECK_FOR_STACK_OVERFLOW 0
#define configUSE_QUEUE_SETS 1U
#define configUSE_COUNTING_SEMAPHORES 1U

View file

@ -100,8 +100,7 @@
#define demoIRQ_TASK_PRIORITY ( configTIMER_TASK_PRIORITY + 2UL )
/** @brief Priority at which the Notification Demo Task is created. */
#define demoNOTIFICATION_TASK_PRIORITY \
( configTIMER_TASK_PRIORITY + 1UL ) | portPRIVILEGE_BIT
#define demoNOTIFICATION_TASK_PRIORITY ( configTIMER_TASK_PRIORITY + 1UL )
/* ------------------------------- Register Test Tasks ------------------------------- */
@ -173,7 +172,6 @@ PRIVILEGED_FUNCTION void vIRQDemoHandler( void );
#define portRTI_INTFLAG_REG ( *( ( volatile uint32_t * ) 0xFFFFFC88UL ) )
#define portEND_OF_INTERRUPT_REG ( ( ( volatile uint32_t * ) configEOI_ADDRESS ) )
/* Registers used by the Vectored Interrupt Manager */
typedef void ( *ISRFunction_t )( void );
#define portVIM_IRQ_INDEX ( *( ( volatile uint32_t * ) 0xFFFFFE00 ) )

View file

@ -50,19 +50,23 @@ INCLUDE(FetchContent)
FetchContent_Declare(
FreeRTOS-Kernel
GIT_REPOSITORY https://github.com/FreeRTOS/FreeRTOS-Kernel.git
GIT_TAG main
# Last tested FreeRTOS-Kernel Commit
GIT_TAG e8289dfee6e00660b5ad028e9f931ffb76c95840
SOURCE_DIR "${DEMO_DIR}/../../Source"
USES_TERMINAL_DOWNLOAD YES
USES_TERMINAL_UPDATE YES
BUILD_COMMAND "")
BUILD_COMMAND ""
)
# Uncomment the following lines to use Fetch-Content to clone Kernel.
# FetchContent_GetProperties(FreeRTOS-Kernel)
# if(NOT FreeRTOS-Kernel_POPULATED)
# FetchContent_Populate(FreeRTOS-Kernel)
# endif()
FetchContent_GetProperties(FreeRTOS-Kernel)
if(NOT FreeRTOS-Kernel_POPULATED)
FetchContent_Populate(FreeRTOS-Kernel)
endif()
# Get the absolute path to the FreeRTOS-Kernel Directory
SET(FREERTOS_KERNEL_DIR_REL "${freertos-kernel_SOURCE_DIR}")
SET(FREERTOS_KERNEL_DIR_REL "${DEMO_DIR}/../../Source")
GET_FILENAME_COMPONENT(FREERTOS_KERNEL_DIR ${FREERTOS_KERNEL_DIR_REL} ABSOLUTE)
# Get the absolute path to the Port Directory

View file

@ -97,6 +97,7 @@ extern void vMainSetupTimerInterrupt( void );
#define configUSE_CO_ROUTINES 0
#define configUSE_MUTEXES 1U
#define configUSE_RECURSIVE_MUTEXES 1U
#define configUSE_EVENT_GROUPS 0U
#define configCHECK_FOR_STACK_OVERFLOW 0
#define configUSE_QUEUE_SETS 1U
#define configUSE_COUNTING_SEMAPHORES 1U

View file

@ -100,8 +100,7 @@
#define demoIRQ_TASK_PRIORITY ( configTIMER_TASK_PRIORITY + 2UL )
/** @brief Priority at which the Notification Demo Task is created. */
#define demoNOTIFICATION_TASK_PRIORITY \
( configTIMER_TASK_PRIORITY + 1UL ) | portPRIVILEGE_BIT
#define demoNOTIFICATION_TASK_PRIORITY ( configTIMER_TASK_PRIORITY + 1UL )
/* ------------------------------- Register Test Tasks ------------------------------- */

@ -1 +1 @@
Subproject commit 625b24a104dd901d86759668b6b272590d154308
Subproject commit e8289dfee6e00660b5ad028e9f931ffb76c95840