From 9dcc9a73f6df2234dbf6a33f8bd4ccd66c858b58 Mon Sep 17 00:00:00 2001 From: Alexey Lapshin Date: Thu, 3 Aug 2023 13:35:43 +0400 Subject: [PATCH] fix(esp_rom): fix libc_stubs.h includes --- .../esp_rom/include/esp32/rom/libc_stubs.h | 19 ++++++------------- .../esp_rom/include/esp32c2/rom/libc_stubs.h | 1 + .../esp_rom/include/esp32c3/rom/libc_stubs.h | 1 + .../esp_rom/include/esp32c6/rom/libc_stubs.h | 1 + .../esp_rom/include/esp32h2/rom/libc_stubs.h | 1 + .../esp_rom/include/esp32p4/rom/libc_stubs.h | 1 + .../esp_rom/include/esp32s2/rom/libc_stubs.h | 19 ++++++------------- .../esp_rom/include/esp32s3/rom/libc_stubs.h | 1 + tools/ci/check_copyright_ignore.txt | 2 -- 9 files changed, 18 insertions(+), 28 deletions(-) diff --git a/components/esp_rom/include/esp32/rom/libc_stubs.h b/components/esp_rom/include/esp32/rom/libc_stubs.h index 47e75bcb33..ce858013e4 100644 --- a/components/esp_rom/include/esp32/rom/libc_stubs.h +++ b/components/esp_rom/include/esp32/rom/libc_stubs.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-2023 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #ifndef _ROM_LIBC_STUBS_H_ #define _ROM_LIBC_STUBS_H_ @@ -18,6 +10,7 @@ #include #include #include +#include #include #include diff --git a/components/esp_rom/include/esp32c2/rom/libc_stubs.h b/components/esp_rom/include/esp32c2/rom/libc_stubs.h index eb31357fc2..077b6c94c5 100644 --- a/components/esp_rom/include/esp32c2/rom/libc_stubs.h +++ b/components/esp_rom/include/esp32c2/rom/libc_stubs.h @@ -11,6 +11,7 @@ #include #include #include +#include #include #include diff --git a/components/esp_rom/include/esp32c3/rom/libc_stubs.h b/components/esp_rom/include/esp32c3/rom/libc_stubs.h index 7008b48794..8378fe53ce 100644 --- a/components/esp_rom/include/esp32c3/rom/libc_stubs.h +++ b/components/esp_rom/include/esp32c3/rom/libc_stubs.h @@ -11,6 +11,7 @@ #include #include #include +#include #include #include diff --git a/components/esp_rom/include/esp32c6/rom/libc_stubs.h b/components/esp_rom/include/esp32c6/rom/libc_stubs.h index 494a70e867..cf1ffbbbf3 100644 --- a/components/esp_rom/include/esp32c6/rom/libc_stubs.h +++ b/components/esp_rom/include/esp32c6/rom/libc_stubs.h @@ -11,6 +11,7 @@ #include #include #include +#include #include #include diff --git a/components/esp_rom/include/esp32h2/rom/libc_stubs.h b/components/esp_rom/include/esp32h2/rom/libc_stubs.h index b7e28e5caf..88ea08cd1e 100644 --- a/components/esp_rom/include/esp32h2/rom/libc_stubs.h +++ b/components/esp_rom/include/esp32h2/rom/libc_stubs.h @@ -11,6 +11,7 @@ #include #include #include +#include #include #include diff --git a/components/esp_rom/include/esp32p4/rom/libc_stubs.h b/components/esp_rom/include/esp32p4/rom/libc_stubs.h index 2601476984..acb569c169 100644 --- a/components/esp_rom/include/esp32p4/rom/libc_stubs.h +++ b/components/esp_rom/include/esp32p4/rom/libc_stubs.h @@ -11,6 +11,7 @@ #include #include #include +#include #include #include diff --git a/components/esp_rom/include/esp32s2/rom/libc_stubs.h b/components/esp_rom/include/esp32s2/rom/libc_stubs.h index 5e514e1803..fe806b4eef 100644 --- a/components/esp_rom/include/esp32s2/rom/libc_stubs.h +++ b/components/esp_rom/include/esp32s2/rom/libc_stubs.h @@ -1,16 +1,8 @@ -// Copyright 2015-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: 2015-2023 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ #ifndef _ROM_LIBC_STUBS_H_ #define _ROM_LIBC_STUBS_H_ @@ -18,6 +10,7 @@ #include #include #include +#include #include #include diff --git a/components/esp_rom/include/esp32s3/rom/libc_stubs.h b/components/esp_rom/include/esp32s3/rom/libc_stubs.h index 47050b543e..937d809981 100644 --- a/components/esp_rom/include/esp32s3/rom/libc_stubs.h +++ b/components/esp_rom/include/esp32s3/rom/libc_stubs.h @@ -11,6 +11,7 @@ #include #include #include +#include #include #include diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index d362986e16..cfc01ba522 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -460,7 +460,6 @@ components/esp_rom/include/esp32/rom/aes.h components/esp_rom/include/esp32/rom/bigint.h components/esp_rom/include/esp32/rom/crc.h components/esp_rom/include/esp32/rom/efuse.h -components/esp_rom/include/esp32/rom/libc_stubs.h components/esp_rom/include/esp32/rom/sha.h components/esp_rom/include/esp32/rom/tbconsole.h components/esp_rom/include/esp32/rom/tjpgd.h @@ -477,7 +476,6 @@ components/esp_rom/include/esp32s2/rom/bigint.h components/esp_rom/include/esp32s2/rom/crc.h components/esp_rom/include/esp32s2/rom/digital_signature.h components/esp_rom/include/esp32s2/rom/hmac.h -components/esp_rom/include/esp32s2/rom/libc_stubs.h components/esp_rom/include/esp32s2/rom/opi_flash.h components/esp_rom/include/esp32s2/rom/rsa_pss.h components/esp_rom/include/esp32s2/rom/sha.h