From 012e618b6dd19b8f59eef260125ba0e0956a6710 Mon Sep 17 00:00:00 2001 From: Rahul Kar <118818625+kar-rahul-aws@users.noreply.github.com> Date: Mon, 11 Dec 2023 23:24:53 +0530 Subject: [PATCH] Update MPU Demos for Kernel V10.6.2 (#1124) Update MPU Demos for Kernel V10.6.2 --- .../.gitignore | 3 + .../FreeRTOSConfig.h | 5 +- .../GCC_Specific/startup_ARMCM4.S | 8 +- .../Keil_Specific/RTOSDemo.uvprojx | 53 +- .../CORTEX_MPU_LPC54018_MCUXpresso/.gitignore | 2 + .../Config/FreeRTOSConfig.h | 5 +- .../Projects/MCUXpresso/.project | 9 + .../Projects/IAR/Config/FreeRTOSConfig.h | 5 +- .../IAR/NonSecure/FreeRTOSDemo_ns.ewd | 100 +- .../IAR/NonSecure/FreeRTOSDemo_ns.ewp | 55 +- .../Projects/IAR/Secure/FreeRTOSDemo_s.ewd | 104 +- .../Projects/IAR/Secure/FreeRTOSDemo_s.ewp | 50 +- .../Projects/Keil/Config/FreeRTOSConfig.h | 5 +- .../Keil/NonSecure/FreeRTOSDemo_ns.uvprojx | 4 +- .../Keil/Secure/FreeRTOSDemo_s.uvprojx | 4 +- .../Projects_NTZ/IAR/Config/FreeRTOSConfig.h | 5 +- .../Projects_NTZ/IAR/FreeRTOSDemo.ewd | 116 +- .../Projects_NTZ/IAR/FreeRTOSDemo.ewp | 51 +- .../Projects_NTZ/Keil/Config/FreeRTOSConfig.h | 5 +- .../Projects_NTZ/Keil/FreeRTOSDemo.uvprojx | 4 +- .../Config/FreeRTOSConfig.h | 5 +- .../FreeRTOSDemo.emProject | 7 +- .../Projects/IAR/Config/FreeRTOSConfig.h | 5 +- .../IAR/NonSecure/FreeRTOSDemo_ns.ewd | 13984 ++-------------- .../IAR/NonSecure/FreeRTOSDemo_ns.ewp | 53 +- .../Projects/IAR/Secure/FreeRTOSDemo_s.ewd | 104 +- .../Projects/IAR/Secure/FreeRTOSDemo_s.ewp | 46 +- .../MCUXpresso/Config/FreeRTOSConfig.h | 5 +- .../Projects/MCUXpresso/NonSecure/.project | 9 + .../Projects_NTZ/IAR/Config/FreeRTOSConfig.h | 5 +- .../Projects_NTZ/IAR/FreeRTOSDemo.ewd | 104 +- .../Projects_NTZ/IAR/FreeRTOSDemo.ewp | 53 +- .../Projects_NTZ/MCUXpresso/.project | 11 +- .../MCUXpresso/Config/FreeRTOSConfig.h | 5 +- .../Config/FreeRTOSConfig.h | 5 +- .../FreeRTOSDemo.emProject | 26 +- .../Config/FreeRTOSConfig.h | 5 +- .../NonSecure/FreeRTOSDemo_ns.uvprojx | 2 +- .../Secure/FreeRTOSDemo_s.uvprojx | 2 +- .../FreeRTOSConfig.h | 5 +- .../.gitignore | 2 + .../Config/FreeRTOSConfig.h | 5 +- .../Projects/GCC/.project | 9 + .../org.eclipse.core.resources.prefs | 2 + .../Projects/GCC/Startup/sysmem.c | 6 +- .../Config/FreeRTOSConfig.h | 5 +- .../Projects/GCC/.project | 11 +- .../Projects/GCC/Startup/sysmem.c | 6 +- .../Projects/IAR/FreeRTOSDemo.ewd | 116 +- .../Projects/IAR/FreeRTOSDemo.ewp | 67 +- .../Projects/Keil/FreeRTOSDemo.uvprojx | 6 +- .../Projects/Keil_V5/FreeRTOSDemo.uvprojx | 64 +- .../.gitignore | 16 + .../Config/FreeRTOSConfig.h | 5 +- .../Projects/GCC/.cproject | 67 +- .../Projects/GCC/.project | 9 + .../org.eclipse.core.resources.prefs | 2 + .../Projects/GCC/Startup/sysmem.c | 6 +- .../Projects/IAR/MPUDemo.ewd | 3061 ++-- .../Projects/IAR/MPUDemo.ewp | 59 +- .../Projects/Keil/MPUDemo.uvprojx | 8 +- .../CORTEX_MPU_Simulator_Keil_GCC/.gitignore | 4 + .../FreeRTOSConfig.h | 5 +- .../Keil_Specific/RTOSDemo.uvprojx | 53 +- .../Demo/CORTEX_MPU_Simulator_Keil_GCC/main.c | 17 +- .../.gitignore | 4 + .../FreeRTOSConfig.h | 5 +- .../Keil_Specific/RTOSDemo.uvprojx | 53 +- .../main.c | 17 +- 69 files changed, 4662 insertions(+), 14062 deletions(-) create mode 100644 FreeRTOS/Demo/CORTEX_MPU_CEC_MEC_17xx_51xx_Keil_GCC/.gitignore create mode 100644 FreeRTOS/Demo/CORTEX_MPU_LPC54018_MCUXpresso/.gitignore create mode 100644 FreeRTOS/Demo/CORTEX_MPU_M3_NUCLEO_L152RE_GCC/.gitignore create mode 100644 FreeRTOS/Demo/CORTEX_MPU_M3_NUCLEO_L152RE_GCC/Projects/GCC/.settings/org.eclipse.core.resources.prefs create mode 100644 FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/.gitignore create mode 100644 FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/GCC/.settings/org.eclipse.core.resources.prefs create mode 100644 FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/.gitignore create mode 100644 FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/.gitignore diff --git a/FreeRTOS/Demo/CORTEX_MPU_CEC_MEC_17xx_51xx_Keil_GCC/.gitignore b/FreeRTOS/Demo/CORTEX_MPU_CEC_MEC_17xx_51xx_Keil_GCC/.gitignore new file mode 100644 index 000000000..f4bd332c9 --- /dev/null +++ b/FreeRTOS/Demo/CORTEX_MPU_CEC_MEC_17xx_51xx_Keil_GCC/.gitignore @@ -0,0 +1,3 @@ +Listings/ +Objects/ +*.uvguix.* diff --git a/FreeRTOS/Demo/CORTEX_MPU_CEC_MEC_17xx_51xx_Keil_GCC/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_CEC_MEC_17xx_51xx_Keil_GCC/FreeRTOSConfig.h index c51491bf2..1131bcc5f 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_CEC_MEC_17xx_51xx_Keil_GCC/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_MPU_CEC_MEC_17xx_51xx_Keil_GCC/FreeRTOSConfig.h @@ -1,6 +1,6 @@ /* * FreeRTOS V202212.00 - * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -142,6 +142,9 @@ See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */ /* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper. * See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */ #define configUSE_MPU_WRAPPERS_V1 ( 0 ) +/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list. + * See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */ +#define configENABLE_ACCESS_CONTROL_LIST ( 1 ) /* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */ #define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 ) /* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_CEC_MEC_17xx_51xx_Keil_GCC/GCC_Specific/startup_ARMCM4.S b/FreeRTOS/Demo/CORTEX_MPU_CEC_MEC_17xx_51xx_Keil_GCC/GCC_Specific/startup_ARMCM4.S index 77f656b20..64dace521 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_CEC_MEC_17xx_51xx_Keil_GCC/GCC_Specific/startup_ARMCM4.S +++ b/FreeRTOS/Demo/CORTEX_MPU_CEC_MEC_17xx_51xx_Keil_GCC/GCC_Specific/startup_ARMCM4.S @@ -1,10 +1,11 @@ /* File: startup_ARMCM4.S * Purpose: startup file for Cortex-M4 devices. Should use with * GCC for ARM Embedded Processors - * Version: V2.0 - * Date: 16 August 2013 + * Version: V2.01 + * Date: 12 June 2014 * -/* Copyright (c) 2011 - 2013 ARM LIMITED + */ +/* Copyright (c) 2011 - 2014 ARM LIMITED All rights reserved. Redistribution and use in source and binary forms, with or without @@ -30,6 +31,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ---------------------------------------------------------------------------*/ + .syntax unified .arch armv7e-m diff --git a/FreeRTOS/Demo/CORTEX_MPU_CEC_MEC_17xx_51xx_Keil_GCC/Keil_Specific/RTOSDemo.uvprojx b/FreeRTOS/Demo/CORTEX_MPU_CEC_MEC_17xx_51xx_Keil_GCC/Keil_Specific/RTOSDemo.uvprojx index ed14f58fe..72dad3be8 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_CEC_MEC_17xx_51xx_Keil_GCC/Keil_Specific/RTOSDemo.uvprojx +++ b/FreeRTOS/Demo/CORTEX_MPU_CEC_MEC_17xx_51xx_Keil_GCC/Keil_Specific/RTOSDemo.uvprojx @@ -10,7 +10,7 @@ RTOSDemo 0x4 ARM-ADS - 5060960::V5.06 update 7 (build 960)::..\..\Program Files (x86)\ARM_Compiler_5.06u7 + 5060960::V5.06 update 7 (build 960)::.\ARM_Compiler_5.06u7 0 @@ -463,6 +463,57 @@ mpu_wrappers_v2.c 1 ..\..\..\Source\portable\Common\mpu_wrappers_v2.c + + + 2 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + --diag_suppress=1296 + + + + + + + stream_buffer.c diff --git a/FreeRTOS/Demo/CORTEX_MPU_LPC54018_MCUXpresso/.gitignore b/FreeRTOS/Demo/CORTEX_MPU_LPC54018_MCUXpresso/.gitignore new file mode 100644 index 000000000..f8b83b366 --- /dev/null +++ b/FreeRTOS/Demo/CORTEX_MPU_LPC54018_MCUXpresso/.gitignore @@ -0,0 +1,2 @@ +.settings/ +Debug/ diff --git a/FreeRTOS/Demo/CORTEX_MPU_LPC54018_MCUXpresso/Config/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_LPC54018_MCUXpresso/Config/FreeRTOSConfig.h index d1ee25674..dff13d8ca 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_LPC54018_MCUXpresso/Config/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_MPU_LPC54018_MCUXpresso/Config/FreeRTOSConfig.h @@ -1,6 +1,6 @@ /* * FreeRTOS V202212.00 - * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -151,6 +151,9 @@ See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */ /* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper. * See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */ #define configUSE_MPU_WRAPPERS_V1 ( 0 ) +/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list. + * See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */ +#define configENABLE_ACCESS_CONTROL_LIST ( 1 ) /* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */ #define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 ) /* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_LPC54018_MCUXpresso/Projects/MCUXpresso/.project b/FreeRTOS/Demo/CORTEX_MPU_LPC54018_MCUXpresso/Projects/MCUXpresso/.project index 02eb533de..89de2a829 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_LPC54018_MCUXpresso/Projects/MCUXpresso/.project +++ b/FreeRTOS/Demo/CORTEX_MPU_LPC54018_MCUXpresso/Projects/MCUXpresso/.project @@ -53,6 +53,15 @@ + + 1701346271384 + FreeRTOS + 10 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-true-false-examples + + 1578832143838 FreeRTOS/portable diff --git a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/Config/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/Config/FreeRTOSConfig.h index f2f40a118..834e53623 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/Config/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/Config/FreeRTOSConfig.h @@ -1,6 +1,6 @@ /* * FreeRTOS V202212.00 - * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -149,6 +149,9 @@ /* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper. * See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */ #define configUSE_MPU_WRAPPERS_V1 ( 0 ) +/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list. + * See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */ +#define configENABLE_ACCESS_CONTROL_LIST ( 1 ) /* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */ #define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 ) /* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/NonSecure/FreeRTOSDemo_ns.ewd b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/NonSecure/FreeRTOSDemo_ns.ewd index c79813719..767974745 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/NonSecure/FreeRTOSDemo_ns.ewd +++ b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/NonSecure/FreeRTOSDemo_ns.ewd @@ -1,6 +1,6 @@ - 3 + 4 Release @@ -11,7 +11,7 @@ C-SPY 2 - 32 + 33 1 0 + + + + + + + + @@ -457,6 +489,39 @@ + + E2_ID + 2 + + 0 + 1 + 0 + + + + + + + + GDBSERVER_ID 2 @@ -494,6 +559,27 @@ + + GPLINK_ID + 2 + + 0 + 1 + 0 + + + + + IJET_ID 2 @@ -1187,7 +1273,7 @@ + + $TOOLKIT_DIR$\plugins\rtos\Azure\AzureArmPlugin.ENU.ewplugin + 0 + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin 0 @@ -1517,6 +1607,10 @@ $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9.ewplugin 0 + + $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9a.ewplugin + 0 + $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9BE.ewplugin 0 diff --git a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/NonSecure/FreeRTOSDemo_ns.ewp b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/NonSecure/FreeRTOSDemo_ns.ewp index 1ab1a0707..9fd8141b7 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/NonSecure/FreeRTOSDemo_ns.ewp +++ b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/NonSecure/FreeRTOSDemo_ns.ewp @@ -1,6 +1,6 @@ - 3 + 4 Release @@ -11,7 +11,7 @@ General 3 - 35 + 36 1 0 + ICCARM 2 - 37 + 38 1 0 + + AARM 2 - 11 + 12 1 0 + @@ -676,18 +694,10 @@ - 112 + 1 inputOutputBased - - BUILDACTION - 1 - - - - - ILINK 0 @@ -1083,6 +1093,11 @@ + + BUILDACTION + 2 + + Config @@ -1155,6 +1170,9 @@ $PROJ_DIR$\..\..\..\..\..\Source\portable\Common\mpu_wrappers_v2.c + + $PROJ_DIR$\..\..\..\..\..\Source\portable\IAR\ARM_CM23\non_secure\mpu_wrappers_v2_asm.S + $PROJ_DIR$\..\..\..\..\..\Source\portable\IAR\ARM_CM23\non_secure\port.c @@ -1164,9 +1182,6 @@ $PROJ_DIR$\..\..\..\..\..\Source\portable\IAR\ARM_CM23\non_secure\portasm.s - - $PROJ_DIR$\..\..\..\..\..\Source\portable\IAR\ARM_CM23\non_secure\mpu_wrappers_v2_asm.S - $PROJ_DIR$\..\..\..\..\..\Source\portable\IAR\ARM_CM23\non_secure\portmacro.h diff --git a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/Secure/FreeRTOSDemo_s.ewd b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/Secure/FreeRTOSDemo_s.ewd index 8491b4e1a..fd039f09c 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/Secure/FreeRTOSDemo_s.ewd +++ b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/Secure/FreeRTOSDemo_s.ewd @@ -1,6 +1,6 @@ - 3 + 4 Release @@ -11,7 +11,7 @@ C-SPY 2 - 32 + 33 1 0 + + + + + + + + @@ -457,6 +489,39 @@ + + E2_ID + 2 + + 0 + 1 + 0 + + + + + + + + GDBSERVER_ID 2 @@ -494,6 +559,27 @@ + + GPLINK_ID + 2 + + 0 + 1 + 0 + + + + + IJET_ID 2 @@ -1187,7 +1273,7 @@ + + $TOOLKIT_DIR$\plugins\rtos\Azure\AzureArmPlugin.ENU.ewplugin + 0 + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin 0 @@ -1517,6 +1607,10 @@ $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9.ewplugin 0 + + $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9a.ewplugin + 0 + $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9BE.ewplugin 0 diff --git a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/Secure/FreeRTOSDemo_s.ewp b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/Secure/FreeRTOSDemo_s.ewp index 9815b540d..f46fb9f82 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/Secure/FreeRTOSDemo_s.ewp +++ b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/Secure/FreeRTOSDemo_s.ewp @@ -1,6 +1,6 @@ - 3 + 4 Release @@ -11,7 +11,7 @@ General 3 - 35 + 36 1 0 + ICCARM 2 - 37 + 38 1 0 + + AARM 2 - 11 + 12 1 0 + @@ -674,14 +691,6 @@ inputOutputBased - - BUILDACTION - 1 - - - - - ILINK 0 @@ -1077,6 +1086,11 @@ + + BUILDACTION + 2 + + Device diff --git a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/Config/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/Config/FreeRTOSConfig.h index 8a7bfadba..760257b98 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/Config/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/Config/FreeRTOSConfig.h @@ -1,6 +1,6 @@ /* * FreeRTOS V202212.00 - * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -144,6 +144,9 @@ extern uint32_t SystemCoreClock; /* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper. * See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */ #define configUSE_MPU_WRAPPERS_V1 ( 0 ) +/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list. + * See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */ +#define configENABLE_ACCESS_CONTROL_LIST ( 1 ) /* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */ #define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 ) /* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/NonSecure/FreeRTOSDemo_ns.uvprojx b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/NonSecure/FreeRTOSDemo_ns.uvprojx index d69d374bd..33fd8fc21 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/NonSecure/FreeRTOSDemo_ns.uvprojx +++ b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/NonSecure/FreeRTOSDemo_ns.uvprojx @@ -10,13 +10,13 @@ FreeRTOSDemo_ns 0x4 ARM-ADS - 6190000::V6.19::ARMCLANG + 6210000::V6.21::ARMCLANG 1 M2351KIAAEES Nuvoton - Nuvoton.NuMicro_DFP.1.3.20 + Nuvoton.NuMicro_DFP.1.3.19 https://github.com/OpenNuvoton/cmsis-packs/raw/master/Nuvoton_DFP/ IRAM(0x20000000,0x18000) IROM(0x00000000,0x00080000) CPUTYPE("ARMV8MBL") TZ CLOCK(12000000) ESEL ELITTLE diff --git a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/Secure/FreeRTOSDemo_s.uvprojx b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/Secure/FreeRTOSDemo_s.uvprojx index 1935b660d..bb961ae6e 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/Secure/FreeRTOSDemo_s.uvprojx +++ b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/Keil/Secure/FreeRTOSDemo_s.uvprojx @@ -10,13 +10,13 @@ FreeRTOSDemo_s 0x4 ARM-ADS - 6190000::V6.19::ARMCLANG + 6210000::V6.21::ARMCLANG 1 M2351KIAAEES Nuvoton - Nuvoton.NuMicro_DFP.1.3.20 + Nuvoton.NuMicro_DFP.1.3.19 https://github.com/OpenNuvoton/cmsis-packs/raw/master/Nuvoton_DFP/ IRAM(0x20000000,0x18000) IROM(0x00000000,0x00080000) CPUTYPE("ARMV8MBL") TZ CLOCK(12000000) ESEL ELITTLE diff --git a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects_NTZ/IAR/Config/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects_NTZ/IAR/Config/FreeRTOSConfig.h index 63d7a9da4..bb7f1aea6 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects_NTZ/IAR/Config/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects_NTZ/IAR/Config/FreeRTOSConfig.h @@ -1,6 +1,6 @@ /* * FreeRTOS V202212.00 - * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -149,6 +149,9 @@ /* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper. * See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */ #define configUSE_MPU_WRAPPERS_V1 ( 0 ) +/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list. + * See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */ +#define configENABLE_ACCESS_CONTROL_LIST ( 1 ) /* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */ #define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 ) /* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects_NTZ/IAR/FreeRTOSDemo.ewd b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects_NTZ/IAR/FreeRTOSDemo.ewd index 722af9eac..9a8ba4f1c 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects_NTZ/IAR/FreeRTOSDemo.ewd +++ b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects_NTZ/IAR/FreeRTOSDemo.ewd @@ -1,6 +1,6 @@ - 3 + 4 Release @@ -11,7 +11,7 @@ C-SPY 2 - 32 + 33 1 0 + + + + + + + + @@ -457,6 +489,39 @@ + + E2_ID + 2 + + 0 + 1 + 0 + + + + + + + + GDBSERVER_ID 2 @@ -494,6 +559,27 @@ + + GPLINK_ID + 2 + + 0 + 1 + 0 + + + + + IJET_ID 2 @@ -1072,7 +1158,7 @@ STLINK_ID 2 - 7 + 8 1 0 + + @@ -1417,7 +1511,7 @@ + + $TOOLKIT_DIR$\plugins\rtos\Azure\AzureArmPlugin.ENU.ewplugin + 0 + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin 0 @@ -1509,6 +1607,10 @@ $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9.ewplugin 0 + + $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9a.ewplugin + 0 + $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9BE.ewplugin 0 diff --git a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects_NTZ/IAR/FreeRTOSDemo.ewp b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects_NTZ/IAR/FreeRTOSDemo.ewp index e4cbc0693..8971b309d 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects_NTZ/IAR/FreeRTOSDemo.ewp +++ b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects_NTZ/IAR/FreeRTOSDemo.ewp @@ -1,6 +1,6 @@ - 3 + 4 Release @@ -11,7 +11,7 @@ General 3 - 35 + 36 1 0 + ICCARM 2 - 37 + 38 1 0 + + AARM 2 - 11 + 12 1 0 + @@ -677,14 +695,6 @@ inputOutputBased - - BUILDACTION - 1 - - - - - ILINK 0 @@ -1080,6 +1090,11 @@ + + BUILDACTION + 2 + + Config diff --git a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects_NTZ/Keil/Config/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects_NTZ/Keil/Config/FreeRTOSConfig.h index 4bf648148..3fd598858 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects_NTZ/Keil/Config/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects_NTZ/Keil/Config/FreeRTOSConfig.h @@ -1,6 +1,6 @@ /* * FreeRTOS V202212.00 - * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -144,6 +144,9 @@ extern uint32_t SystemCoreClock; /* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper. * See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */ #define configUSE_MPU_WRAPPERS_V1 ( 0 ) +/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list. + * See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */ +#define configENABLE_ACCESS_CONTROL_LIST ( 1 ) /* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */ #define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 ) /* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects_NTZ/Keil/FreeRTOSDemo.uvprojx b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects_NTZ/Keil/FreeRTOSDemo.uvprojx index b9c71c1e3..50796b109 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects_NTZ/Keil/FreeRTOSDemo.uvprojx +++ b/FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects_NTZ/Keil/FreeRTOSDemo.uvprojx @@ -10,13 +10,13 @@ FreeRTOSDemo 0x4 ARM-ADS - 6190000::V6.19::ARMCLANG + 6210000::V6.21::ARMCLANG 1 M2351KIAAEES Nuvoton - Nuvoton.NuMicro_DFP.1.3.20 + Nuvoton.NuMicro_DFP.1.3.19 https://github.com/OpenNuvoton/cmsis-packs/raw/master/Nuvoton_DFP/ IRAM(0x20000000,0x18000) IROM(0x00000000,0x00080000) CPUTYPE("ARMV8MBL") TZ CLOCK(12000000) ESEL ELITTLE diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_NTZ_Nordic_NRF9160_SES/Config/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_M33F_NTZ_Nordic_NRF9160_SES/Config/FreeRTOSConfig.h index 391a62949..e6c4f8508 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_NTZ_Nordic_NRF9160_SES/Config/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_NTZ_Nordic_NRF9160_SES/Config/FreeRTOSConfig.h @@ -1,6 +1,6 @@ /* * FreeRTOS V202212.00 - * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -160,6 +160,9 @@ extern uint32_t SystemCoreClock; /* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper. * See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */ #define configUSE_MPU_WRAPPERS_V1 ( 0 ) +/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list. + * See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */ +#define configENABLE_ACCESS_CONTROL_LIST ( 1 ) /* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */ #define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 ) /* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_NTZ_Nordic_NRF9160_SES/FreeRTOSDemo.emProject b/FreeRTOS/Demo/CORTEX_MPU_M33F_NTZ_Nordic_NRF9160_SES/FreeRTOSDemo.emProject index 0dc66229e..83d87746b 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_NTZ_Nordic_NRF9160_SES/FreeRTOSDemo.emProject +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_NTZ_Nordic_NRF9160_SES/FreeRTOSDemo.emProject @@ -55,10 +55,10 @@ - + @@ -106,7 +106,8 @@ + default_const_section=".init_rodata" + gcc_strict_prototypes_warning="No" /> @@ -115,10 +116,10 @@ - + diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/IAR/Config/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/IAR/Config/FreeRTOSConfig.h index b02100760..a64ab4433 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/IAR/Config/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/IAR/Config/FreeRTOSConfig.h @@ -1,6 +1,6 @@ /* * FreeRTOS V202212.00 - * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -155,6 +155,9 @@ /* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper. * See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */ #define configUSE_MPU_WRAPPERS_V1 ( 0 ) +/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list. + * See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */ +#define configENABLE_ACCESS_CONTROL_LIST ( 1 ) /* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */ #define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 ) /* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/IAR/NonSecure/FreeRTOSDemo_ns.ewd b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/IAR/NonSecure/FreeRTOSDemo_ns.ewd index 5f2320290..db6a62b68 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/IAR/NonSecure/FreeRTOSDemo_ns.ewd +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/IAR/NonSecure/FreeRTOSDemo_ns.ewd @@ -1,12342 +1,1648 @@ - + - - 3 - - - - debug - - - - ARM - - - - 1 - - - - C-SPY - - 2 - - - - 32 - - 1 - + 4 + + debug + + ARM + 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ARMSIM_ID - - 2 - - - - 1 - - 1 - - 1 - - - - - - - - - - - - - - - - CADI_ID - - 2 - - - - 0 - - 1 - - 1 - - - - - - - - - - - - - - - - - - CMSISDAP_ID - - 2 - - - - 4 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - GDBSERVER_ID - - 2 - - - - 0 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - IJET_ID - - 2 - - - - 9 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - JLINK_ID - - 2 - - - - 16 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - LMIFTDI_ID - - 2 - - - - 3 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - NULINK_ID - - 2 - - - - 0 - - 1 - - 1 - - - - - - - - - - - - - - PEMICRO_ID - - 2 - - - - 3 - - 1 - - 1 - - - - - - - - - - - - - - - - STLINK_ID - - 2 - - - - 7 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - THIRDPARTY_ID - - 2 - - - - 0 - - 1 - - 1 - - - - - - - - - - - - - - - - TIFET_ID - - 2 - - - - 1 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - XDS100_ID - - 2 - - - - 9 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9BE.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin - - 0 - - - - - - $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin - - 0 - - - - - - $EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin - - 0 - - - - - - $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin - - 0 - - - - - - - - - - int flash sramdata debug - - - - ARM - - - - 1 - - - - C-SPY - - 2 - - - - 32 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ARMSIM_ID - - 2 - - - - 1 - - 1 - - 1 - - - - - - - - - - - - - - - - CADI_ID - - 2 - - - - 0 - - 1 - - 1 - - - - - - - - - - - - - - - - - - CMSISDAP_ID - - 2 - - - - 4 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - GDBSERVER_ID - - 2 - - - - 0 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - IJET_ID - - 2 - - - - 9 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - JLINK_ID - - 2 - - - - 16 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - LMIFTDI_ID - - 2 - - - - 3 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - NULINK_ID - - 2 - - - - 0 - - 1 - - 1 - - - - - - - - - - - - - - PEMICRO_ID - - 2 - - - - 3 - - 1 - - 1 - - - - - - - - - - - - - - - - STLINK_ID - - 2 - - - - 7 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - THIRDPARTY_ID - - 2 - - - - 0 - - 1 - - 1 - - - - - - - - - - - - - - - - TIFET_ID - - 2 - - - - 1 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - XDS100_ID - - 2 - - - - 9 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9BE.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin - - 0 - - - - - - $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin - - 0 - - - - - - $EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin - - 0 - - - - - - $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin - - 0 - - - - - - - - - - int flash ddrdata debug - - - - ARM - - - - 1 - - - - C-SPY - - 2 - - - - 32 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ARMSIM_ID - - 2 - - - - 1 - - 1 - - 1 - - - - - - - - - - - - - - - - CADI_ID - - 2 - - - - 0 - - 1 - - 1 - - - - - - - - - - - - - - - - - - CMSISDAP_ID - - 2 - - - - 4 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - GDBSERVER_ID - - 2 - - - - 0 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - IJET_ID - - 2 - - - - 9 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - JLINK_ID - - 2 - - - - 16 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - LMIFTDI_ID - - 2 - - - - 3 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - NULINK_ID - - 2 - - - - 0 - - 1 - - 1 - - - - - - - - - - - - - - PEMICRO_ID - - 2 - - - - 3 - - 1 - - 1 - - - - - - - - - - - - - - - - STLINK_ID - - 2 - - - - 7 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - THIRDPARTY_ID - - 2 - - - - 0 - - 1 - - 1 - - - - - - - - - - - - - - - - TIFET_ID - - 2 - - - - 1 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - XDS100_ID - - 2 - - - - 9 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9BE.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin - - 0 - - - - - - $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin - - 0 - - - - - - $EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin - - 0 - - - - - - $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin - - 0 - - - - - - - - - - int ram debug - - - - ARM - - - - 1 - - - - C-SPY - - 2 - - - - 32 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ARMSIM_ID - - 2 - - - - 1 - - 1 - - 1 - - - - - - - - - - - - - - - - CADI_ID - - 2 - - - - 0 - - 1 - - 1 - - - - - - - - - - - - - - - - - - CMSISDAP_ID - - 2 - - - - 4 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - GDBSERVER_ID - - 2 - - - - 0 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - IJET_ID - - 2 - - - - 9 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - JLINK_ID - - 2 - - - - 16 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - LMIFTDI_ID - - 2 - - - - 3 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - NULINK_ID - - 2 - - - - 0 - - 1 - - 1 - - - - - - - - - - - - - - PEMICRO_ID - - 2 - - - - 3 - - 1 - - 1 - - - - - - - - - - - - - - - - STLINK_ID - - 2 - - - - 7 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - THIRDPARTY_ID - - 2 - - - - 0 - - 1 - - 1 - - - - - - - - - - - - - - - - TIFET_ID - - 2 - - - - 1 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - XDS100_ID - - 2 - - - - 9 - - 1 - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9BE.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin - - 0 - - - - - - $TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin - - 0 - - - - - - $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin - - 0 - - - - - - $EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin - - 0 - - - - - - $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin - - 0 - - - - - - - + + C-SPY + 2 + + 33 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ARMSIM_ID + 2 + + 1 + 1 + 1 + + + + + + + + CADI_ID + 2 + + 0 + 1 + 1 + + + + + + + + + CMSISDAP_ID + 2 + + 4 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + E2_ID + 2 + + 0 + 1 + 1 + + + + + + + + + + GDBSERVER_ID + 2 + + 0 + 1 + 1 + + + + + + + + + + + GPLINK_ID + 2 + + 0 + 1 + 1 + + + + + + + IJET_ID + 2 + + 9 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + JLINK_ID + 2 + + 16 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LMIFTDI_ID + 2 + + 3 + 1 + 1 + + + + + + + + + + + + + NULINK_ID + 2 + + 0 + 1 + 1 + + + + + + + PEMICRO_ID + 2 + + 3 + 1 + 1 + + + + + + + + STLINK_ID + 2 + + 8 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + THIRDPARTY_ID + 2 + + 0 + 1 + 1 + + + + + + + + TIFET_ID + 2 + + 1 + 1 + 1 + + + + + + + + + + + + + + + + + + + XDS100_ID + 2 + + 9 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $TOOLKIT_DIR$\plugins\rtos\Azure\AzureArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9a.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9BE.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin + 0 + + + $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin + 0 + + + diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/IAR/NonSecure/FreeRTOSDemo_ns.ewp b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/IAR/NonSecure/FreeRTOSDemo_ns.ewp index 6b69d229a..60c9bed91 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/IAR/NonSecure/FreeRTOSDemo_ns.ewp +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/IAR/NonSecure/FreeRTOSDemo_ns.ewp @@ -1,6 +1,6 @@ - 3 + 4 debug @@ -11,7 +11,7 @@ General 3 - 35 + 36 1 1 + ICCARM 2 - 37 + 38 1 1 + + AARM 2 - 11 + 12 1 1 + @@ -685,14 +703,6 @@ inputOutputBased - - BUILDACTION - 1 - - - - - ILINK 0 @@ -1088,6 +1098,11 @@ + + BUILDACTION + 2 + + Config @@ -1198,6 +1213,9 @@ ARM_CM33 non_secure + + $PROJ_DIR$\..\..\..\..\..\Source\portable\IAR\ARM_CM33\non_secure\mpu_wrappers_v2_asm.S + $PROJ_DIR$\..\..\..\..\..\Source\portable\IAR\ARM_CM33\non_secure\port.c @@ -1207,9 +1225,6 @@ $PROJ_DIR$\..\..\..\..\..\Source\portable\IAR\ARM_CM33\non_secure\portasm.s - - $PROJ_DIR$\..\..\..\..\..\Source\portable\IAR\ARM_CM33\non_secure\mpu_wrappers_v2_asm.S - $PROJ_DIR$\..\..\..\..\..\Source\portable\IAR\ARM_CM33\non_secure\portmacro.h diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/IAR/Secure/FreeRTOSDemo_s.ewd b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/IAR/Secure/FreeRTOSDemo_s.ewd index b23ea7ac4..3bcd6076c 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/IAR/Secure/FreeRTOSDemo_s.ewd +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/IAR/Secure/FreeRTOSDemo_s.ewd @@ -1,6 +1,6 @@ - 3 + 4 debug @@ -11,7 +11,7 @@ C-SPY 2 - 32 + 33 1 1 + + + + + + + + @@ -457,6 +489,39 @@ + + E2_ID + 2 + + 0 + 1 + 1 + + + + + + + + GDBSERVER_ID 2 @@ -494,6 +559,27 @@ + + GPLINK_ID + 2 + + 0 + 1 + 1 + + + + + IJET_ID 2 @@ -1187,7 +1273,7 @@ + + $TOOLKIT_DIR$\plugins\rtos\Azure\AzureArmPlugin.ENU.ewplugin + 0 + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin 0 @@ -1517,6 +1607,10 @@ $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9.ewplugin 0 + + $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9a.ewplugin + 0 + $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9BE.ewplugin 0 diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/IAR/Secure/FreeRTOSDemo_s.ewp b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/IAR/Secure/FreeRTOSDemo_s.ewp index 0ab1d3272..246a6d0c7 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/IAR/Secure/FreeRTOSDemo_s.ewp +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/IAR/Secure/FreeRTOSDemo_s.ewp @@ -1,6 +1,6 @@ - 3 + 4 debug @@ -11,7 +11,7 @@ General 3 - 35 + 36 1 1 + ICCARM 2 - 37 + 38 1 1 + + AARM 2 - 11 + 12 1 1 + @@ -678,14 +695,6 @@ inputOutputBased - - BUILDACTION - 1 - - - - - ILINK 0 @@ -1081,6 +1090,11 @@ + + BUILDACTION + 2 + + Config diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/Config/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/Config/FreeRTOSConfig.h index a1e21d292..da9ade7d6 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/Config/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/Config/FreeRTOSConfig.h @@ -1,6 +1,6 @@ /* * FreeRTOS V202212.00 - * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -154,6 +154,9 @@ /* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper. * See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */ #define configUSE_MPU_WRAPPERS_V1 ( 0 ) +/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list. + * See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */ +#define configENABLE_ACCESS_CONTROL_LIST ( 1 ) /* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */ #define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 ) /* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/NonSecure/.project b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/NonSecure/.project index 8588fa7ec..b7d2db19e 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/NonSecure/.project +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects/MCUXpresso/NonSecure/.project @@ -117,6 +117,15 @@ 1.0-name-matches-false-false-*.h + + 1701338096747 + FreeRTOS + 10 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-true-false-examples + + 1682451751797 NXP_Code diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects_NTZ/IAR/Config/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects_NTZ/IAR/Config/FreeRTOSConfig.h index c2084aef4..e9fbbbc80 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects_NTZ/IAR/Config/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects_NTZ/IAR/Config/FreeRTOSConfig.h @@ -1,6 +1,6 @@ /* * FreeRTOS V202212.00 - * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -156,6 +156,9 @@ /* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper. * See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */ #define configUSE_MPU_WRAPPERS_V1 ( 0 ) +/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list. + * See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */ +#define configENABLE_ACCESS_CONTROL_LIST ( 1 ) /* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */ #define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 ) /* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects_NTZ/IAR/FreeRTOSDemo.ewd b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects_NTZ/IAR/FreeRTOSDemo.ewd index b23ea7ac4..3bcd6076c 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects_NTZ/IAR/FreeRTOSDemo.ewd +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects_NTZ/IAR/FreeRTOSDemo.ewd @@ -1,6 +1,6 @@ - 3 + 4 debug @@ -11,7 +11,7 @@ C-SPY 2 - 32 + 33 1 1 + + + + + + + + @@ -457,6 +489,39 @@ + + E2_ID + 2 + + 0 + 1 + 1 + + + + + + + + GDBSERVER_ID 2 @@ -494,6 +559,27 @@ + + GPLINK_ID + 2 + + 0 + 1 + 1 + + + + + IJET_ID 2 @@ -1187,7 +1273,7 @@ + + $TOOLKIT_DIR$\plugins\rtos\Azure\AzureArmPlugin.ENU.ewplugin + 0 + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin 0 @@ -1517,6 +1607,10 @@ $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9.ewplugin 0 + + $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9a.ewplugin + 0 + $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9BE.ewplugin 0 diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects_NTZ/IAR/FreeRTOSDemo.ewp b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects_NTZ/IAR/FreeRTOSDemo.ewp index 26d898062..7691e7a94 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects_NTZ/IAR/FreeRTOSDemo.ewp +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects_NTZ/IAR/FreeRTOSDemo.ewp @@ -1,6 +1,6 @@ - 3 + 4 debug @@ -11,7 +11,7 @@ General 3 - 35 + 36 1 1 + ICCARM 2 - 37 + 38 1 1 + + AARM 2 - 11 + 12 1 1 + @@ -681,14 +699,6 @@ inputOutputBased - - BUILDACTION - 1 - - - - - ILINK 0 @@ -1084,6 +1094,11 @@ + + BUILDACTION + 2 + + Config @@ -1135,6 +1150,9 @@ IAR ARM_CM33_NTZ + + $PROJ_DIR$\..\..\..\..\Source\portable\IAR\ARM_CM33_NTZ\non_secure\mpu_wrappers_v2_asm.S + $PROJ_DIR$\..\..\..\..\Source\portable\IAR\ARM_CM33_NTZ\non_secure\port.c @@ -1144,9 +1162,6 @@ $PROJ_DIR$\..\..\..\..\Source\portable\IAR\ARM_CM33_NTZ\non_secure\portasm.s - - $PROJ_DIR$\..\..\..\..\Source\portable\IAR\ARM_CM33_NTZ\non_secure\mpu_wrappers_v2_asm.S - $PROJ_DIR$\..\..\..\..\Source\portable\IAR\ARM_CM33_NTZ\non_secure\portmacro.h diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects_NTZ/MCUXpresso/.project b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects_NTZ/MCUXpresso/.project index b459a5645..ab8885564 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects_NTZ/MCUXpresso/.project +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects_NTZ/MCUXpresso/.project @@ -95,7 +95,7 @@ - 1682480839426 + 1701338446087 FreeRTOS 5 @@ -103,6 +103,15 @@ 1.0-name-matches-false-false-*.c + + 1701338446104 + FreeRTOS + 10 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-true-false-examples + + 1682481066220 NXP_Code diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects_NTZ/MCUXpresso/Config/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects_NTZ/MCUXpresso/Config/FreeRTOSConfig.h index 674d898cd..b7d7bfb0d 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects_NTZ/MCUXpresso/Config/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_NXP_LPC55S69_MCUXpresso/Projects_NTZ/MCUXpresso/Config/FreeRTOSConfig.h @@ -1,6 +1,6 @@ /* * FreeRTOS V202212.00 - * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -154,6 +154,9 @@ /* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper. * See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */ #define configUSE_MPU_WRAPPERS_V1 ( 0 ) +/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list. + * See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */ +#define configENABLE_ACCESS_CONTROL_LIST ( 1 ) /* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */ #define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 ) /* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_Nordic_NRF9160_SES/Config/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_M33F_Nordic_NRF9160_SES/Config/FreeRTOSConfig.h index 150e68a53..a3206f36d 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_Nordic_NRF9160_SES/Config/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_Nordic_NRF9160_SES/Config/FreeRTOSConfig.h @@ -1,6 +1,6 @@ /* * FreeRTOS V202212.00 - * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -157,6 +157,9 @@ extern uint32_t SystemCoreClock; /* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper. * See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */ #define configUSE_MPU_WRAPPERS_V1 ( 0 ) +/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list. + * See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */ +#define configENABLE_ACCESS_CONTROL_LIST ( 1 ) /* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */ #define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 ) /* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_Nordic_NRF9160_SES/FreeRTOSDemo.emProject b/FreeRTOS/Demo/CORTEX_MPU_M33F_Nordic_NRF9160_SES/FreeRTOSDemo.emProject index 23049f3a3..1182795a7 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_Nordic_NRF9160_SES/FreeRTOSDemo.emProject +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_Nordic_NRF9160_SES/FreeRTOSDemo.emProject @@ -58,10 +58,10 @@ - + @@ -82,9 +82,9 @@ + - @@ -107,7 +107,8 @@ + default_const_section=".init_rodata" + gcc_strict_prototypes_warning="No" /> @@ -116,10 +117,10 @@ - + @@ -189,12 +190,6 @@ - - - - - - @@ -202,7 +197,8 @@ + default_const_section=".init_rodata" + gcc_strict_prototypes_warning="No" /> @@ -211,13 +207,19 @@ - + + + + + + + diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/Config/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/Config/FreeRTOSConfig.h index a35154ab1..ae63ef96f 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/Config/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/Config/FreeRTOSConfig.h @@ -1,6 +1,6 @@ /* * FreeRTOS V202212.00 - * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -154,6 +154,9 @@ extern uint32_t SystemCoreClock; /* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper. * See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */ #define configUSE_MPU_WRAPPERS_V1 ( 0 ) +/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list. + * See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */ +#define configENABLE_ACCESS_CONTROL_LIST ( 1 ) /* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */ #define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 ) /* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/NonSecure/FreeRTOSDemo_ns.uvprojx b/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/NonSecure/FreeRTOSDemo_ns.uvprojx index 8423d394e..8861361ee 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/NonSecure/FreeRTOSDemo_ns.uvprojx +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/NonSecure/FreeRTOSDemo_ns.uvprojx @@ -10,7 +10,7 @@ FVP Simulation Model 0x4 ARM-ADS - 6190000::V6.19::ARMCLANG + 6210000::V6.21::ARMCLANG 1 diff --git a/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/Secure/FreeRTOSDemo_s.uvprojx b/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/Secure/FreeRTOSDemo_s.uvprojx index 1ee4aba4b..d83c5c1ab 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/Secure/FreeRTOSDemo_s.uvprojx +++ b/FreeRTOS/Demo/CORTEX_MPU_M33F_Simulator_Keil_GCC/Secure/FreeRTOSDemo_s.uvprojx @@ -10,7 +10,7 @@ FVP Simulation Model 0x4 ARM-ADS - 6190000::V6.19::ARMCLANG + 6210000::V6.21::ARMCLANG 1 diff --git a/FreeRTOS/Demo/CORTEX_MPU_M3_MPS2_QEMU_GCC/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_M3_MPS2_QEMU_GCC/FreeRTOSConfig.h index 9b6bfae76..d379f7da8 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M3_MPS2_QEMU_GCC/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_MPU_M3_MPS2_QEMU_GCC/FreeRTOSConfig.h @@ -1,6 +1,6 @@ /* * FreeRTOS V202212.00 - * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -116,6 +116,9 @@ unsigned long ulGetRunTimeCounterValue( void ); /* Prototype of function that re /* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper. * See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */ #define configUSE_MPU_WRAPPERS_V1 ( 0 ) +/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list. + * See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */ +#define configENABLE_ACCESS_CONTROL_LIST ( 1 ) /* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */ #define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 ) /* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_M3_NUCLEO_L152RE_GCC/.gitignore b/FreeRTOS/Demo/CORTEX_MPU_M3_NUCLEO_L152RE_GCC/.gitignore new file mode 100644 index 000000000..f8b83b366 --- /dev/null +++ b/FreeRTOS/Demo/CORTEX_MPU_M3_NUCLEO_L152RE_GCC/.gitignore @@ -0,0 +1,2 @@ +.settings/ +Debug/ diff --git a/FreeRTOS/Demo/CORTEX_MPU_M3_NUCLEO_L152RE_GCC/Config/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_M3_NUCLEO_L152RE_GCC/Config/FreeRTOSConfig.h index 234b79673..cec7aa548 100755 --- a/FreeRTOS/Demo/CORTEX_MPU_M3_NUCLEO_L152RE_GCC/Config/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_MPU_M3_NUCLEO_L152RE_GCC/Config/FreeRTOSConfig.h @@ -1,6 +1,6 @@ /* * FreeRTOS V202212.00 - * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -159,6 +159,9 @@ header file. */ /* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper. * See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */ #define configUSE_MPU_WRAPPERS_V1 ( 0 ) +/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list. + * See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */ +#define configENABLE_ACCESS_CONTROL_LIST ( 1 ) /* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */ #define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 ) /* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_M3_NUCLEO_L152RE_GCC/Projects/GCC/.project b/FreeRTOS/Demo/CORTEX_MPU_M3_NUCLEO_L152RE_GCC/Projects/GCC/.project index 730a7efc2..e554f4084 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M3_NUCLEO_L152RE_GCC/Projects/GCC/.project +++ b/FreeRTOS/Demo/CORTEX_MPU_M3_NUCLEO_L152RE_GCC/Projects/GCC/.project @@ -53,6 +53,15 @@ + + 1701333116189 + FreeRTOS + 10 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-true-false-examples + + 1579730437023 FreeRTOS/portable diff --git a/FreeRTOS/Demo/CORTEX_MPU_M3_NUCLEO_L152RE_GCC/Projects/GCC/.settings/org.eclipse.core.resources.prefs b/FreeRTOS/Demo/CORTEX_MPU_M3_NUCLEO_L152RE_GCC/Projects/GCC/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/FreeRTOS/Demo/CORTEX_MPU_M3_NUCLEO_L152RE_GCC/Projects/GCC/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/FreeRTOS/Demo/CORTEX_MPU_M3_NUCLEO_L152RE_GCC/Projects/GCC/Startup/sysmem.c b/FreeRTOS/Demo/CORTEX_MPU_M3_NUCLEO_L152RE_GCC/Projects/GCC/Startup/sysmem.c index e5e1bc2d9..b89d75ed8 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M3_NUCLEO_L152RE_GCC/Projects/GCC/Startup/sysmem.c +++ b/FreeRTOS/Demo/CORTEX_MPU_M3_NUCLEO_L152RE_GCC/Projects/GCC/Startup/sysmem.c @@ -60,7 +60,7 @@ register char * stack_ptr asm("sp"); _sbrk Increase program data space. Malloc and related functions depend on this **/ -caddr_t _sbrk(int incr) +char * _sbrk(int incr) { extern char end asm("end"); static char *heap_end; @@ -73,11 +73,11 @@ caddr_t _sbrk(int incr) if (heap_end + incr > stack_ptr) { errno = ENOMEM; - return (caddr_t) -1; + return (char *) -1; } heap_end += incr; - return (caddr_t) prev_heap_end; + return prev_heap_end; } diff --git a/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Config/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Config/FreeRTOSConfig.h index 755cd86cd..bb06a9ec3 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Config/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Config/FreeRTOSConfig.h @@ -1,6 +1,6 @@ /* * FreeRTOS V202212.00 - * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -145,6 +145,9 @@ See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */ /* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper. * See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */ #define configUSE_MPU_WRAPPERS_V1 ( 0 ) +/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list. + * See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */ +#define configENABLE_ACCESS_CONTROL_LIST ( 1 ) /* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */ #define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 ) /* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/GCC/.project b/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/GCC/.project index 23501c2b0..2e0f2b827 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/GCC/.project +++ b/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/GCC/.project @@ -63,7 +63,7 @@ - 1594591511105 + 1701327345246 FreeRTOS 5 @@ -71,6 +71,15 @@ 1.0-name-matches-false-false-*.c + + 1701327345257 + FreeRTOS + 10 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-true-false-examples + + 1594591566433 FreeRTOS/portable diff --git a/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/GCC/Startup/sysmem.c b/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/GCC/Startup/sysmem.c index e5e1bc2d9..b89d75ed8 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/GCC/Startup/sysmem.c +++ b/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/GCC/Startup/sysmem.c @@ -60,7 +60,7 @@ register char * stack_ptr asm("sp"); _sbrk Increase program data space. Malloc and related functions depend on this **/ -caddr_t _sbrk(int incr) +char * _sbrk(int incr) { extern char end asm("end"); static char *heap_end; @@ -73,11 +73,11 @@ caddr_t _sbrk(int incr) if (heap_end + incr > stack_ptr) { errno = ENOMEM; - return (caddr_t) -1; + return (char *) -1; } heap_end += incr; - return (caddr_t) prev_heap_end; + return prev_heap_end; } diff --git a/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/IAR/FreeRTOSDemo.ewd b/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/IAR/FreeRTOSDemo.ewd index e380c1f25..55de9793f 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/IAR/FreeRTOSDemo.ewd +++ b/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/IAR/FreeRTOSDemo.ewd @@ -1,6 +1,6 @@ - 3 + 4 FreeRTOSDemo @@ -11,7 +11,7 @@ C-SPY 2 - 32 + 33 1 1 + + + + + + + + @@ -457,6 +489,39 @@ + + E2_ID + 2 + + 0 + 1 + 1 + + + + + + + + GDBSERVER_ID 2 @@ -494,6 +559,27 @@ + + GPLINK_ID + 2 + + 0 + 1 + 1 + + + + + IJET_ID 2 @@ -1072,7 +1158,7 @@ STLINK_ID 2 - 7 + 8 1 1 + + @@ -1473,6 +1567,10 @@ + + $TOOLKIT_DIR$\plugins\rtos\Azure\AzureArmPlugin.ENU.ewplugin + 0 + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin 0 @@ -1509,6 +1607,10 @@ $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9.ewplugin 0 + + $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9a.ewplugin + 0 + $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9BE.ewplugin 0 diff --git a/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/IAR/FreeRTOSDemo.ewp b/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/IAR/FreeRTOSDemo.ewp index 48c4ae4b2..512ab5111 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/IAR/FreeRTOSDemo.ewp +++ b/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/IAR/FreeRTOSDemo.ewp @@ -1,6 +1,6 @@ - 3 + 4 FreeRTOSDemo @@ -11,7 +11,7 @@ General 3 - 34 + 36 1 1 + + + ICCARM 2 - 37 + 38 1 1 + + AARM 2 - 11 + 12 1 1 + @@ -669,19 +695,11 @@ inputOutputBased - - BUILDACTION - 1 - - - - - ILINK 0 - 26 + 27 1 1 + + @@ -1064,6 +1090,11 @@ + + BUILDACTION + 2 + + Config diff --git a/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/Keil/FreeRTOSDemo.uvprojx b/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/Keil/FreeRTOSDemo.uvprojx index ff5b9bda5..f9a46a785 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/Keil/FreeRTOSDemo.uvprojx +++ b/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/Keil/FreeRTOSDemo.uvprojx @@ -10,14 +10,14 @@ FreeRTOSDemo 0x4 ARM-ADS - 6180000::V6.18::ARMCLANG + 6210000::V6.21::ARMCLANG 1 STM32H743ZITx STMicroelectronics - Keil.STM32H7xx_DFP.3.0.0 - http://www.keil.com/pack/ + Keil.STM32H7xx_DFP.3.1.0 + https://www.keil.com/pack/ IRAM(0x20000000-0x2001FFFF) IRAM2(0x24000000-0x2407FFFF) IROM(0x8000000-0x81FFFFF) CLOCK(12000000) FPU3(DFPU) CPUTYPE("Cortex-M7") ELITTLE diff --git a/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/Keil_V5/FreeRTOSDemo.uvprojx b/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/Keil_V5/FreeRTOSDemo.uvprojx index db512b130..85adaa8a1 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/Keil_V5/FreeRTOSDemo.uvprojx +++ b/FreeRTOS/Demo/CORTEX_MPU_M7_NUCLEO_H743ZI2_GCC_IAR_Keil/Projects/Keil_V5/FreeRTOSDemo.uvprojx @@ -16,8 +16,8 @@ STM32H743ZITx STMicroelectronics - Keil.STM32H7xx_DFP.3.0.0 - http://www.keil.com/pack/ + Keil.STM32H7xx_DFP.3.1.0 + https://www.keil.com/pack/ IRAM(0x20000000-0x2001FFFF) IRAM2(0x24000000-0x2407FFFF) IROM(0x8000000-0x81FFFFF) CLOCK(12000000) FPU3(DFPU) CPUTYPE("Cortex-M7") ELITTLE @@ -478,6 +478,57 @@ mpu_wrappers_v2.c 1 ..\..\..\..\Source\portable\Common\mpu_wrappers_v2.c + + + 2 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + --diag_suppress=1296 + + + + + + + port.c @@ -1136,4 +1187,13 @@ + + + + FreeRTOSDemo + 1 + + + + diff --git a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/.gitignore b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/.gitignore new file mode 100644 index 000000000..2da29b4dd --- /dev/null +++ b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/.gitignore @@ -0,0 +1,16 @@ +# STM32Cube IDE. +.settings/ +Debug/ + +# Keil uVision. +DebugConfig/ +RTE/ +EventRecorderStub.scvd +*.uvguix.* + +# IAR +settings +Listings +Objects +BuildLogs +BrowseInfo diff --git a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Config/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Config/FreeRTOSConfig.h index 2b18a173e..f31f1ba12 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Config/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Config/FreeRTOSConfig.h @@ -1,6 +1,6 @@ /* * FreeRTOS V202212.00 - * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -150,6 +150,9 @@ See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */ /* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper. * See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */ #define configUSE_MPU_WRAPPERS_V1 ( 0 ) +/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list. + * See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */ +#define configENABLE_ACCESS_CONTROL_LIST ( 1 ) /* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */ #define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 ) /* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/GCC/.cproject b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/GCC/.cproject index 7b757048a..d0879ed09 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/GCC/.cproject +++ b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/GCC/.cproject @@ -10,21 +10,23 @@ + - - - - - @@ -123,21 +99,22 @@ + - - + \ No newline at end of file diff --git a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/GCC/.project b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/GCC/.project index 6f28b16c8..c8122883a 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/GCC/.project +++ b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/GCC/.project @@ -58,6 +58,15 @@ + + 1701334040509 + FreeRTOS + 10 + + org.eclipse.ui.ide.multiFilter + 1.0-name-matches-true-false-examples + + 1576807148309 FreeRTOS/portable diff --git a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/GCC/.settings/org.eclipse.core.resources.prefs b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/GCC/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/GCC/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/GCC/Startup/sysmem.c b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/GCC/Startup/sysmem.c index e5e1bc2d9..b89d75ed8 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/GCC/Startup/sysmem.c +++ b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/GCC/Startup/sysmem.c @@ -60,7 +60,7 @@ register char * stack_ptr asm("sp"); _sbrk Increase program data space. Malloc and related functions depend on this **/ -caddr_t _sbrk(int incr) +char * _sbrk(int incr) { extern char end asm("end"); static char *heap_end; @@ -73,11 +73,11 @@ caddr_t _sbrk(int incr) if (heap_end + incr > stack_ptr) { errno = ENOMEM; - return (caddr_t) -1; + return (char *) -1; } heap_end += incr; - return (caddr_t) prev_heap_end; + return prev_heap_end; } diff --git a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/IAR/MPUDemo.ewd b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/IAR/MPUDemo.ewd index f9ec12dc6..14ae941fc 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/IAR/MPUDemo.ewd +++ b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/IAR/MPUDemo.ewd @@ -1,1419 +1,1648 @@ - 3 - - MPUDemo - - ARM - - 1 - - C-SPY - 2 - - 29 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ARMSIM_ID - 2 - - 1 - 1 - 1 - - - - - - - - CADI_ID - 2 - - 0 - 1 - 1 - - - - - - - - - CMSISDAP_ID - 2 - - 4 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - GDBSERVER_ID - 2 - - 0 - 1 - 1 - - - - - - - - - - - IJET_ID - 2 - - 8 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - JLINK_ID - 2 - - 16 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - LMIFTDI_ID - 2 - - 2 - 1 - 1 - - - - - - - - - - PEMICRO_ID - 2 - - 3 - 1 - 1 - - - - - - - - STLINK_ID - 2 - - 4 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - THIRDPARTY_ID - 2 - - 0 - 1 - 1 - - - - - - - - TIFET_ID - 2 - - 1 - 1 - 1 - - - - - - - - - - - - - - - - - - - XDS100_ID - 2 - - 6 - 1 - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\TI-RTOS\tirtosplugin.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin - 0 - - - $TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin - 0 - - - $EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin - 1 - - - $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin - 0 - - - $EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin - 0 - - - $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin - 0 - - - + 4 + + MPUDemo + + ARM + + 1 + + C-SPY + 2 + + 33 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ARMSIM_ID + 2 + + 1 + 1 + 1 + + + + + + + + CADI_ID + 2 + + 0 + 1 + 1 + + + + + + + + + CMSISDAP_ID + 2 + + 4 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + E2_ID + 2 + + 0 + 1 + 1 + + + + + + + + + + GDBSERVER_ID + 2 + + 0 + 1 + 1 + + + + + + + + + + + GPLINK_ID + 2 + + 0 + 1 + 1 + + + + + + + IJET_ID + 2 + + 9 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + JLINK_ID + 2 + + 16 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + LMIFTDI_ID + 2 + + 3 + 1 + 1 + + + + + + + + + + + + + NULINK_ID + 2 + + 0 + 1 + 1 + + + + + + + PEMICRO_ID + 2 + + 3 + 1 + 1 + + + + + + + + STLINK_ID + 2 + + 8 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + THIRDPARTY_ID + 2 + + 0 + 1 + 1 + + + + + + + + TIFET_ID + 2 + + 1 + 1 + 1 + + + + + + + + + + + + + + + + + + + XDS100_ID + 2 + + 9 + 1 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $TOOLKIT_DIR$\plugins\rtos\Azure\AzureArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\CMX\CmxTinyArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\FreeRtos\FreeRtosArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\Mbed\MbedArmPlugin2.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\SafeRTOS\SafeRTOSPlugin.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9a.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9BE.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\ThreadX\ThreadXArmPlugin.ENU.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin + 0 + + + $TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin + 0 + + + $EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\TargetAccessServer\TargetAccessServer.ENU.ewplugin + 0 + + + $EW_DIR$\common\plugins\uCProbe\uCProbePlugin.ENU.ewplugin + 0 + + + diff --git a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/IAR/MPUDemo.ewp b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/IAR/MPUDemo.ewp index 3e46c9d73..319fc2100 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/IAR/MPUDemo.ewp +++ b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/IAR/MPUDemo.ewp @@ -1,6 +1,6 @@ - 3 + 4 MPUDemo @@ -11,24 +11,24 @@ General 3 - 35 + 36 1 1 + ICCARM 2 - 37 + 38 1 1 + + AARM 2 - 11 + 12 1 1 + @@ -677,14 +695,6 @@ inputOutputBased - - BUILDACTION - 1 - - - - - ILINK 0 @@ -1080,6 +1090,11 @@ + + BUILDACTION + 2 + + Config diff --git a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/Keil/MPUDemo.uvprojx b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/Keil/MPUDemo.uvprojx index 5aa766a90..eb35aaaca 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/Keil/MPUDemo.uvprojx +++ b/FreeRTOS/Demo/CORTEX_MPU_STM32L4_Discovery_GCC_IAR_Keil/Projects/Keil/MPUDemo.uvprojx @@ -10,14 +10,14 @@ MPUDemo 0x4 ARM-ADS - 6190000::V6.19::ARMCLANG + 6210000::V6.21::ARMCLANG 1 STM32L475VGTx STMicroelectronics - Keil.STM32L4xx_DFP.2.6.2 - https://www.keil.com/pack/ + Keil.STM32L4xx_DFP.2.6.1 + http://www.keil.com/pack/ IRAM(0x20000000-0x20017FFF) IRAM2(0x10000000-0x10007FFF) IROM(0x8000000-0x80FFFFF) CLOCK(8000000) FPU2 CPUTYPE("Cortex-M4") @@ -159,7 +159,7 @@ 1 1 0 - 1 + 0 1 0 0 diff --git a/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/.gitignore b/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/.gitignore new file mode 100644 index 000000000..3f2767e0c --- /dev/null +++ b/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/.gitignore @@ -0,0 +1,4 @@ +Listings/ +Objects/ +EventRecorderStub.scvd +*.uvguix.* diff --git a/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/FreeRTOSConfig.h index 722108fef..56d196b7d 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/FreeRTOSConfig.h @@ -1,6 +1,6 @@ /* * FreeRTOS V202212.00 - * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -144,6 +144,9 @@ See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */ /* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper. * See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */ #define configUSE_MPU_WRAPPERS_V1 ( 0 ) +/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list. + * See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */ +#define configENABLE_ACCESS_CONTROL_LIST ( 1 ) /* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */ #define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 ) /* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/Keil_Specific/RTOSDemo.uvprojx b/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/Keil_Specific/RTOSDemo.uvprojx index 3fbf7dbf0..bf65ae49a 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/Keil_Specific/RTOSDemo.uvprojx +++ b/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/Keil_Specific/RTOSDemo.uvprojx @@ -10,7 +10,7 @@ RTOSDemo 0x4 ARM-ADS - 5060960::V5.06 update 7 (build 960)::..\..\Program Files (x86)\ARM_Compiler_5.06u7 + 5060960::V5.06 update 7 (build 960)::.\ARM_Compiler_5.06u7 0 @@ -463,6 +463,57 @@ mpu_wrappers_v2.c 1 ..\..\..\Source\portable\Common\mpu_wrappers_v2.c + + + 2 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + --diag_suppress=1296 + + + + + + + stream_buffer.c diff --git a/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/main.c b/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/main.c index 868b8dc5f..73f724630 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/main.c +++ b/FreeRTOS/Demo/CORTEX_MPU_Simulator_Keil_GCC/main.c @@ -1,6 +1,6 @@ /* * FreeRTOS V202212.00 - * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -448,6 +448,8 @@ static TaskParameters_t xTaskToDeleteParameters = int main( void ) { + TaskHandle_t xRegTest1TaskHandle, xRegTest2TaskHandle, xCheckTaskHandle; + /* Used to check linker configuration. */ configASSERT( ul1 == 0x123 ); configASSERT( ul2 == 0 ); @@ -462,11 +464,14 @@ int main( void ) queue has been created so is set here. */ xRegTest2Parameters.pvParameters = xGlobalScopeCheckQueue; - /* Create three test tasks. Handles to the created tasks are not required, - hence the second parameter is NULL. */ - xTaskCreateRestricted( &xRegTest1Parameters, NULL ); - xTaskCreateRestricted( &xRegTest2Parameters, NULL ); - xTaskCreateRestricted( &xCheckTaskParameters, NULL ); + /* Create three test tasks. */ + xTaskCreateRestricted( &xRegTest1Parameters, &( xRegTest1TaskHandle ) ); + xTaskCreateRestricted( &xRegTest2Parameters, &( xRegTest2TaskHandle ) ); + xTaskCreateRestricted( &xCheckTaskParameters, &( xCheckTaskHandle ) ); + + vGrantAccessToQueue( xRegTest1TaskHandle, xGlobalScopeCheckQueue ); + vGrantAccessToQueue( xRegTest2TaskHandle, xGlobalScopeCheckQueue ); + vGrantAccessToQueue( xCheckTaskHandle, xGlobalScopeCheckQueue ); /* Create a task that does nothing but ensure some of the MPU API functions can be called correctly, then get deleted. This is done for code coverage diff --git a/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/.gitignore b/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/.gitignore new file mode 100644 index 000000000..3f2767e0c --- /dev/null +++ b/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/.gitignore @@ -0,0 +1,4 @@ +Listings/ +Objects/ +EventRecorderStub.scvd +*.uvguix.* diff --git a/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/FreeRTOSConfig.h b/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/FreeRTOSConfig.h index 3a460f9cb..1f9d6553c 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/FreeRTOSConfig.h +++ b/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/FreeRTOSConfig.h @@ -1,6 +1,6 @@ /* * FreeRTOS V202212.00 - * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -145,6 +145,9 @@ See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */ /* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper. * See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */ #define configUSE_MPU_WRAPPERS_V1 ( 0 ) +/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list. + * See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */ +#define configENABLE_ACCESS_CONTROL_LIST ( 1 ) /* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */ #define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 ) /* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */ diff --git a/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/Keil_Specific/RTOSDemo.uvprojx b/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/Keil_Specific/RTOSDemo.uvprojx index 7181cca8a..5c5d0df8d 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/Keil_Specific/RTOSDemo.uvprojx +++ b/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/Keil_Specific/RTOSDemo.uvprojx @@ -10,7 +10,7 @@ RTOSDemo 0x4 ARM-ADS - 5060960::V5.06 update 7 (build 960)::..\..\Program Files (x86)\ARM_Compiler_5.06u7 + 5060960::V5.06 update 7 (build 960)::.\ARM_Compiler_5.06u7 0 @@ -458,6 +458,57 @@ mpu_wrappers_v2.c 1 ..\..\..\Source\portable\Common\mpu_wrappers_v2.c + + + 2 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + --diag_suppress=1296 + + + + + + + stream_buffer.c diff --git a/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/main.c b/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/main.c index dcc952cd4..b02b44272 100644 --- a/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/main.c +++ b/FreeRTOS/Demo/CORTEX_MPU_Static_Simulator_Keil_GCC/main.c @@ -1,6 +1,6 @@ /* * FreeRTOS V202212.00 - * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. + * Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. * * Permission is hereby granted, free of charge, to any person obtaining a copy of * this software and associated documentation files (the "Software"), to deal in @@ -442,6 +442,8 @@ volatile uint32_t ul1 = 0x123, ul2 = 0; int main( void ) { + TaskHandle_t xRegTest1TaskHandle, xRegTest2TaskHandle, xCheckTaskHandle; + configASSERT( ul1 == 0x123 ); configASSERT( ul2 == 0 ); prvSetupHardware(); @@ -455,11 +457,14 @@ int main( void ) queue has been created so is set here. */ xRegTest2Parameters.pvParameters = xGlobalScopeCheckQueue; - /* Create three test tasks. Handles to the created tasks are not required, - hence the second parameter is NULL. */ - xTaskCreateRestrictedStatic( &xRegTest1Parameters, NULL ); - xTaskCreateRestrictedStatic( &xRegTest2Parameters, NULL ); - xTaskCreateRestrictedStatic( &xCheckTaskParameters, NULL ); + /* Create three test tasks. */ + xTaskCreateRestrictedStatic( &xRegTest1Parameters, &( xRegTest1TaskHandle ) ); + xTaskCreateRestrictedStatic( &xRegTest2Parameters, &( xRegTest2TaskHandle ) ); + xTaskCreateRestrictedStatic( &xCheckTaskParameters, &( xCheckTaskHandle ) ); + + vGrantAccessToQueue( xRegTest1TaskHandle, xGlobalScopeCheckQueue ); + vGrantAccessToQueue( xRegTest2TaskHandle, xGlobalScopeCheckQueue ); + vGrantAccessToQueue( xCheckTaskHandle, xGlobalScopeCheckQueue ); /* Create a task that does nothing but ensure some of the MPU API functions can be called correctly, then get deleted. This is done for code coverage