From 3cf4cabf385ad28a966aba3b4ea64a19412106a1 Mon Sep 17 00:00:00 2001
From: wangjialiang <wangjialiang@espressif.com>
Date: Tue, 10 Jan 2023 14:06:21 +0800
Subject: [PATCH] ble_mesh: example: Fix esp32c3 and esp32s3 partition table
 overflow issue

---
 .../ble_mesh_console/main/ble_mesh_console_system.c             | 1 -
 .../esp_ble_mesh/ble_mesh_console/sdkconfig.defaults.esp32c3    | 2 ++
 .../esp_ble_mesh/ble_mesh_console/sdkconfig.defaults.esp32s3    | 2 ++
 .../fast_prov_client/sdkconfig.defaults.esp32c3                 | 1 +
 .../fast_prov_client/sdkconfig.defaults.esp32s3                 | 1 +
 .../ble_mesh_node/onoff_client/sdkconfig.defaults.esp32c3       | 1 +
 .../ble_mesh_node/onoff_client/sdkconfig.defaults.esp32s3       | 1 +
 .../ble_mesh_node/onoff_server/sdkconfig.defaults.esp32c3       | 1 +
 .../ble_mesh_node/onoff_server/sdkconfig.defaults.esp32s3       | 1 +
 .../ble_mesh_provisioner/sdkconfig.defaults.esp32c3             | 1 +
 .../ble_mesh_provisioner/sdkconfig.defaults.esp32s3             | 1 +
 .../sensor_client/sdkconfig.defaults.esp32c3                    | 1 +
 .../sensor_client/sdkconfig.defaults.esp32s3                    | 1 +
 .../sensor_server/sdkconfig.defaults.esp32c3                    | 1 +
 .../sensor_server/sdkconfig.defaults.esp32s3                    | 1 +
 .../vendor_client/sdkconfig.defaults.esp32c3                    | 1 +
 .../vendor_client/sdkconfig.defaults.esp32s3                    | 1 +
 .../vendor_server/sdkconfig.defaults.esp32c3                    | 1 +
 .../vendor_server/sdkconfig.defaults.esp32s3                    | 1 +
 19 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_console_system.c b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_console_system.c
index 56997608f7..78bfb5df73 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_console_system.c
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/main/ble_mesh_console_system.c
@@ -16,7 +16,6 @@
 #include "esp_system.h"
 #include "esp_sleep.h"
 #include "driver/rtc_io.h"
-#include "soc/rtc_cntl_reg.h"
 #include "argtable3/argtable3.h"
 
 #include "freertos/FreeRTOS.h"
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/sdkconfig.defaults.esp32c3
index eee9ca57cd..22f54a4129 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/sdkconfig.defaults.esp32c3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/sdkconfig.defaults.esp32c3
@@ -22,4 +22,6 @@ CONFIG_BLE_MESH_TEST_AUTO_ENTER_NETWORK=y
 CONFIG_BLE_MESH_WAIT_FOR_PROV_MAX_DEV_NUM=80
 CONFIG_BLE_MESH_MAX_PROV_NODES=80
 
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 # end of ESP32C3-specific
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/sdkconfig.defaults.esp32s3
index f5e28dbf1d..1dffd51632 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_console/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_console/sdkconfig.defaults.esp32s3
@@ -22,4 +22,6 @@ CONFIG_BLE_MESH_TEST_AUTO_ENTER_NETWORK=y
 CONFIG_BLE_MESH_WAIT_FOR_PROV_MAX_DEV_NUM=80
 CONFIG_BLE_MESH_MAX_PROV_NODES=80
 
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 # end of ESP32S3-specific
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/sdkconfig.defaults.esp32c3
index fcefd4a641..2f10e5e041 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/sdkconfig.defaults.esp32c3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/sdkconfig.defaults.esp32c3
@@ -5,6 +5,7 @@ CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
 
 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/sdkconfig.defaults.esp32s3
