Skip to content

Commit 012e618

Browse files
kar-rahul-awskar-rahul-aws
authored
Update MPU Demos for Kernel V10.6.2 (FreeRTOS#1124)
Update MPU Demos for Kernel V10.6.2
1 parent 0857bd7 commit 012e618

File tree

69 files changed

+4662
-14062
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+4662
-14062
lines changed

‎FreeRTOS/Demo/CORTEX_MPU_CEC_MEC_17xx_51xx_Keil_GCC/.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Listings/
2+
Objects/
3+
*.uvguix.*

‎FreeRTOS/Demo/CORTEX_MPU_CEC_MEC_17xx_51xx_Keil_GCC/FreeRTOSConfig.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* FreeRTOS V202212.00
3-
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of
66
* 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. */
142142
/* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper.
143143
* See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */
144144
#define configUSE_MPU_WRAPPERS_V1 ( 0 )
145+
/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list.
146+
* See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */
147+
#define configENABLE_ACCESS_CONTROL_LIST ( 1 )
145148
/* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */
146149
#define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 )
147150
/* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */

‎FreeRTOS/Demo/CORTEX_MPU_CEC_MEC_17xx_51xx_Keil_GCC/GCC_Specific/startup_ARMCM4.S‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
/* File: startup_ARMCM4.S
22
* Purpose: startup file for Cortex-M4 devices. Should use with
33
* GCC for ARM Embedded Processors
4-
* Version: V2.0
5-
* Date: 16 August 2013
4+
* Version: V2.01
5+
* Date: 12 June 2014
66
*
7-
/* Copyright (c) 2011 - 2013 ARM LIMITED
7+
*/
8+
/* Copyright (c) 2011 - 2014 ARM LIMITED
89
910
All rights reserved.
1011
Redistribution and use in source and binary forms, with or without
@@ -30,6 +31,7 @@
3031
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
3132
POSSIBILITY OF SUCH DAMAGE.
3233
---------------------------------------------------------------------------*/
34+
3335
.syntax unified
3436
.arch armv7e-m
3537

‎FreeRTOS/Demo/CORTEX_MPU_CEC_MEC_17xx_51xx_Keil_GCC/Keil_Specific/RTOSDemo.uvprojx‎

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<TargetName>RTOSDemo</TargetName>
1111
<ToolsetNumber>0x4</ToolsetNumber>
1212
<ToolsetName>ARM-ADS</ToolsetName>
13-
<pCCUsed>5060960::V5.06 update 7 (build 960)::..\..\Program Files (x86)\ARM_Compiler_5.06u7</pCCUsed>
13+
<pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARM_Compiler_5.06u7</pCCUsed>
1414
<uAC6>0</uAC6>
1515
<TargetOption>
1616
<TargetCommonOption>
@@ -463,6 +463,57 @@
463463
<FileName>mpu_wrappers_v2.c</FileName>
464464
<FileType>1</FileType>
465465
<FilePath>..\..\..\Source\portable\Common\mpu_wrappers_v2.c</FilePath>
466+
<FileOption>
467+
<CommonProperty>
468+
<UseCPPCompiler>2</UseCPPCompiler>
469+
<RVCTCodeConst>0</RVCTCodeConst>
470+
<RVCTZI>0</RVCTZI>
471+
<RVCTOtherData>0</RVCTOtherData>
472+
<ModuleSelection>0</ModuleSelection>
473+
<IncludeInBuild>2</IncludeInBuild>
474+
<AlwaysBuild>2</AlwaysBuild>
475+
<GenerateAssemblyFile>2</GenerateAssemblyFile>
476+
<AssembleAssemblyFile>2</AssembleAssemblyFile>
477+
<PublicsOnly>2</PublicsOnly>
478+
<StopOnExitCode>11</StopOnExitCode>
479+
<CustomArgument></CustomArgument>
480+
<IncludeLibraryModules></IncludeLibraryModules>
481+
<ComprImg>1</ComprImg>
482+
</CommonProperty>
483+
<FileArmAds>
484+
<Cads>
485+
<interw>2</interw>
486+
<Optim>0</Optim>
487+
<oTime>2</oTime>
488+
<SplitLS>2</SplitLS>
489+
<OneElfS>2</OneElfS>
490+
<Strict>2</Strict>
491+
<EnumInt>2</EnumInt>
492+
<PlainCh>2</PlainCh>
493+
<Ropi>2</Ropi>
494+
<Rwpi>2</Rwpi>
495+
<wLevel>0</wLevel>
496+
<uThumb>2</uThumb>
497+
<uSurpInc>2</uSurpInc>
498+
<uC99>2</uC99>
499+
<uGnu>2</uGnu>
500+
<useXO>2</useXO>
501+
<v6Lang>0</v6Lang>
502+
<v6LangP>0</v6LangP>
503+
<vShortEn>2</vShortEn>
504+
<vShortWch>2</vShortWch>
505+
<v6Lto>2</v6Lto>
506+
<v6WtE>2</v6WtE>
507+
<v6Rtti>2</v6Rtti>
508+
<VariousControls>
509+
<MiscControls>--diag_suppress=1296</MiscControls>
510+
<Define></Define>
511+
<Undefine></Undefine>
512+
<IncludePath></IncludePath>
513+
</VariousControls>
514+
</Cads>
515+
</FileArmAds>
516+
</FileOption>
466517
</File>
467518
<File>
468519
<FileName>stream_buffer.c</FileName>

‎FreeRTOS/Demo/CORTEX_MPU_LPC54018_MCUXpresso/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.settings/
2+
Debug/

‎FreeRTOS/Demo/CORTEX_MPU_LPC54018_MCUXpresso/Config/FreeRTOSConfig.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* FreeRTOS V202212.00
3-
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of
66
* 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. */
151151
/* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper.
152152
* See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */
153153
#define configUSE_MPU_WRAPPERS_V1 ( 0 )
154+
/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list.
155+
* See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */
156+
#define configENABLE_ACCESS_CONTROL_LIST ( 1 )
154157
/* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */
155158
#define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 )
156159
/* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */

‎FreeRTOS/Demo/CORTEX_MPU_LPC54018_MCUXpresso/Projects/MCUXpresso/.project‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,15 @@
5353
</link>
5454
</linkedResources>
5555
<filteredResources>
56+
<filter>
57+
<id>1701346271384</id>
58+
<name>FreeRTOS</name>
59+
<type>10</type>
60+
<matcher>
61+
<id>org.eclipse.ui.ide.multiFilter</id>
62+
<arguments>1.0-name-matches-true-false-examples</arguments>
63+
</matcher>
64+
</filter>
5665
<filter>
5766
<id>1578832143838</id>
5867
<name>FreeRTOS/portable</name>

‎FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/Config/FreeRTOSConfig.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* FreeRTOS V202212.00
3-
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of
66
* this software and associated documentation files (the "Software"), to deal in
@@ -149,6 +149,9 @@
149149
/* Set configUSE_MPU_WRAPPERS_V1 to 0 to use new MPU wrapper.
150150
* See https://freertos.org/a00110.html#configUSE_MPU_WRAPPERS_V1 for details. */
151151
#define configUSE_MPU_WRAPPERS_V1 ( 0 )
152+
/* Set configENABLE_ACCESS_CONTROL_LIST to 1 to use access control list.
153+
* See https://freertos.org/a00110.html#configENABLE_ACCESS_CONTROL_LIST for details. */
154+
#define configENABLE_ACCESS_CONTROL_LIST ( 1 )
152155
/* See https://freertos.org/a00110.html#configPROTECTED_KERNEL_OBJECT_POOL_SIZE for details. */
153156
#define configPROTECTED_KERNEL_OBJECT_POOL_SIZE ( 150 )
154157
/* See https://freertos.org/a00110.html#configSYSTEM_CALL_STACK_SIZE for details. */

‎FreeRTOS/Demo/CORTEX_MPU_M23_Nuvoton_NuMaker_PFM_M2351_IAR_GCC/Projects/IAR/NonSecure/FreeRTOSDemo_ns.ewd‎

Lines changed: 97 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<project>
3-
<fileVersion>3</fileVersion>
3+
<fileVersion>4</fileVersion>
44
<configuration>
55
<name>Release</name>
66
<toolchain>
@@ -11,7 +11,7 @@
1111
<name>C-SPY</name>
1212
<archiveVersion>2</archiveVersion>
1313
<data>
14-
<version>32</version>
14+
<version>33</version>
1515
<wantNonLocal>1</wantNonLocal>
1616
<debug>0</debug>
1717
<option>
@@ -222,6 +222,38 @@
222222
<name>OCTpiuBaseOption</name>
223223
<state>1</state>
224224
</option>
225+
<option>
226+
<name>OCOverrideSlave</name>
227+
<state>0</state>
228+
</option>
229+
<option>
230+
<name>OCOverrideSlavePath</name>
231+
<state></state>
232+
</option>
233+
<option>
234+
<name>C_32_64Device</name>
235+
<state>1</state>
236+
</option>
237+
<option>
238+
<name>AuthEnable</name>
239+
<state>0</state>
240+
</option>
241+
<option>
242+
<name>AuthSdmSelection</name>
243+
<state>1</state>
244+
</option>
245+
<option>
246+
<name>AuthSdmManifest</name>
247+
<state></state>
248+
</option>
249+
<option>
250+
<name>AuthSdmExplicitLib</name>
251+
<state></state>
252+
</option>
253+
<option>
254+
<name>AuthEnforce</name>
255+
<state>0</state>
256+
</option>
225257
</data>
226258
</settings>
227259
<settings>
@@ -457,6 +489,39 @@
457489
</option>
458490
</data>
459491
</settings>
492+
<settings>
493+
<name>E2_ID</name>
494+
<archiveVersion>2</archiveVersion>
495+
<data>
496+
<version>0</version>
497+
<wantNonLocal>1</wantNonLocal>
498+
<debug>0</debug>
499+
<option>
500+
<name>E2PowerFromProbe</name>
501+
<state>1</state>
502+
</option>
503+
<option>
504+
<name>CE2UsbSerialNo</name>
505+
<state></state>
506+
</option>
507+
<option>
508+
<name>CE2IdCodeEditB</name>
509+
<state>0xFFFF'FFFF'FFFF'FFFF'FFFF'FFFF'FFFF'FFFF</state>
510+
</option>
511+
<option>
512+
<name>CE2LogFileCheck</name>
513+
<state>0</state>
514+
</option>
515+
<option>
516+
<name>CE2LogFileEditB</name>
517+
<state>$PROJ_DIR$\cspycomm.log</state>
518+
</option>
519+
<option>
520+
<name>OCDriverInfo</name>
521+
<state>1</state>
522+
</option>
523+
</data>
524+
</settings>
460525
<settings>
461526
<name>GDBSERVER_ID</name>
462527
<archiveVersion>2</archiveVersion>
@@ -494,6 +559,27 @@
494559
</option>
495560
</data>
496561
</settings>
562+
<settings>
563+
<name>GPLINK_ID</name>
564+
<archiveVersion>2</archiveVersion>
565+
<data>
566+
<version>0</version>
567+
<wantNonLocal>1</wantNonLocal>
568+
<debug>0</debug>
569+
<option>
570+
<name>OCDriverInfo</name>
571+
<state>1</state>
572+
</option>
573+
<option>
574+
<name>DoLogfile</name>
575+
<state>0</state>
576+
</option>
577+
<option>
578+
<name>LogFile</name>
579+
<state>$PROJ_DIR$\cspycomm.log</state>
580+
</option>
581+
</data>
582+
</settings>
497583
<settings>
498584
<name>IJET_ID</name>
499585
<archiveVersion>2</archiveVersion>
@@ -1187,7 +1273,7 @@
11871273
</option>
11881274
<option>
11891275
<name>CCSTLinkProbeList</name>
1190-
<version>1</version>
1276+
<version>2</version>
11911277
<state>0</state>
11921278
</option>
11931279
<option>
@@ -1481,6 +1567,10 @@
14811567
</data>
14821568
</settings>
14831569
<debuggerPlugins>
1570+
<plugin>
1571+
<file>$TOOLKIT_DIR$\plugins\rtos\Azure\AzureArmPlugin.ENU.ewplugin</file>
1572+
<loadFlag>0</loadFlag>
1573+
</plugin>
14841574
<plugin>
14851575
<file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>
14861576
<loadFlag>0</loadFlag>
@@ -1517,6 +1607,10 @@
15171607
<file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9.ewplugin</file>
15181608
<loadFlag>0</loadFlag>
15191609
</plugin>
1610+
<plugin>
1611+
<file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9a.ewplugin</file>
1612+
<loadFlag>0</loadFlag>
1613+
</plugin>
15201614
<plugin>
15211615
<file>$TOOLKIT_DIR$\plugins\rtos\SMX\smxAwareIarArm9BE.ewplugin</file>
15221616
<loadFlag>0</loadFlag>

0 commit comments

Comments
 (0)