alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'feature/github-7517' into 'master'

Browse Source 
[system] fix compiler warning with silent panic option

Closes IDFGH-5812

See merge request espressif/esp-idf!15420
This commit is contained in:
Zim Kalinowski 2021-10-11 08:56:57 +00:00
commit 6dc684d2fa
3 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
components/esp_system/port/arch/riscv/panic_arch.c
View File

@ -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 <stdio.h>
#include "esp_spi_flash.h"

19
components/esp_system/port/arch/xtensa/panic_arch.c
View File

@ -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"
@ -44,6 +37,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 +109,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);

2
tools/ci/check_copyright_ignore.txt
View File

@ -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/include/esp_clk_internal.h