Skip to content

Commit 1a3cee9

Browse files
committed
Remove error for 16 MPU resgion from IAR ports
Support for 16 MPU regions was added to Cortex-M33, M35P, M55 and M85 ports was added but the compile time error check was not removed. This results in compilation error when 16 MPU regions are used. This PR removes the not needed compile time error check. It was reported here - https://forums.freertos.org/t/cortex-m55-and-16-region-mpu-support/21470. Signed-off-by: Gaurav Aggarwal <aggarg@amazon.com>
1 parent 9788e7e commit 1a3cee9

File tree

13 files changed

+0
-62
lines changed

13 files changed

+0
-62
lines changed

portable/ARMv8M/non_secure/portable/IAR/ARM_CM33/portmacro.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@
5454
#define portDONT_DISCARD __root
5555
/*-----------------------------------------------------------*/
5656

57-
#if ( configTOTAL_MPU_REGIONS == 16 )
58-
#error 16 MPU regions are not yet supported for this port.
59-
#endif
60-
/*-----------------------------------------------------------*/
61-
6257
/* ARMv8-M common port configurations. */
6358
#include "portmacrocommon.h"
6459
/*-----------------------------------------------------------*/

portable/ARMv8M/non_secure/portable/IAR/ARM_CM33_NTZ/portmacro.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,11 @@
5858
#include "portmacrocommon.h"
5959
/*-----------------------------------------------------------*/
6060

61-
#if ( configTOTAL_MPU_REGIONS == 16 )
62-
#error 16 MPU regions are not yet supported for this port.
63-
#endif
64-
6561
#ifndef configENABLE_MVE
6662
#define configENABLE_MVE 0
6763
#elif( configENABLE_MVE != 0 )
6864
#error configENABLE_MVE must be left undefined, or defined to 0 for the Cortex-M33.
6965
#endif
70-
7166
/*-----------------------------------------------------------*/
7267

7368
/**

portable/ARMv8M/non_secure/portable/IAR/ARM_CM35P/portmacro.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@
5858
#include "portmacrocommon.h"
5959
/*-----------------------------------------------------------*/
6060

61-
#if ( configTOTAL_MPU_REGIONS == 16 )
62-
#error 16 MPU regions are not yet supported for this port.
63-
#endif
64-
6561
#ifndef configENABLE_MVE
6662
#define configENABLE_MVE 0
6763
#elif( configENABLE_MVE != 0 )

portable/ARMv8M/non_secure/portable/IAR/ARM_CM55/portmacro.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,6 @@
6363
#include "portmacrocommon.h"
6464
/*-----------------------------------------------------------*/
6565

66-
#if ( configTOTAL_MPU_REGIONS == 16 )
67-
#error 16 MPU regions are not yet supported for this port.
68-
#endif
69-
/*-----------------------------------------------------------*/
70-
7166
/**
7267
* @brief Critical section management.
7368
*/

portable/ARMv8M/non_secure/portable/IAR/ARM_CM85/portmacro.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,6 @@
6363
#include "portmacrocommon.h"
6464
/*-----------------------------------------------------------*/
6565

66-
#if ( configTOTAL_MPU_REGIONS == 16 )
67-
#error 16 MPU regions are not yet supported for this port.
68-
#endif
69-
/*-----------------------------------------------------------*/
70-
7166
/**
7267
* @brief Critical section management.
7368
*/

portable/IAR/ARM_CM33/non_secure/portmacro.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@
5454
#define portDONT_DISCARD __root
5555
/*-----------------------------------------------------------*/
5656

57-
#if ( configTOTAL_MPU_REGIONS == 16 )
58-
#error 16 MPU regions are not yet supported for this port.
59-
#endif
60-
/*-----------------------------------------------------------*/
61-
6257
/* ARMv8-M common port configurations. */
6358
#include "portmacrocommon.h"
6459
/*-----------------------------------------------------------*/

portable/IAR/ARM_CM33_NTZ/non_secure/portmacro.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,11 @@
5858
#include "portmacrocommon.h"
5959
/*-----------------------------------------------------------*/
6060

61-
#if ( configTOTAL_MPU_REGIONS == 16 )
62-
#error 16 MPU regions are not yet supported for this port.
63-
#endif
64-
6561
#ifndef configENABLE_MVE
6662
#define configENABLE_MVE 0
6763
#elif( configENABLE_MVE != 0 )
6864
#error configENABLE_MVE must be left undefined, or defined to 0 for the Cortex-M33.
6965
#endif
70-
7166
/*-----------------------------------------------------------*/
7267

7368
/**

portable/IAR/ARM_CM35P/non_secure/portmacro.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@
5858
#include "portmacrocommon.h"
5959
/*-----------------------------------------------------------*/
6060

61-
#if ( configTOTAL_MPU_REGIONS == 16 )
62-
#error 16 MPU regions are not yet supported for this port.
63-
#endif
64-
6561
#ifndef configENABLE_MVE
6662
#define configENABLE_MVE 0
6763
#elif( configENABLE_MVE != 0 )

portable/IAR/ARM_CM35P_NTZ/non_secure/portmacro.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@
5858
#include "portmacrocommon.h"
5959
/*-----------------------------------------------------------*/
6060

61-
#if ( configTOTAL_MPU_REGIONS == 16 )
62-
#error 16 MPU regions are not yet supported for this port.
63-
#endif
64-
6561
#ifndef configENABLE_MVE
6662
#define configENABLE_MVE 0
6763
#elif( configENABLE_MVE != 0 )

portable/IAR/ARM_CM55/non_secure/portmacro.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,6 @@
6363
#include "portmacrocommon.h"
6464
/*-----------------------------------------------------------*/
6565

66-
#if ( configTOTAL_MPU_REGIONS == 16 )
67-
#error 16 MPU regions are not yet supported for this port.
68-
#endif
69-
/*-----------------------------------------------------------*/
70-
7166
/**
7267
* @brief Critical section management.
7368
*/

portable/IAR/ARM_CM55_NTZ/non_secure/portmacro.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,6 @@
6363
#include "portmacrocommon.h"
6464
/*-----------------------------------------------------------*/
6565

66-
#if ( configTOTAL_MPU_REGIONS == 16 )
67-
#error 16 MPU regions are not yet supported for this port.
68-
#endif
69-
/*-----------------------------------------------------------*/
70-
7166
/**
7267
* @brief Critical section management.
7368
*/

portable/IAR/ARM_CM85/non_secure/portmacro.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,6 @@
6363
#include "portmacrocommon.h"
6464
/*-----------------------------------------------------------*/
6565

66-
#if ( configTOTAL_MPU_REGIONS == 16 )
67-
#error 16 MPU regions are not yet supported for this port.
68-
#endif
69-
/*-----------------------------------------------------------*/
70-
7166
/**
7267
* @brief Critical section management.
7368
*/

portable/IAR/ARM_CM85_NTZ/non_secure/portmacro.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,6 @@
6363
#include "portmacrocommon.h"
6464
/*-----------------------------------------------------------*/
6565

66-
#if ( configTOTAL_MPU_REGIONS == 16 )
67-
#error 16 MPU regions are not yet supported for this port.
68-
#endif
69-
/*-----------------------------------------------------------*/
70-
7166
/**
7267
* @brief Critical section management.
7368
*/

0 commit comments

Comments
 (0)