Skip to content

Commit 99742d2

Browse files
aggargaggarg
authored
Merge branch 'main' into add-task-dedicated-pac-key-support
2 parents c6be7f8 + e169442 commit 99742d2

File tree

27 files changed

+94
-89
lines changed

27 files changed

+94
-89
lines changed

‎.github/allowed_urls.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
https://www.renesas.com/us/en/document/mah/rh850f1k-group-users-manual-hardware?r=1170166
2+
https://www.renesas.com/us/en/products/microcontrollers-microprocessors/rh850-automotive-mcus
3+
https://www.renesas.com/us/en/software-tool/c-compiler-package-rh850-family#downloads

‎.github/scripts/manifest_updater.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def update_manifest_file(new_version_number):
1111
for line in f:
1212
line = line.strip()
1313
if line.startswith('version'):
14-
updated_lines.append(f'version: "v{new_version_number}"\n')
14+
updated_lines.append(f'version: "V{new_version_number}"\n')
1515
else:
1616
updated_lines.append(f'{line}\n')
1717

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ jobs:
3333
uses: actions/[email protected]
3434
- name: Link Verification
3535
uses: FreeRTOS/CI-CD-Github-Actions/link-verifier@main
36+
with:
37+
allowlist-file: '.github/allowed_urls.txt'
3638

3739
verify-manifest:
3840
runs-on: ubuntu-latest

‎manifest.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
name : "FreeRTOS-Kernel"
2-
version: "v11.0.1+"
2+
version: "V11.0.1+"
33
description: "FreeRTOS Kernel."
44
license: "MIT"

‎portable/ARMv8M/non_secure/port.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ typedef void ( * portISR_t )( void );
403403
*/
404404
static void prvTaskExitError( void );
405405

406-
#if ( configENABLE_MPU == 1 )
406+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
407407

408408
/**
409409
* @brief Extract MPU region's access permissions from the Region Base Address
@@ -414,7 +414,7 @@ static void prvTaskExitError( void );
414414
* @return uint32_t Access permissions.
415415
*/
416416
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
417-
#endif /* configENABLE_MPU */
417+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
418418

419419
#if ( configENABLE_MPU == 1 )
420420

@@ -876,7 +876,7 @@ static void prvTaskExitError( void )
876876
}
877877
/*-----------------------------------------------------------*/
878878

879-
#if ( configENABLE_MPU == 1 )
879+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
880880

881881
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
882882
{
@@ -895,7 +895,7 @@ static void prvTaskExitError( void )
895895
return ulAccessPermissions;
896896
}
897897

898-
#endif /* configENABLE_MPU */
898+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
899899
/*-----------------------------------------------------------*/
900900

901901
#if ( configENABLE_MPU == 1 )

‎portable/GCC/ARM_CA9/portASM.S‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ switch_before_exit:
302302
vApplicationIRQHandler:
303303
PUSH {LR}
304304
FMRX R1, FPSCR
305-
VPUSH {D0-D15}
305+
VPUSH {D0-D7}
306306
VPUSH {D16-D31}
307307
PUSH {R1}
308308

@@ -311,7 +311,7 @@ vApplicationIRQHandler:
311311

312312
POP {R0}
313313
VPOP {D16-D31}
314-
VPOP {D0-D15}
314+
VPOP {D0-D7}
315315
VMSR FPSCR, R0
316316

317317
POP {PC}

‎portable/GCC/ARM_CM23/non_secure/port.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ typedef void ( * portISR_t )( void );
403403
*/
404404
static void prvTaskExitError( void );
405405

406-
#if ( configENABLE_MPU == 1 )
406+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
407407

408408
/**
409409
* @brief Extract MPU region's access permissions from the Region Base Address
@@ -414,7 +414,7 @@ static void prvTaskExitError( void );
414414
* @return uint32_t Access permissions.
415415
*/
416416
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
417-
#endif /* configENABLE_MPU */
417+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
418418

419419
#if ( configENABLE_MPU == 1 )
420420

@@ -876,7 +876,7 @@ static void prvTaskExitError( void )
876876
}
877877
/*-----------------------------------------------------------*/
878878

879-
#if ( configENABLE_MPU == 1 )
879+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
880880

