examples: remove non-existent options from sdkconfig.defaults

diff --git a/examples/build_system/cmake/import_lib/sdkconfig.defaults b/examples/build_system/cmake/import_lib/sdkconfig.defaults
index f30f322c623fa73971a2bedc9e19e3f28468255a..b9bb0c0a5dc37ec510155c6303dd7392a84e5316 100644 (file)
--- a/examples/build_system/cmake/import_lib/sdkconfig.defaults
+++ b/examples/build_system/cmake/import_lib/sdkconfig.defaults
@@ -1,5 +1,3 @@
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
 CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
-CONFIG_APP_OFFSET=0x10000

diff --git a/examples/ethernet/iperf/sdkconfig.defaults b/examples/ethernet/iperf/sdkconfig.defaults
index 085e6f3138496bc71f6e18b42cf6b354a6b35ae0..1bdcdc72085d3acec0b17d986411ba5c4f2ac92b 100644 (file)
--- a/examples/ethernet/iperf/sdkconfig.defaults
+++ b/examples/ethernet/iperf/sdkconfig.defaults
@@ -4,7 +4,6 @@ CONFIG_ESP_MAIN_TASK_STACK_SIZE=7168
 # Enable filesystem
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
 CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
 
 # Enable FreeRTOS stats formatting functions, needed for 'tasks' command

diff --git a/examples/protocols/http_server/file_serving/sdkconfig.defaults b/examples/protocols/http_server/file_serving/sdkconfig.defaults
index e64150b07964ce1a97a78e5cba0fed4873eb1536..30306931f358a72b8dd2bbd182efea2eb3531031 100644 (file)
--- a/examples/protocols/http_server/file_serving/sdkconfig.defaults
+++ b/examples/protocols/http_server/file_serving/sdkconfig.defaults
@@ -1,6 +1,4 @@
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
 CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
-CONFIG_APP_OFFSET=0x10000
 CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024

diff --git a/examples/protocols/http_server/restful_server/sdkconfig.defaults b/examples/protocols/http_server/restful_server/sdkconfig.defaults
index 599472d8489050b5f83fdcf1c2732efe6f7907a8..87b6ea1e5727d667f2c604bb9871f676e1957020 100644 (file)
--- a/examples/protocols/http_server/restful_server/sdkconfig.defaults
+++ b/examples/protocols/http_server/restful_server/sdkconfig.defaults
@@ -5,5 +5,4 @@ CONFIG_FATFS_LFN_HEAP=y
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
 CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"

diff --git a/examples/storage/partition_api/partition_find/sdkconfig.defaults b/examples/storage/partition_api/partition_find/sdkconfig.defaults
index 61aebc7e9030b552282363900fdf6735eb10596e..b9bb0c0a5dc37ec510155c6303dd7392a84e5316 100644 (file)
--- a/examples/storage/partition_api/partition_find/sdkconfig.defaults
+++ b/examples/storage/partition_api/partition_find/sdkconfig.defaults
@@ -1,5 +1,3 @@
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
 CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
-CONFIG_APP_OFFSET=0x10000
\ No newline at end of file

diff --git a/examples/storage/partition_api/partition_mmap/sdkconfig.defaults b/examples/storage/partition_api/partition_mmap/sdkconfig.defaults
index 61aebc7e9030b552282363900fdf6735eb10596e..b9bb0c0a5dc37ec510155c6303dd7392a84e5316 100644 (file)
--- a/examples/storage/partition_api/partition_mmap/sdkconfig.defaults
+++ b/examples/storage/partition_api/partition_mmap/sdkconfig.defaults
@@ -1,5 +1,3 @@
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
 CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
-CONFIG_APP_OFFSET=0x10000
\ No newline at end of file

diff --git a/examples/storage/partition_api/partition_ops/sdkconfig.defaults b/examples/storage/partition_api/partition_ops/sdkconfig.defaults
index 61aebc7e9030b552282363900fdf6735eb10596e..b9bb0c0a5dc37ec510155c6303dd7392a84e5316 100644 (file)
--- a/examples/storage/partition_api/partition_ops/sdkconfig.defaults
+++ b/examples/storage/partition_api/partition_ops/sdkconfig.defaults
@@ -1,5 +1,3 @@
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
 CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
