Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-12-16 01:34:58 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

risc-v/esp32-c3: Disable wdt in the start function.

Browse Source
This commit is contained in:
Sara Souza
2021-07-16 14:06:18 -03:00
committed by Xiang Xiao
parent 5baeb7430b
commit 0794991a07
5 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/risc-v/src/esp32c3/Make.defs
View File

@@ -45,7 +45,7 @@ endif
# Specify our C code within this directory to be included
CHIP_CSRCS = esp32c3_allocateheap.c esp32c3_start.c esp32c3_idle.c
CHIP_CSRCS = esp32c3_allocateheap.c esp32c3_start.c esp32c3_wdt.c esp32c3_idle.c
CHIP_CSRCS += esp32c3_irq.c
CHIP_CSRCS += esp32c3_clockconfig.c esp32c3_gpio.c
CHIP_CSRCS += esp32c3_lowputc.c
@@ -85,12 +85,9 @@ ifeq ($(CONFIG_ESP32C3_PARTITION),y)
CHIP_CSRCS += esp32c3_partition.c
endif
ifeq ($(CONFIG_ESP32C3_WDT),y)
CHIP_CSRCS += esp32c3_wdt.c
ifeq ($(CONFIG_WATCHDOG),y)
CHIP_CSRCS += esp32c3_wdt_lowerhalf.c
endif
endif
ifeq ($(CONFIG_ESP32C3_TIMER),y)
CHIP_CSRCS += esp32c3_tim.c

5
arch/risc-v/src/esp32c3/esp32c3_start.c
View File

@@ -34,6 +34,7 @@
#include "esp32c3_irq.h"
#include "esp32c3_lowputc.h"
#include "esp32c3_start.h"
#include "esp32c3_wdt.h"
/****************************************************************************
* Pre-processor Definitions
@@ -94,6 +95,10 @@ void __esp32c3_start(void)
showprogress('B');
/* Disable any wdt enabled by bootloader */
esp32c3_wdt_early_deinit();
/* Initialize onboard resources */
esp32c3_board_initialize();

18
arch/risc-v/src/esp32c3/esp32c3_wdt.c
View File

@@ -876,6 +876,24 @@ struct esp32c3_wdt_dev_s *esp32c3_wdt_init(enum esp32c3_wdt_inst_e wdt_id)
return (struct esp32c3_wdt_dev_s *)wdt;
}
/****************************************************************************
* Name: esp32c3_wdt_early_deinit
*
* Description:
* Disable the WDT(s) that was/were enabled by the bootloader.
*
****************************************************************************/
void esp32c3_wdt_early_deinit(void)
{
uint32_t regval;
putreg32(RTC_CNTL_WDT_WKEY_VALUE, RTC_CNTL_WDTWPROTECT_REG);
regval = getreg32(RTC_CNTL_WDTCONFIG0_REG);
regval &= ~RTC_CNTL_WDT_EN;
putreg32(regval, RTC_CNTL_WDTCONFIG0_REG);
putreg32(0, RTC_CNTL_WDTWPROTECT_REG);
}
/****************************************************************************
* Name: esp32c3_wdt_deinit
*

1
arch/risc-v/src/esp32c3/esp32c3_wdt.h
View File

@@ -141,6 +141,7 @@ struct esp32c3_wdt_ops_s
****************************************************************************/
struct esp32c3_wdt_dev_s *esp32c3_wdt_init(enum esp32c3_wdt_inst_e wdt_id);
void esp32c3_wdt_early_deinit(void);
void esp32c3_wdt_deinit(struct esp32c3_wdt_dev_s *dev);
bool esp32c3_wdt_is_running(struct esp32c3_wdt_dev_s *dev);

4
arch/risc-v/src/esp32c3/hardware/esp32c3_rtccntl.h
View File

@@ -49,13 +49,13 @@
* write-enable the wdt registers
*/
#define RTC_CNTL_WDT_WKEY_VALUE 0x50D83AA1
#define RTC_CNTL_WDT_WKEY_VALUE 0x50d83aa1
/* The value that needs to be written to RTC_CNTL_SWD_WPROTECT_REG
* to write-enable the wdt registers
*/
#define RTC_CNTL_SWD_WKEY_VALUE 0x8F1D312A
#define RTC_CNTL_SWD_WKEY_VALUE 0x8f1d312a
/* Possible values for RTC_CNTL_WDT_CPU_RESET_LENGTH
* and RTC_CNTL_WDT_SYS_RESET_LENGTH