Skip to content

Commit e99220f

Browse files
kar-rahul-awskar-rahul-aws
authored
Merge branch 'main' into revert-988-Misra13.3
2 parents 63b1301 + 030c1aa commit e99220f

File tree

678 files changed

+18526
-12050
lines changed

Some content is hidden

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

678 files changed

+18526
-12050
lines changed

‎.github/.cSpellWords.txt

Lines changed: 17 additions & 0 deletions
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
@@ -630,6 +634,7 @@ PREB
630634
PRIA
631635
Prioritised
632636
PRIS
637+
PRIVDEFENA
633638
PROCDLY
634639
PRODH
635640
PRODL
@@ -795,6 +800,15 @@ SWRST
795800
SWTRG
796801
synchronise
797802
SYSC
803+
sysclk
804+
Sysclk
805+
SysClk
806+
SYSClk
807+
SYSCLK
808+
sysclock
809+
Sysclock
810+
SysClock
811+
SYSCLOCK
798812
TACCR
799813
TACCTL
800814
TACLR
@@ -877,6 +891,9 @@ UNDADD
877891
unpadded
878892
Unpadded
879893
UNPADDED
894+
unprotect
895+
Unprotect
896+
Unprotected
880897
UNRE
881898
UNSUB
882899
UNSUBACK

