Skip to content

Commit 79b3016

Browse files
committed
license and end of file newline fixes
1 parent 418937c commit 79b3016

File tree

7 files changed

+26
-42
lines changed

7 files changed

+26
-42
lines changed

portable/ThirdParty/GCC/RP2040/idle_task_static_memory.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
* Copyright (c) 2021 Raspberry Pi (Trading) Ltd.
55
*
6+
* SPDX-License-Identifier: MIT AND BSD-3-Clause
7+
*
68
* Permission is hereby granted, free of charge, to any person obtaining a copy of
79
* this software and associated documentation files (the "Software"), to deal in
810
* the Software without restriction, including without limitation the rights to
@@ -24,12 +26,6 @@
2426
* https://github.com/FreeRTOS
2527
*/
2628

27-
/*
28-
* Copyright (c) 2021 Raspberry Pi (Trading) Ltd.
29-
*
30-
* SPDX-License-Identifier: BSD-3-Clause
31-
*/
32-
3329
#include "FreeRTOS.h"
3430

3531
void vApplicationGetIdleTaskMemory( StaticTask_t **ppxIdleTaskTCBBuffer,

portable/ThirdParty/GCC/RP2040/include/freertos_sdk_config.h

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
/*
22
* FreeRTOS Kernel V10.4.3
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
* Copyright (c) 2021 Raspberry Pi (Trading) Ltd.
5+
*
6+
* SPDX-License-Identifier: BSD-3-Clause
47
*
58
* Permission is hereby granted, free of charge, to any person obtaining a copy of
69
* this software and associated documentation files (the "Software"), to deal in
@@ -23,12 +26,6 @@
2326
* https://github.com/FreeRTOS
2427
*/
2528

26-
/*
27-
* Copyright (c) 2021 Raspberry Pi (Trading) Ltd.
28-
*
29-
* SPDX-License-Identifier: BSD-3-Clause
30-
*/
31-
3229
#ifndef FREERTOS_SDK_CONFIG_H
3330
#define FREERTOS_SDK_CONFIG_H
3431

portable/ThirdParty/GCC/RP2040/include/portmacro.h

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
/*
22
* FreeRTOS Kernel V10.4.3
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
* Copyright (c) 2021 Raspberry Pi (Trading) Ltd.
5+
*
6+
* SPDX-License-Identifier: MIT AND BSD-3-Clause
47
*
58
* Permission is hereby granted, free of charge, to any person obtaining a copy of
69
* this software and associated documentation files (the "Software"), to deal in
@@ -24,12 +27,6 @@
2427
*
2528
*/
2629

27-
/*
28-
* Copyright (c) 2021 Raspberry Pi (Trading) Ltd.
29-
*
30-
* SPDX-License-Identifier: BSD-3-Clause
31-
*/
32-
3330
#ifndef PORTMACRO_H
3431
#define PORTMACRO_H
3532

portable/ThirdParty/GCC/RP2040/include/rp2040_config.h

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
/*
22
* FreeRTOS Kernel V10.4.3
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
* Copyright (c) 2021 Raspberry Pi (Trading) Ltd.
5+
*
6+
* SPDX-License-Identifier: MIT AND BSD-3-Clause
47
*
58
* Permission is hereby granted, free of charge, to any person obtaining a copy of
69
* this software and associated documentation files (the "Software"), to deal in
@@ -23,12 +26,6 @@
2326
* https://github.com/FreeRTOS
2427
*/
2528

26-
/*
27-
* Copyright (c) 2021 Raspberry Pi (Trading) Ltd.
28-
*
29-
* SPDX-License-Identifier: BSD-3-Clause
30-
*/
31-
3229
#ifndef RP2040_CONFIG_H
3330
#define RP2040_CONFIG_H
3431

@@ -70,4 +67,4 @@ extern "C" {
7067
};
7168
#endif
7269

73-
#endif
70+
#endif

portable/ThirdParty/GCC/RP2040/library.cmake

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
1-
# Called after the Raspberry Pi Pico SDK has been initialized to add our libraries
2-
3-
add_library(FreeRTOS-Kernel_included INTERFACE)
4-
target_compile_definitions(FreeRTOS-Kernel_included INTERFACE
5-
-DFREERTOS_KERNEL=1
6-
# todo don't know if we need this; maybe just want to explicitly disable things
7-
-DPICO_RTOS=1 # let SDK know that RTOS is in use
8-
)
1+
# Copyright (c) 2020 Raspberry Pi (Trading) Ltd.
2+
#
3+
# SPDX-License-Identifier: BSD-3-Clause
94

10-
pico_add_platform_library(FreeRTOS-Kernel_included)
5+
# Called after the Raspberry Pi Pico SDK has been initialized to add our libraries
116

127
add_library(FreeRTOS-Kernel-Core INTERFACE)
138
target_sources(FreeRTOS-Kernel-Core INTERFACE
@@ -36,13 +31,14 @@ target_link_libraries(FreeRTOS-Kernel INTERFACE
3631

3732
target_compile_definitions(FreeRTOS-Kernel INTERFACE
3833
LIB_FREERTOS_KERNEL=1
39-
FREE_RTOS_KERNEL_SMP=0
34+
FREERTOS_KERNEL_SMP=0
4035
)
4136

4237
add_library(FreeRTOS-Kernel-Static INTERFACE)
4338
target_compile_definitions(FreeRTOS-Kernel-Static INTERFACE
4439
configSUPPORT_STATIC_ALLOCATION=1
4540
)
41+
4642
target_sources(FreeRTOS-Kernel-Static INTERFACE ${CMAKE_CURRENT_LIST_DIR}/idle_task_static_memory.c)
4743
target_link_libraries(FreeRTOS-Kernel-Static INTERFACE FreeRTOS-Kernel)
4844

portable/ThirdParty/GCC/RP2040/pico_sdk_import.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Copyright (c) 2020 Raspberry Pi (Trading) Ltd.
2+
#
3+
# SPDX-License-Identifier: BSD-3-Clause
4+
15
# This is a copy of <PICO_SDK_PATH>/external/pico_sdk_import.cmake
26

37
# This can be dropped into an external project to help locate this SDK

portable/ThirdParty/GCC/RP2040/port.c

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
/*
22
* FreeRTOS Kernel V10.4.3
33
* Copyright (C) 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
4+
* Copyright (c) 2021 Raspberry Pi (Trading) Ltd.
5+
*
6+
* SPDX-License-Identifier: MIT AND BSD-3-Clause
47
*
58
* Permission is hereby granted, free of charge, to any person obtaining a copy of
69
* this software and associated documentation files (the "Software"), to deal in
@@ -24,12 +27,6 @@
2427
*
2528
*/
2629

27-
/*
28-
* Copyright (c) 2021 Raspberry Pi (Trading) Ltd.
29-
*
30-
* SPDX-License-Identifier: BSD-3-Clause
31-
*/
32-
3330
/*----------------------------------------------------------------------
3431
* Implementation of functions defined in portable.h for the RP2040 port.
3532
*----------------------------------------------------------------------*/
@@ -876,4 +873,4 @@ __attribute__( ( weak ) ) void vPortSetupTimerInterrupt( void )
876873
vTaskDelay(uxTicksToWait);
877874
}
878875
}
879-
#endif /* configSUPPORT_PICO_TIME_INTEROP */
876+
#endif /* configSUPPORT_PICO_TIME_INTEROP */

0 commit comments

Comments
 (0)