From: Ivan Grokhotkov Date: Fri, 26 Jul 2019 12:36:21 +0000 (+0200) Subject: examples: remove non-existent options from sdkconfig.defaults X-Git-Tag: v4.0-beta1~33^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c63f495914cae7cac8add82b4373b37436d7410;p=esp-idf 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 f30f322c62..b9bb0c0a5d 100644 --- 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 085e6f3138..1bdcdc7208 100644 --- 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 e64150b079..30306931f3 100644 --- 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 599472d848..87b6ea1e57 100644 --- 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 61aebc7e90..b9bb0c0a5d 100644 --- 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 61aebc7e90..b9bb0c0a5d 100644 --- 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 61aebc7e90..b9bb0c0a5d 100644 --- 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 61aebc7e90..b9bb0c0a5d 100644 --- 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 f30f322c62..b9bb0c0a5d 100644 --- 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 f30f322c62..b9bb0c0a5d 100644 --- 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 b09d670fdb..47363c32d5 100644 --- 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 5e4c72ae84..49c3225d69 100644 --- 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 8fbfd61586..075841ea81 100644 --- 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 #