diff --git a/components/app_trace/port/include/esp_app_trace_port.h b/components/app_trace/port/include/esp_app_trace_port.h index a463105e7a..f0be32eca4 100644 --- a/components/app_trace/port/include/esp_app_trace_port.h +++ b/components/app_trace/port/include/esp_app_trace_port.h @@ -1,16 +1,9 @@ -// Copyright 2020 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ + #ifndef ESP_APP_TRACE_PORT_H_ #define ESP_APP_TRACE_PORT_H_ diff --git a/components/app_trace/private_include/esp_app_trace_membufs_proto.h b/components/app_trace/private_include/esp_app_trace_membufs_proto.h index 55865616ca..8b71cb5b48 100644 --- a/components/app_trace/private_include/esp_app_trace_membufs_proto.h +++ b/components/app_trace/private_include/esp_app_trace_membufs_proto.h @@ -1,16 +1,9 @@ -// Copyright 2020 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/* + * SPDX-FileCopyrightText: 2020-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ + #ifndef ESP_APP_TRACE_MEMBUFS_PROTO_H_ #define ESP_APP_TRACE_MEMBUFS_PROTO_H_ diff --git a/components/app_trace/sys_view/Config/Global.h b/components/app_trace/sys_view/Config/Global.h index 274340f04a..421af5e1c8 100644 --- a/components/app_trace/sys_view/Config/Global.h +++ b/components/app_trace/sys_view/Config/Global.h @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2015-2017 SEGGER Microcontroller GmbH & Co. KG + * + * SPDX-License-Identifier: BSD-3-Clause + */ /********************************************************************* * SEGGER Microcontroller GmbH & Co. KG * * The Embedded Experts * diff --git a/components/app_trace/sys_view/Config/SEGGER_RTT_Conf.h b/components/app_trace/sys_view/Config/SEGGER_RTT_Conf.h index a468797800..be61b5f7ba 100644 --- a/components/app_trace/sys_view/Config/SEGGER_RTT_Conf.h +++ b/components/app_trace/sys_view/Config/SEGGER_RTT_Conf.h @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2015-2017 SEGGER Microcontroller GmbH & Co. KG + * + * SPDX-License-Identifier: BSD-3-Clause + */ /********************************************************************* * SEGGER Microcontroller GmbH & Co. KG * * The Embedded Experts * diff --git a/components/app_trace/sys_view/Config/SEGGER_SYSVIEW_Conf.h b/components/app_trace/sys_view/Config/SEGGER_SYSVIEW_Conf.h index 4d359ebad3..d247531215 100644 --- a/components/app_trace/sys_view/Config/SEGGER_SYSVIEW_Conf.h +++ b/components/app_trace/sys_view/Config/SEGGER_SYSVIEW_Conf.h @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2015-2017 SEGGER Microcontroller GmbH & Co. KG + * + * SPDX-License-Identifier: BSD-3-Clause + */ /********************************************************************* * SEGGER Microcontroller GmbH & Co. KG * * The Embedded Experts * diff --git a/components/app_trace/sys_view/SEGGER/SEGGER.h b/components/app_trace/sys_view/SEGGER/SEGGER.h index c6e571cb72..e007b85a01 100644 --- a/components/app_trace/sys_view/SEGGER/SEGGER.h +++ b/components/app_trace/sys_view/SEGGER/SEGGER.h @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2015-2017 SEGGER Microcontroller GmbH & Co. KG + * + * SPDX-License-Identifier: BSD-3-Clause + */ /********************************************************************* * SEGGER Microcontroller GmbH & Co. KG * * The Embedded Experts * diff --git a/components/app_trace/sys_view/SEGGER/SEGGER_RTT.h b/components/app_trace/sys_view/SEGGER/SEGGER_RTT.h index 4cb95c2212..3e0fdf9af2 100644 --- a/components/app_trace/sys_view/SEGGER/SEGGER_RTT.h +++ b/components/app_trace/sys_view/SEGGER/SEGGER_RTT.h @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2015-2017 SEGGER Microcontroller GmbH & Co. KG + * + * SPDX-License-Identifier: BSD-3-Clause + */ /********************************************************************* * SEGGER Microcontroller GmbH & Co. KG * * The Embedded Experts * diff --git a/components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW.c b/components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW.c index 14e3c5534e..dc8a44bb16 100644 --- a/components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW.c +++ b/components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW.c @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2015-2017 SEGGER Microcontroller GmbH & Co. KG + * + * SPDX-License-Identifier: BSD-3-Clause + */ /********************************************************************* * SEGGER Microcontroller GmbH & Co. KG * * The Embedded Experts * diff --git a/components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW.h b/components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW.h index b5b5519d08..eb4cfc583f 100644 --- a/components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW.h +++ b/components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW.h @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2015-2017 SEGGER Microcontroller GmbH & Co. KG + * + * SPDX-License-Identifier: BSD-3-Clause + */ /********************************************************************* * SEGGER Microcontroller GmbH & Co. KG * * The Embedded Experts * diff --git a/components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW_ConfDefaults.h b/components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW_ConfDefaults.h index 0acd593921..a741f89e2a 100644 --- a/components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW_ConfDefaults.h +++ b/components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW_ConfDefaults.h @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2015-2017 SEGGER Microcontroller GmbH & Co. KG + * + * SPDX-License-Identifier: BSD-3-Clause + */ /********************************************************************* * SEGGER Microcontroller GmbH & Co. KG * * The Embedded Experts * diff --git a/components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW_Int.h b/components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW_Int.h index b52918c676..1614e378e3 100644 --- a/components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW_Int.h +++ b/components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW_Int.h @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2015-2017 SEGGER Microcontroller GmbH & Co. KG + * + * SPDX-License-Identifier: BSD-3-Clause + */ /********************************************************************* * SEGGER Microcontroller GmbH & Co. KG * * The Embedded Experts * diff --git a/components/app_trace/sys_view/Sample/Config/SEGGER_SYSVIEW_Config_FreeRTOS.c b/components/app_trace/sys_view/Sample/Config/SEGGER_SYSVIEW_Config_FreeRTOS.c index 9138da01e6..d24ea43a2d 100644 --- a/components/app_trace/sys_view/Sample/Config/SEGGER_SYSVIEW_Config_FreeRTOS.c +++ b/components/app_trace/sys_view/Sample/Config/SEGGER_SYSVIEW_Config_FreeRTOS.c @@ -1,3 +1,10 @@ +/* + * SPDX-FileCopyrightText: 2015-2017 SEGGER Microcontroller GmbH & Co. KG + * + * SPDX-License-Identifier: BSD-3-Clause + * + * SPDX-FileContributor: 2017-2022 Espressif Systems (Shanghai) CO LTD + */ /********************************************************************* * SEGGER Microcontroller GmbH & Co. KG * * The Embedded Experts * diff --git a/components/app_trace/sys_view/Sample/OS/SEGGER_SYSVIEW_FreeRTOS.c b/components/app_trace/sys_view/Sample/OS/SEGGER_SYSVIEW_FreeRTOS.c index e9f36a33d4..33477e26ed 100644 --- a/components/app_trace/sys_view/Sample/OS/SEGGER_SYSVIEW_FreeRTOS.c +++ b/components/app_trace/sys_view/Sample/OS/SEGGER_SYSVIEW_FreeRTOS.c @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2015-2017 SEGGER Microcontroller GmbH & Co. KG + * + * SPDX-License-Identifier: BSD-3-Clause + */ /********************************************************************* * SEGGER Microcontroller GmbH & Co. KG * * The Embedded Experts * diff --git a/components/app_trace/sys_view/Sample/OS/SEGGER_SYSVIEW_FreeRTOS.h b/components/app_trace/sys_view/Sample/OS/SEGGER_SYSVIEW_FreeRTOS.h index dc410edf8e..310dd22c56 100644 --- a/components/app_trace/sys_view/Sample/OS/SEGGER_SYSVIEW_FreeRTOS.h +++ b/components/app_trace/sys_view/Sample/OS/SEGGER_SYSVIEW_FreeRTOS.h @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2015-2017 SEGGER Microcontroller GmbH & Co. KG + * + * SPDX-License-Identifier: BSD-3-Clause + */ /********************************************************************* * SEGGER Microcontroller GmbH & Co. KG * * The Embedded Experts * diff --git a/docs/en/COPYRIGHT.rst b/docs/en/COPYRIGHT.rst index e0388fcbae..f757505fef 100644 --- a/docs/en/COPYRIGHT.rst +++ b/docs/en/COPYRIGHT.rst @@ -69,6 +69,8 @@ These third party libraries can be included into the application (firmware) prod * :component:`HTTP Parser ` Based on src/http/ngx_http_parse.c from NGINX copyright Igor Sysoev. Additional changes are licensed under the same terms as NGINX and Joyent, Inc. and other Node contributors. For details please check :component_file:`LICENSE file`. +* `SEGGER SystemView`_ target-side library, Copyright (c) 2015-2017 SEGGER Microcontroller GmbH & Co. KG, is licensed under BSD 3-clause license. + Build Tools ----------- @@ -176,3 +178,4 @@ Copyright (C) 2011, ChaN, all right reserved. .. _cryptoauthlib: https://github.com/MicrochipTech/cryptoauthlib .. _qrcode: https://github.com/nayuki/QR-Code-generator .. _freemodbus: https://github.com/armink/FreeModbus_Slave-Master-RTT-STM32 +.. _SEGGER SystemView: https://www.segger.com/downloads/systemview/ diff --git a/tools/ci/check_copyright_config.yaml b/tools/ci/check_copyright_config.yaml index 03819d9bef..a2861eb24f 100644 --- a/tools/ci/check_copyright_config.yaml +++ b/tools/ci/check_copyright_config.yaml @@ -81,6 +81,14 @@ freertos_component: - Apache-2.0 #Files added to the freertos added by us - MIT #FreeRTOS sources and port files +systemview: + include: + - 'components/app_trace/sys_view' + allowed_licenses: + - Apache-2.0 + - BSD-3-Clause + license_for_new_files: Apache-2.0 + # files matching this section do not perform the check # file patterns starting with ! are negated, meaning files matching them won't match the section. ignore: diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index 2ce8efe849..83885cf5cb 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -1,17 +1,3 @@ -components/app_trace/port/include/esp_app_trace_port.h -components/app_trace/private_include/esp_app_trace_membufs_proto.h -components/app_trace/sys_view/Config/Global.h -components/app_trace/sys_view/Config/SEGGER_RTT_Conf.h -components/app_trace/sys_view/Config/SEGGER_SYSVIEW_Conf.h -components/app_trace/sys_view/SEGGER/SEGGER.h -components/app_trace/sys_view/SEGGER/SEGGER_RTT.h -components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW.c -components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW.h -components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW_ConfDefaults.h -components/app_trace/sys_view/SEGGER/SEGGER_SYSVIEW_Int.h -components/app_trace/sys_view/Sample/Config/SEGGER_SYSVIEW_Config_FreeRTOS.c -components/app_trace/sys_view/Sample/OS/SEGGER_SYSVIEW_FreeRTOS.c -components/app_trace/sys_view/Sample/OS/SEGGER_SYSVIEW_FreeRTOS.h components/bootloader/subproject/main/bootloader_hooks.h components/bootloader/subproject/main/bootloader_start.c components/bootloader/subproject/main/ld/esp32/bootloader.ld