881881
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
882882
{
@@ -895,7 +895,7 @@ static void prvTaskExitError( void )
895895
return ulAccessPermissions;
896896
}
897897

898-
#endif /* configENABLE_MPU */
898+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
899899
/*-----------------------------------------------------------*/
900900

901901
#if ( configENABLE_MPU == 1 )

‎portable/GCC/ARM_CM23_NTZ/non_secure/port.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ typedef void ( * portISR_t )( void );
403403
*/
404404
static void prvTaskExitError( void );
405405

406-
#if ( configENABLE_MPU == 1 )
406+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
407407

408408
/**
409409
* @brief Extract MPU region's access permissions from the Region Base Address
@@ -414,7 +414,7 @@ static void prvTaskExitError( void );
414414
* @return uint32_t Access permissions.
415415
*/
416416
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
417-
#endif /* configENABLE_MPU */
417+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
418418

419419
#if ( configENABLE_MPU == 1 )
420420

@@ -876,7 +876,7 @@ static void prvTaskExitError( void )
876876
}
877877
/*-----------------------------------------------------------*/
878878

879-
#if ( configENABLE_MPU == 1 )
879+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
880880

881881
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
882882
{
@@ -895,7 +895,7 @@ static void prvTaskExitError( void )
895895
return ulAccessPermissions;
896896
}
897897

898-
#endif /* configENABLE_MPU */
898+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
899899
/*-----------------------------------------------------------*/
900900

901901
#if ( configENABLE_MPU == 1 )

‎portable/GCC/ARM_CM33/non_secure/port.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ typedef void ( * portISR_t )( void );
403403
*/
404404
static void prvTaskExitError( void );
405405

406-
#if ( configENABLE_MPU == 1 )
406+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
407407

408408
/**
409409
* @brief Extract MPU region's access permissions from the Region Base Address
@@ -414,7 +414,7 @@ static void prvTaskExitError( void );
414414
* @return uint32_t Access permissions.
415415
*/
416416
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
417-
#endif /* configENABLE_MPU */
417+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
418418

419419
#if ( configENABLE_MPU == 1 )
420420

@@ -876,7 +876,7 @@ static void prvTaskExitError( void )
876876
}
877877
/*-----------------------------------------------------------*/
878878

879-
#if ( configENABLE_MPU == 1 )
879+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
880880

881881
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
882882
{
@@ -895,7 +895,7 @@ static void prvTaskExitError( void )
895895
return ulAccessPermissions;
896896
}
897897

898-
#endif /* configENABLE_MPU */
898+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
899899
/*-----------------------------------------------------------*/
900900

901901
#if ( configENABLE_MPU == 1 )

‎portable/GCC/ARM_CM33_NTZ/non_secure/port.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ typedef void ( * portISR_t )( void );
403403
*/
404404
static void prvTaskExitError( void );
405405

406-
#if ( configENABLE_MPU == 1 )
406+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
407407

408408
/**
409409
* @brief Extract MPU region's access permissions from the Region Base Address
@@ -414,7 +414,7 @@ static void prvTaskExitError( void );
414414
* @return uint32_t Access permissions.
415415
*/
416416
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) PRIVILEGED_FUNCTION;
417-
#endif /* configENABLE_MPU */
417+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
418418

419419
#if ( configENABLE_MPU == 1 )
420420

@@ -876,7 +876,7 @@ static void prvTaskExitError( void )
876876
}
877877
/*-----------------------------------------------------------*/
878878

879-
#if ( configENABLE_MPU == 1 )
879+
#if ( ( configENABLE_MPU == 1 ) && ( configUSE_MPU_WRAPPERS_V1 == 0 ) )
880880

881881
static uint32_t prvGetRegionAccessPermissions( uint32_t ulRBARValue ) /* PRIVILEGED_FUNCTION */
882882
{
@@ -895,7 +895,7 @@ static void prvTaskExitError( void )
895895
return ulAccessPermissions;
896896
}
897897

898-
#endif /* configENABLE_MPU */
898+
#endif /* configENABLE_MPU == 1 && configUSE_MPU_WRAPPERS_V1 == 0 */
899899
/*-----------------------------------------------------------*/
900900

901901
#if ( configENABLE_MPU == 1 )

0 commit comments

Comments
 (0)