Skip to content

Commit 61111b1

Browse files
authored
Add ARMv7-R MPU Port (#938)
* Apply git review patch created by @aggargr * Add necessary changes to the CMakeLists.txt file to build the port
1 parent 839ccb7 commit 61111b1

File tree

10 files changed

+3022
-2
lines changed

10 files changed

+3022
-2
lines changed

.github/.cSpellWords.txt

+16
Original file line numberDiff line numberDiff line change
@@ -549,6 +549,10 @@ NTRST
549549
NVIC
550550
ODAT
551551
ODSR
552+
OINC
553+
OIWBNOWA
554+
OIWBWA
555+
OIWTNOWA
552556
OPMOD
553557
optimisations
554558
OPTIMISED
@@ -795,6 +799,15 @@ SWRST
795799
SWTRG
796800
synchronise
797801
SYSC
802+
sysclk
803+
Sysclk
804+
SysClk
805+
SYSClk
806+
SYSCLK
807+
sysclock
808+
Sysclock
809+
SysClock
810+
SYSCLOCK
798811
TACCR
799812
TACCTL
800813
TACLR
@@ -877,6 +890,9 @@ UNDADD
877890
unpadded
878891
Unpadded
879892
UNPADDED
893+
unprotect
894+
Unprotect
895+
Unprotected
880896
UNRE
881897
UNSUB
882898
UNSUBACK

.github/scripts/kernel_checker.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
'FreeRTOS-openocd.c',
3838
'Makefile',
3939
'.DS_Store',
40-
'cspell.config.yaml'
40+
'cspell.config.yaml',
41+
'.clang-format'
4142
]
4243

4344
KERNEL_IGNORED_EXTENSIONS = [

.github/workflows/formatting.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-20.04
2020
steps:
2121
- name: Apply Formatting Fix
22-
id: check-formatting
22+
id: check-formatting
2323
uses: FreeRTOS/CI-CD-Github-Actions/formatting-bot@main
2424
with:
2525
exclude-dirs: portable

CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ if(NOT FREERTOS_PORT)
8585
" GCC_ARM_CM85_NTZ_NONSECURE - Compiler: GCC Target: ARM Cortex-M85 non-trustzone non-secure\n"
8686
" GCC_ARM_CM85_TFM - Compiler: GCC Target: ARM Cortex-M85 non-secure for TF-M\n"
8787
" GCC_ARM_CR5 - Compiler: GCC Target: ARM Cortex-R5\n"
88+
" GCC_ARM_CRX_MPU - Compiler: GCC Target: ARM Cortex-Rx with MPU\n"
8889
" GCC_ARM_CRX_NOGIC - Compiler: GCC Target: ARM Cortex-Rx no GIC\n"
8990
" GCC_ARM7_AT91FR40008 - Compiler: GCC Target: ARM7 Atmel AT91R40008\n"
9091
" GCC_ARM7_AT91SAM7S - Compiler: GCC Target: ARM7 Atmel AT91SAM7S\n"

portable/CMakeLists.txt

+6
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,11 @@ add_library(freertos_kernel_port OBJECT
207207
GCC/ARM_CR5/port.c
208208
GCC/ARM_CR5/portASM.S>
209209

210+
$<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CRX_MPU>:
211+
GCC/ARM_CRx_MPU/port.c
212+
GCC/ARM_CRx_MPU/portASM.S
213+
GCC/ARM_CRx_MPU/mpu_wrappers_v2_asm.S>
214+
210215
$<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CRX_NOGIC>:
211216
GCC/ARM_CRx_No_GIC/port.c
212217
GCC/ARM_CRx_No_GIC/portASM.S>
@@ -836,6 +841,7 @@ target_include_directories(freertos_kernel_port_headers INTERFACE
836841

837842
# ARMv7-R ports for GCC
838843
$<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CR5>:${CMAKE_CURRENT_LIST_DIR}/GCC/ARM_CR5>
844+
$<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CRX_MPU>:${CMAKE_CURRENT_LIST_DIR}/GCC/ARM_CRx_MPU>
839845
$<$<STREQUAL:${FREERTOS_PORT},GCC_ARM_CRX_NOGIC>:${CMAKE_CURRENT_LIST_DIR}/GCC/ARM_CRx_No_GIC>
840846

841847
# ARMv4T ARM7TDMI ports for GCC

0 commit comments

Comments
 (0)