From 9acc5d468a6d624fe3207b07d943bc9865ad967e Mon Sep 17 00:00:00 2001
From: Adrian Soundy <adriansoundy@gmail.com>
Date: Thu, 6 Jun 2024 18:11:03 +1200
Subject: [PATCH] Add CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE to all sdkconfig

Also make all specify 4mb flashsize
---
 targets/ESP32/_IDF/sdkconfig.default                        | 1 +
 targets/ESP32/_IDF/sdkconfig.default.esp32c3                | 1 +
 targets/ESP32/_IDF/sdkconfig.default.esp32c6                | 2 ++
 targets/ESP32/_IDF/sdkconfig.default.esp32h2                | 1 +
 targets/ESP32/_IDF/sdkconfig.default.esp32s2                | 2 +-
 targets/ESP32/_IDF/sdkconfig.default.esp32s3                | 5 +++--
 targets/ESP32/_IDF/sdkconfig.default_ble.esp32s3            | 5 +++--
 targets/ESP32/_IDF/sdkconfig.default_ble_rev3.esp32         | 2 ++
 targets/ESP32/_IDF/sdkconfig.default_nopsram.esp32          | 1 +
 targets/ESP32/_IDF/sdkconfig.default_nopsram_ble.esp32      | 2 ++
 targets/ESP32/_IDF/sdkconfig.default_nopsram_rev3.esp32     | 2 ++
 targets/ESP32/_IDF/sdkconfig.default_pico                   | 1 +
 targets/ESP32/_IDF/sdkconfig.default_pico_ble_rev3          | 1 +
 targets/ESP32/_IDF/sdkconfig.default_rev3.esp32             | 1 +
 targets/ESP32/_IDF/sdkconfig.default_rev3.esp32c3           | 1 +
 targets/ESP32/_IDF/sdkconfig.default_rev3_ipv6.esp32        | 2 ++
 targets/ESP32/_IDF/sdkconfig.default_rev3_noconsole.esp32c3 | 1 +
 17 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/targets/ESP32/_IDF/sdkconfig.default b/targets/ESP32/_IDF/sdkconfig.default
index 4f0d08e805..c1f942ea76 100644
--- a/targets/ESP32/_IDF/sdkconfig.default
+++ b/targets/ESP32/_IDF/sdkconfig.default
@@ -7,6 +7,7 @@ CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
 CONFIG_ESPTOOLPY_FLASHFREQ_80M=y
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
 
 CONFIG_SPIRAM=y
 CONFIG_SPIRAM_BOOT_INIT=y
diff --git a/targets/ESP32/_IDF/sdkconfig.default.esp32c3 b/targets/ESP32/_IDF/sdkconfig.default.esp32c3
index f93c5f0579..5ce6859479 100644
--- a/targets/ESP32/_IDF/sdkconfig.default.esp32c3
+++ b/targets/ESP32/_IDF/sdkconfig.default.esp32c3
@@ -4,6 +4,7 @@
 CONFIG_IDF_TARGET="esp32c3"
 CONFIG_ESP32C3_REV_MIN_2=y
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
 
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="targets/ESP32/_IDF/${TARGET_SERIES_SHORT}/partitions_nanoclr_4mb.csv"
diff --git a/targets/ESP32/_IDF/sdkconfig.default.esp32c6 b/targets/ESP32/_IDF/sdkconfig.default.esp32c6
index e53b69de89..89d4d740fc 100644
--- a/targets/ESP32/_IDF/sdkconfig.default.esp32c6
+++ b/targets/ESP32/_IDF/sdkconfig.default.esp32c6
@@ -4,6 +4,8 @@
 CONFIG_IDF_TARGET="esp32c6"
 
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
+
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="targets/ESP32/_IDF/${TARGET_SERIES_SHORT}/partitions_nanoclr_4mb.csv"
 
diff --git a/targets/ESP32/_IDF/sdkconfig.default.esp32h2 b/targets/ESP32/_IDF/sdkconfig.default.esp32h2
index 83c0a60622..3315758e14 100644
--- a/targets/ESP32/_IDF/sdkconfig.default.esp32h2
+++ b/targets/ESP32/_IDF/sdkconfig.default.esp32h2
@@ -35,6 +35,7 @@ CONFIG_BT_CONTROLLER_ENABLED=y
 #
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
+CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
 
 #
 # UART Configuration
