diff --git a/components/app_trace/app_trace.c b/components/app_trace/app_trace.c index 16b3ae3336..d88a4b42ad 100644 --- a/components/app_trace/app_trace.c +++ b/components/app_trace/app_trace.c @@ -1,7 +1,7 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2024 Espressif Systems (Shanghai) CO LTD * - * SPDX-License-Identifier: Apache-2.0 + * SPDX-License-Identifier: Apache-2.0 OR MIT */ #include diff --git a/components/app_trace/app_trace_membufs_proto.c b/components/app_trace/app_trace_membufs_proto.c index 3404ebdca8..b8d6966fb4 100644 --- a/components/app_trace/app_trace_membufs_proto.c +++ b/components/app_trace/app_trace_membufs_proto.c @@ -1,7 +1,7 @@ /* - * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD * - * SPDX-License-Identifier: Apache-2.0 + * SPDX-License-Identifier: Apache-2.0 OR MIT */ #include diff --git a/components/app_trace/app_trace_util.c b/components/app_trace/app_trace_util.c index 44bd1e30f2..11f150c734 100644 --- a/components/app_trace/app_trace_util.c +++ b/components/app_trace/app_trace_util.c @@ -1,7 +1,7 @@ /* - * SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2017-2024 Espressif Systems (Shanghai) CO LTD * - * SPDX-License-Identifier: Apache-2.0 + * SPDX-License-Identifier: Apache-2.0 OR MIT */ // #include "freertos/FreeRTOS.h" diff --git a/components/app_trace/port/riscv/port.c b/components/app_trace/port/riscv/port.c index 4e592aee34..255e1b3d49 100644 --- a/components/app_trace/port/riscv/port.c +++ b/components/app_trace/port/riscv/port.c @@ -1,7 +1,7 @@ /* - * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD * - * SPDX-License-Identifier: Apache-2.0 + * SPDX-License-Identifier: Apache-2.0 OR MIT */ #include "esp_cpu.h" diff --git a/components/app_trace/port/xtensa/port.c b/components/app_trace/port/xtensa/port.c index 80a2efcd9a..a2f0f63efd 100644 --- a/components/app_trace/port/xtensa/port.c +++ b/components/app_trace/port/xtensa/port.c @@ -1,7 +1,7 @@ /* - * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD * - * SPDX-License-Identifier: Apache-2.0 + * SPDX-License-Identifier: Apache-2.0 OR MIT */ // diff --git a/components/xtensa/eri.c b/components/xtensa/eri.c index 97525c384e..d5315acc6d 100644 --- a/components/xtensa/eri.c +++ b/components/xtensa/eri.c @@ -1,16 +1,9 @@ -// Copyright 2015-2016 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 +/* + * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 OR MIT + */ -// 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. #include #include "eri.h" diff --git a/tools/ci/check_copyright_config.yaml b/tools/ci/check_copyright_config.yaml index 1401cfac26..9f80f8c529 100644 --- a/tools/ci/check_copyright_config.yaml +++ b/tools/ci/check_copyright_config.yaml @@ -141,6 +141,20 @@ md5_hash: - BSD-3-Clause - Apache-2.0 +# OpenOCD project is licensed under GPLv2.0, which is incompatible with Apache-2.0 +# The source files built by the OpenOCD stub flasher, need to be dual-licensed for the upstreaming. +# MIT is chosen as the dual license, ensuring compatibility with GPLv2.0. +app_trace: + include: + - components/app_trace/app_trace.c + - components/app_trace/app_trace_membufs_proto.c + - components/app_trace/app_trace_util.c + - components/app_trace/port/riscv/port.c + - components/app_trace/port/xtensa/port.c + allowed_licenses: + - Apache-2.0 + - MIT + xtensa: include: - 'components/xtensa/**'