From dddc282e34a318d15a3ecba00ea8e482fb82ad82 Mon Sep 17 00:00:00 2001
From: microDev <70126934+microDev1@users.noreply.github.com>
Date: Fri, 26 Nov 2021 22:44:22 +0530
Subject: [PATCH] update default sdkconfig and correct bootloader offset

---
 ports/espressif/Makefile                          | 11 ++++++-----
 ports/espressif/esp-idf-config/sdkconfig.defaults | 14 ++++++++------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/ports/espressif/Makefile b/ports/espressif/Makefile
index fd8c2b251d..c997dc6a0a 100644
--- a/ports/espressif/Makefile
+++ b/ports/espressif/Makefile
@@ -338,13 +338,14 @@ BINARY_BLOBS += esp-idf/components/xtensa/$(IDF_TARGET)/libxt_hal.a
 ESP_IDF_COMPONENTS_EXPANDED += esp-idf/components/xtensa/$(IDF_TARGET)/libxt_hal.a
 endif
 
-ifeq ($(IDF_TARGET), esp32c3)
-ESPTOOL_BAUDRATE = 230400
-BOOTLOADER_OFFSET = 0x0000
+ifeq ($(IDF_TARGET),esp32c3)
+BOOTLOADER_OFFSET = 0x0
+else ifeq ($(IDF_TARGET),esp32s3)
+BOOTLOADER_OFFSET = 0x0
 else
-ESPTOOL_BAUDRATE = 460800
 BOOTLOADER_OFFSET = 0x1000
 endif
+
 PARTITION_TABLE_OFFSET = 0x8000
 FIRMWARE_OFFSET = 0x10000
 
@@ -352,7 +353,7 @@ ESP_AUTOGEN_LD = $(BUILD)/esp-idf/esp-idf/$(IDF_TARGET)/$(IDF_TARGET)_out.ld $(B
 
 FLASH_FLAGS = --flash_mode $(CIRCUITPY_ESP_FLASH_MODE) --flash_freq $(CIRCUITPY_ESP_FLASH_FREQ) --flash_size $(CIRCUITPY_ESP_FLASH_SIZE)
 
-ESPTOOL_FLAGS ?= -b $(ESPTOOL_BAUDRATE) --before=default_reset --after=no_reset
+ESPTOOL_FLAGS ?= --before=default_reset --after=no_reset
 
 ifeq ($(IDF_TARGET),esp32c3)
 all: $(BUILD)/firmware.bin
diff --git a/ports/espressif/esp-idf-config/sdkconfig.defaults b/ports/espressif/esp-idf-config/sdkconfig.defaults
index 25e2f103d5..67e2594339 100644
--- a/ports/espressif/esp-idf-config/sdkconfig.defaults
+++ b/ports/espressif/esp-idf-config/sdkconfig.defaults
@@ -1,9 +1,3 @@
-#
-# Bootloader config
-#
-# CONFIG_BOOTLOADER_VDDSDIO_BOOST_1_8V is not set
-# end of Bootloader config
-
 #
 # Serial flasher config
 #
@@ -50,6 +44,14 @@ CONFIG_ESP32S2_DATA_CACHE_16KB=y
 # end of Cache config
 # end of ESP32S2-specific
 
+#
+# ESP32S3-specific
+#
+# CONFIG_ESP32S3_DEFAULT_CPU_FREQ_160 is not set
+CONFIG_ESP32S3_DEFAULT_CPU_FREQ_240=y
+CONFIG_ESP32S3_DEFAULT_CPU_FREQ_MHZ=240
+# end of ESP32S3-specific
+
 #
 # Common ESP-related
 #