Merge branch 'bugfix/cleanup_nimble_sdkconfig' into 'master'

ci(nimble): Cleanup sdkconfig files for nimble examples Closes IDF-8496 See merge request espressif/esp-idf!26932
espressif · Nov 22, 2023 · 229d275 · 229d275
2 parents 397f9f2 + 843f48f
commit 229d275
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 23 deletions.
diff --git a/examples/bluetooth/nimble/ble_htp/htp_prph/sdkconfig.ci b/examples/bluetooth/nimble/ble_htp/htp_prph/sdkconfig.ci
diff --git a/examples/bluetooth/nimble/power_save/sdkconfig.32m.esp32h2 b/examples/bluetooth/nimble/power_save/sdkconfig.32m.esp32h2
@@ -2,17 +2,14 @@ CONFIG_IDF_TARGET="esp32h2"
 
 # Bluetooth Low Power Config
 CONFIG_BT_LE_SLEEP_ENABLE=y
-# CONFIG_BT_LE_WAKEUP_SOURCE_CPU_RTC_TIMER is not set
 CONFIG_BT_LE_LP_CLK_SRC_MAIN_XTAL=y
-# CONFIG_BT_LE_LP_CLK_SRC_DEFAULT is not set
 
 #
 # Power Management
 #
 CONFIG_PM_ENABLE=y
 CONFIG_PM_DFS_INIT_AUTO=y
 CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=y
-# CONFIG_PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP is not set
 # end of Power Management
 
 #

diff --git a/examples/bluetooth/nimble/power_save/sdkconfig.40m.esp32c6 b/examples/bluetooth/nimble/power_save/sdkconfig.40m.esp32c6
@@ -2,17 +2,14 @@ CONFIG_IDF_TARGET="esp32c6"
 
 # Bluetooth Low Power Config
 CONFIG_BT_LE_SLEEP_ENABLE=y
-# CONFIG_BT_LE_WAKEUP_SOURCE_CPU_RTC_TIMER is not set
 CONFIG_BT_LE_LP_CLK_SRC_MAIN_XTAL=y
-# CONFIG_BT_LE_LP_CLK_SRC_DEFAULT is not set
 
 #
 # Power Management
 #
 CONFIG_PM_ENABLE=y
 CONFIG_PM_DFS_INIT_AUTO=y
 CONFIG_PM_POWER_DOWN_CPU_IN_LIGHT_SLEEP=y
-# CONFIG_PM_POWER_DOWN_PERIPHERAL_IN_LIGHT_SLEEP is not set
 # end of Power Management
 
 CONFIG_FREERTOS_USE_TICKLESS_IDLE=y

diff --git a/examples/bluetooth/nimble/power_save/sdkconfig.defaults.esp32c6 b/examples/bluetooth/nimble/power_save/sdkconfig.defaults.esp32c6
@@ -2,8 +2,6 @@ CONFIG_IDF_TARGET="esp32c6"
 
 # Bluetooth Low Power Config
 CONFIG_BT_LE_SLEEP_ENABLE=y
-# CONFIG_BT_LE_WAKEUP_SOURCE_CPU_RTC_TIMER is not set
-# CONFIG_BT_LE_LP_CLK_SRC_MAIN_XTAL is not set
 CONFIG_BT_LE_LP_CLK_SRC_DEFAULT=y
 
 #
@@ -27,8 +25,5 @@ CONFIG_ESP_PHY_MAC_BB_PD=y
 #
 # RTC Clock Config
 #
-# CONFIG_RTC_CLK_SRC_INT_RC is not set
 CONFIG_RTC_CLK_SRC_EXT_CRYS=y
-# CONFIG_RTC_CLK_SRC_EXT_OSC is not set
-# CONFIG_RTC_CLK_SRC_INT_RC32K is not set
 # end of RTC Clock Config
diff --git a/examples/bluetooth/nimble/power_save/sdkconfig.defaults.esp32h2 b/examples/bluetooth/nimble/power_save/sdkconfig.defaults.esp32h2
@@ -2,8 +2,6 @@ CONFIG_IDF_TARGET="esp32h2"
 
 # Bluetooth Low Power Config
 CONFIG_BT_LE_SLEEP_ENABLE=y
