From 911a8fc714283ddac3f57a3936827fc4fc7f6885 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Tue, 22 Feb 2022 00:09:24 +0300 Subject: [PATCH] spiffs, wear_levelling: update copyright headers --- components/spiffs/include/esp_spiffs.h | 18 ++++------- components/spiffs/include/spiffs_config.h | 5 ++++ components/spiffs/spiffs_api.c | 18 ++++------- components/spiffs/spiffs_api.h | 18 ++++------- components/spiffs/spiffsgen.py | 15 ++-------- components/spiffs/test/test_spiffs.c | 18 ++++------- components/spiffs/test_spiffs_host/main.cpp | 5 ++++ .../test_spiffs_host/sdkconfig/sdkconfig.h | 5 ++++ .../spiffs/test_spiffs_host/test_spiffs.cpp | 5 ++++ .../spiffs/test_spiffsgen/test_spiffsgen.py | 2 ++ components/wear_levelling/Partition.cpp | 18 ++++------- components/wear_levelling/SPI_Flash.cpp | 18 ++++------- components/wear_levelling/WL_Ext_Perf.cpp | 18 ++++------- components/wear_levelling/WL_Ext_Safe.cpp | 18 ++++------- components/wear_levelling/WL_Flash.cpp | 18 ++++------- components/wear_levelling/crc32.cpp | 18 ++++------- components/wear_levelling/crc32.h | 18 ++++------- .../wear_levelling/include/wear_levelling.h | 18 ++++------- .../private_include/Flash_Access.h | 18 ++++------- .../private_include/Partition.h | 6 ++++ .../private_include/SPI_Flash.h | 6 ++++ .../private_include/WL_Ext_Cfg.h | 18 ++++------- .../private_include/WL_Ext_Perf.h | 18 ++++------- .../private_include/WL_Ext_Safe.h | 18 ++++------- .../wear_levelling/private_include/WL_Flash.h | 18 ++++------- .../test_wl_host/esp_error_check_stub.cpp | 5 ++++ .../wear_levelling/test_wl_host/main.cpp | 5 ++++ .../test_wl_host/sdkconfig/sdkconfig.h | 5 ++++ .../wear_levelling/test_wl_host/test_wl.cpp | 5 ++++ components/wear_levelling/wear_levelling.cpp | 18 ++++------- tools/ci/check_copyright_config.yaml | 7 +++++ tools/ci/check_copyright_ignore.txt | 30 ------------------- 32 files changed, 153 insertions(+), 277 deletions(-) diff --git a/components/spiffs/include/esp_spiffs.h b/components/spiffs/include/esp_spiffs.h index 9cc120895d..50d30a1ae2 100644 --- a/components/spiffs/include/esp_spiffs.h +++ b/components/spiffs/include/esp_spiffs.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_SPIFFS_H_ #define _ESP_SPIFFS_H_ diff --git a/components/spiffs/include/spiffs_config.h b/components/spiffs/include/spiffs_config.h index 5cc3d78049..6a7b61321f 100644 --- a/components/spiffs/include/spiffs_config.h +++ b/components/spiffs/include/spiffs_config.h @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2013-2017 Peter Andersson (pelleplutt1976gmail.com) + * + * SPDX-License-Identifier: MIT + */ /* * spiffs_config.h * diff --git a/components/spiffs/spiffs_api.c b/components/spiffs/spiffs_api.c index 69d023d8da..aa7f4ddc63 100644 --- a/components/spiffs/spiffs_api.c +++ b/components/spiffs/spiffs_api.c @@ -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 + */ #include "freertos/FreeRTOS.h" #include "esp_log.h" diff --git a/components/spiffs/spiffs_api.h b/components/spiffs/spiffs_api.h index 7361638ab5..7a9cb8ef5f 100644 --- a/components/spiffs/spiffs_api.h +++ b/components/spiffs/spiffs_api.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 + */ #pragma once diff --git a/components/spiffs/spiffsgen.py b/components/spiffs/spiffsgen.py index 96d48bf015..9a1dae4ad6 100755 --- a/components/spiffs/spiffsgen.py +++ b/components/spiffs/spiffsgen.py @@ -2,19 +2,8 @@ # # spiffsgen is a tool used to generate a spiffs image from a directory # -# Copyright 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: 2019-2022 Espressif Systems (Shanghai) CO LTD +# SPDX-License-Identifier: Apache-2.0 from __future__ import division, print_function diff --git a/components/spiffs/test/test_spiffs.c b/components/spiffs/test/test_spiffs.c index 2166774292..a84ebfc0c2 100644 --- a/components/spiffs/test/test_spiffs.c +++ b/components/spiffs/test/test_spiffs.c @@ -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 + */ #include #include diff --git a/components/spiffs/test_spiffs_host/main.cpp b/components/spiffs/test_spiffs_host/main.cpp index 0c7c351f43..42286b7501 100644 --- a/components/spiffs/test_spiffs_host/main.cpp +++ b/components/spiffs/test_spiffs_host/main.cpp @@ -1,2 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2016-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #define CATCH_CONFIG_MAIN #include "catch.hpp" diff --git a/components/spiffs/test_spiffs_host/sdkconfig/sdkconfig.h b/components/spiffs/test_spiffs_host/sdkconfig/sdkconfig.h index 2afbe3c044..6295cbdf4f 100644 --- a/components/spiffs/test_spiffs_host/sdkconfig/sdkconfig.h +++ b/components/spiffs/test_spiffs_host/sdkconfig/sdkconfig.h @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2016-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #pragma once #define CONFIG_IDF_TARGET_ESP32 1 #define CONFIG_SPIFFS_USE_MAGIC_LENGTH 1 diff --git a/components/spiffs/test_spiffs_host/test_spiffs.cpp b/components/spiffs/test_spiffs_host/test_spiffs.cpp index ecc967e80d..85961b6059 100644 --- a/components/spiffs/test_spiffs_host/test_spiffs.cpp +++ b/components/spiffs/test_spiffs_host/test_spiffs.cpp @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2016-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include #include #include diff --git a/components/spiffs/test_spiffsgen/test_spiffsgen.py b/components/spiffs/test_spiffsgen/test_spiffsgen.py index df6a5f7745..44f9d2851c 100755 --- a/components/spiffs/test_spiffsgen/test_spiffsgen.py +++ b/components/spiffs/test_spiffsgen/test_spiffsgen.py @@ -1,4 +1,6 @@ #!/usr/bin/env python +# SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD +# SPDX-License-Identifier: Apache-2.0 import os import sys import unittest diff --git a/components/wear_levelling/Partition.cpp b/components/wear_levelling/Partition.cpp index 818a9eb886..e9869b5078 100644 --- a/components/wear_levelling/Partition.cpp +++ b/components/wear_levelling/Partition.cpp @@ -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 + */ #include "esp_log.h" #include "Partition.h" static const char *TAG = "wl_partition"; diff --git a/components/wear_levelling/SPI_Flash.cpp b/components/wear_levelling/SPI_Flash.cpp index 97634e420b..664e1947c7 100644 --- a/components/wear_levelling/SPI_Flash.cpp +++ b/components/wear_levelling/SPI_Flash.cpp @@ -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 + */ #include "esp_log.h" #include "SPI_Flash.h" diff --git a/components/wear_levelling/WL_Ext_Perf.cpp b/components/wear_levelling/WL_Ext_Perf.cpp index 4fe0e80633..34a81626af 100644 --- a/components/wear_levelling/WL_Ext_Perf.cpp +++ b/components/wear_levelling/WL_Ext_Perf.cpp @@ -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 + */ #include "WL_Ext_Perf.h" #include #include "esp_log.h" diff --git a/components/wear_levelling/WL_Ext_Safe.cpp b/components/wear_levelling/WL_Ext_Safe.cpp index c266d6b35c..fec0894d06 100644 --- a/components/wear_levelling/WL_Ext_Safe.cpp +++ b/components/wear_levelling/WL_Ext_Safe.cpp @@ -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 + */ #include "WL_Ext_Safe.h" #include #include "esp_log.h" diff --git a/components/wear_levelling/WL_Flash.cpp b/components/wear_levelling/WL_Flash.cpp index b2ee84db12..c1131d5a06 100644 --- a/components/wear_levelling/WL_Flash.cpp +++ b/components/wear_levelling/WL_Flash.cpp @@ -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 + */ #include #include "esp_system.h" #include "esp_log.h" diff --git a/components/wear_levelling/crc32.cpp b/components/wear_levelling/crc32.cpp index 982c5b1c21..5658e14dd9 100644 --- a/components/wear_levelling/crc32.cpp +++ b/components/wear_levelling/crc32.cpp @@ -1,16 +1,8 @@ -// 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 -// 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 + */ #include "crc32.h" #include "esp32/rom/crc.h" diff --git a/components/wear_levelling/crc32.h b/components/wear_levelling/crc32.h index d1f8977ff7..a41f624a6c 100644 --- a/components/wear_levelling/crc32.h +++ b/components/wear_levelling/crc32.h @@ -1,16 +1,8 @@ -// 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 -// 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 _crc32_H_ #define _crc32_H_ diff --git a/components/wear_levelling/include/wear_levelling.h b/components/wear_levelling/include/wear_levelling.h index 137b13f1d1..81643449a1 100644 --- a/components/wear_levelling/include/wear_levelling.h +++ b/components/wear_levelling/include/wear_levelling.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 _wear_levelling_H_ #define _wear_levelling_H_ diff --git a/components/wear_levelling/private_include/Flash_Access.h b/components/wear_levelling/private_include/Flash_Access.h index 5c28d48c73..ddded7b016 100644 --- a/components/wear_levelling/private_include/Flash_Access.h +++ b/components/wear_levelling/private_include/Flash_Access.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 _Flash_Access_H_ #define _Flash_Access_H_ diff --git a/components/wear_levelling/private_include/Partition.h b/components/wear_levelling/private_include/Partition.h index e03c32be94..3c83f0bbae 100644 --- a/components/wear_levelling/private_include/Partition.h +++ b/components/wear_levelling/private_include/Partition.h @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ + #ifndef _Partition_H_ #define _Partition_H_ diff --git a/components/wear_levelling/private_include/SPI_Flash.h b/components/wear_levelling/private_include/SPI_Flash.h index 21e9ab8301..eee1e36db8 100644 --- a/components/wear_levelling/private_include/SPI_Flash.h +++ b/components/wear_levelling/private_include/SPI_Flash.h @@ -1,3 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ + #ifndef _SPI_Flash_H_ #define _SPI_Flash_H_ diff --git a/components/wear_levelling/private_include/WL_Ext_Cfg.h b/components/wear_levelling/private_include/WL_Ext_Cfg.h index 928bc6e547..b503c1187e 100644 --- a/components/wear_levelling/private_include/WL_Ext_Cfg.h +++ b/components/wear_levelling/private_include/WL_Ext_Cfg.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 _WL_Ext_Cfg_H_ #define _WL_Ext_Cfg_H_ #include "WL_Config.h" diff --git a/components/wear_levelling/private_include/WL_Ext_Perf.h b/components/wear_levelling/private_include/WL_Ext_Perf.h index 6d5d9de67a..1facc83a79 100644 --- a/components/wear_levelling/private_include/WL_Ext_Perf.h +++ b/components/wear_levelling/private_include/WL_Ext_Perf.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 _WL_Ext_Perf_H_ #define _WL_Ext_Perf_H_ diff --git a/components/wear_levelling/private_include/WL_Ext_Safe.h b/components/wear_levelling/private_include/WL_Ext_Safe.h index c1620edff5..d17084971e 100644 --- a/components/wear_levelling/private_include/WL_Ext_Safe.h +++ b/components/wear_levelling/private_include/WL_Ext_Safe.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 _WL_Ext_Safe_H_ #define _WL_Ext_Safe_H_ diff --git a/components/wear_levelling/private_include/WL_Flash.h b/components/wear_levelling/private_include/WL_Flash.h index 19a682e064..a75ad2479d 100644 --- a/components/wear_levelling/private_include/WL_Flash.h +++ b/components/wear_levelling/private_include/WL_Flash.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 _WL_Flash_H_ #define _WL_Flash_H_ diff --git a/components/wear_levelling/test_wl_host/esp_error_check_stub.cpp b/components/wear_levelling/test_wl_host/esp_error_check_stub.cpp index 1eb70e3e9f..fe407ad079 100644 --- a/components/wear_levelling/test_wl_host/esp_error_check_stub.cpp +++ b/components/wear_levelling/test_wl_host/esp_error_check_stub.cpp @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2016-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include "catch.hpp" #include "esp_err.h" #include "sdkconfig.h" diff --git a/components/wear_levelling/test_wl_host/main.cpp b/components/wear_levelling/test_wl_host/main.cpp index 0c7c351f43..42286b7501 100644 --- a/components/wear_levelling/test_wl_host/main.cpp +++ b/components/wear_levelling/test_wl_host/main.cpp @@ -1,2 +1,7 @@ +/* + * SPDX-FileCopyrightText: 2016-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #define CATCH_CONFIG_MAIN #include "catch.hpp" diff --git a/components/wear_levelling/test_wl_host/sdkconfig/sdkconfig.h b/components/wear_levelling/test_wl_host/sdkconfig/sdkconfig.h index 7ed2f9eecb..902e2e0b02 100644 --- a/components/wear_levelling/test_wl_host/sdkconfig/sdkconfig.h +++ b/components/wear_levelling/test_wl_host/sdkconfig/sdkconfig.h @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2016-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #pragma once #define CONFIG_IDF_TARGET_ESP32 1 #define CONFIG_WL_SECTOR_SIZE 4096 diff --git a/components/wear_levelling/test_wl_host/test_wl.cpp b/components/wear_levelling/test_wl_host/test_wl.cpp index 54390c8920..6a9bf3260d 100644 --- a/components/wear_levelling/test_wl_host/test_wl.cpp +++ b/components/wear_levelling/test_wl_host/test_wl.cpp @@ -1,3 +1,8 @@ +/* + * SPDX-FileCopyrightText: 2016-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #include #include #include diff --git a/components/wear_levelling/wear_levelling.cpp b/components/wear_levelling/wear_levelling.cpp index e5e5ffeb80..70db45c80d 100644 --- a/components/wear_levelling/wear_levelling.cpp +++ b/components/wear_levelling/wear_levelling.cpp @@ -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 + */ #include #include diff --git a/tools/ci/check_copyright_config.yaml b/tools/ci/check_copyright_config.yaml index a2861eb24f..f494074933 100644 --- a/tools/ci/check_copyright_config.yaml +++ b/tools/ci/check_copyright_config.yaml @@ -89,6 +89,13 @@ systemview: - BSD-3-Clause license_for_new_files: Apache-2.0 +spiffs: + include: + - 'components/spiffs/include/' + allowed_licenses: + - MIT + - 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 9508d4bc62..6c50bba9d7 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -1874,16 +1874,6 @@ components/spi_flash/test/test_out_of_bounds_write.c components/spi_flash/test/test_partition_ext.c components/spi_flash/test/test_partitions.c components/spi_flash/test/test_spi_flash.c -components/spiffs/include/esp_spiffs.h -components/spiffs/include/spiffs_config.h -components/spiffs/spiffs_api.c -components/spiffs/spiffs_api.h -components/spiffs/spiffsgen.py -components/spiffs/test/test_spiffs.c -components/spiffs/test_spiffs_host/main.cpp -components/spiffs/test_spiffs_host/sdkconfig/sdkconfig.h -components/spiffs/test_spiffs_host/test_spiffs.cpp -components/spiffs/test_spiffsgen/test_spiffsgen.py components/tcp_transport/include/esp_transport.h components/tcp_transport/include/esp_transport_ssl.h components/tcp_transport/include/esp_transport_tcp.h @@ -1929,26 +1919,6 @@ components/vfs/test/test_vfs_lwip.c components/vfs/test/test_vfs_paths.c components/vfs/test/test_vfs_uart.c components/vfs/vfs_eventfd.c -components/wear_levelling/Partition.cpp -components/wear_levelling/SPI_Flash.cpp -components/wear_levelling/WL_Ext_Perf.cpp -components/wear_levelling/WL_Ext_Safe.cpp -components/wear_levelling/WL_Flash.cpp -components/wear_levelling/crc32.cpp -components/wear_levelling/crc32.h -components/wear_levelling/include/wear_levelling.h -components/wear_levelling/private_include/Flash_Access.h -components/wear_levelling/private_include/Partition.h -components/wear_levelling/private_include/SPI_Flash.h -components/wear_levelling/private_include/WL_Ext_Cfg.h -components/wear_levelling/private_include/WL_Ext_Perf.h -components/wear_levelling/private_include/WL_Ext_Safe.h -components/wear_levelling/private_include/WL_Flash.h -components/wear_levelling/test_wl_host/esp_error_check_stub.cpp -components/wear_levelling/test_wl_host/main.cpp -components/wear_levelling/test_wl_host/sdkconfig/sdkconfig.h -components/wear_levelling/test_wl_host/test_wl.cpp -components/wear_levelling/wear_levelling.cpp components/wifi_provisioning/include/wifi_provisioning/manager.h components/wifi_provisioning/include/wifi_provisioning/scheme_ble.h components/wifi_provisioning/include/wifi_provisioning/scheme_console.h