From a09d222cbc361dcd79bf0a37fb56c9a46654003e Mon Sep 17 00:00:00 2001
From: Serge Bazanski <q3k@q3k.org>
Date: Tue, 13 Jun 2023 19:11:33 +0200
Subject: [PATCH] sdkconfig: disable stub in esptool

The stub seems to break uploading from running firmware on newer
ESP-IDFs.

There's a better way to fix this by patching esptool.py, but this is
good enough for now.

https://www.esp32.com/viewtopic.php?t=10184#p42176
---
 sdkconfig.p1 | 1 +
 sdkconfig.p3 | 1 +
 sdkconfig.p4 | 1 +
 sdkconfig.p6 | 1 +
 4 files changed, 4 insertions(+)

diff --git a/sdkconfig.p1 b/sdkconfig.p1
index 00dd5c5e04..284d1ed89f 100644
--- a/sdkconfig.p1
+++ b/sdkconfig.p1
@@ -1,6 +1,7 @@
 CONFIG_APP_EXCLUDE_PROJECT_VER_VAR=y
 CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y
 CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y
+CONFIG_ESPTOOLPY_NO_STUB=y
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
diff --git a/sdkconfig.p3 b/sdkconfig.p3
index 9878330cc5..b66f216311 100644
--- a/sdkconfig.p3
+++ b/sdkconfig.p3
@@ -1,6 +1,7 @@
 CONFIG_APP_EXCLUDE_PROJECT_VER_VAR=y
 CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y
 CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y
+CONFIG_ESPTOOLPY_NO_STUB=y
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
diff --git a/sdkconfig.p4 b/sdkconfig.p4
index d955197b93..b23c568c9b 100644
--- a/sdkconfig.p4
+++ b/sdkconfig.p4
@@ -1,6 +1,7 @@
 CONFIG_APP_EXCLUDE_PROJECT_VER_VAR=y
 CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y
 CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y
+CONFIG_ESPTOOLPY_NO_STUB=y
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
diff --git a/sdkconfig.p6 b/sdkconfig.p6
index faf5b537a6..d9ff19bf1b 100644
--- a/sdkconfig.p6
+++ b/sdkconfig.p6
@@ -1,6 +1,7 @@
 CONFIG_APP_EXCLUDE_PROJECT_VER_VAR=y
 CONFIG_APP_EXCLUDE_PROJECT_NAME_VAR=y
 CONFIG_BOOTLOADER_LOG_LEVEL_WARN=y
+CONFIG_ESPTOOLPY_NO_STUB=y
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
 CONFIG_ESPTOOLPY_AFTER_NORESET=y
-- 
GitLab