-CONFIG_APP_OFFSET=0x10000
\ No newline at end of file

diff --git a/examples/storage/parttool/sdkconfig.defaults b/examples/storage/parttool/sdkconfig.defaults
index 61aebc7e9030b552282363900fdf6735eb10596e..b9bb0c0a5dc37ec510155c6303dd7392a84e5316 100644 (file)
--- a/examples/storage/parttool/sdkconfig.defaults
+++ b/examples/storage/parttool/sdkconfig.defaults
@@ -1,5 +1,3 @@
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
 CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
-CONFIG_APP_OFFSET=0x10000
\ No newline at end of file

diff --git a/examples/storage/spiffs/sdkconfig.defaults b/examples/storage/spiffs/sdkconfig.defaults
index f30f322c623fa73971a2bedc9e19e3f28468255a..b9bb0c0a5dc37ec510155c6303dd7392a84e5316 100644 (file)
--- a/examples/storage/spiffs/sdkconfig.defaults
+++ b/examples/storage/spiffs/sdkconfig.defaults
@@ -1,5 +1,3 @@
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
 CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
-CONFIG_APP_OFFSET=0x10000

diff --git a/examples/storage/spiffsgen/sdkconfig.defaults b/examples/storage/spiffsgen/sdkconfig.defaults
index f30f322c623fa73971a2bedc9e19e3f28468255a..b9bb0c0a5dc37ec510155c6303dd7392a84e5316 100644 (file)
--- a/examples/storage/spiffsgen/sdkconfig.defaults
+++ b/examples/storage/spiffsgen/sdkconfig.defaults
@@ -1,5 +1,3 @@
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
 CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
-CONFIG_APP_OFFSET=0x10000

diff --git a/examples/storage/wear_levelling/sdkconfig.defaults b/examples/storage/wear_levelling/sdkconfig.defaults
index b09d670fdbaea3d54a7401714091eaf52ce3e6f5..47363c32d517ac9376dfc1d43086d8240d259209 100644 (file)
--- a/examples/storage/wear_levelling/sdkconfig.defaults
+++ b/examples/storage/wear_levelling/sdkconfig.defaults
@@ -1,6 +1,4 @@
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
 CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
-CONFIG_APP_OFFSET=0x10000
 CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y

diff --git a/examples/system/console/sdkconfig.defaults b/examples/system/console/sdkconfig.defaults
index 5e4c72ae84b6c7c53791506848effbc8acc09ced..49c3225d695e639deb33f2b845a8f89dec78f5ca 100644 (file)
--- a/examples/system/console/sdkconfig.defaults
+++ b/examples/system/console/sdkconfig.defaults
@@ -8,9 +8,7 @@ CONFIG_ESP_MAIN_TASK_STACK_SIZE=7168
 # Enable filesystem
 CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions_example.csv"
-CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
 CONFIG_PARTITION_TABLE_FILENAME="partitions_example.csv"
-CONFIG_APP_OFFSET=0x10000
 
 # Enable FreeRTOS stats formatting functions, needed for 'tasks' command
 CONFIG_FREERTOS_USE_TRACE_FACILITY=y

diff --git a/tools/ldgen/samples/sdkconfig b/tools/ldgen/samples/sdkconfig
index 8fbfd615861cdc71252f7dda62093f5c23e2e1e2..075841ea81541c33eafc77361a82b7168e19e944 100644 (file)
--- a/tools/ldgen/samples/sdkconfig
+++ b/tools/ldgen/samples/sdkconfig
@@ -76,9 +76,7 @@ CONFIG_PARTITION_TABLE_SINGLE_APP=y
 CONFIG_PARTITION_TABLE_TWO_OTA=
 CONFIG_PARTITION_TABLE_CUSTOM=
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
-CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
 CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp.csv"
-CONFIG_APP_OFFSET=0x10000
 CONFIG_PARTITION_TABLE_MD5=y
 
 #