diff --git a/components/esp_system/eh_frame_parser.c b/components/esp_system/eh_frame_parser.c index 3a2b184b61..7dd9faee6f 100644 --- a/components/esp_system/eh_frame_parser.c +++ b/components/esp_system/eh_frame_parser.c @@ -1,17 +1,8 @@ - -// Copyright 2020 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: 2020-2022 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ /** * @file DWARF Exception Frames parser @@ -681,13 +672,13 @@ static uint32_t esp_eh_frame_initialize_state(const uint8_t* cie, ExecutionFrame /* Next field is a null-terminated UTF-8 string. Ignore it, look for the end. */ while((c = *cie_data++) != 0); - /* Field alignement factor shall be 1. It is encoded in ULEB128. */ + /* Field alignment factor shall be 1. It is encoded in ULEB128. */ const uint32_t code_align = decode_leb128(cie_data, false, &size); assert(code_align == 1); /* Jump to the next field */ cie_data += size; - /* Same goes for data alignement factor. Shall be equal to -4. */ + /* Same goes for data alignment factor. Shall be equal to -4. */ const int32_t data_align = decode_leb128(cie_data, true, &size); cie_data += size; assert(data_align == -4); diff --git a/components/esp_system/ld/esp32c2/sections.ld.in b/components/esp_system/ld/esp32c2/sections.ld.in index c103e87d97..46d928cfad 100644 --- a/components/esp_system/ld/esp32c2/sections.ld.in +++ b/components/esp_system/ld/esp32c2/sections.ld.in @@ -135,16 +135,16 @@ SECTIONS /** * This dummy section represents the .flash.text section but in default_rodata_seg. - * Thus, it must have its alignement and (at least) its size. + * Thus, it must have its alignment and (at least) its size. */ .flash_rodata_dummy (NOLOAD): { _flash_rodata_dummy_start = .; - /* Start at the same alignement constraint than .flash.text */ + /* Start at the same alignment constraint than .flash.text */ . = ALIGN(ALIGNOF(.flash.text)); /* Create an empty gap as big as .flash.text section */ . = . + SIZEOF(.flash.text); - /* Prepare the alignement of the section above. Few bytes (0x20) must be + /* Prepare the alignment of the section above. Few bytes (0x20) must be * added for the mapping header. */ . = ALIGN(0x10000) + 0x20; _rodata_reserved_start = .; diff --git a/components/esp_system/ld/esp32c3/sections.ld.in b/components/esp_system/ld/esp32c3/sections.ld.in index e6fe6307a4..a990050275 100644 --- a/components/esp_system/ld/esp32c3/sections.ld.in +++ b/components/esp_system/ld/esp32c3/sections.ld.in @@ -245,16 +245,16 @@ SECTIONS /** * This dummy section represents the .flash.text section but in default_rodata_seg. - * Thus, it must have its alignement and (at least) its size. + * Thus, it must have its alignment and (at least) its size. */ .flash_rodata_dummy (NOLOAD): { _flash_rodata_dummy_start = .; - /* Start at the same alignement constraint than .flash.text */ + /* Start at the same alignment constraint than .flash.text */ . = ALIGN(ALIGNOF(.flash.text)); /* Create an empty gap as big as .flash.text section */ . = . + SIZEOF(.flash.text); - /* Prepare the alignement of the section above. Few bytes (0x20) must be + /* Prepare the alignment of the section above. Few bytes (0x20) must be * added for the mapping header. */ . = ALIGN(0x10000) + 0x20; _rodata_reserved_start = .; diff --git a/components/esp_system/ld/esp32h2/sections.ld.in b/components/esp_system/ld/esp32h2/sections.ld.in index f80493f1fd..6424f2f19c 100644 --- a/components/esp_system/ld/esp32h2/sections.ld.in +++ b/components/esp_system/ld/esp32h2/sections.ld.in @@ -248,16 +248,16 @@ SECTIONS /** * This dummy section represents the .flash.text section but in default_rodata_seg. - * Thus, it must have its alignement and (at least) its size. + * Thus, it must have its alignment and (at least) its size. */ .flash_rodata_dummy (NOLOAD): { _flash_rodata_dummy_start = .; - /* Start at the same alignement constraint than .flash.text */ + /* Start at the same alignment constraint than .flash.text */ . = ALIGN(ALIGNOF(.flash.text)); /* Create an empty gap as big as .flash.text section */ . = . + SIZEOF(.flash.text); - /* Prepare the alignement of the section above. Few bytes (0x20) must be + /* Prepare the alignment of the section above. Few bytes (0x20) must be * added for the mapping header. */ . = ALIGN(0x10000) + 0x20; _rodata_reserved_start = .; diff --git a/components/esp_system/ld/esp32s3/sections.ld.in b/components/esp_system/ld/esp32s3/sections.ld.in index aff65b0f29..b0b585465e 100644 --- a/components/esp_system/ld/esp32s3/sections.ld.in +++ b/components/esp_system/ld/esp32s3/sections.ld.in @@ -288,16 +288,16 @@ SECTIONS /** * This dummy section represents the .flash.text section but in default_rodata_seg. - * Thus, it must have its alignement and (at least) its size. + * Thus, it must have its alignment and (at least) its size. */ .flash_rodata_dummy (NOLOAD): { _flash_rodata_dummy_start = .; - /* Start at the same alignement constraint than .flash.text */ + /* Start at the same alignment constraint than .flash.text */ . = ALIGN(ALIGNOF(.flash.text)); /* Create an empty gap as big as .flash.text section */ . = . + SIZEOF(.flash.text); - /* Prepare the alignement of the section above. Few bytes (0x20) must be + /* Prepare the alignment of the section above. Few bytes (0x20) must be * added for the mapping header. */ . = ALIGN(0x10000) + 0x20; _rodata_reserved_start = .; diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index 6b34bc9a69..b440731c43 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -687,7 +687,6 @@ components/esp_serial_slave_link/include/esp_serial_slave_link/essl_spi.h components/esp_serial_slave_link/include/essl_spi/esp32c3_defs.h components/esp_serial_slave_link/include/essl_spi/esp32s2_defs.h components/esp_serial_slave_link/include/essl_spi/esp32s3_defs.h -components/esp_system/eh_frame_parser.c components/esp_system/esp_err.c components/esp_system/freertos_hooks.c components/esp_system/include/eh_frame_parser.h