From f7e4b9a132d5bd560a5c64bffbf067636eb946f7 Mon Sep 17 00:00:00 2001 From: "sonika.rathi" Date: Thu, 8 Feb 2024 08:45:27 +0100 Subject: [PATCH] fix(storage): cleanup storage examples/test_apps sdkconfigs --- .../partition_api_test/sdkconfig.defaults | 2 -- components/fatfs/host_test/sdkconfig.defaults | 1 - ...kconfig.ci.psram => sdkconfig.ci.psram.esp32} | 1 + ...kconfig.ci.psram => sdkconfig.ci.psram.esp32} | 1 + components/spiffs/host_test/sdkconfig.defaults | 2 -- ...onfig.ci.psram => sdkconfig.ci.psram.esp32s3} | 1 + components/vfs/test_apps/pytest_vfs.py | 2 -- ...kconfig.ci.ccomp => sdkconfig.ci.ccomp.esp32} | 1 + ...onfig.ci.psram => sdkconfig.ci.psram.esp32s3} | 1 + .../wear_levelling/host_test/sdkconfig.defaults | 2 -- tools/ci/ignore_build_warnings.txt | 16 ---------------- 11 files changed, 5 insertions(+), 25 deletions(-) rename components/fatfs/test_apps/flash_wl/{sdkconfig.ci.psram => sdkconfig.ci.psram.esp32} (77%) rename components/fatfs/test_apps/sdcard/{sdkconfig.ci.psram => sdkconfig.ci.psram.esp32} (77%) rename components/spiffs/test_apps/{sdkconfig.ci.psram => sdkconfig.ci.psram.esp32s3} (65%) rename components/vfs/test_apps/{sdkconfig.ci.ccomp => sdkconfig.ci.ccomp.esp32} (59%) rename components/vfs/test_apps/{sdkconfig.ci.psram => sdkconfig.ci.psram.esp32s3} (76%) diff --git a/components/esp_partition/host_test/partition_api_test/sdkconfig.defaults b/components/esp_partition/host_test/partition_api_test/sdkconfig.defaults index 29f922994d..3bd20b7a3b 100644 --- a/components/esp_partition/host_test/partition_api_test/sdkconfig.defaults +++ b/components/esp_partition/host_test/partition_api_test/sdkconfig.defaults @@ -5,6 +5,4 @@ CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=n CONFIG_UNITY_ENABLE_FIXTURE=y CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partition_table.csv" -CONFIG_ESPTOOLPY_FLASHSIZE="4MB" -CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y CONFIG_ESP_PARTITION_ENABLE_STATS=y diff --git a/components/fatfs/host_test/sdkconfig.defaults b/components/fatfs/host_test/sdkconfig.defaults index e0d9a692fd..53e7687b77 100644 --- a/components/fatfs/host_test/sdkconfig.defaults +++ b/components/fatfs/host_test/sdkconfig.defaults @@ -6,7 +6,6 @@ CONFIG_LOG_DEFAULT_LEVEL=3 CONFIG_PARTITION_TABLE_OFFSET=0x8000 CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partition_table.csv" -CONFIG_ESPTOOLPY_FLASHSIZE="8MB" CONFIG_MMU_PAGE_SIZE=0X10000 CONFIG_ESP_PARTITION_ENABLE_STATS=y CONFIG_FATFS_VOLUME_COUNT=3 diff --git a/components/fatfs/test_apps/flash_wl/sdkconfig.ci.psram b/components/fatfs/test_apps/flash_wl/sdkconfig.ci.psram.esp32 similarity index 77% rename from components/fatfs/test_apps/flash_wl/sdkconfig.ci.psram rename to components/fatfs/test_apps/flash_wl/sdkconfig.ci.psram.esp32 index b3b45db94a..5becfb9448 100644 --- a/components/fatfs/test_apps/flash_wl/sdkconfig.ci.psram +++ b/components/fatfs/test_apps/flash_wl/sdkconfig.ci.psram.esp32 @@ -1,3 +1,4 @@ +CONFIG_IDF_TARGET="esp32" CONFIG_SPIRAM=y CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0 CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y diff --git a/components/fatfs/test_apps/sdcard/sdkconfig.ci.psram b/components/fatfs/test_apps/sdcard/sdkconfig.ci.psram.esp32 similarity index 77% rename from components/fatfs/test_apps/sdcard/sdkconfig.ci.psram rename to components/fatfs/test_apps/sdcard/sdkconfig.ci.psram.esp32 index b3b45db94a..5becfb9448 100644 --- a/components/fatfs/test_apps/sdcard/sdkconfig.ci.psram +++ b/components/fatfs/test_apps/sdcard/sdkconfig.ci.psram.esp32 @@ -1,3 +1,4 @@ +CONFIG_IDF_TARGET="esp32" CONFIG_SPIRAM=y CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0 CONFIG_FATFS_ALLOC_PREFER_EXTRAM=y diff --git a/components/spiffs/host_test/sdkconfig.defaults b/components/spiffs/host_test/sdkconfig.defaults index 275e768c6c..6c7916689e 100644 --- a/components/spiffs/host_test/sdkconfig.defaults +++ b/components/spiffs/host_test/sdkconfig.defaults @@ -4,5 +4,3 @@ CONFIG_UNITY_ENABLE_IDF_TEST_RUNNER=n CONFIG_UNITY_ENABLE_FIXTURE=y CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partition_table.csv" -CONFIG_ESPTOOLPY_FLASHSIZE="4MB" -CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y diff --git a/components/spiffs/test_apps/sdkconfig.ci.psram b/components/spiffs/test_apps/sdkconfig.ci.psram.esp32s3 similarity index 65% rename from components/spiffs/test_apps/sdkconfig.ci.psram rename to components/spiffs/test_apps/sdkconfig.ci.psram.esp32s3 index db575808cf..e8fd8d2ae3 100644 --- a/components/spiffs/test_apps/sdkconfig.ci.psram +++ b/components/spiffs/test_apps/sdkconfig.ci.psram.esp32s3 @@ -1,2 +1,3 @@ +CONFIG_IDF_TARGET="esp32s3" CONFIG_SPIRAM=y CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0 diff --git a/components/vfs/test_apps/pytest_vfs.py b/components/vfs/test_apps/pytest_vfs.py index 5e471f1518..afee5fd2ea 100644 --- a/components/vfs/test_apps/pytest_vfs.py +++ b/components/vfs/test_apps/pytest_vfs.py @@ -1,6 +1,5 @@ # SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD # SPDX-License-Identifier: CC0-1.0 - import pytest from pytest_embedded import Dut @@ -17,7 +16,6 @@ def test_vfs_default(dut: Dut) -> None: @pytest.mark.esp32 -@pytest.mark.esp32c3 @pytest.mark.parametrize('config', [ 'ccomp', ], indirect=True) diff --git a/components/vfs/test_apps/sdkconfig.ci.ccomp b/components/vfs/test_apps/sdkconfig.ci.ccomp.esp32 similarity index 59% rename from components/vfs/test_apps/sdkconfig.ci.ccomp rename to components/vfs/test_apps/sdkconfig.ci.ccomp.esp32 index 7382da578e..61d793ee27 100644 --- a/components/vfs/test_apps/sdkconfig.ci.ccomp +++ b/components/vfs/test_apps/sdkconfig.ci.ccomp.esp32 @@ -1 +1,2 @@ +CONFIG_IDF_TARGET="esp32" CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y diff --git a/components/vfs/test_apps/sdkconfig.ci.psram b/components/vfs/test_apps/sdkconfig.ci.psram.esp32s3 similarity index 76% rename from components/vfs/test_apps/sdkconfig.ci.psram rename to components/vfs/test_apps/sdkconfig.ci.psram.esp32s3 index e831880d07..a952af6a53 100644 --- a/components/vfs/test_apps/sdkconfig.ci.psram +++ b/components/vfs/test_apps/sdkconfig.ci.psram.esp32s3 @@ -1,3 +1,4 @@ +CONFIG_IDF_TARGET="esp32s3" CONFIG_SPIRAM=y CONFIG_SPIRAM_MALLOC_ALWAYSINTERNAL=0 CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y diff --git a/components/wear_levelling/host_test/sdkconfig.defaults b/components/wear_levelling/host_test/sdkconfig.defaults index 39dac6d5a9..71671c1c6f 100644 --- a/components/wear_levelling/host_test/sdkconfig.defaults +++ b/components/wear_levelling/host_test/sdkconfig.defaults @@ -6,7 +6,5 @@ CONFIG_LOG_DEFAULT_LEVEL=3 CONFIG_PARTITION_TABLE_OFFSET=0x8000 CONFIG_PARTITION_TABLE_CUSTOM=y CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partition_table.csv" -CONFIG_ESPTOOLPY_FLASHSIZE="8MB" -CONFIG_SPI_FLASH_USE_LEGACY_IMPL=1 CONFIG_MMU_PAGE_SIZE=0X10000 CONFIG_ESP_PARTITION_ENABLE_STATS=y diff --git a/tools/ci/ignore_build_warnings.txt b/tools/ci/ignore_build_warnings.txt index 332ef25185..1b92e59888 100644 --- a/tools/ci/ignore_build_warnings.txt +++ b/tools/ci/ignore_build_warnings.txt @@ -25,7 +25,6 @@ warning: unknown kconfig symbol 'BTDM_CTRL_MODE_BR_EDR_ONLY' assigned to* warning: unknown kconfig symbol 'BTDM_CTRL_MODE_BTDM' assigned to* warning: unknown kconfig symbol 'BTDM_SCAN_DUPL_TYPE_DATA_DEVICE' assigned to* warning: unknown kconfig symbol 'CTRL_BTDM_MODEM_SLEEP' assigned to* -warning: unknown kconfig symbol 'ESP_DEFAULT_CPU_FREQ_MHZ_240' assigned to 'y' in .*/components/vfs/test_apps/* warning: unknown kconfig symbol 'ESP_DEFAULT_CPU_FREQ_MHZ_240' assigned to 'y' in .*/examples/bluetooth/esp_ble_mesh/wifi_coexist/ warning: unknown kconfig symbol 'ESP_DEFAULT_CPU_FREQ_MHZ_80' assigned to 'y' in .*/examples/system/deep_sleep/* warning: unknown kconfig symbol 'ESP_DEFAULT_CPU_FREQ_MHZ_80' assigned to 'y' in .*/examples/system/light_sleep/* @@ -35,29 +34,14 @@ warning: unknown kconfig symbol 'ESP32_REV_MIN_3' assigned to 'y' in .*/examples warning: unknown kconfig symbol 'ESP32_REV_MIN' assigned to '3' in .*/examples/system/ota/simple_ota_example/sdkconfig.ci.on_update_no_sb_rsa warning: unknown kconfig symbol 'ESP32H4_RTC_CLK_CAL_CYCLES' assigned to '576' in .*/examples/bluetooth/nimble/blecent/sdkconfig.defaults.esp32h4 warning: unknown kconfig symbol 'ESP32H4_RTC_CLK_SRC_EXT_CRYS' assigned to 'y' in .*/examples/bluetooth/nimble/blecent/sdkconfig.defaults.esp32h4 -warning: unknown kconfig symbol 'ESPTOOLPY_FLASHSIZE_4MB' assigned to 'y' in .*/components/esp_partition/host_test/partition_api_test/sdkconfig.defaults -warning: unknown kconfig symbol 'ESPTOOLPY_FLASHSIZE_4MB' assigned to 'y' in .*/components/spiffs/host_test/sdkconfig.defaults -warning: unknown kconfig symbol 'ESPTOOLPY_FLASHSIZE' assigned to '"4MB"' in .*/components/esp_partition/host_test/partition_api_test/sdkconfig.defaults -warning: unknown kconfig symbol 'ESPTOOLPY_FLASHSIZE' assigned to '"4MB"' in .*/components/spiffs/host_test/sdkconfig.defaults -warning: unknown kconfig symbol 'ESPTOOLPY_FLASHSIZE' assigned to '"8MB"' in .*/components/wear_levelling/host_test/sdkconfig.defaults -warning: unknown kconfig symbol 'ESPTOOLPY_FLASHSIZE' assigned to '"8MB"' in .*/components/fatfs/host_test/sdkconfig.defaults warning: unknown kconfig symbol 'ESPTOOLPY_MONITOR_BAUD_921600B' assigned to 'y' in .*/examples/bluetooth/esp_ble_mesh/vendor_models/* warning: unknown kconfig symbol 'LWIP_ETHARP_TRUST_IP_MAC' assigned to 'n' in .*/examples/bluetooth/esp_ble_mesh/* warning: unknown kconfig symbol 'LWIP_ETHARP_TRUST_IP_MAC' assigned to 'n' in .*/examples/wifi/iperf/* warning: unknown kconfig symbol 'LWIP_ETHARP_TRUST_IP_MAC' assigned to 'n' in .*/idf-app-test/apps/iperf/* -warning: unknown kconfig symbol 'SPI_FLASH_USE_LEGACY_IMPL' assigned to '1' in .*/components/wear_levelling/host_test/sdkconfig.defaults warning: unknown kconfig symbol 'SPIRAM_ALLOW_STACK_EXTERNAL_MEMORY' assigned to 'y' in .*/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.psram warning: unknown kconfig symbol 'SPIRAM_FETCH_INSTRUCTIONS' assigned to 'y' in .*/components/spi_flash/test_apps/mspi_test/sdkconfig.ci.psram warning: unknown kconfig symbol 'SPIRAM_IGNORE_NOTFOUND' assigned to 'y' in .*/examples/network/simple_sniffer/sdkconfig.ci.mem -warning: unknown kconfig symbol 'SPIRAM_MALLOC_ALWAYSINTERNAL' assigned to '0' in .*/components/fatfs/test_apps/flash_wl/sdkconfig.ci.psram -warning: unknown kconfig symbol 'SPIRAM_MALLOC_ALWAYSINTERNAL' assigned to '0' in .*/components/fatfs/test_apps/sdcard/sdkconfig.ci.psram -warning: unknown kconfig symbol 'SPIRAM_MALLOC_ALWAYSINTERNAL' assigned to '0' in .*/components/spiffs/test_apps/sdkconfig.ci.psram -warning: unknown kconfig symbol 'SPIRAM_MALLOC_ALWAYSINTERNAL' assigned to '0' in .*/components/vfs/test_apps/* warning: unknown kconfig symbol 'SPIRAM_RODATA' assigned to 'y' in .*/components/spi_flash/test_apps/mspi_test/sdkconfig.ci.psram -warning: unknown kconfig symbol 'SPIRAM' assigned to 'y' in .*/components/fatfs/test_apps/flash_wl/sdkconfig.ci.psram -warning: unknown kconfig symbol 'SPIRAM' assigned to 'y' in .*/components/fatfs/test_apps/sdcard/sdkconfig.ci.psram -warning: unknown kconfig symbol 'SPIRAM' assigned to 'y' in .*/components/spiffs/test_apps/sdkconfig.ci.psram -warning: unknown kconfig symbol 'SPIRAM' assigned to 'y' in .*/components/vfs/test_apps/* warning: unknown kconfig symbol 'SPIRAM' assigned to 'y' in .*/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.psram warning: unknown kconfig symbol 'SPIRAM' assigned to 'y' in .*/examples/network/simple_sniffer/sdkconfig.ci.mem warning: unknown kconfig symbol 'SPIRAM' assigned to 'y' in .*/examples/protocols/http2_request/sdkconfig.ci