From 413375453bea40c44a7246d90ff2415b81241da5 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Mon, 21 Feb 2022 00:03:22 +0300 Subject: [PATCH] esp_common: update copyright headers --- components/esp_common/include/esp_assert.h | 18 +++++------------- components/esp_common/include/esp_bit_defs.h | 18 +++++------------- components/esp_common/include/esp_compiler.h | 18 +++++------------- components/esp_common/include/esp_types.h | 18 +++++------------- components/esp_common/src/esp_err_to_name.c | 6 ++++++ components/esp_common/src/esp_err_to_name.c.in | 6 ++++++ components/esp_common/test/test_attr.c | 6 ++++++ tools/ci/check_copyright_ignore.txt | 6 ------ 8 files changed, 38 insertions(+), 58 deletions(-) diff --git a/components/esp_common/include/esp_assert.h b/components/esp_common/include/esp_assert.h index 39d6a32843..12d2d1f075 100644 --- a/components/esp_common/include/esp_assert.h +++ b/components/esp_common/include/esp_assert.h @@ -1,16 +1,8 @@ -// Copyright 2015-2017 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: 2015-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #ifndef __ESP_ASSERT_H__ #define __ESP_ASSERT_H__ diff --git a/components/esp_common/include/esp_bit_defs.h b/components/esp_common/include/esp_bit_defs.h index 6c1600b69b..b506d04c18 100644 --- a/components/esp_common/include/esp_bit_defs.h +++ b/components/esp_common/include/esp_bit_defs.h @@ -1,16 +1,8 @@ -// Copyright 2010-2019 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: 2010-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #pragma once diff --git a/components/esp_common/include/esp_compiler.h b/components/esp_common/include/esp_compiler.h index 917c660253..07019425d5 100644 --- a/components/esp_common/include/esp_compiler.h +++ b/components/esp_common/include/esp_compiler.h @@ -1,16 +1,8 @@ -// Copyright 2016-2019 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: 2016-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #ifndef __ESP_COMPILER_H #define __ESP_COMPILER_H diff --git a/components/esp_common/include/esp_types.h b/components/esp_common/include/esp_types.h index 547024e3f7..37f3b2c466 100644 --- a/components/esp_common/include/esp_types.h +++ b/components/esp_common/include/esp_types.h @@ -1,16 +1,8 @@ -// Copyright 2010-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 - -// 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: 2010-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #ifndef __ESP_TYPES_H__ #define __ESP_TYPES_H__ diff --git a/components/esp_common/src/esp_err_to_name.c b/components/esp_common/src/esp_err_to_name.c index 3bc9f8edc1..6659691485 100644 --- a/components/esp_common/src/esp_err_to_name.c +++ b/components/esp_common/src/esp_err_to_name.c @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2018-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ + //Do not edit this file because it is autogenerated by gen_esp_err_to_name.py #include diff --git a/components/esp_common/src/esp_err_to_name.c.in b/components/esp_common/src/esp_err_to_name.c.in index 28520157ee..56a48ee28f 100644 --- a/components/esp_common/src/esp_err_to_name.c.in +++ b/components/esp_common/src/esp_err_to_name.c.in @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2018-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ + @COMMENT@ #include diff --git a/components/esp_common/test/test_attr.c b/components/esp_common/test/test_attr.c index 2b41ad1371..91f643a99f 100644 --- a/components/esp_common/test/test_attr.c +++ b/components/esp_common/test/test_attr.c @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2017-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ + #include "inttypes.h" #include "unity.h" #include "esp_attr.h" diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index 3d822d1a3a..c078bd9fe9 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -433,12 +433,6 @@ components/esp32/include/rom/spi_flash.h components/esp32/include/rom/tbconsole.h components/esp32/include/rom/tjpgd.h components/esp32/include/rom/uart.h -components/esp_common/include/esp_assert.h -components/esp_common/include/esp_bit_defs.h -components/esp_common/include/esp_compiler.h -components/esp_common/include/esp_types.h -components/esp_common/src/esp_err_to_name.c -components/esp_common/test/test_attr.c components/esp_eth/include/eth_phy_regs_struct.h components/esp_eth/src/dm9051.h components/esp_eth/src/esp_eth_mac_openeth.c