‎.github/scripts/kernel_checker.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env python3
22
#/*
33
# * FreeRTOS Kernel <DEVELOPMENT BRANCH>
4-
# * Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
# * Copyright (C) 2024 Amazon.com, Inc. or its affiliates. All Rights Reserved.
55
# *
66
# * SPDX-License-Identifier: MIT
77
# *
@@ -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 = [
@@ -108,7 +109,7 @@
108109
KERNEL_HEADER = [
109110
'/*\n',
110111
' * FreeRTOS Kernel <DEVELOPMENT BRANCH>\n',
111-
' * Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n',
112+
' * Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.\n',
112113
' *\n',
113114
' * SPDX-License-Identifier: MIT\n',
114115
' *\n',
@@ -135,12 +136,16 @@
135136
' */\n',
136137
]
137138

139+
140+
FREERTOS_COPYRIGHT_REGEX = r"^(;|#)?( *(\/\*|\*|#|\/\/))? Copyright \(C\) 20\d\d Amazon.com, Inc. or its affiliates. All Rights Reserved\.( \*\/)?$"
141+
138142
def main():
139143
parser = HeaderChecker.configArgParser()
140144
args = parser.parse_args()
141145

142146
# Configure the checks then run
143147
checker = HeaderChecker(KERNEL_HEADER,
148+
copyright_regex=FREERTOS_COPYRIGHT_REGEX,
144149
ignored_files=KERNEL_IGNORED_FILES,
145150
ignored_ext=KERNEL_IGNORED_EXTENSIONS,
146151
ignored_patterns=KERNEL_IGNORED_PATTERNS,

‎.github/workflows/auto-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ jobs:
3131

3232
# Currently FreeRTOS/.github/scripts houses the release script. Download it for upcoming usage
3333
- name: Checkout FreeRTOS Release Tools
34-
uses: actions/checkout@v3
34+
uses: actions/checkout@v4.1.1
3535
with:
3636
repository: FreeRTOS/FreeRTOS
3737
path: tools
3838

3939
# Simpler git auth if we use checkout action and forward the repo to release script
4040
- name: Checkout FreeRTOS Kernel
41-
uses: actions/checkout@v3
41+
uses: actions/checkout@v4.1.1
4242
with:
4343
path: local_kernel
4444
fetch-depth: 0

‎.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
formatting:
1010
runs-on: ubuntu-20.04
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4.1.1
1313
- name: Check Formatting of FreeRTOS-Kernel Files
1414
uses: FreeRTOS/CI-CD-Github-Actions/formatting@main
1515
with:
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Clone This Repo
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4.1.1
2323
- name: Run spellings check
2424
uses: FreeRTOS/CI-CD-Github-Actions/spellings@main
2525
with:
@@ -30,14 +30,14 @@ jobs:
3030
runs-on: ubuntu-latest
3131
steps:
3232
- name: Clone This Repo
33-
uses: actions/checkout@v3
33+
uses: actions/checkout@v4.1.1
3434
- name: Link Verification
3535
uses: FreeRTOS/CI-CD-Github-Actions/link-verifier@main
3636

3737
verify-manifest:
3838
runs-on: ubuntu-latest
3939
steps:
40-
- uses: actions/checkout@v3
40+
- uses: actions/checkout@v4.1.1
4141
with:
4242
submodules: true
4343
fetch-depth: 0

‎.github/workflows/coverity_scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout the Repository
22-
uses: actions/checkout@v3
22+
uses: actions/checkout@v4.1.1
2323

2424
- env:
2525
stepName: Install Build Essentials

‎.github/workflows/formatting.yml

Lines changed: 1 addition & 1 deletion
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

‎.github/workflows/git-secrets.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ jobs:
77
git-secrets:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v4.1.1
1111
with:
1212
submodules: recursive
1313
- name: Checkout awslabs/git-secrets
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4.1.1
1515
with:
1616
repository: awslabs/git-secrets
1717
ref: master

‎.github/workflows/kernel-checks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
# There is shared code, hosted by FreeRTOS/FreeRTOS, with deps needed by header checker
1717
- name: Checkout FreeRTOS Tools
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4.1.1
1919
with:
2020
repository: FreeRTOS/FreeRTOS
2121
sparse-checkout: '.github'
@@ -24,7 +24,7 @@ jobs:
2424

2525
# Checkout user pull request changes
2626
- name: Checkout Pull Request
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4.1.1
2828
with:
2929
path: inspect
3030

‎.github/workflows/kernel-demos.yml

Lines changed: 29 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: windows-latest
1515
steps:
1616
- name: Checkout the FreeRTOS/FreeRTOS Repository
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4.1.1
1818
with:
1919
ref: main
2020
repository: FreeRTOS/FreeRTOS
@@ -23,7 +23,7 @@ jobs:
2323

2424
# Checkout user pull request changes
2525
- name: Checkout Pull Request
26-
uses: actions/checkout@v3
26+
uses: actions/checkout@v4.1.1
2727
with:
2828
path: ./FreeRTOS/Source
2929

@@ -43,7 +43,7 @@ jobs:
4343
runs-on: windows-latest
4444
steps:
4545
- name: Checkout the FreeRTOS/FreeRTOS Repository
46-
uses: actions/checkout@v3
46+
uses: actions/checkout@v4.1.1
4747
with:
4848
ref: main
4949
repository: FreeRTOS/FreeRTOS
@@ -52,7 +52,7 @@ jobs:
5252

5353
# Checkout user pull request changes
5454
- name: Checkout Pull Request
55-
uses: actions/checkout@v3
55+
uses: actions/checkout@v4.1.1
5656
with:
5757
path: ./FreeRTOS/Source
5858

@@ -74,7 +74,7 @@ jobs:
7474
runs-on: ${{ matrix.os }}
7575
steps:
7676
- name: Checkout the FreeRTOS/FreeRTOS Repository
77-
uses: actions/checkout@v3
77+
uses: actions/checkout@v4.1.1
7878
with:
7979
ref: main
8080
repository: FreeRTOS/FreeRTOS
@@ -83,7 +83,7 @@ jobs:
8383

8484
# Checkout user pull request changes
8585
- name: Checkout Pull Request
86-
uses: actions/checkout@v3
86+
uses: actions/checkout@v4.1.1
8787
with:
8888
path: ./FreeRTOS/Source
8989

@@ -110,7 +110,7 @@ jobs:
110110
steps:
111111
# Checkout user pull request changes
112112
- name: Checkout Repository
113-
uses: actions/checkout@v3
113+
uses: actions/checkout@v4.1.1
114114

115115
- name: Install GCC
116116
shell: bash
@@ -137,7 +137,7 @@ jobs:
137137
runs-on: ubuntu-latest
138138
steps:
139139
- name: Checkout the FreeRTOS/FreeRTOS Repository
140-
uses: actions/checkout@v3
140+
uses: actions/checkout@v4.1.1
141141
with:
142142
ref: main
143143
repository: FreeRTOS/FreeRTOS
@@ -146,7 +146,7 @@ jobs:
146146

147147
# Checkout user pull request changes
148148
- name: Checkout Pull Request
149-
uses: actions/checkout@v3
149+
uses: actions/checkout@v4.1.1
150150
with:
151151
path: ./FreeRTOS/Source
152152

@@ -166,7 +166,7 @@ jobs:
166166
runs-on: ubuntu-latest
167167
steps:
168168
- name: Checkout the FreeRTOS/FreeRTOS Repository
169-
uses: actions/checkout@v3
169+
uses: actions/checkout@v4.1.1
170170
with:
171171
ref: main
172172
repository: FreeRTOS/FreeRTOS
@@ -176,7 +176,7 @@ jobs:
176176
stepName: Fetch Community-Supported-Demos Submodule
177177
shell: bash
178178
run: |
179-
# Fetch Community-Supported-Demos Submodule
179+
# ${{ env.stepName }}
180180
echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
181181
git submodule update --checkout --init --depth 1 FreeRTOS/Demo/ThirdParty/Community-Supported-Demos
182182
# This repository contains the microblaze_instructions.h header file
@@ -186,7 +186,7 @@ jobs:
186186
187187
# Checkout user pull request changes
188188
- name: Checkout Pull Request
189-
uses: actions/checkout@v3
189+
uses: actions/checkout@v4.1.1
190190
with:
191191
path: ./FreeRTOS/Source
192192

@@ -252,29 +252,24 @@ jobs:
252252
runs-on: ubuntu-latest
253253
steps:
254254
- name: Checkout the FreeRTOS/FreeRTOS Repository
255-
uses: actions/checkout@v3
255+
uses: actions/checkout@v4.1.1
256256
with:
257257
ref: main
258258
repository: FreeRTOS/FreeRTOS
259259
fetch-depth: 1
260260

261-
- name: Fetch Community-Supported-Demos Submodule
261+
- env:
262+
stepName: Fetch Community-Supported-Demos Submodule
262263
shell: bash
263264
run: |
264-
# Fetch Community-Supported-Demos Submodule
265-
echo "::group::Fetch Community-Supported-Demos Submodule"
265+
# ${{ env.stepName }}
266+
echo -e "::group::${{ env.bashInfo }} ${{ env.stepName }} ${{ env.bashEnd }}"
266267
git submodule update --checkout --init --depth 1 FreeRTOS/Demo/ThirdParty/Community-Supported-Demos
267-
echo "::endgroup::"
268-
if [ "$?" = "0" ]; then
269-
echo -e "\033[32;3mCloned the Community-Supported-Demos\033[0m"
270-
else
271-
echo -e "\033[32;31mCommunity-Supported-Demos Clone Failed...\033[0m"
272-
exit 1
273-
fi
268+
echo -e "${{ env.bashPass }} ${{ env.stepName }} ${{ env.bashEnd }}"
274269
275270
# Checkout user pull request changes
276271
- name: Checkout Pull Request
277-
uses: actions/checkout@v3
272+
uses: actions/checkout@v4.1.1
278273
with:
279274
path: ./FreeRTOS/Source
280275

@@ -289,6 +284,16 @@ jobs:
289284
working-directory: FreeRTOS/Demo/CORTEX_MPU_M3_MPS2_QEMU_GCC
290285
run: make -j
291286

287+
- name: Build CORTEX_MPU_R4F_TI_RM46_HERCULES_GCC Demo
288+
shell: bash
289+
working-directory: FreeRTOS/Demo/CORTEX_MPU_R4F_TI_RM46_HERCULES_GCC
290+
run: cmake -S . -B build && make -j -C build all
291+
292+
- name: Build CORTEX_MPU_R5F_TI_RM57_HERCULES_GCC Demo
293+
shell: bash
294+
working-directory: FreeRTOS/Demo/CORTEX_MPU_R5F_TI_RM57_HERCULES_GCC
295+
run: cmake -S . -B build && make -j -C build all
296+
292297
- name: Build CORTEX_LM3S102_GCC Demo
293298
shell: bash
294299
working-directory: FreeRTOS/Demo/CORTEX_LM3S102_GCC

‎.github/workflows/unit-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
runs-on: ubuntu-20.04
77
steps:
88
- name: Checkout Parent Repository
9-
uses: actions/checkout@v3
9+
uses: actions/checkout@v4.1.1
1010
with:
1111
ref: main
1212
repository: FreeRTOS/FreeRTOS
@@ -15,7 +15,7 @@ jobs:
1515

1616
# Checkout user pull request changes
1717
- name: Checkout Pull Request
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4.1.1
1919
with:
2020
path: ./FreeRTOS/Source
2121

0 commit comments

Comments
 (0)