Skip to content

Commit e3e7343

Browse files
authored
Merge branch 'main' into ARM_CRx_MPU
2 parents ecd936b + 839ccb7 commit e3e7343

File tree

647 files changed

+652
-648
lines changed

Some content is hidden

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

647 files changed

+652
-648
lines changed

.github/scripts/kernel_checker.py

Lines changed: 6 additions & 2 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
# *
@@ -109,7 +109,7 @@
109109
KERNEL_HEADER = [
110110
'/*\n',
111111
' * FreeRTOS Kernel <DEVELOPMENT BRANCH>\n',
112-
' * 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',
113113
' *\n',
114114
' * SPDX-License-Identifier: MIT\n',
115115
' *\n',
@@ -136,12 +136,16 @@
136136
' */\n',
137137
]
138138

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

143146
# Configure the checks then run
144147
checker = HeaderChecker(KERNEL_HEADER,
148+
copyright_regex=FREERTOS_COPYRIGHT_REGEX,
145149
ignored_files=KERNEL_IGNORED_FILES,
146150
ignored_ext=KERNEL_IGNORED_EXTENSIONS,
147151
ignored_patterns=KERNEL_IGNORED_PATTERNS,

croutine.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3-
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* SPDX-License-Identifier: MIT
66
*

event_groups.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3-
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* SPDX-License-Identifier: MIT
66
*

examples/cmake_example/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3-
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* SPDX-License-Identifier: MIT
66
*

examples/coverity/FreeRTOSConfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3-
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* SPDX-License-Identifier: MIT
66
*

examples/template_configuration/FreeRTOSConfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3-
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* SPDX-License-Identifier: MIT
66
*

include/FreeRTOS.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3-
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* SPDX-License-Identifier: MIT
66
*

include/StackMacros.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3-
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* SPDX-License-Identifier: MIT
66
*

include/atomic.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3-
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* SPDX-License-Identifier: MIT
66
*

include/croutine.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* FreeRTOS Kernel <DEVELOPMENT BRANCH>
3-
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* SPDX-License-Identifier: MIT
66
*

0 commit comments

Comments
 (0)