eaw/esp-idf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/support_esp32s3_beta_3' into 'master'

Browse Source 
Support ESP32S3 beta 3 target

Closes IDF-2908

See merge request espressif/esp-idf!12661
This commit is contained in:
Angus Gratton
2021-03-23 10:17:58 +00:00
parent 7ebefe2e2b c24e3aa931
commit fa2946d651
133 changed files with 58385 additions and 38858 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/bootloader_support/src/bootloader_console_loader.c
View File

@@ -27,6 +27,11 @@
#include "esp32s2/rom/usb/usb_dc.h"
#include "esp32s2/rom/usb/cdc_acm.h"
#include "esp32s2/rom/usb/usb_persist.h"
#elif CONFIG_IDF_TARGET_ESP32S3
#include "esp32s3/rom/usb/chip_usb_dw_wrapper.h"
#include "esp32s3/rom/usb/usb_dc.h"
#include "esp32s3/rom/usb/cdc_acm.h"
#include "esp32s3/rom/usb/usb_persist.h"
#endif
#ifdef CONFIG_ESP_CONSOLE_USB_CDC

3
components/bootloader_support/src/bootloader_flash_config_esp32s3.c
View File

@@ -32,7 +32,8 @@
void bootloader_flash_update_id()
{
g_rom_flashchip.device_id = bootloader_read_flash_id();
esp_rom_spiflash_chip_t *chip = &rom_spiflash_legacy_data->chip;
chip->device_id = bootloader_read_flash_id();
}
void IRAM_ATTR bootloader_flash_cs_timing_config()

2
components/bootloader_support/src/esp32s3/bootloader_esp32s3.c
View File

@@ -290,7 +290,9 @@ static void bootloader_check_wdt_reset(void)
static void bootloader_super_wdt_auto_feed(void)
{
REG_WRITE(RTC_CNTL_SWD_WPROTECT_REG, RTC_CNTL_SWD_WKEY_VALUE);
REG_SET_BIT(RTC_CNTL_SWD_CONF_REG, RTC_CNTL_SWD_AUTO_FEED_EN);
REG_WRITE(RTC_CNTL_SWD_WPROTECT_REG, 0);
}
esp_err_t bootloader_init(void)

2
components/bootloader_support/src/flash_partitions.c
View File

@@ -19,6 +19,8 @@
#include "esp32c3/rom/spi_flash.h"
#elif CONFIG_IDF_TARGET_ESP32S2
#include "esp32s2/rom/spi_flash.h"
#elif CONFIG_IDF_TARGET_ESP32S3
#include "esp32s3/rom/spi_flash.h"
#else
#include "esp32/rom/spi_flash.h"
#endif