-# CONFIG_BT_LE_WAKEUP_SOURCE_CPU_RTC_TIMER is not set
-# CONFIG_BT_LE_LP_CLK_SRC_MAIN_XTAL is not set
 CONFIG_BT_LE_LP_CLK_SRC_DEFAULT=y
 
 #
@@ -24,8 +22,5 @@ CONFIG_ESP_SLEEP_POWER_DOWN_FLASH=y
 #
 # RTC Clock Config
 #
-# CONFIG_RTC_CLK_SRC_INT_RC is not set
 CONFIG_RTC_CLK_SRC_EXT_CRYS=y
-# CONFIG_RTC_CLK_SRC_EXT_OSC is not set
-# CONFIG_RTC_CLK_SRC_INT_RC32K is not set
 # end of RTC Clock Config
diff --git a/tools/ci/ignore_build_warnings.txt b/tools/ci/ignore_build_warnings.txt
@@ -19,7 +19,6 @@ warning: unknown kconfig symbol 'BT_CTRL_COEX_PARAMETERS_ENABLE' assigned to*
 warning: unknown kconfig symbol 'BT_CTRL_COEX_USE_HOOKS' assigned to*
 warning: unknown kconfig symbol 'BT_LE_50_FEATURE_SUPPORT' assigned to*
 warning: unknown kconfig symbol 'BT_LE_MAX_EXT_ADV_INSTANCES' assigned to*
-warning: unknown kconfig symbol 'BT_LE_WAKEUP_SOURCE_CPU_RTC_TIMER' assigned to 'n' in /builds/espressif/esp-idf/examples/bluetooth/nimble/power_save/sdkconfig.defaults.*
 warning: unknown kconfig symbol 'BTDM_BLE_MESH_SCAN_DUPL_EN' assigned to*
 warning: unknown kconfig symbol 'BTDM_CTRL_MODE_BLE_ONLY' assigned to*
 warning: unknown kconfig symbol 'BTDM_CTRL_MODE_BR_EDR_ONLY' assigned to*
@@ -32,9 +31,6 @@ warning: unknown kconfig symbol 'ESP_DEFAULT_CPU_FREQ_MHZ_80' assigned to 'y' in
 warning: unknown kconfig symbol 'ESP_DEFAULT_CPU_FREQ_MHZ_80' assigned to 'y' in /builds/espressif/esp-idf/examples/system/light_sleep/*
 warning: unknown kconfig symbol 'ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY' assigned to 'y' in /builds/espressif/esp-idf/examples/bluetooth/esp_ble_mesh/fast_provisioning/fast_prov_server/sdkconfig.ci.iram
 warning: unknown kconfig symbol 'ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY' assigned to 'y' in /builds/espressif/esp-idf/examples/bluetooth/esp_ble_mesh/fast_provisioninging/fast_prov_server/sdkconfig.ci.iram
-warning: unknown kconfig symbol 'ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY' assigned to 'y' in /builds/espressif/esp-idf/examples/bluetooth/nimble/ble_htp/htp_prph/sdkconfig.ci
-warning: unknown kconfig symbol 'ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY' assigned to 'y' in /builds/espressif/esp-idf/examples/bluetooth/nimble/ble_proximity_sensor/proximity_sensor_prph/sdkconfig.ci
-warning: unknown kconfig symbol 'ESP32_IRAM_AS_8BIT_ACCESSIBLE_MEMORY' assigned to 'y' in /builds/espressif/esp-idf/examples/bluetooth/nimble/blehr/sdkconfig.ci
 warning: unknown kconfig symbol 'ESP32_REV_MIN_3' assigned to 'y' in /builds/espressif/esp-idf/examples/system/ota/simple_ota_example/sdkconfig.ci.on_update_no_sb_rsa
 warning: unknown kconfig symbol 'ESP32_REV_MIN' assigned to '3' in /builds/espressif/esp-idf/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 /builds/espressif/esp-idf/examples/bluetooth/nimble/blecent/sdkconfig.defaults.esp32h4