Merge branch 'fix/remove_duplicates_from_sdkconfig_renames_v5.4' into 'release/v5.4'

dobairoland · dobairoland · commit a84b03dd4160 · 2025-01-15T17:58:26.000+08:00
fix: remove duplicit lines from sdkconfig.rename files (v5.4)

See merge request espressif/esp-idf!36346
diff --git a/components/esp_system/sdkconfig.rename.esp32c3 b/components/esp_system/sdkconfig.rename.esp32c3
@@ -5,7 +5,6 @@ CONFIG_ESP32C3_MEMPROT_FEATURE                          CONFIG_ESP_SYSTEM_MEMPRO
 CONFIG_ESP32C3_MEMPROT_FEATURE_LOCK                     CONFIG_ESP_SYSTEM_MEMPROT_FEATURE_LOCK
 CONFIG_ESP32C3_DEBUG_OCDAWARE                           CONFIG_ESP_DEBUG_OCDAWARE
 
-CONFIG_ESP32C3_BROWNOUT_DET                             CONFIG_ESP_BROWNOUT_DET
 CONFIG_ESP32C3_BROWNOUT_DET                             CONFIG_ESP_BROWNOUT_DET
 CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL                     CONFIG_ESP_BROWNOUT_DET_LVL_SEL
 CONFIG_ESP32C3_BROWNOUT_DET_LVL_SEL_0                   CONFIG_ESP_BROWNOUT_DET_LVL_SEL_0
diff --git a/components/esp_system/sdkconfig.rename.esp32s2 b/components/esp_system/sdkconfig.rename.esp32s2
@@ -12,7 +12,6 @@ CONFIG_ESP32S2_ALLOW_RTC_FAST_MEM_AS_HEAP               CONFIG_ESP_SYSTEM_ALLOW_
 CONFIG_ESP32S2_DEBUG_OCDAWARE                           CONFIG_ESP_DEBUG_OCDAWARE
 CONFIG_ESP32S2_NO_BLOBS                                 CONFIG_APP_NO_BLOBS
 
-CONFIG_ESP32S2_BROWNOUT_DET                             CONFIG_ESP_BROWNOUT_DET
 CONFIG_ESP32S2_BROWNOUT_DET                             CONFIG_ESP_BROWNOUT_DET
 CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL                     CONFIG_ESP_BROWNOUT_DET_LVL_SEL
 CONFIG_ESP32S2_BROWNOUT_DET_LVL_SEL_0                   CONFIG_ESP_BROWNOUT_DET_LVL_SEL_0
diff --git a/components/esp_system/sdkconfig.rename.esp32s3 b/components/esp_system/sdkconfig.rename.esp32s3
@@ -3,7 +3,6 @@
 
 CONFIG_ESP32S3_DEBUG_OCDAWARE                           CONFIG_ESP_DEBUG_OCDAWARE
 
-CONFIG_ESP32S3_BROWNOUT_DET                             CONFIG_ESP_BROWNOUT_DET
 CONFIG_ESP32S3_BROWNOUT_DET                             CONFIG_ESP_BROWNOUT_DET
 CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL                     CONFIG_ESP_BROWNOUT_DET_LVL_SEL
 CONFIG_ESP32S3_BROWNOUT_DET_LVL_SEL_0                   CONFIG_ESP_BROWNOUT_DET_LVL_SEL_0
diff --git a/components/esp_wifi/sdkconfig.rename b/components/esp_wifi/sdkconfig.rename
@@ -17,8 +17,6 @@ CONFIG_ESP32_WIFI_DYNAMIC_TX_BUFFER_NUM CONFIG_ESP_WIFI_DYNAMIC_TX_BUFFER_NUM
 CONFIG_ESP32_WIFI_CSI_ENABLED           CONFIG_ESP_WIFI_CSI_ENABLED
 CONFIG_ESP32_WIFI_AMPDU_TX_ENABLED      CONFIG_ESP_WIFI_AMPDU_TX_ENABLED
 CONFIG_ESP32_WIFI_TX_BA_WIN             CONFIG_ESP_WIFI_TX_BA_WIN
-CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED      CONFIG_ESP_WIFI_AMPDU_RX_ENABLED
-CONFIG_ESP32_WIFI_RX_BA_WIN             CONFIG_ESP_WIFI_RX_BA_WIN
 CONFIG_ESP32_WIFI_AMSDU_TX_ENABLED      CONFIG_ESP_WIFI_AMSDU_TX_ENABLED
 CONFIG_ESP32_WIFI_NVS_ENABLED           CONFIG_ESP_WIFI_NVS_ENABLED
 CONFIG_ESP32_WIFI_TASK_CORE_ID          CONFIG_ESP_WIFI_TASK_CORE_ID