diff --git a/targets/ESP32/_IDF/sdkconfig.default.esp32s2 b/targets/ESP32/_IDF/sdkconfig.default.esp32s2
index 312eaf86e4..4738ced234 100644
--- a/targets/ESP32/_IDF/sdkconfig.default.esp32s2
+++ b/targets/ESP32/_IDF/sdkconfig.default.esp32s2
@@ -383,7 +383,7 @@ CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 # CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set
 CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
-# CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE is not set
+CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
 CONFIG_ESPTOOLPY_BEFORE_RESET=y
 # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
 CONFIG_ESPTOOLPY_BEFORE="default_reset"
diff --git a/targets/ESP32/_IDF/sdkconfig.default.esp32s3 b/targets/ESP32/_IDF/sdkconfig.default.esp32s3
index cd856ad0f4..d08c872147 100644
--- a/targets/ESP32/_IDF/sdkconfig.default.esp32s3
+++ b/targets/ESP32/_IDF/sdkconfig.default.esp32s3
@@ -13,10 +13,11 @@ CONFIG_PCNT_SUPPRESS_DEPRECATE_WARN=y
 CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y
 CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y
 
-CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
 
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="targets/ESP32/_IDF/esp32s3/partitions_nanoclr_8mb.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="targets/ESP32/_IDF/esp32s3/partitions_nanoclr_4mb.csv"
 
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
diff --git a/targets/ESP32/_IDF/sdkconfig.default_ble.esp32s3 b/targets/ESP32/_IDF/sdkconfig.default_ble.esp32s3
index 2ceb08e415..c8d2ea1861 100644
--- a/targets/ESP32/_IDF/sdkconfig.default_ble.esp32s3
+++ b/targets/ESP32/_IDF/sdkconfig.default_ble.esp32s3
@@ -13,10 +13,11 @@ CONFIG_PCNT_SUPPRESS_DEPRECATE_WARN=y
 CONFIG_RMT_SUPPRESS_DEPRECATE_WARN=y
 CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y
 
-CONFIG_ESPTOOLPY_FLASHSIZE_8MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
 
 CONFIG_PARTITION_TABLE_CUSTOM=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="targets/ESP32/_IDF/esp32s3/partitions_nanoclr_8mb.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="targets/ESP32/_IDF/esp32s3/partitions_nanoclr_4mb.csv"
 
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
 CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE=y
diff --git a/targets/ESP32/_IDF/sdkconfig.default_ble_rev3.esp32 b/targets/ESP32/_IDF/sdkconfig.default_ble_rev3.esp32
index b29a53b408..4b87c385d6 100644
--- a/targets/ESP32/_IDF/sdkconfig.default_ble_rev3.esp32
+++ b/targets/ESP32/_IDF/sdkconfig.default_ble_rev3.esp32
@@ -16,6 +16,8 @@ CONFIG_I2S_SUPPRESS_DEPRECATE_WARN=y
 CONFIG_DAC_SUPPRESS_DEPRECATE_WARN=y
 
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
+
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="targets/ESP32/_IDF/${TARGET_SERIES_SHORT}/partitions_nanoclr_4mb.csv"
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
diff --git a/targets/ESP32/_IDF/sdkconfig.default_nopsram.esp32 b/targets/ESP32/_IDF/sdkconfig.default_nopsram.esp32
index be629f390a..37d14d4eb7 100644
--- a/targets/ESP32/_IDF/sdkconfig.default_nopsram.esp32
+++ b/targets/ESP32/_IDF/sdkconfig.default_nopsram.esp32
@@ -9,6 +9,7 @@ CONFIG_IDF_TARGET_ESP32=y
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
 
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="targets/ESP32/_IDF/${TARGET_SERIES_SHORT}/partitions_nanoclr_4mb.csv"
diff --git a/targets/ESP32/_IDF/sdkconfig.default_nopsram_ble.esp32 b/targets/ESP32/_IDF/sdkconfig.default_nopsram_ble.esp32
index 8f726a0741..cc36b14e5c 100644
--- a/targets/ESP32/_IDF/sdkconfig.default_nopsram_ble.esp32
+++ b/targets/ESP32/_IDF/sdkconfig.default_nopsram_ble.esp32
@@ -2,6 +2,8 @@
 # Espressif IoT Development Framework (ESP-IDF)  Project Minimal Configuration
 #
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
+
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="targets/ESP32/_IDF/${TARGET_SERIES_SHORT}/partitions_nanoclr_4mb.csv"
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
diff --git a/targets/ESP32/_IDF/sdkconfig.default_nopsram_rev3.esp32 b/targets/ESP32/_IDF/sdkconfig.default_nopsram_rev3.esp32
index 57b643beba..1864f598f7 100644
--- a/targets/ESP32/_IDF/sdkconfig.default_nopsram_rev3.esp32
+++ b/targets/ESP32/_IDF/sdkconfig.default_nopsram_rev3.esp32
@@ -8,6 +8,8 @@ CONFIG_IDF_TARGET="esp32"
 CONFIG_ESP32_REV_MIN_3=y
 
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
+
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="targets/ESP32/_IDF/${TARGET_SERIES_SHORT}/partitions_nanoclr_4mb.csv"
 
