From ec70bc0523d0067d51b00488f989bd0a781f61d4 Mon Sep 17 00:00:00 2001 From: boarchuz <46267286+boarchuz@users.noreply.github.com> Date: Sat, 4 Sep 2021 14:46:26 +1000 Subject: [PATCH 1/2] fix compiler warning with silent panic option --- components/esp_system/port/arch/xtensa/panic_arch.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/esp_system/port/arch/xtensa/panic_arch.c b/components/esp_system/port/arch/xtensa/panic_arch.c index 6ca03b520c..1db4fb6b38 100644 --- a/components/esp_system/port/arch/xtensa/panic_arch.c +++ b/components/esp_system/port/arch/xtensa/panic_arch.c @@ -44,6 +44,7 @@ void panic_print_registers(const void *f, int core) { XtExcFrame *frame = (XtExcFrame *) f; int *regs = (int *)frame; + (void)regs; const char *sdesc[] = { "PC ", "PS ", "A0 ", "A1 ", "A2 ", "A3 ", "A4 ", "A5 ", @@ -115,6 +116,7 @@ static void print_illegal_instruction_details(const void *f) return; } volatile uint32_t *pepc = (uint32_t *)epc; + (void)pepc; panic_print_str("Memory dump at 0x"); panic_print_hex(epc); From 584806a78a4b9deebbeec9822cefb52b0f9cf7f4 Mon Sep 17 00:00:00 2001 From: Zim Kalinowski Date: Mon, 11 Oct 2021 11:38:35 +0800 Subject: [PATCH 2/2] updated copyright text --- .../esp_system/port/arch/riscv/panic_arch.c | 18 +++++------------- .../esp_system/port/arch/xtensa/panic_arch.c | 17 +++++------------ tools/ci/check_copyright_ignore.txt | 2 -- 3 files changed, 10 insertions(+), 27 deletions(-) diff --git a/components/esp_system/port/arch/riscv/panic_arch.c b/components/esp_system/port/arch/riscv/panic_arch.c index 1607dd0e3c..f34f22fcfe 100644 --- a/components/esp_system/port/arch/riscv/panic_arch.c +++ b/components/esp_system/port/arch/riscv/panic_arch.c @@ -1,17 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2020-2021 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ -// 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. #include #include "esp_spi_flash.h" diff --git a/components/esp_system/port/arch/xtensa/panic_arch.c b/components/esp_system/port/arch/xtensa/panic_arch.c index c1df18d97c..66d995c820 100644 --- a/components/esp_system/port/arch/xtensa/panic_arch.c +++ b/components/esp_system/port/arch/xtensa/panic_arch.c @@ -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-2021 Espressif Systems (Shanghai) CO LTD + * + * SPDX-License-Identifier: Apache-2.0 + */ -// 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 "freertos/xtensa_context.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index 79d2ab3534..34eedbe104 100644 --- a/tools/ci/check_copyright_ignore.txt +++ b/tools/ci/check_copyright_ignore.txt @@ -1136,10 +1136,8 @@ components/esp_system/include/esp_task_wdt.h components/esp_system/int_wdt.c components/esp_system/panic.c components/esp_system/port/arch/riscv/expression_with_stack.c -components/esp_system/port/arch/riscv/panic_arch.c components/esp_system/port/arch/xtensa/debug_helpers.c components/esp_system/port/arch/xtensa/expression_with_stack.c -components/esp_system/port/arch/xtensa/panic_arch.c components/esp_system/port/arch/xtensa/trax.c components/esp_system/port/brownout.c components/esp_system/port/cpu_start.c