alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-20 00:36:01 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'update_spdx_license_tag' into 'master'

Browse Source 
feat(license): update OpenOCD stub source files with additional MIT license

See merge request espressif/esp-idf!28480
This commit is contained in:
Erhan Kurubas 2024-01-17 19:26:06 +08:00
commit bc2650cdca
7 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/app_trace/app_trace.c
View File

@ -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 <string.h>

4
components/app_trace/app_trace_membufs_proto.c
View File

@ -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 <sys/param.h>

4
components/app_trace/app_trace_util.c
View File

@ -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"

4
components/app_trace/port/riscv/port.c
View File

@ -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"

4
components/app_trace/port/xtensa/port.c
View File

@ -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
*/
//

17
components/xtensa/eri.c
View File

@ -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 <stdint.h>
#include "eri.h"

14
tools/ci/check_copyright_config.yaml
View File

@ -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/**'