index fcefd4a641..2f10e5e041 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_fast_provision/fast_prov_client/sdkconfig.defaults.esp32s3
@@ -5,6 +5,7 @@ CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
 
 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.defaults.esp32c3
index 0a18a5e398..b64e6068ee 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.defaults.esp32c3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.defaults.esp32c3
@@ -6,6 +6,7 @@ CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
 
 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.defaults.esp32s3
index 0a18a5e398..b64e6068ee 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_client/sdkconfig.defaults.esp32s3
@@ -6,6 +6,7 @@ CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
 
 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/sdkconfig.defaults.esp32c3
index fbb2f102d7..ad04a937e2 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/sdkconfig.defaults.esp32c3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/sdkconfig.defaults.esp32c3
@@ -6,6 +6,7 @@ CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
 
 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/sdkconfig.defaults.esp32s3
index fbb2f102d7..ad04a937e2 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_node/onoff_server/sdkconfig.defaults.esp32s3
@@ -6,6 +6,7 @@ CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
 
 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.defaults.esp32c3
index a51201e7c5..5897d737c0 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.defaults.esp32c3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.defaults.esp32c3
@@ -5,6 +5,7 @@ CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
 
 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.defaults.esp32s3
index a51201e7c5..5897d737c0 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_provisioner/sdkconfig.defaults.esp32s3
@@ -5,6 +5,7 @@ CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
 
 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/sdkconfig.defaults.esp32c3
index 40b895710b..e5b1db984e 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/sdkconfig.defaults.esp32c3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/sdkconfig.defaults.esp32c3
@@ -5,6 +5,7 @@ CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
 
 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/sdkconfig.defaults.esp32s3
index 40b895710b..e5b1db984e 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_client/sdkconfig.defaults.esp32s3
@@ -5,6 +5,7 @@ CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
 
 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/sdkconfig.defaults.esp32c3
index fbb2f102d7..ad04a937e2 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/sdkconfig.defaults.esp32c3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/sdkconfig.defaults.esp32c3
@@ -6,6 +6,7 @@ CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
 
 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/sdkconfig.defaults.esp32s3
index fbb2f102d7..ad04a937e2 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_sensor_model/sensor_server/sdkconfig.defaults.esp32s3
@@ -6,6 +6,7 @@ CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
 
 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/sdkconfig.defaults.esp32c3
index dfaa377627..9c50765263 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/sdkconfig.defaults.esp32c3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/sdkconfig.defaults.esp32c3
@@ -5,6 +5,7 @@ CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
 
 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/sdkconfig.defaults.esp32s3
index dfaa377627..9c50765263 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_client/sdkconfig.defaults.esp32s3
@@ -5,6 +5,7 @@ CONFIG_BT_CTRL_SCAN_DUPL_TYPE_DATA_DEVICE=y
 CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
 
 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/sdkconfig.defaults.esp32c3 b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/sdkconfig.defaults.esp32c3
index fbb2f102d7..ad04a937e2 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/sdkconfig.defaults.esp32c3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/sdkconfig.defaults.esp32c3
@@ -6,6 +6,7 @@ CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
 
 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y
diff --git a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/sdkconfig.defaults.esp32s3 b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/sdkconfig.defaults.esp32s3
index fbb2f102d7..ad04a937e2 100644
--- a/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/sdkconfig.defaults.esp32s3
+++ b/examples/bluetooth/esp_ble_mesh/ble_mesh_vendor_model/vendor_server/sdkconfig.defaults.esp32s3
@@ -6,6 +6,7 @@ CONFIG_BT_CTRL_BLE_MESH_SCAN_DUPL_EN=y
 CONFIG_BT_GATTS_SEND_SERVICE_CHANGE_MANUAL=y
 CONFIG_BT_BTU_TASK_STACK_SIZE=4512
 CONFIG_BT_BLE_42_FEATURES_SUPPORTED=y
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
 
 # Override some defaults of ESP BLE Mesh
 CONFIG_BLE_MESH=y