diff --git a/targets/ESP32/_IDF/sdkconfig.default_pico b/targets/ESP32/_IDF/sdkconfig.default_pico
index 872672f25e..071368f893 100644
--- a/targets/ESP32/_IDF/sdkconfig.default_pico
+++ b/targets/ESP32/_IDF/sdkconfig.default_pico
@@ -6,6 +6,7 @@ CONFIG_IDF_TARGET_ESP32=y
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
 
 CONFIG_SPIRAM=y
 CONFIG_SPIRAM_BOOT_INIT=y
diff --git a/targets/ESP32/_IDF/sdkconfig.default_pico_ble_rev3 b/targets/ESP32/_IDF/sdkconfig.default_pico_ble_rev3
index b199815550..a8aaaf86ab 100644
--- a/targets/ESP32/_IDF/sdkconfig.default_pico_ble_rev3
+++ b/targets/ESP32/_IDF/sdkconfig.default_pico_ble_rev3
@@ -6,6 +6,7 @@ CONFIG_IDF_TARGET_ESP32=y
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
 
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="targets/ESP32/_IDF/${TARGET_SERIES_SHORT}/partitions_nanoclr_4mb.csv"
diff --git a/targets/ESP32/_IDF/sdkconfig.default_rev3.esp32 b/targets/ESP32/_IDF/sdkconfig.default_rev3.esp32
index 014bb83420..0453e61a3c 100644
--- a/targets/ESP32/_IDF/sdkconfig.default_rev3.esp32
+++ b/targets/ESP32/_IDF/sdkconfig.default_rev3.esp32
@@ -8,6 +8,7 @@ CONFIG_IDF_TARGET="esp32"
 CONFIG_IDF_TARGET_ESP32=y
 
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
 
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="targets/ESP32/_IDF/${TARGET_SERIES_SHORT}/partitions_nanoclr_4mb.csv"
diff --git a/targets/ESP32/_IDF/sdkconfig.default_rev3.esp32c3 b/targets/ESP32/_IDF/sdkconfig.default_rev3.esp32c3
index 701e021e9c..5b3fd711ef 100644
--- a/targets/ESP32/_IDF/sdkconfig.default_rev3.esp32c3
+++ b/targets/ESP32/_IDF/sdkconfig.default_rev3.esp32c3
@@ -3,6 +3,7 @@
 #
 CONFIG_IDF_TARGET="esp32c3"
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
 CONFIG_ESP32C3_REV_MIN_3=y
 
 CONFIG_PARTITION_TABLE_CUSTOM=y
diff --git a/targets/ESP32/_IDF/sdkconfig.default_rev3_ipv6.esp32 b/targets/ESP32/_IDF/sdkconfig.default_rev3_ipv6.esp32
index ab5351932e..4f2c067db6 100644
--- a/targets/ESP32/_IDF/sdkconfig.default_rev3_ipv6.esp32
+++ b/targets/ESP32/_IDF/sdkconfig.default_rev3_ipv6.esp32
@@ -2,6 +2,8 @@
 # Espressif IoT Development Framework (ESP-IDF)  Project Minimal Configuration
 #
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
+
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="targets/ESP32/_IDF/${TARGET_SERIES_SHORT}/partitions_nanoclr_4mb.csv"
 CONFIG_COMPILER_OPTIMIZATION_SIZE=y
diff --git a/targets/ESP32/_IDF/sdkconfig.default_rev3_noconsole.esp32c3 b/targets/ESP32/_IDF/sdkconfig.default_rev3_noconsole.esp32c3
index 1309186c8b..38553bee93 100644
--- a/targets/ESP32/_IDF/sdkconfig.default_rev3_noconsole.esp32c3
+++ b/targets/ESP32/_IDF/sdkconfig.default_rev3_noconsole.esp32c3
@@ -5,6 +5,7 @@ CONFIG_IDF_TARGET="esp32c3"
 
 CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE=y
 
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="targets/ESP32/_IDF/${TARGET_SERIES_SHORT}/partitions_nanoclr_4mb.csv"