change(version): Update version to v5.5-dev

2024-10-28 10:17:21 +01:00
773 changed files with 267014 additions and 64076 deletions
--- a/.codespellrc
+++ b/.codespellrc
@@ -1,4 +1,4 @@
 [codespell]
 skip = build,*.yuv,components/fatfs/src/*,alice.txt,*.rgb,components/wpa_supplicant/*,components/esp_wifi/*,*.pem
-ignore-words-list = ser,dout,rsource,fram,inout,shs,ans,aci,unstall,unstalling,hart,wheight,wel,ot,fane,assertIn,registr,oen,parms
+ignore-words-list = ser,dout,rsource,fram,inout,shs,ans,aci,unstall,unstalling,hart,wheight,wel,ot,fane,assertIn,registr,oen
 write-changes = true
--- a/.gitlab/CODEOWNERS
+++ b/.gitlab/CODEOWNERS
@@ -2,5 +2,248 @@
 #
 #    https://docs.gitlab.com/ee/user/project/code_owners.html#the-syntax-of-code-owners-files
 #
+# If more than one rule matches a given file, the latest rule is used.
+# The file should be generally kept sorted, except when it is necessary
+# to use a different order due to the fact above. In that case, use
+# '# sort-order-reset' comment line to reset the sort order.
+#
+# Recipes for a few common cases:
+#
+# 1. Specific directory with all its contents:
+#
+#    /components/app_trace/
+#
+#    Note the trailing slash!
+#
+# 2. File with certain extension in any subdirectory of a certain directory:
+#
+#    /examples/**/*.py
+#
+#    This includes an *.py files in /examples/ directory as well.
+#
+# 3. Contents of a directory with a certain name, anywhere in the tree:
+#
+#    test_*_host/
+#
+#    Will match everything under components/efuse/test_efuse_host/,
+#    components/heap/test_multi_heap_host/, components/lwip/test_afl_host/, etc.
+#
+# 4. Same as above, except limited to a specific place in the tree:
+#
+#    /components/esp32*/
+#
+#    Matches everything under /components/esp32, /components/esp32s2, etc.
+#    Doesn't match /tools/some-test/components/esp32s5.
+#
+# 5. Specific file:
+#
+#    /tools/tools.json
+#
+# 6. File with a certain name anywhere in the tree
+#
+#    .gitignore
+#

-* @esp-idf-codeowners/all-maintainers
+* @esp-idf-codeowners/other
+
+/.*                                   @esp-idf-codeowners/tools
+/.codespellrc                         @esp-idf-codeowners/ci
+/.github/workflows/                   @esp-idf-codeowners/ci
+/.gitlab-ci.yml                       @esp-idf-codeowners/ci
+/.gitlab/ci/                          @esp-idf-codeowners/ci
+/.pre-commit-config.yaml              @esp-idf-codeowners/ci
+/.readthedocs.yml                     @esp-idf-codeowners/docs
+/.vale.ini                            @esp-idf-codeowners/docs
+/CMakeLists.txt                       @esp-idf-codeowners/build-config
+/COMPATIBILITY*.md                    @esp-idf-codeowners/peripherals
+/CONTRIBUTING.md                      @esp-idf-codeowners/docs
+/Kconfig                              @esp-idf-codeowners/build-config
+/README*.md                           @esp-idf-codeowners/docs
+/ROADMAP*.md                          @esp-idf-codeowners/docs
+/SUPPORT_POLICY*.md                   @esp-idf-codeowners/docs
+/add_path.sh                          @esp-idf-codeowners/tools
+/conftest.py                          @esp-idf-codeowners/ci
+/export.*                             @esp-idf-codeowners/tools
+/install.*                            @esp-idf-codeowners/tools
+/pytest.ini                           @esp-idf-codeowners/ci
+/sdkconfig.rename                     @esp-idf-codeowners/build-config
+/sonar-project.properties             @esp-idf-codeowners/ci
+
+# sort-order-reset
+
+/components/app_trace/                @esp-idf-codeowners/debugging
+/components/app_update/               @esp-idf-codeowners/system @esp-idf-codeowners/app-utilities
+/components/bootloader*/              @esp-idf-codeowners/system @esp-idf-codeowners/security
+/components/bootloader_support/bootloader_flash/    @esp-idf-codeowners/peripherals
+/components/bt/                       @esp-idf-codeowners/bluetooth
+/components/cmock/                    @esp-idf-codeowners/system
+/components/console/                  @esp-idf-codeowners/system @esp-idf-codeowners/app-utilities/console
+/components/cxx/                      @esp-idf-codeowners/system
+/components/driver/                   @esp-idf-codeowners/peripherals
+/components/efuse/                    @esp-idf-codeowners/system
+/components/esp_adc/                  @esp-idf-codeowners/peripherals
+/components/esp_app_format/           @esp-idf-codeowners/system @esp-idf-codeowners/app-utilities
+/components/esp_bootloader_format/    @esp-idf-codeowners/system @esp-idf-codeowners/app-utilities
+/components/esp_coex/                 @esp-idf-codeowners/wifi @esp-idf-codeowners/bluetooth @esp-idf-codeowners/ieee802154
+/components/esp_common/               @esp-idf-codeowners/system
+/components/esp_driver_*/             @esp-idf-codeowners/peripherals
+/components/esp_driver_sdmmc/         @esp-idf-codeowners/peripherals @esp-idf-codeowners/storage
+/components/esp_eth/                  @esp-idf-codeowners/network
+/components/esp_event/                @esp-idf-codeowners/system
+/components/esp_gdbstub/              @esp-idf-codeowners/debugging
+/components/esp_hid/                  @esp-idf-codeowners/bluetooth
+/components/esp_http_client/          @esp-idf-codeowners/app-utilities
+/components/esp_http_server/          @esp-idf-codeowners/app-utilities
+/components/esp_https_ota/            @esp-idf-codeowners/app-utilities
+/components/esp_https_server/         @esp-idf-codeowners/app-utilities
+/components/esp_hw_support/           @esp-idf-codeowners/system @esp-idf-codeowners/peripherals
+/components/esp_hw_support/lowpower/  @esp-idf-codeowners/power-management
+/components/esp_lcd/                  @esp-idf-codeowners/peripherals
+/components/esp_local_ctrl/           @esp-idf-codeowners/app-utilities
+/components/esp_mm/                   @esp-idf-codeowners/peripherals
+/components/esp_netif/                @esp-idf-codeowners/network
+/components/esp_netif_stack/          @esp-idf-codeowners/network
+/components/esp_partition/            @esp-idf-codeowners/storage
+/components/esp_phy/                  @esp-idf-codeowners/bluetooth @esp-idf-codeowners/wifi @esp-idf-codeowners/ieee802154
+/components/esp_pm/                   @esp-idf-codeowners/power-management @esp-idf-codeowners/bluetooth @esp-idf-codeowners/wifi @esp-idf-codeowners/system
+/components/esp_psram/                @esp-idf-codeowners/peripherals @esp-idf-codeowners/system
+/components/esp_ringbuf/              @esp-idf-codeowners/system
+/components/esp_rom/                  @esp-idf-codeowners/system @esp-idf-codeowners/bluetooth @esp-idf-codeowners/wifi
+/components/esp_security/             @esp-idf-codeowners/security
+/components/esp_system/               @esp-idf-codeowners/system
+/components/esp_timer/                @esp-idf-codeowners/system
+/components/esp-tls/                  @esp-idf-codeowners/app-utilities
+/components/esp_vfs_*/                @esp-idf-codeowners/storage
+/components/esp_vfs_console/          @esp-idf-codeowners/storage @esp-idf-codeowners/system
+/components/esp_wifi/                 @esp-idf-codeowners/wifi
+/components/espcoredump/              @esp-idf-codeowners/debugging
+/components/esptool_py/               @esp-idf-codeowners/tools
+/components/fatfs/                    @esp-idf-codeowners/storage
+/components/freertos/                 @esp-idf-codeowners/system
+/components/hal/                      @esp-idf-codeowners/peripherals
+/components/hal/test_apps/crypto/     @esp-idf-codeowners/peripherals @esp-idf-codeowners/security
+/components/heap/                     @esp-idf-codeowners/system
+/components/http_parser/              @esp-idf-codeowners/app-utilities
+/components/idf_test/                 @esp-idf-codeowners/ci
+/components/ieee802154/               @esp-idf-codeowners/ieee802154
+/components/json/                     @esp-idf-codeowners/app-utilities
+/components/linux/                    @esp-idf-codeowners/system
+/components/log/                      @esp-idf-codeowners/system
+/components/lwip/                     @esp-idf-codeowners/lwip
+/components/mbedtls/                  @esp-idf-codeowners/app-utilities/mbedtls @esp-idf-codeowners/security
+/components/mqtt/                     @esp-idf-codeowners/network
+/components/newlib/                   @esp-idf-codeowners/system @esp-idf-codeowners/toolchain
+/components/nvs_flash/                @esp-idf-codeowners/storage
+/components/nvs_sec_provider/         @esp-idf-codeowners/storage @esp-idf-codeowners/security
+/components/openthread/               @esp-idf-codeowners/ieee802154
+/components/partition_table/          @esp-idf-codeowners/system
+/components/perfmon/                  @esp-idf-codeowners/debugging
+/components/protobuf-c/               @esp-idf-codeowners/app-utilities
+/components/protocomm/                @esp-idf-codeowners/app-utilities/provisioning
+/components/pthread/                  @esp-idf-codeowners/system
+/components/riscv/                    @esp-idf-codeowners/system
+/components/rt/                       @esp-idf-codeowners/system
+/components/sdmmc/                    @esp-idf-codeowners/storage
+/components/soc/                      @esp-idf-codeowners/peripherals @esp-idf-codeowners/system
+/components/spi_flash/                @esp-idf-codeowners/peripherals
+/components/spiffs/                   @esp-idf-codeowners/storage
+/components/tcp_transport/            @esp-idf-codeowners/network
+/components/touch_element/            @esp-idf-codeowners/peripherals
+/components/ulp/                      @esp-idf-codeowners/system
+/components/unity/                    @esp-idf-codeowners/ci
+/components/usb/                      @esp-idf-codeowners/peripherals/usb
+/components/vfs/                      @esp-idf-codeowners/storage
+/components/wear_levelling/           @esp-idf-codeowners/storage
+/components/wifi_provisioning/        @esp-idf-codeowners/app-utilities/provisioning
+/components/wpa_supplicant/           @esp-idf-codeowners/wifi @esp-idf-codeowners/app-utilities/mbedtls
+/components/xtensa/                   @esp-idf-codeowners/system
+
+/docs/                                      @esp-idf-codeowners/docs
+/docs/docs_not_updated/                     @esp-idf-codeowners/all-maintainers
+/docs/**/api-guides/tools/                  @esp-idf-codeowners/tools
+/docs/en/api-guides/core_dump.rst           @esp-idf-codeowners/debugging
+/docs/**/api-guides/wifi*                   @esp-idf-codeowners/wifi
+/docs/**/api-guides/esp-wifi-mesh.rst       @esp-idf-codeowners/wifi
+/docs/en/api-guides/jtag-debugging/         @esp-idf-codeowners/debugging
+/docs/**/api-reference/bluetooth/           @esp-idf-codeowners/bluetooth
+/docs/**/api-reference/network/             @esp-idf-codeowners/network @esp-idf-codeowners/wifi
+/docs/**/api-reference/peripherals/         @esp-idf-codeowners/peripherals
+/docs/**/api-reference/peripherals/usb*     @esp-idf-codeowners/peripherals @esp-idf-codeowners/peripherals/usb
+/docs/**/api-reference/peripherals/usb*/    @esp-idf-codeowners/peripherals @esp-idf-codeowners/peripherals/usb
+/docs/**/api-reference/protocols/           @esp-idf-codeowners/network @esp-idf-codeowners/app-utilities
+/docs/**/api-reference/provisioning/        @esp-idf-codeowners/app-utilities/provisioning
+/docs/**/api-reference/storage/             @esp-idf-codeowners/storage
+/docs/**/api-reference/system/              @esp-idf-codeowners/system
+/docs/**/security/                          @esp-idf-codeowners/security
+/docs/**/migration-guides/                  @esp-idf-codeowners/docs @esp-idf-codeowners/all-maintainers
+/docs/**/contribute/install-pre-commit-hook.rst @esp-idf-codeowners/ci @esp-idf-codeowners/tools
+
+/examples/README.md           @esp-idf-codeowners/docs @esp-idf-codeowners/ci
+/examples/**/*.py             @esp-idf-codeowners/ci @esp-idf-codeowners/tools
+/examples/bluetooth/          @esp-idf-codeowners/bluetooth
+/examples/build_system/       @esp-idf-codeowners/build-config
+/examples/common_components/  @esp-idf-codeowners/system @esp-idf-codeowners/wifi @esp-idf-codeowners/lwip @esp-idf-codeowners/network
+/examples/custom_bootloader/  @esp-idf-codeowners/system
+/examples/cxx/                @esp-idf-codeowners/system
+/examples/ethernet/           @esp-idf-codeowners/network
+/examples/get-started/        @esp-idf-codeowners/system
+/examples/ieee802154/         @esp-idf-codeowners/ieee802154
+/examples/mesh/               @esp-idf-codeowners/wifi
+/examples/network/            @esp-idf-codeowners/network @esp-idf-codeowners/wifi
+/examples/openthread/         @esp-idf-codeowners/ieee802154
+/examples/peripherals/        @esp-idf-codeowners/peripherals
+/examples/peripherals/usb/    @esp-idf-codeowners/peripherals @esp-idf-codeowners/peripherals/usb
+/examples/phy/                @esp-idf-codeowners/bluetooth @esp-idf-codeowners/wifi @esp-idf-codeowners/ieee802154
+/examples/protocols/          @esp-idf-codeowners/network @esp-idf-codeowners/app-utilities
+/examples/provisioning/       @esp-idf-codeowners/app-utilities/provisioning
+/examples/security/           @esp-idf-codeowners/security
+/examples/storage/            @esp-idf-codeowners/storage
+/examples/system/             @esp-idf-codeowners/system
+/examples/system/ota/         @esp-idf-codeowners/app-utilities
+/examples/wifi/               @esp-idf-codeowners/wifi
+/examples/zigbee/             @esp-idf-codeowners/ieee802154
+
+/tools/                       @esp-idf-codeowners/tools
+/tools/ble/                   @esp-idf-codeowners/app-utilities
+/tools/catch/                 @esp-idf-codeowners/ci
+/tools/ci/                    @esp-idf-codeowners/ci
+/tools/cmake/                 @esp-idf-codeowners/build-config
+/tools/cmake/toolchain-*.cmake      @esp-idf-codeowners/toolchain
+/tools/esp_app_trace/         @esp-idf-codeowners/debugging
+/tools/esp_prov/              @esp-idf-codeowners/app-utilities
+/tools/gdb_panic_server.py    @esp-idf-codeowners/debugging
+/tools/kconfig*/              @esp-idf-codeowners/build-config
+/tools/ldgen/                 @esp-idf-codeowners/build-config
+/tools/mass_mfg/              @esp-idf-codeowners/app-utilities
+/tools/mocks/                 @esp-idf-codeowners/system
+
+/tools/test_apps/                    @esp-idf-codeowners/ci
+/tools/test_apps/README.md           @esp-idf-codeowners/docs @esp-idf-codeowners/ci
+
+## Note: owners here should be the same as the owners for the same example subdir, above
+/tools/test_apps/build_system/       @esp-idf-codeowners/build-config
+/tools/test_apps/configs/            @esp-idf-codeowners/system
+/tools/test_apps/linux_compatible/   @esp-idf-codeowners/system
+/tools/test_apps/peripherals/        @esp-idf-codeowners/peripherals
+/tools/test_apps/phy/                @esp-idf-codeowners/bluetooth @esp-idf-codeowners/wifi @esp-idf-codeowners/ieee802154
+/tools/test_apps/protocols/          @esp-idf-codeowners/network @esp-idf-codeowners/app-utilities
+/tools/test_apps/security/           @esp-idf-codeowners/security
+/tools/test_apps/storage/            @esp-idf-codeowners/storage
+/tools/test_apps/system/             @esp-idf-codeowners/system
+
+/tools/test_apps/**/*.py             @esp-idf-codeowners/ci @esp-idf-codeowners/tools
+
+/tools/test_build_system/     @esp-idf-codeowners/tools @esp-idf-codeowners/build-config
+
+/tools/tools.json             @esp-idf-codeowners/tools @esp-idf-codeowners/toolchain @esp-idf-codeowners/debugging
+
+/tools/unit-test-app/         @esp-idf-codeowners/system @esp-idf-codeowners/tools
+
+# sort-order-reset
+
+/components/**/test_apps/**/*.py     @esp-idf-codeowners/ci @esp-idf-codeowners/tools
+
+# ignore lists
+/tools/ci/check_copyright_config.yaml                   @esp-idf-codeowners/all-maintainers
+/tools/ci/check_copyright_ignore.txt                    @esp-idf-codeowners/all-maintainers
+/tools/ci/mypy_ignore_list.txt                          @esp-idf-codeowners/tools
--- a/.gitlab/ci/build.yml
+++ b/.gitlab/ci/build.yml
@@ -1,7 +1,7 @@
 .build_template:
  stage: build
  extends:
-    - .after_script:build:ccache-show-stats:upload-failed-job-logs
+    - .after_script:build:ccache:upload-when-fail
  image: $ESP_ENV_IMAGE
  tags:
    - build
@@ -16,7 +16,7 @@
  extends:
    - .build_template
    - .before_script:build
-    - .after_script:build:ccache-show-stats
+    - .after_script:build:ccache
  dependencies: # set dependencies to null to avoid missing artifacts issue
  needs:
    - job: fast_template_app
@@ -246,16 +246,15 @@ pytest_build_system_macos:
  extends:
    - .test_build_system_template
    - .before_script:build:macos
-    - .after_script:build:macos:upload-failed-job-logs:ccache-show-stats
+    - .after_script:build:macos:upload-when-fail
    - .rules:build:macos
  tags:
    - macos_shell
  parallel: 3
  variables:
    PYENV_VERSION: "3.8"
-    # CCACHE_DIR: "/cache/idf_ccache". On macOS, you cannot write to this folder due to insufficient permissions.
-    CCACHE_DIR: "" # ccache will use "$HOME/Library/Caches/ccache".
-    CCACHE_MAXSIZE: "5G" # To preserve the limited Macbook storage. CCACHE automatically prunes old caches to fit the set limit.
+    CI_CCACHE_DISABLE: "1"  # ccache: error: Read-only file system
+
 build_docker:
  extends:
    - .before_script:minimal
--- a/.gitlab/ci/common.yml
+++ b/.gitlab/ci/common.yml
@@ -6,9 +6,9 @@ stages:
  - pre_check
  - build
  - assign_test
-  - build_doc
  - target_test
  - host_test
+  - build_doc
  - test_deploy
  - deploy
  - post_deploy
@@ -40,7 +40,7 @@ variables:
  GIT_FETCH_EXTRA_FLAGS: "--no-recurse-submodules --prune --prune-tags"
  # we're using .cache folder for caches
  GIT_CLEAN_FLAGS: -ffdx -e .cache/
-  LATEST_GIT_TAG: v5.4
+  LATEST_GIT_TAG: v5.4-dev

  SUBMODULE_FETCH_TOOL: "tools/ci/ci_fetch_submodule.py"
  # by default we will fetch all submodules
@@ -55,9 +55,9 @@ variables:
  CHECKOUT_REF_SCRIPT: "$CI_PROJECT_DIR/tools/ci/checkout_project_ref.py"

  # Docker images
-  ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v5.4:1"
-  ESP_IDF_DOC_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-doc-env-v5.4:1-1"
-  TARGET_TEST_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/target-test-env-v5.4:1"
+  ESP_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-env-v5.5:1"
+  ESP_IDF_DOC_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-doc-env-v5.5:1-1"
+  TARGET_TEST_ENV_IMAGE: "${CI_DOCKER_REGISTRY}/target-test-env-v5.5:1"
  SONARQUBE_SCANNER_IMAGE: "${CI_DOCKER_REGISTRY}/sonarqube-scanner:5"
  PRE_COMMIT_IMAGE: "${CI_DOCKER_REGISTRY}/esp-idf-pre-commit:1"

@@ -70,7 +70,7 @@ variables:
  CI_PYTHON_CONSTRAINT_BRANCH: ""

  # Update the filename for a specific ESP-IDF release. It is used only with CI_PYTHON_CONSTRAINT_BRANCH.
-  CI_PYTHON_CONSTRAINT_FILE: "espidf.constraints.v5.4.txt"
+  CI_PYTHON_CONSTRAINT_FILE: "espidf.constraints.v5.5.txt"

  # Set this variable to repository name of a Python tool you wish to install and test in the context of ESP-IDF CI.
  # Keep the variable empty when not used.
@@ -88,7 +88,7 @@ variables:
  CI_CLANG_DISTRO_URL: ""

  # Set this variable to specify the file name for the known failure cases.
-  KNOWN_FAILURE_CASES_FILE_NAME: "5.4.txt"
+  KNOWN_FAILURE_CASES_FILE_NAME: "master.txt"

  IDF_CI_BUILD: 1

@@ -227,14 +227,13 @@ variables:
    - *setup_tools_and_idf_python_venv
    - fetch_submodules

-.after_script:build:macos:upload-failed-job-logs:ccache-show-stats:
+.after_script:build:macos:upload-when-fail:
  after_script:
    # macos is running shell executor, which means it would use
    # the system installed /usr/local/bin/python3 by default.
    # Ensure pyenv and PYENV_VERSION installed
    - eval "$(pyenv init -)"
    - *upload_failed_job_log_artifacts
-    - *show_ccache_statistics

 .before_script:build:
  before_script:
@@ -245,11 +244,11 @@ variables:
    - export EXTRA_CFLAGS=${PEDANTIC_CFLAGS}
    - export EXTRA_CXXFLAGS=${PEDANTIC_CXXFLAGS}

-.after_script:build:ccache-show-stats:
+.after_script:build:ccache:
  after_script:
    - *show_ccache_statistics

-.after_script:build:ccache-show-stats:upload-failed-job-logs:
+.after_script:build:ccache:upload-when-fail:
  after_script:
    - *show_ccache_statistics
    - *upload_failed_job_log_artifacts
--- a/.gitlab/ci/docs.yml
+++ b/.gitlab/ci/docs.yml
@@ -37,16 +37,25 @@
 .if-dev-push: &if-dev-push
  if: '$CI_COMMIT_REF_NAME != "master" && $CI_COMMIT_BRANCH !~ /^release\/v/ && $CI_COMMIT_TAG !~ /^v\d+\.\d+(\.\d+)?($|-)/ && $CI_COMMIT_TAG !~ /^qa-test/ && ($CI_PIPELINE_SOURCE == "push" || $CI_PIPELINE_SOURCE == "merge_request_event")'

+.if-schedule: &if-schedule
+  if: '$CI_PIPELINE_SOURCE == "schedule"'
+
 .doc-rules:build:docs-full:
  rules:
    - <<: *if-qa-test-tag
      when: never
-    - <<: *if-protected
+    - <<: *if-schedule
    - <<: *if-label-build_docs
    - <<: *if-label-docs_full
    - <<: *if-dev-push
      changes: *patterns-docs-full

+.doc-rules:build:docs-full-prod:
+  rules:
+    - <<: *if-qa-test-tag
+      when: never
+    - <<: *if-protected-no_label
+
 .doc-rules:build:docs-partial:
  rules:
    - <<: *if-qa-test-tag
@@ -83,14 +92,13 @@ check_docs_lang_sync:
  stage: build_doc
  tags:
    - build_docs
-  needs:
-    - job: fast_template_app
-      artifacts: false
-      optional: true
  script:
    - if [ -n "${BREATHE_ALT_INSTALL_URL}" ]; then pip uninstall -y breathe && pip install -U ${BREATHE_ALT_INSTALL_URL}; fi
    - cd docs
    - build-docs -t $DOCTGT -bs $DOC_BUILDERS -l $DOCLANG build
+  artifacts:
+    expire_in: 4 days
+    when: always
  parallel:
    matrix:
      - DOCLANG: ["en", "zh_CN"]
@@ -111,12 +119,26 @@ build_docs_html_full:
  extends:
    - .build_docs_template
    - .doc-rules:build:docs-full
+  needs:
+    - job: fast_template_app
+      artifacts: false
+      optional: true
+  artifacts:
+    paths:
+      - docs/_build/*/*/*.txt
+      - docs/_build/*/*/html/*
+  variables:
+    DOC_BUILDERS: "html"
+
+build_docs_html_full_prod:
+  extends:
+    - .build_docs_template
+    - .doc-rules:build:docs-full-prod
+  dependencies: [] # Stop build_docs jobs from downloading all previous job's artifacts
  artifacts:
-    when: always
    paths:
      - docs/_build/*/*/*.txt
      - docs/_build/*/*/html/*
-    expire_in: 4 days
  variables:
    DOC_BUILDERS: "html"

@@ -124,12 +146,14 @@ build_docs_html_partial:
  extends:
    - .build_docs_template
    - .doc-rules:build:docs-partial
+  needs:
+    - job: fast_template_app
+      artifacts: false
+      optional: true
  artifacts:
-    when: always
    paths:
      - docs/_build/*/*/*.txt
      - docs/_build/*/*/html/*
-    expire_in: 4 days
  variables:
    DOC_BUILDERS: "html"
  parallel:
@@ -139,6 +163,33 @@ build_docs_html_partial:
      - DOCLANG: "zh_CN"
        DOCTGT: "esp32p4"

+build_docs_pdf:
+  extends:
+    - .build_docs_template
+    - .doc-rules:build:docs-full
+  needs:
+    - job: fast_template_app
+      artifacts: false
+      optional: true
+  allow_failure: true # TODO IDFCI-2216
+  artifacts:
+    paths:
+      - docs/_build/*/*/latex/*
+  variables:
+    DOC_BUILDERS: "latex"
+
+build_docs_pdf_prod:
+  extends:
+    - .build_docs_template
+    - .doc-rules:build:docs-full-prod
+  dependencies: [] # Stop build_docs jobs from downloading all previous job's artifacts
+  allow_failure: true # TODO IDFCI-2216
+  artifacts:
+    paths:
+      - docs/_build/*/*/latex/*
+  variables:
+    DOC_BUILDERS: "latex"
+
 .deploy_docs_template:
  image: $ESP_IDF_DOC_ENV_IMAGE
  variables:
@@ -167,6 +218,8 @@ deploy_docs_preview:
      optional: true
    - job: build_docs_html_full
      optional: true
+    - job: build_docs_pdf
+      optional: true
  variables:
    TYPE: "preview"
    # older branches use DOCS_DEPLOY_KEY, DOCS_SERVER, DOCS_SERVER_USER, DOCS_PATH for preview server so we keep these names for 'preview'
@@ -181,12 +234,12 @@ deploy_docs_production:
  # The DOCS_PROD_* variables used by this job are "Protected" so these branches must all be marked "Protected" in Gitlab settings
  extends:
    - .deploy_docs_template
-  rules:
-    - <<: *if-protected-no_label
+    - .doc-rules:build:docs-full-prod
  stage: post_deploy
  dependencies:  # set dependencies to null to avoid missing artifacts issue
  needs: # ensure runs after push_to_github succeeded
-    - build_docs_html_full
+    - build_docs_html_full_prod
+    - build_docs_pdf_prod
    - job: push_to_github
      artifacts: false
  variables:
@@ -201,19 +254,16 @@ deploy_docs_production:
 check_doc_links:
  extends:
    - .build_docs_template
-  rules:
-    - <<: *if-protected-no_label
+    - .doc-rules:build:docs-full-prod
  stage: post_deploy
  needs:
    - job: deploy_docs_production
      artifacts: false
  tags: ["build", "amd64", "internet"]
  artifacts:
-    when: always
    paths:
      - docs/_build/*/*/*.txt
      - docs/_build/*/*/linkcheck/*.txt
-    expire_in: 1 week
  allow_failure: true
  script:
    - cd docs
--- a/.gitlab/ci/pre_check.yml
+++ b/.gitlab/ci/pre_check.yml
@@ -183,24 +183,12 @@ baseline_manifest_sha:
  tags: [fast_run, shiny]
  script:
    - |
-      # merged results pipelines, by default
-      # diff between target-branch-head and merged-result-head
-      if [ -n "$CI_MERGE_REQUEST_TARGET_BRANCH_SHA" ]; then
-        git fetch origin $CI_MERGE_REQUEST_TARGET_BRANCH_SHA --depth=1
-        git checkout FETCH_HEAD
-        idf-build-apps dump-manifest-sha \
-          --manifest-files $(find . -name ".build-test-rules.yml" | xargs) \
-          --output .manifest_sha
-      # merge request pipelines, when the mr got conflicts
-      # diff between diff-base-sha and merge-request-head
-      elif [ -n "$CI_MERGE_REQUEST_DIFF_BASE_SHA" ]; then
+      if [ -n "$CI_MERGE_REQUEST_DIFF_BASE_SHA" ]; then
        git fetch origin $CI_MERGE_REQUEST_DIFF_BASE_SHA --depth=1
        git checkout FETCH_HEAD
        idf-build-apps dump-manifest-sha \
          --manifest-files $(find . -name ".build-test-rules.yml" | xargs) \
          --output .manifest_sha
-      # other pipelines, like the protected branches pipelines
-      # not triggered in this job
      fi
  artifacts:
    paths:
--- a/components/app_trace/sys_view/Sample/FreeRTOSV10.4/Config/esp/SEGGER_SYSVIEW_Config_FreeRTOS.c
+++ b/components/app_trace/sys_view/Sample/FreeRTOSV10.4/Config/esp/SEGGER_SYSVIEW_Config_FreeRTOS.c
@@ -3,7 +3,7 @@
 *
 * SPDX-License-Identifier: BSD-1-Clause
 *
- * SPDX-FileContributor: 2017-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileContributor: 2017-2022 Espressif Systems (Shanghai) CO LTD
 */
 /*********************************************************************
 *                    SEGGER Microcontroller GmbH                     *
@@ -58,7 +58,6 @@ File    : SEGGER_SYSVIEW_Config_FreeRTOS.c
 Purpose : Sample setup configuration of SystemView with FreeRTOS.
 Revision: $Rev: 7745 $
 */
-#include <string.h>
 #include "sdkconfig.h"
 #include "freertos/FreeRTOS.h"
 #include "SEGGER_SYSVIEW.h"
@@ -157,16 +156,15 @@ static esp_apptrace_lock_t s_sys_view_lock = {.mux = portMUX_INITIALIZER_UNLOCKE
 *    Sends SystemView description strings.
 */
 static void _cbSendSystemDesc(void) {
-    char irq_str[32] = "I#";
+    char irq_str[32];
    SEGGER_SYSVIEW_SendSysDesc("N="SYSVIEW_APP_NAME",D="SYSVIEW_DEVICE_NAME",C="SYSVIEW_CORE_NAME",O=FreeRTOS");
-    strcat(itoa(SYSTICK_INTR_ID, irq_str + 2, 10), "=SysTick");
+    snprintf(irq_str, sizeof(irq_str), "I#%d=SysTick", SYSTICK_INTR_ID);
    SEGGER_SYSVIEW_SendSysDesc(irq_str);
    size_t isr_count = sizeof(esp_isr_names)/sizeof(esp_isr_names[0]);
    for (size_t i = 0; i < isr_count; ++i) {
        if (esp_isr_names[i] == NULL || (ETS_INTERNAL_INTR_SOURCE_OFF + i) == SYSTICK_INTR_ID)
            continue;
-        strcat(itoa(ETS_INTERNAL_INTR_SOURCE_OFF + i, irq_str + 2, 10), "=");
-        strncat(irq_str, esp_isr_names[i], sizeof(irq_str) - strlen(irq_str) - 1);
+        snprintf(irq_str, sizeof(irq_str), "I#%d=%s", ETS_INTERNAL_INTR_SOURCE_OFF + i, esp_isr_names[i]);
        SEGGER_SYSVIEW_SendSysDesc(irq_str);
    }
 }
--- a/components/app_trace/sys_view/ext/heap_trace_module.c
+++ b/components/app_trace/sys_view/ext/heap_trace_module.c
@@ -21,7 +21,7 @@ const static char *TAG = "sysview_heap_trace";
 #endif

 static SEGGER_SYSVIEW_MODULE s_esp_sysview_heap_module = {
-    .sModule = "M=ESP32 SystemView Heap Tracing Module",
+    .sModule = "ESP32 SystemView Heap Tracing Module",
    .NumEvents = 2,
 };

--- a/components/bootloader_support/bootloader_flash/include/bootloader_flash_priv.h
+++ b/components/bootloader_support/bootloader_flash/include/bootloader_flash_priv.h
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD
 *
 * SPDX-License-Identifier: Apache-2.0
 */
@@ -13,7 +13,6 @@
 #include <spi_flash_mmap.h> /* including in bootloader for error values */
 #include "sdkconfig.h"
 #include "bootloader_flash.h"
-#include "soc/ext_mem_defs.h"

 #ifdef __cplusplus
 extern "C" {
@@ -21,11 +20,8 @@ extern "C" {

 #define FLASH_SECTOR_SIZE 0x1000
 #define FLASH_BLOCK_SIZE 	0x10000
-
 #define MMAP_ALIGNED_MASK 	(SPI_FLASH_MMU_PAGE_SIZE - 1)
 #define MMU_FLASH_MASK    (~(SPI_FLASH_MMU_PAGE_SIZE - 1))
-#define MMU_FLASH_MASK_FROM_VAL(PAGE_SZ) (~((PAGE_SZ) - 1))
-#define MMU_DROM_END_ENTRY_VADDR_FROM_VAL(PAGE_SZ) (SOC_DRAM_FLASH_ADDRESS_HIGH - (PAGE_SZ))

 /**
 * MMU mapping must always be in the unit of a SPI_FLASH_MMU_PAGE_SIZE
@@ -93,7 +89,7 @@ uint32_t bootloader_mmap_get_free_pages(void);
 * @param length - Length of data to map.
 *
 * @return Pointer to mapped data memory (at src_addr), or NULL
- * if an allocation error occurred.
+ * if an allocation error occured.
 */
 const void *bootloader_mmap(uint32_t src_addr, uint32_t size);

--- a/components/bootloader_support/include/esp_image_format.h
+++ b/components/bootloader_support/include/esp_image_format.h
@@ -34,7 +34,6 @@ typedef struct {
  uint32_t image_len; /* Length of image on flash, in bytes */
  uint8_t image_digest[32]; /* appended SHA-256 digest */
  uint32_t secure_version; /* secure version for anti-rollback, it is covered by sha256 (set if CONFIG_BOOTLOADER_APP_ANTI_ROLLBACK=y) */
-  uint32_t mmu_page_size; /* Flash MMU page size per binary header */
 } esp_image_metadata_t;

 typedef enum {
--- a/components/bootloader_support/src/bootloader_console.c
+++ b/components/bootloader_support/src/bootloader_console.c
@@ -74,12 +74,6 @@ void bootloader_console_init(void)
        // Enable the peripheral
        uart_ll_enable_bus_clock(uart_num, true);
        uart_ll_reset_register(uart_num);
-        // Set clock source
-#if SOC_UART_SUPPORT_XTAL_CLK
-        uart_ll_set_sclk(UART_LL_GET_HW(uart_num), (soc_module_clk_t)UART_SCLK_XTAL);
-#else
-        uart_ll_set_sclk(UART_LL_GET_HW(uart_num), (soc_module_clk_t)UART_SCLK_APB);
-#endif
        // Reset TX and RX FIFOs
        uart_ll_txfifo_rst(UART_LL_GET_HW(uart_num));
        uart_ll_rxfifo_rst(UART_LL_GET_HW(uart_num));
--- a/components/bootloader_support/src/bootloader_utility.c
+++ b/components/bootloader_support/src/bootloader_utility.c
@@ -20,7 +20,6 @@
 #include "esp_rom_spiflash.h"

 #include "soc/soc.h"
-#include "soc/soc_caps.h"
 #include "soc/rtc.h"
 #include "soc/efuse_periph.h"
 #include "soc/rtc_periph.h"
@@ -67,7 +66,7 @@ static void set_cache_and_start_app(uint32_t drom_addr,
                                    uint32_t irom_addr,
                                    uint32_t irom_load_addr,
                                    uint32_t irom_size,
-                                    const esp_image_metadata_t *data);
+                                    uint32_t entry_addr);

 esp_err_t bootloader_common_read_otadata(const esp_partition_pos_t *ota_info, esp_ota_select_entry_t *two_otadata)
 {
@@ -790,7 +789,7 @@ static void unpack_load_app(const esp_image_metadata_t *data)
                            rom_addr[1],
                            rom_load_addr[1],
                            rom_size[1],
-                            data);
+                            data->image.entry_addr);
 }

 #else  //!SOC_MMU_DI_VADDR_SHARED
@@ -835,7 +834,7 @@ static void unpack_load_app(const esp_image_metadata_t *data)
                            irom_addr,
                            irom_load_addr,
                            irom_size,
-                            data);
+                            data->image.entry_addr);
 }
 #endif  //#if SOC_MMU_DI_VADDR_SHARED

@@ -860,11 +859,9 @@ static void set_cache_and_start_app(
    uint32_t irom_addr,
    uint32_t irom_load_addr,
    uint32_t irom_size,
-    const esp_image_metadata_t *data)
+    uint32_t entry_addr)
 {
    int rc __attribute__((unused));
-    const uint32_t entry_addr = data->image.entry_addr;
-    const uint32_t mmu_page_size = data->mmu_page_size;

    ESP_EARLY_LOGD(TAG, "configure drom and irom and start");
    //-----------------------Disable Cache to do the mapping---------
@@ -874,18 +871,12 @@ static void set_cache_and_start_app(
 #else
    cache_hal_disable(CACHE_LL_LEVEL_EXT_MEM, CACHE_TYPE_ALL);
 #endif
-
-#if SOC_MMU_PAGE_SIZE_CONFIGURABLE
-    // re-configure MMU page size
-    mmu_ll_set_page_size(0, mmu_page_size);
-#endif //SOC_MMU_PAGE_SIZE_CONFIGURABLE
-
    //reset MMU table first
    mmu_hal_unmap_all();

    //-----------------------MAP DROM--------------------------
-    uint32_t drom_load_addr_aligned = drom_load_addr & MMU_FLASH_MASK_FROM_VAL(mmu_page_size);
-    uint32_t drom_addr_aligned = drom_addr & MMU_FLASH_MASK_FROM_VAL(mmu_page_size);
+    uint32_t drom_load_addr_aligned = drom_load_addr & MMU_FLASH_MASK;
+    uint32_t drom_addr_aligned = drom_addr & MMU_FLASH_MASK;
    ESP_EARLY_LOGV(TAG, "rodata starts from paddr=0x%08" PRIx32 ", vaddr=0x%08" PRIx32 ", size=0x%" PRIx32, drom_addr, drom_load_addr, drom_size);
    //The addr is aligned, so we add the mask off length to the size, to make sure the corresponding buses are enabled.
    drom_size = (drom_load_addr - drom_load_addr_aligned) + drom_size;
@@ -903,13 +894,13 @@ static void set_cache_and_start_app(
        ESP_EARLY_LOGV(TAG, "after mapping rodata, starting from paddr=0x%08" PRIx32 " and vaddr=0x%08" PRIx32 ", 0x%" PRIx32 " bytes are mapped", drom_addr_aligned, drom_load_addr_aligned, actual_mapped_len);
    }
    //we use the MMU_LL_END_DROM_ENTRY_ID mmu entry as a map page for app to find the boot partition
-    mmu_hal_map_region(0, MMU_TARGET_FLASH0, MMU_DROM_END_ENTRY_VADDR_FROM_VAL(mmu_page_size), drom_addr_aligned, mmu_page_size, &actual_mapped_len);
+    mmu_hal_map_region(0, MMU_TARGET_FLASH0, MMU_LL_END_DROM_ENTRY_VADDR, drom_addr_aligned, CONFIG_MMU_PAGE_SIZE, &actual_mapped_len);
    ESP_EARLY_LOGV(TAG, "mapped one page of the rodata, from paddr=0x%08" PRIx32 " and vaddr=0x%08" PRIx32 ", 0x%" PRIx32 " bytes are mapped", drom_addr_aligned, MMU_LL_END_DROM_ENTRY_VADDR, actual_mapped_len);
 #endif

    //-----------------------MAP IROM--------------------------
-    uint32_t irom_load_addr_aligned = irom_load_addr & MMU_FLASH_MASK_FROM_VAL(mmu_page_size);
-    uint32_t irom_addr_aligned = irom_addr & MMU_FLASH_MASK_FROM_VAL(mmu_page_size);
+    uint32_t irom_load_addr_aligned = irom_load_addr & MMU_FLASH_MASK;
+    uint32_t irom_addr_aligned = irom_addr & MMU_FLASH_MASK;
    ESP_EARLY_LOGV(TAG, "text starts from paddr=0x%08" PRIx32 ", vaddr=0x%08" PRIx32 ", size=0x%" PRIx32, irom_addr, irom_load_addr, irom_size);
    //The addr is aligned, so we add the mask off length to the size, to make sure the corresponding buses are enabled.
    irom_size = (irom_load_addr - irom_load_addr_aligned) + irom_size;
--- a/components/bootloader_support/src/esp32h2/bootloader_esp32h2.c
+++ b/components/bootloader_support/src/esp32h2/bootloader_esp32h2.c
@@ -92,8 +92,6 @@ static inline void bootloader_hardware_init(void)

    regi2c_ctrl_ll_master_enable_clock(true);
    regi2c_ctrl_ll_master_configure_clock();
-    REGI2C_WRITE_MASK(I2C_BIAS, I2C_BIAS_DREG_0P8, 8);  // fix low temp issue, need to increase this internal voltage
-
 }

 static inline void bootloader_ana_reset_config(void)
--- a/components/bootloader_support/src/esp_image_format.c
+++ b/components/bootloader_support/src/esp_image_format.c
@@ -22,7 +22,6 @@
 #include "bootloader_memory_utils.h"
 #include "soc/soc_caps.h"
 #include "hal/cache_ll.h"
-#include "spi_flash_mmap.h"

 #define ALIGN_UP(num, align) (((num) + ((align) - 1)) & ~((align) - 1))

@@ -78,7 +77,7 @@ static esp_err_t process_segment_data(int segment, intptr_t load_addr, uint32_t
 static esp_err_t verify_image_header(uint32_t src_addr, const esp_image_header_t *image, bool silent);

 /* Verify a segment header */
-static esp_err_t verify_segment_header(int index, const esp_image_segment_header_t *segment, uint32_t segment_data_offs, esp_image_metadata_t *metadata, bool silent);
+static esp_err_t verify_segment_header(int index, const esp_image_segment_header_t *segment, uint32_t segment_data_offs, bool silent);

 /* Log-and-fail macro for use in esp_image_load */
 #define FAIL_LOAD(...) do {                         \
@@ -560,7 +559,7 @@ static esp_err_t process_segment(int index, uint32_t flash_addr, esp_image_segme

    ESP_LOGV(TAG, "segment data length 0x%"PRIx32" data starts 0x%"PRIx32, data_len, data_addr);

-    CHECK_ERR(verify_segment_header(index, header, data_addr, metadata, silent));
+    CHECK_ERR(verify_segment_header(index, header, data_addr, silent));

    if (data_len % 4 != 0) {
        FAIL_LOAD("unaligned segment length 0x%"PRIx32, data_len);
@@ -749,7 +748,7 @@ static esp_err_t process_segment_data(int segment, intptr_t load_addr, uint32_t
    return ESP_OK;
 }

-static esp_err_t verify_segment_header(int index, const esp_image_segment_header_t *segment, uint32_t segment_data_offs, esp_image_metadata_t *metadata, bool silent)
+static esp_err_t verify_segment_header(int index, const esp_image_segment_header_t *segment, uint32_t segment_data_offs, bool silent)
 {
    if ((segment->data_len & 3) != 0
            || segment->data_len >= SIXTEEN_MB) {
@@ -762,39 +761,13 @@ static esp_err_t verify_segment_header(int index, const esp_image_segment_header
    uint32_t load_addr = segment->load_addr;
    bool map_segment = should_map(load_addr);

-#if SOC_MMU_PAGE_SIZE_CONFIGURABLE
-    /* ESP APP descriptor is present in the DROM segment #0 */
-    if (index == 0 && metadata->start_addr != ESP_BOOTLOADER_OFFSET) {
-        const esp_app_desc_t *app_desc = (const esp_app_desc_t *)bootloader_mmap(segment_data_offs, sizeof(esp_app_desc_t));
-        if (!app_desc || app_desc->magic_word != ESP_APP_DESC_MAGIC_WORD) {
-            ESP_LOGE(TAG, "Failed to fetch app description header!");
-            return ESP_FAIL;
-        }
-
-        // Convert from log base 2 number to actual size while handling legacy image case (value 0)
-        metadata->mmu_page_size = (app_desc->mmu_page_size > 0) ? (1UL << app_desc->mmu_page_size) : SPI_FLASH_MMU_PAGE_SIZE;
-        if (metadata->mmu_page_size != SPI_FLASH_MMU_PAGE_SIZE) {
-            ESP_LOGI(TAG, "MMU page size mismatch, configured: 0x%x, found: 0x%"PRIx32, SPI_FLASH_MMU_PAGE_SIZE, metadata->mmu_page_size);
-        }
-        bootloader_munmap(app_desc);
-    } else if (index == 0 && metadata->start_addr == ESP_BOOTLOADER_OFFSET) {
-        // Bootloader always uses the default MMU page size
-        metadata->mmu_page_size = SPI_FLASH_MMU_PAGE_SIZE;
-    }
-#else // SOC_MMU_PAGE_SIZE_CONFIGURABLE
-    metadata->mmu_page_size = SPI_FLASH_MMU_PAGE_SIZE;
-#endif // !SOC_MMU_PAGE_SIZE_CONFIGURABLE
-
-    const int mmu_page_size = metadata->mmu_page_size;
-    ESP_LOGV(TAG, "MMU page size 0x%x", mmu_page_size);
-
    /* Check that flash cache mapped segment aligns correctly from flash to its mapped address,
-       relative to the MMU page mapping size.
+       relative to the 64KB page mapping size.
    */
    ESP_LOGV(TAG, "segment %d map_segment %d segment_data_offs 0x%"PRIx32" load_addr 0x%"PRIx32,
             index, map_segment, segment_data_offs, load_addr);
    if (map_segment
-            && ((segment_data_offs % mmu_page_size) != (load_addr % mmu_page_size))) {
+            && ((segment_data_offs % SPI_FLASH_MMU_PAGE_SIZE) != (load_addr % SPI_FLASH_MMU_PAGE_SIZE))) {
        if (!silent) {
            ESP_LOGE(TAG, "Segment %d load address 0x%08"PRIx32", doesn't match data 0x%08"PRIx32,
                     index, load_addr, segment_data_offs);
--- a/components/bt/CMakeLists.txt
+++ b/components/bt/CMakeLists.txt
@@ -85,9 +85,6 @@ if(CONFIG_BT_ENABLED)
        elseif(CONFIG_IDF_TARGET_ESP32S3)
            list(APPEND ldscripts "linker_rw_bt_controller.lf")
        elseif(CONFIG_IDF_TARGET_ESP32C2)
-            if(CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY)
-                list(APPEND srcs "controller/esp32c2/dummy.c")
-            endif()
            set(ldscripts "linker_esp32c2.lf")
        else()
            list(APPEND ldscripts "linker_esp_ble_controller.lf")
@@ -868,19 +865,11 @@ if(CONFIG_BT_ENABLED)
    elseif(CONFIG_IDF_TARGET_ESP32C3)
        target_link_directories(${COMPONENT_LIB} INTERFACE
                "${CMAKE_CURRENT_LIST_DIR}/controller/lib_esp32c3_family/esp32c3")
-        if(CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY)
-            target_link_libraries(${COMPONENT_LIB} PUBLIC btdm_app_flash)
-        else()
-            target_link_libraries(${COMPONENT_LIB} PUBLIC btdm_app)
-        endif()
+        target_link_libraries(${COMPONENT_LIB} PUBLIC btdm_app)
    elseif(CONFIG_IDF_TARGET_ESP32S3)
        target_link_directories(${COMPONENT_LIB} INTERFACE
                "${CMAKE_CURRENT_LIST_DIR}/controller/lib_esp32c3_family/esp32s3")
-        if(CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY)
-            target_link_libraries(${COMPONENT_LIB} PUBLIC btdm_app_flash)
-        else()
-            target_link_libraries(${COMPONENT_LIB} PUBLIC btdm_app)
-        endif()
+        target_link_libraries(${COMPONENT_LIB} PUBLIC btdm_app)
    elseif(CONFIG_BT_CONTROLLER_ENABLED)
        if(CONFIG_IDF_TARGET_ESP32C6)
            add_prebuilt_library(libble_app
@@ -889,13 +878,8 @@ if(CONFIG_BT_ENABLED)
            add_prebuilt_library(libble_app
                "${CMAKE_CURRENT_LIST_DIR}/controller/lib_esp32c6/esp32c6-bt-lib/esp32c61/libble_app.a")
        else()
-            if(CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY)
-                add_prebuilt_library(libble_app
-                    "controller/lib_${target_name}/${target_name}-bt-lib/libble_app_flash.a")
-            else()
-                add_prebuilt_library(libble_app
-                    "controller/lib_${target_name}/${target_name}-bt-lib/libble_app.a")
-            endif()
+            add_prebuilt_library(libble_app
+                 "controller/lib_${target_name}/${target_name}-bt-lib/libble_app.a")
        endif()
        target_link_libraries(${COMPONENT_LIB} PRIVATE libble_app)
    endif()
--- a/components/bt/common/btc/core/btc_task.c
+++ b/components/bt/common/btc/core/btc_task.c
@@ -382,7 +382,7 @@ static void btc_deinit_mem(void) {
        btc_profile_cb_tab = NULL;
    }

-#if (BLE_42_FEATURE_SUPPORT == TRUE)
+#if (BLE_INCLUDED == TRUE)
    if (gl_bta_adv_data_ptr) {
        osi_free(gl_bta_adv_data_ptr);
        gl_bta_adv_data_ptr = NULL;
@@ -392,7 +392,7 @@ static void btc_deinit_mem(void) {
        osi_free(gl_bta_scan_rsp_data_ptr);
        gl_bta_scan_rsp_data_ptr = NULL;
    }
-#endif // BLE_42_FEATURE_SUPPORT
+#endif  ///BLE_INCLUDED == TRUE

 #if GATTS_INCLUDED == TRUE && GATT_DYNAMIC_MEMORY == TRUE
    if (btc_creat_tab_env_ptr) {
@@ -444,8 +444,7 @@ static bt_status_t btc_init_mem(void) {
    }
    memset((void *)btc_profile_cb_tab, 0, sizeof(void *) * BTC_PID_NUM);

-#if BTC_DYNAMIC_MEMORY == TRUE
-#if (BLE_42_FEATURE_SUPPORT == TRUE)
+#if (BLE_INCLUDED == TRUE)
    if ((gl_bta_adv_data_ptr = (tBTA_BLE_ADV_DATA *)osi_malloc(sizeof(tBTA_BLE_ADV_DATA))) == NULL) {
        goto error_exit;
    }
@@ -455,8 +454,7 @@ static bt_status_t btc_init_mem(void) {
        goto error_exit;
    }
    memset((void *)gl_bta_scan_rsp_data_ptr, 0, sizeof(tBTA_BLE_ADV_DATA));
-#endif // (BLE_42_FEATURE_SUPPORT == TRUE)
-#endif // BTC_DYNAMIC_MEMORY == TRUE
+#endif  ///BLE_INCLUDED == TRUE

 #if GATTS_INCLUDED == TRUE && GATT_DYNAMIC_MEMORY == TRUE
    if ((btc_creat_tab_env_ptr = (esp_btc_creat_tab_t *)osi_malloc(sizeof(esp_btc_creat_tab_t))) == NULL) {
--- a/components/bt/common/osi/allocator.c
+++ b/components/bt/common/osi/allocator.c
@@ -241,8 +241,5 @@ void *osi_calloc_func(size_t size)

 void osi_free_func(void *ptr)
 {
-#if HEAP_MEMORY_DEBUG
-    osi_mem_dbg_clean(ptr, __func__, __LINE__);
-#endif
    free(ptr);
 }
--- a/components/bt/common/osi/include/osi/allocator.h
+++ b/components/bt/common/osi/include/osi/allocator.h
@@ -29,15 +29,6 @@ void *osi_malloc_func(size_t size);
 void *osi_calloc_func(size_t size);
 void osi_free_func(void *ptr);

-// Memory alloc function without print and assertion
-#if HEAP_ALLOCATION_FROM_SPIRAM_FIRST
-#define osi_malloc_base(size)             heap_caps_malloc_prefer(size, 2, MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL)
-#define osi_calloc_base(size)             heap_caps_calloc_prefer(1, size, 2, MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL)
-#else
-#define osi_malloc_base(size)             malloc((size))
-#define osi_calloc_base(size)             calloc(1, (size))
-#endif /* #if HEAP_ALLOCATION_FROM_SPIRAM_FIRST */
-
 #if HEAP_MEMORY_DEBUG

 void osi_mem_dbg_init(void);
@@ -50,10 +41,13 @@ void osi_men_dbg_set_section_start(uint8_t index);
 void osi_men_dbg_set_section_end(uint8_t index);
 uint32_t osi_mem_dbg_get_max_size_section(uint8_t index);

+#if HEAP_ALLOCATION_FROM_SPIRAM_FIRST
 #define osi_malloc(size)                                \
 ({                                                      \
    void *p;                                            \
-    p = osi_malloc_base(size);                          \
+    p = heap_caps_malloc_prefer(size, 2,                \
+        MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM,           \
+        MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL);        \
    osi_mem_dbg_record(p, size, __func__, __LINE__);    \
    (void *)p;                                          \
 })
@@ -61,11 +55,34 @@ uint32_t osi_mem_dbg_get_max_size_section(uint8_t index);
 #define osi_calloc(size)                                \
 ({                                                      \
    void *p;                                            \
-    p = osi_calloc_base(size);                          \
+    p = heap_caps_calloc_prefer(1, size, 2,             \
+        MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM,           \
+        MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL);        \
    osi_mem_dbg_record(p, size, __func__, __LINE__);    \
    (void *)p;                                          \
 })

+#else
+
+#define osi_malloc(size)                                \
+({                                                      \
+    void *p;                                            \
+    p = malloc((size));                                 \
+    osi_mem_dbg_record(p, size, __func__, __LINE__);    \
+    (void *)p;                                          \
+})
+
+#define osi_calloc(size)                                \
+({                                                      \
+    void *p;                                            \
+    p = calloc(1, (size));                              \
+    osi_mem_dbg_record(p, size, __func__, __LINE__);    \
+    (void *)p;                                          \
+})
+
+#endif /* #if HEAP_ALLOCATION_FROM_SPIRAM_FIRST */
+
+
 #if 0
 #define osi_malloc(size)                                \
 do {                                                    \
@@ -105,6 +122,15 @@ do {                                                    \

 #else

+// Memory alloc function without print and assertion
+#if HEAP_ALLOCATION_FROM_SPIRAM_FIRST
+#define osi_malloc_base(size)             heap_caps_malloc_prefer(size, 2, MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL)
+#define osi_calloc_base(size)             heap_caps_calloc_prefer(1, size, 2, MALLOC_CAP_DEFAULT|MALLOC_CAP_SPIRAM, MALLOC_CAP_DEFAULT|MALLOC_CAP_INTERNAL)
+#else
+#define osi_malloc_base(size)             malloc((size))
+#define osi_calloc_base(size)             calloc(1, (size))
+#endif /* #if HEAP_ALLOCATION_FROM_SPIRAM_FIRST */
+
 // Memory alloc function with print and assertion when fails
 #define osi_malloc(size)                  osi_malloc_func((size))
 #define osi_calloc(size)                  osi_calloc_func((size))
--- a/components/bt/controller/esp32/Kconfig.in
+++ b/components/bt/controller/esp32/Kconfig.in
@@ -444,15 +444,6 @@ config BTDM_CTRL_SCAN_BACKOFF_UPPERLIMITMAX
        minimize collision of scan request PDUs from nultiple scanners. If scan backoff is disabled, in active
        scanning, scan request PDU will be sent every time when HW receives scannable ADV PDU.

-config BTDM_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS
-    bool "Enable enhanced Access Address check in CONNECT_IND"
-    default n
-    help
-        Enabling this option will add stricter verification of the Access Address in the CONNECT_IND PDU.
-        This improves security by ensuring that only connection requests with valid Access Addresses are accepted.
-        If disabled, only basic checks are applied, improving compatibility.
-
-
 config BTDM_BLE_ADV_REPORT_FLOW_CTRL_SUPP
    bool "BLE adv report flow control supported"
    depends on (BTDM_CTRL_MODE_BTDM || BTDM_CTRL_MODE_BLE_ONLY)
--- a/components/bt/controller/esp32/bt.c
+++ b/components/bt/controller/esp32/bt.c
@@ -1931,7 +1931,7 @@ esp_err_t esp_bredr_sco_datapath_set(esp_sco_data_path_t data_path)
    return ESP_OK;
 }

-esp_err_t esp_ble_scan_duplicate_list_flush(void)
+esp_err_t esp_ble_scan_dupilcate_list_flush(void)
 {
    if (btdm_controller_status != ESP_BT_CONTROLLER_STATUS_ENABLED) {
        return ESP_ERR_INVALID_STATE;
@@ -1940,11 +1940,6 @@ esp_err_t esp_ble_scan_duplicate_list_flush(void)
    return ESP_OK;
 }

-esp_err_t esp_ble_scan_dupilcate_list_flush(void)
-{
-    return esp_ble_scan_duplicate_list_flush();
-}
-
 /**
 * This function re-write controller's function,
 * As coredump can not show parameters in function which is in a .a file.
--- a/components/bt/controller/esp32c2/Kconfig.in
+++ b/components/bt/controller/esp32c2/Kconfig.in
@@ -109,100 +109,86 @@ menuconfig BT_LE_50_FEATURE_SUPPORT
    help
        Enable BLE 5 feature

-if BT_LE_50_FEATURE_SUPPORT
-    config BT_LE_LL_CFG_FEAT_LE_2M_PHY
-        bool "Enable 2M Phy"
-        depends on BT_LE_50_FEATURE_SUPPORT
+config BT_LE_LL_CFG_FEAT_LE_2M_PHY
+    bool "Enable 2M Phy"
+    depends on BT_LE_50_FEATURE_SUPPORT
+    default y
+    help
+        Enable 2M-PHY
+
+config BT_LE_LL_CFG_FEAT_LE_CODED_PHY
+    bool "Enable coded Phy"
+    depends on BT_LE_50_FEATURE_SUPPORT
+    default y
+    help
+        Enable coded-PHY
+
+config BT_LE_EXT_ADV
+    bool "Enable extended advertising"
+    depends on BT_LE_50_FEATURE_SUPPORT
+    default y
+    help
+        Enable this option to do extended advertising. Extended advertising
+        will be supported from BLE 5.0 onwards.
+
+if BT_LE_EXT_ADV
+    config BT_LE_MAX_EXT_ADV_INSTANCES
+        int "Maximum number of extended advertising instances."
+        range 0 4
+        default 1
+        depends on BT_LE_EXT_ADV
+        help
+            Change this option to set maximum number of extended advertising
+            instances. Minimum there is always one instance of
+            advertising. Enter how many more advertising instances you
+            want.
+            Each extended advertising instance will take about 0.5k DRAM.
+
+    config BT_LE_EXT_ADV_MAX_SIZE
+        int "Maximum length of the advertising data."
+        range 0 1650
+        default 1650
+        depends on BT_LE_EXT_ADV
+        help
+            Defines the length of the extended adv data. The value should not
+            exceed 1650.
+
+    config BT_LE_ENABLE_PERIODIC_ADV
+        bool "Enable periodic advertisement."
+        default y
+        depends on BT_LE_EXT_ADV
+        help
+            Enable this option to start periodic advertisement.
+
+    config BT_LE_PERIODIC_ADV_SYNC_TRANSFER
+        bool "Enable Transfer Sync Events"
+        depends on BT_LE_ENABLE_PERIODIC_ADV
        default y
        help
-            Enable 2M-PHY
+            This enables controller transfer periodic sync events to host

-    config BT_LE_LL_CFG_FEAT_LE_CODED_PHY
-        bool "Enable coded Phy"
-        depends on BT_LE_50_FEATURE_SUPPORT
-        default y
-        help
-            Enable coded-PHY
-
-    config BT_LE_EXT_ADV
-        bool "Enable extended advertising"
-        depends on BT_LE_50_FEATURE_SUPPORT
-        default y
-        help
-            Enable this option to do extended advertising. Extended advertising
-            will be supported from BLE 5.0 onwards.
-
-    if BT_LE_EXT_ADV
-        config BT_LE_MAX_EXT_ADV_INSTANCES
-            int "Maximum number of extended advertising instances."
-            range 0 4
-            default 1
-            depends on BT_LE_EXT_ADV
-            help
-                Change this option to set maximum number of extended advertising
-                instances. Minimum there is always one instance of
-                advertising. Enter how many more advertising instances you
-                want.
-                Each extended advertising instance will take about 0.5k DRAM.
-
-        config BT_LE_EXT_ADV_MAX_SIZE
-            int "Maximum length of the advertising data."
-            range 0 1650
-            default 1650
-            depends on BT_LE_EXT_ADV
-            help
-                Defines the length of the extended adv data. The value should not
-                exceed 1650.
-
-        config BT_LE_ENABLE_PERIODIC_ADV
-            bool "Enable periodic advertisement."
-            default y
-            depends on BT_LE_EXT_ADV
-            help
-                Enable this option to start periodic advertisement.
-
-        config BT_LE_PERIODIC_ADV_SYNC_TRANSFER
-            bool "Enable Transfer Sync Events"
-            depends on BT_LE_ENABLE_PERIODIC_ADV
-            default y
-            help
-                This enables controller transfer periodic sync events to host
-    endif
-
-    config BT_LE_EXT_SCAN
-        bool "Enable extended scanning"
-        depends on BT_LE_50_FEATURE_SUPPORT && BT_LE_ROLE_OBSERVER_ENABLE
-        default y
-        help
-            Enable this option to do extended scanning.
-
-    config BT_LE_ENABLE_PERIODIC_SYNC
-        bool "Enable periodic sync"
-        default y
-        depends on BT_LE_EXT_SCAN
-        help
-            Enable this option to receive periodic advertisement.
-
-    if BT_LE_ENABLE_PERIODIC_SYNC
-        config BT_LE_MAX_PERIODIC_SYNCS
-            int "Maximum number of periodic advertising syncs"
-            range 0 3
-            default 1 if BT_LE_ENABLE_PERIODIC_ADV
-            default 0
-            help
-                Set this option to set the upper limit for number of periodic sync
-                connections. This should be less than maximum connections allowed by
-                controller.
-
-        config BT_LE_MAX_PERIODIC_ADVERTISER_LIST
-            int "Maximum number of periodic advertiser list"
-            range 1 5
-            default 5
-            help
-                Set this option to set the upper limit for number of periodic advertiser list.
-    endif
 endif

+config BT_LE_MAX_PERIODIC_SYNCS
+    int "Maximum number of periodic advertising syncs"
+    depends on BT_LE_50_FEATURE_SUPPORT && !BT_NIMBLE_ENABLED
+
+    range 0 3
+    default 1 if BT_LE_ENABLE_PERIODIC_ADV
+    default 0
+    help
+        Set this option to set the upper limit for number of periodic sync
+        connections. This should be less than maximum connections allowed by
+        controller.
+
+config BT_LE_MAX_PERIODIC_ADVERTISER_LIST
+    int "Maximum number of periodic advertiser list"
+    depends on BT_LE_50_FEATURE_SUPPORT && !BT_NIMBLE_ENABLED
+    range 1 5
+    default 5
+    help
+        Set this option to set the upper limit for number of periodic advertiser list.
+
 menu "Memory Settings"
    depends on !BT_NIMBLE_ENABLED

@@ -537,10 +523,6 @@ config BT_LE_TX_CCA_ENABLED
    help
        Enable CCA feature to cancel sending the packet if the signal power is stronger than CCA threshold.

-config BT_LE_DTM_ENABLED
-    bool "Enable Direct Test Mode (DTM) feature"
-    default n
-
 config BT_LE_CCA_RSSI_THRESH
    int "CCA RSSI threshold value"
    depends on BT_LE_TX_CCA_ENABLED
@@ -549,10 +531,6 @@ config BT_LE_CCA_RSSI_THRESH
    help
        Power threshold of CCA in unit of -1 dBm.

-config BT_LE_FEAT_LL_ENCRYPTION
-    bool "Enable controller ACL encryption"
-    default y
-
 config BT_LE_ROLE_CENTROL_ENABLE
    bool "Enable BLE Centrol role function"
    depends on !BT_NIMBLE_ENABLED
@@ -639,23 +617,3 @@ config BT_LE_DFT_TX_POWER_LEVEL_DBM_EFF
    default 18 if BT_LE_DFT_TX_POWER_LEVEL_P18
    default 20 if BT_LE_DFT_TX_POWER_LEVEL_P20
    default 0
-
-config BT_CTRL_RUN_IN_FLASH_ONLY
-    bool "Reduce BLE IRAM usage (READ DOCS FIRST) (EXPERIMENTAL)"
-    default n
-    help
-        Move most IRAM into flash. This will increase the usage of flash and reduce ble performance.
-        Because the code is moved to the flash, the execution speed of the code is reduced.
-        To have a small impact on performance, you need to enable flash suspend (SPI_FLASH_AUTO_SUSPEND).
-
-        - Only one Tx-Rx can be performed in each connection interval. Therefore, reduce the connection interval
-          as much as possible to improve the throughput. If you want higher connection performance, you can
-          enable BT_LE_PLACE_CONN_RELATED_INTO_IRAM to put the connection-related code into iram.
-        - For HCI_LE_Extended_Create_Connection command, only 1M phy's connection parameters will be applied.
-          Other phys' will be ignored.
-        - For extended scanning, we may be unable to receive the extended adv with 300us MAFS.
-
-config BT_LE_PLACE_CONN_RELATED_INTO_IRAM
-    bool "Place the connection-related code into IRAM"
-    depends on BT_CTRL_RUN_IN_FLASH_ONLY
-    default n
--- a/components/bt/controller/esp32c2/bt.c
+++ b/components/bt/controller/esp32c2/bt.c
@@ -156,10 +156,6 @@ extern int ble_get_npl_element_info(esp_bt_controller_config_t *cfg, ble_npl_cou
 extern void bt_track_pll_cap(void);
 extern char *ble_controller_get_compile_version(void);
 extern const char *r_ble_controller_get_rom_compile_version(void);
-#if CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY
-extern void ble_ll_supported_features_init(void);
-#endif //CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY
-
 #if CONFIG_BT_RELEASE_IRAM
 extern uint32_t _iram_bt_text_start;
 extern uint32_t _bss_bt_end;
@@ -199,9 +195,6 @@ static void esp_bt_ctrl_log_partition_get_and_erase_first_block(void);
 /* Local variable definition
 ***************************************************************************
 */
-#if CONFIG_ESP32C2_REV_MIN_FULL < 200
-void *g_ble_lll_rfmgmt_env_p;
-#endif
 /* Static variable declare */
 static DRAM_ATTR esp_bt_controller_status_t ble_controller_status = ESP_BT_CONTROLLER_STATUS_IDLE;
 #if CONFIG_BT_LE_CONTROLLER_LOG_ENABLED
@@ -541,12 +534,7 @@ static int esp_ecc_gen_dh_key(const uint8_t *peer_pub_key_x, const uint8_t *peer

 static int esp_intr_alloc_wrapper(int source, int flags, intr_handler_t handler, void *arg, void **ret_handle_in)
 {
-#if CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY
-    int rc = esp_intr_alloc(source, flags, handler, arg, (intr_handle_t *)ret_handle_in);
-#else
    int rc = esp_intr_alloc(source, flags | ESP_INTR_FLAG_IRAM, handler, arg, (intr_handle_t *)ret_handle_in);
-#endif
-
    return rc;
 }

@@ -755,8 +743,6 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
        return ret;
    }

-    /* If we place the ble code into flash, don't need to initialize ROM. */
-#if !CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY
 #if DEFAULT_BT_LE_50_FEATURE_SUPPORT || DEFAULT_BT_LE_ROLE_CENTROL || DEFAULT_BT_LE_ROLE_OBSERVER
    extern int esp_ble_rom_func_ptr_init_all(void);
    esp_ble_rom_func_ptr_init_all();
@@ -765,7 +751,6 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
    extern int esp_ble_rom_func_ptr_init_legacy_adv_and_slave(void);
    esp_ble_rom_func_ptr_init_legacy_adv_and_slave();
 #endif
-#endif //!CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY

    /* Initialize the function pointers for OS porting */
    npl_freertos_funcs_init();
@@ -815,11 +800,6 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
 #if CONFIG_SW_COEXIST_ENABLE
    coex_init();
 #endif
-
-#if CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY
-    ble_ll_supported_features_init();
-#endif //CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY
-
    ret = ble_controller_init(cfg);
    if (ret != ESP_OK) {
        ESP_LOGW(NIMBLE_PORT_LOG_TAG, "ble_controller_init failed %d", ret);
--- a/components/bt/controller/esp32c2/dummy.c
+++ b/components/bt/controller/esp32c2/dummy.c
@@ -1,320 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#include "esp_bt_cfg.h"
-
-#define BLE_ERR_UNKNOWN_HCI_CMD         (0x01)
-/* LL Features */
-#define BLE_LL_FEAT_LE_ENCRYPTION       (0x0000000001)
-#define BLE_LL_FEAT_CONN_PARM_REQ       (0x0000000002)
-#define BLE_LL_FEAT_EXTENDED_REJ        (0x0000000004)
-#define BLE_LL_FEAT_PERIPH_INIT         (0x0000000008)
-#define BLE_LL_FEAT_LE_PING             (0x0000000010)
-#define BLE_LL_FEAT_DATA_LEN_EXT        (0x0000000020)
-#define BLE_LL_FEAT_LL_PRIVACY          (0x0000000040)
-#define BLE_LL_FEAT_EXT_SCAN_FILT       (0x0000000080)
-#define BLE_LL_FEAT_LE_2M_PHY           (0x0000000100)
-#define BLE_LL_FEAT_STABLE_MOD_ID_TX    (0x0000000200)
-#define BLE_LL_FEAT_STABLE_MOD_ID_RX    (0x0000000400)
-#define BLE_LL_FEAT_LE_CODED_PHY        (0x0000000800)
-#define BLE_LL_FEAT_EXT_ADV             (0x0000001000)
-#define BLE_LL_FEAT_PERIODIC_ADV        (0x0000002000)
-#define BLE_LL_FEAT_CSA2                (0x0000004000)
-#define BLE_LL_FEAT_LE_POWER_CLASS_1    (0x0000008000)
-#define BLE_LL_FEAT_MIN_USED_CHAN       (0x0000010000)
-#define BLE_LL_FEAT_CTE_REQ             (0x0000020000)
-#define BLE_LL_FEAT_CTE_RSP             (0x0000040000)
-#define BLE_LL_FEAT_CTE_TX              (0x0000080000)
-#define BLE_LL_FEAT_CTE_RX              (0x0000100000)
-#define BLE_LL_FEAT_CTE_AOD             (0x0000200000)
-#define BLE_LL_FEAT_CTE_AOA             (0x0000400000)
-#define BLE_LL_FEAT_CTE_RECV            (0x0000800000)
-#define BLE_LL_FEAT_SYNC_TRANS_SEND     (0x0001000000)
-#define BLE_LL_FEAT_SYNC_TRANS_RECV     (0x0002000000)
-#define BLE_LL_FEAT_SCA_UPDATE          (0x0004000000)
-#define BLE_LL_FEAT_REM_PKEY            (0x0008000000)
-#define BLE_LL_FEAT_CIS_CENTRAL         (0x0010000000)
-#define BLE_LL_FEAT_CIS_PERIPH          (0x0020000000)
-#define BLE_LL_FEAT_ISO_BROADCASTER     (0x0040000000)
-#define BLE_LL_FEAT_SYNC_RECV           (0x0080000000)
-#define BLE_LL_FEAT_CIS_HOST            (0x0100000000)
-#define BLE_LL_FEAT_POWER_CTRL_REQ      (0x0200000000)
-#define BLE_LL_FEAT_POWER_CHANGE_IND    (0x0400000000)
-#define BLE_LL_FEAT_PATH_LOSS_MON       (0x0800000000)
-#define BLE_LL_FEAT_PERIODIC_ADV_ADI    (0x1000000000)
-#define BLE_LL_FEAT_CONN_SUBRATING      (0x2000000000)
-#define BLE_LL_FEAT_CONN_SUBRATING_HOST (0x4000000000)
-#define BLE_LL_FEAT_CHANNEL_CLASS       (0x8000000000)
-
-uint64_t ble_ll_supported_features;
-
-void
-ble_ll_supported_features_init(void)
-{
-    ble_ll_supported_features = BLE_LL_FEAT_EXTENDED_REJ;
-    ble_ll_supported_features |= BLE_LL_FEAT_DATA_LEN_EXT;
-
-#if DEFAULT_BT_LE_ROLE_CENTROL || DEFAULT_BT_LE_ROLE_PERIPHERAL
-    ble_ll_supported_features |= BLE_LL_FEAT_PERIPH_INIT;
-    ble_ll_supported_features |= BLE_LL_FEAT_CONN_PARM_REQ;
-#endif
-
-#if CONFIG_BT_LE_FEAT_LL_ENCRYPTION
-    ble_ll_supported_features |= BLE_LL_FEAT_LE_ENCRYPTION;
-#endif
-
-    ble_ll_supported_features |= (BLE_LL_FEAT_LL_PRIVACY | BLE_LL_FEAT_EXT_SCAN_FILT);
-    ble_ll_supported_features |= BLE_LL_FEAT_LE_PING;
-
-#if DEFAULT_BT_LE_EXT_ADV
-    ble_ll_supported_features |= BLE_LL_FEAT_EXT_ADV;
-#endif
-
-#if DEFAULT_BT_LE_PERIODIC_ADV
-    ble_ll_supported_features |= BLE_LL_FEAT_PERIODIC_ADV;
-    ble_ll_supported_features |= BLE_LL_FEAT_PERIODIC_ADV_ADI;
-#endif
-
-#if DEFAULT_BT_LE_PAST
-    ble_ll_supported_features |= BLE_LL_FEAT_SYNC_TRANS_RECV;
-    ble_ll_supported_features |= BLE_LL_FEAT_SYNC_TRANS_SEND;
-#endif
-
-#if DEGAULT_BT_LE_2M_PHY
-    ble_ll_supported_features |= BLE_LL_FEAT_LE_2M_PHY;
-#endif
-
-#if DEGAULT_BT_LE_CODED_PHY
-    ble_ll_supported_features |= BLE_LL_FEAT_LE_CODED_PHY;
-#endif
-
-#if DEFAULT_BT_LE_50_FEATURE_SUPPORT
-    ble_ll_supported_features |= BLE_LL_FEAT_CSA2;
-    ble_ll_supported_features |= BLE_LL_FEAT_SCA_UPDATE;
-    ble_ll_supported_features |= BLE_LL_FEAT_REM_PKEY;
-    ble_ll_supported_features |= BLE_LL_FEAT_CHANNEL_CLASS;
-#endif
-}
-
-#if !DEFAULT_BT_LE_ROLE_BROADCASTER
-void r_ble_ll_adv_rpa_timeout(void) { }
-void r_ble_lll_adv_halt(void) { }
-void r_ble_lll_adv_event_rmvd_from_sched(void) { }
-void r_ble_lll_adv_ext_event_rmvd_from_sched(void) { }
-int  r_ble_ll_adv_enabled(void) { return 0; }
-int  r_ble_ll_adv_can_chg_whitelist(void) { return 1; }
-int  r_ble_ll_adv_set_random_addr(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-void r_ble_ll_adv_reset(void) { }
-void r_ble_ll_adv_init(void) { }
-void r_ble_ll_adv_deinit(void) { }
-int  r_ble_ll_adv_env_init(void) { return 0; }
-void r_ble_ll_adv_env_deinit(void) { }
-int  r_ble_lll_adv_rx_pkt_isr(void) { return -1; }
-void r_ble_ll_adv_rx_pkt_in(void) { }
-int  r_ble_ll_adv_set_adv_params(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_adv_read_txpwr(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_hci_set_adv_data(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_hci_set_scan_rsp_data(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_hci_adv_set_enable(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_adv_vendor_hci_legacy_adv_clear(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_adv_set_data_related_addr_change(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-#endif // !DEFAULT_BT_LE_ROLE_BROADCASTER
-
-#if !DEFAULT_BT_LE_EXT_ADV
-bool r_ble_ll_adv_ext_check_data_itvl(void) { return true; }
-void r_ble_lll_adv_coex_dpc_update_on_aux_scheduled(void) { }
-void r_ble_lll_adv_coex_dpc_calc_pti_update_itvl(void) { }
-void r_ble_lll_adv_sec_done(void) { }
-int r_ble_lll_adv_sec_schedule_next_aux(void) { return 0; }
-void r_ble_lll_adv_sec_event_done(void) { }
-int  r_ble_lll_adv_secondary_tx_start_cb(void) { return 0; }
-void r_ble_lll_adv_aux_schedule(void) { }
-void r_ble_lll_adv_update_rsp_offset(void) { }
-int  r_ble_ll_adv_hci_set_random_addr(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_adv_ext_set_param(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_adv_ext_set_adv_data(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_adv_ext_set_scan_rsp(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_adv_ext_set_enable(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_adv_rd_max_adv_data_len(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_adv_rd_sup_adv_sets(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_adv_remove(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_adv_clear_all(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-#endif //!DEFAULT_BT_LE_EXT_ADV
-
-#if !DEFAULT_BT_LE_PERIODIC_ADV
-void r_ble_ll_adv_sm_stop_periodic(void) { }
-void r_ble_lll_adv_periodic_event_done(void) { }
-int  r_ble_lll_adv_sync_tx_start_cb(void) { return 0; }
-void r_ble_lll_adv_sync_tx_end(void) { }
-int  r_ble_lll_adv_periodic_start(void) { return 0; }
-void r_ble_lll_adv_periodic_rmvd_from_sched(void) { }
-int  r_ble_ll_adv_periodic_set_param(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_adv_periodic_set_data(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_adv_periodic_enable(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-#endif //!DEFAULT_BT_LE_PERIODIC_ADV
-
-#if !DEFAULT_BT_LE_ROLE_OBSERVER
-void r_ble_lll_scan_halt(void) { }
-void r_ble_ll_scan_end_adv_evt(void) { }
-void r_ble_ll_scan_rx_pkt_in(void) { }
-int  r_ble_lll_scan_rx_pkt_isr(void) { return -1; }
-int  r_ble_ll_scan_env_init(void) { return 0; }
-void r_ble_ll_scan_env_deinit(void) {  }
-void r_ble_ll_scan_init(void) { }
-void r_ble_ll_scan_deinit(void) { }
-void r_ble_ll_scan_reset(void) { }
-int  r_ble_ll_scan_can_chg_whitelist(void) { return 1; }
-int  r_ble_ll_scan_enabled(void) { return false; }
-int  r_ble_lll_scan_chk_resume(void) { return -1; }
-int  r_ble_ll_scan_set_scan_params(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_hci_scan_set_enable(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_scan_hci_update_adv_report_flow_ctrl(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_scan_hci_set_adv_report_flow_ctrl(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-#endif //!DEFAULT_BT_LE_ROLE_OBSERVER
-
-#if !DEFAULT_BT_LE_EXT_SCAN
-void r_ble_lll_scan_duration_period_timers_restart(void) { }
-void r_ble_lll_scan_duration_period_timers_stop(void) { }
-int r_ble_ll_hci_send_legacy_ext_adv_report(void) { return -1; }
-void r_ble_lll_sched_rmv_elem_type(void) { }
-void r_ble_ll_scan_send_truncated(void) { }
-void r_ble_ll_scan_aux_data_unref(void) { }
-void r_ble_lll_scan_sched_remove(void) { }
-void r_ble_lll_scan_aux_data_free(void) { }
-void r_ble_lll_aux_scan_drop(void) { }
-int r_ble_lll_sched_aux_scan(void) { return -1; }
-int r_ble_lll_scan_rx_isr_on_aux(void) { return -1; }
-void r_ble_lll_scan_period_timer_cb(void) { }
-void r_ble_lll_scan_duration_timer_cb(void) { }
-void r_ble_ll_scan_rx_pkt_in_on_aux(void) { }
-int  r_ble_ll_set_ext_scan_params(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_hci_ext_scan_set_enable(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-#endif //!DEFAULT_BT_LE_EXT_SCAN
-
-#if !DEFAULT_BT_LE_ROLE_CENTROL
-void r_ble_ll_init_rx_pkt_in(void) { }
-int  r_ble_lll_init_rx_pkt_isr(void) { return -1; }
-int  r_ble_ll_conn_create(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_conn_create_cancel(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-#endif //!DEFAULT_BT_LE_ROLE_CENTROL
-
-#if !DEFAULT_BT_LE_ROLE_CENTROL || !DEFAULT_BT_LE_EXT_SCAN
-int  r_ble_ll_ext_conn_create(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-#endif //!DEFAULT_BT_LE_ROLE_CENTROL || !DEFAULT_BT_LE_EXT_SCAN
-
-#if !DEFAULT_BT_LE_ROLE_PERIPHERAL
-int r_ble_ll_conn_slave_start(void) { return 0; }
-#endif //!DEFAULT_BT_LE_ROLE_PERIPHERAL
-
-#if !DEFAULT_BT_LE_ROLE_CENTROL && !DEFAULT_BT_LE_ROLE_PERIPHERAL
-void r_ble_ll_conn_rx_data_pdu(void) { }
-int  r_ble_lll_conn_rx_pkt_isr(void) { return -1; }
-int  r_ble_ll_hci_disconnect(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_conn_hci_rd_rem_ver_cmd(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_conn_hci_update(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_conn_hci_rd_chan_map(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_conn_hci_read_rem_features(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_conn_hci_param_rr(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_conn_hci_param_nrr(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-#endif //!DEFAULT_BT_LE_ROLE_CENTROL && !DEFAULT_BT_LE_ROLE_PERIPHERAL
-
-#if !CONFIG_BT_LE_FEAT_LL_ENCRYPTION
-int r_ble_ll_conn_chk_phy_upd_start(void) { return -1; }
-void r_ble_ll_hci_ev_encrypt_chg(void) { }
-int r_ble_ll_ctrl_enc_allowed_pdu_rx(void) { return 1; }
-int r_ble_ll_ctrl_enc_allowed_pdu_tx(void) { return 1; }
-uint8_t r_ble_ll_ctrl_rx_start_enc_rsp(void) { return 0x07; }
-uint8_t r_ble_ll_ctrl_rx_pause_enc_rsp(void) { return 0x07; }
-int  r_ble_ll_hci_le_encrypt(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-#endif //!CONFIG_BT_LE_FEAT_LL_ENCRYPTION
-
-#if !DEFAULT_BT_LE_ROLE_PERIPHERAL || !CONFIG_BT_LE_FEAT_LL_ENCRYPTION
-uint8_t r_ble_ll_ctrl_rx_pause_enc_req(void) { return 0x07; }
-uint8_t r_ble_ll_ctrl_rx_enc_req(void) { return 0x07; }
-int r_ble_ll_conn_hci_le_ltk_reply(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int r_ble_ll_conn_hci_le_ltk_neg_reply(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-#endif //!DEFAULT_BT_LE_ROLE_PERIPHERAL || !CONFIG_BT_LE_FEAT_LL_ENCRYPTION
-
-#if !DEFAULT_BT_LE_ROLE_CENTROL || !CONFIG_BT_LE_FEAT_LL_ENCRYPTION
-uint8_t r_ble_ll_ctrl_rx_start_enc_req(void) { return 0x07; }
-void r_ble_ll_ctrl_rx_enc_rsp(void) { }
-void r_ble_ll_ctrl_enc_req_make(void) { }
-int r_ble_ll_conn_hci_le_start_encrypt(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-#endif //!DEFAULT_BT_LE_ROLE_CENTROL || !CONFIG_BT_LE_FEAT_LL_ENCRYPTION
-
-#if !DEGAULT_BT_LE_2M_PHY && !DEGAULT_BT_LE_CODED_PHY
-void r_ble_ll_ctrl_phy_update_proc_complete(void) { }
-void r_ble_ll_ctrl_phy_update_cancel(void) { }
-uint8_t r_ble_ll_ctrl_rx_phy_update_ind(void) { return 0x07; }
-uint8_t r_ble_ll_ctrl_rx_phy_rsp(void) { return 0x07; }
-uint8_t r_ble_ll_ctrl_rx_phy_req(void) { return 0x07; }
-void r_ble_ll_ctrl_phy_req_rsp_make(void) { }
-#endif //DEGAULT_BT_LE_2M_PHY && DEGAULT_BT_LE_CODED_PHY
-
-#if !DEFAULT_BT_LE_PERIODIC_SYNC
-void r_ble_lll_sync_halt(void) { }
-void r_ble_lll_sync_rmvd_from_sched(void) { }
-int  r_ble_ll_sync_list_search(void) { return -1; }
-uint8_t r_ble_ll_ctrl_rx_periodic_sync_ind(void) { return 0x07; }
-void r_ble_ll_sync_rx_pkt_in(void) {  }
-int  r_ble_lll_sync_rx_pkt_isr(void) { return -1; }
-int  r_ble_ll_sync_env_init(void) { return 0; }
-void r_ble_ll_sync_env_deinit(void) {  }
-void r_ble_ll_sync_init(void) {  }
-void r_ble_ll_sync_deinit(void) {  }
-void r_ble_ll_sync_reset(void) {  }
-bool r_ble_ll_sync_enabled(void) { return false; }
-int  r_ble_ll_sync_create(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_sync_cancel(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_sync_terminate(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_sync_list_add(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_sync_list_remove(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_sync_list_clear(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_sync_list_size(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_sync_receive_enable(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-#endif //!DEFAULT_BT_LE_PERIODIC_SYNC
-
-#if !DEFAULT_BT_LE_PAST || !DEFAULT_BT_LE_PERIODIC_ADV
-int  r_ble_ll_adv_periodic_set_info_transfer(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-#endif //!DEFAULT_BT_LE_PAST || !DEFAULT_BT_LE_PERIODIC_ADV
-
-#if !DEFAULT_BT_LE_PAST || !DEFAULT_BT_LE_PERIODIC_SYNC
-int  r_ble_ll_sync_transfer(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_set_sync_transfer_params(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_set_default_sync_transfer_params(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-#endif //!DEFAULT_BT_LE_PAST || !DEFAULT_BT_LE_PERIODIC_SYNC
-
-#if !DEFAULT_BT_LE_50_FEATURE_SUPPORT
-uint8_t r_ble_ll_ctrl_rx_channel_reporting_ind(void) { return 0x07; }
-uint8_t r_ble_ll_ctrl_rx_channel_status_ind(void) { return 0x07; }
-uint8_t r_ble_ll_ctrl_rx_sca_req(void) { return 0x07; }
-uint8_t r_ble_ll_ctrl_rx_sca_rsp(void) { return 0x07; }
-void r_ble_ll_ctrl_channel_class_reporting_make(void) { }
-void r_ble_ll_ctrl_channel_class_enable_make(void) { }
-void r_ble_ll_ctrl_sca_req_rsp_make(void) { }
-int  r_ble_ll_modify_sca(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_conn_req_peer_sca(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-#endif //!DEFAULT_BT_LE_50_FEATURE_SUPPORT
-
-#if !DEFAULT_BT_LE_50_FEATURE_SUPPORT
-int  r_ble_ll_conn_hci_le_rd_phy(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_hci_le_set_def_phy(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_ll_conn_hci_le_set_phy(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-#endif //!DEFAULT_BT_LE_50_FEATURE_SUPPORT
-
-#if !CONFIG_BT_LE_DTM_ENABLED
-void r_ble_lll_dtm_rx_pkt_in(void) {  }
-int  r_ble_lll_dtm_rx_isr_end(void) { return -1; }
-void r_ble_lll_dtm_reset(void) { }
-void r_ble_lll_dtm_init(void) { }
-void r_ble_lll_dtm_deinit(void) { }
-int  r_ble_lll_dtm_env_init(void) { return 0; }
-void r_ble_lll_dtm_env_deinit(void) { }
-int  r_ble_lll_hci_dtm_tx_test(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_lll_hci_dtm_rx_test(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_lll_dtm_end_test(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_lll_hci_dtm_rx_test_v2(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-int  r_ble_lll_hci_dtm_tx_test_v2(void) { return BLE_ERR_UNKNOWN_HCI_CMD; }
-#endif //!CONFIG_BT_LE_DTM_ENABLED
--- a/components/bt/controller/esp32c2/esp_bt_cfg.h
+++ b/components/bt/controller/esp32c2/esp_bt_cfg.h
@@ -45,14 +45,6 @@ extern "C" {
    #define DEFAULT_BT_LE_50_FEATURE_SUPPORT (0)
    #endif

-    #define DEGAULT_BT_LE_2M_PHY                         (CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY)
-    #define DEGAULT_BT_LE_CODED_PHY                      (CONFIG_BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY)
-    #define DEFAULT_BT_LE_EXT_ADV                        (CONFIG_BT_NIMBLE_EXT_ADV)
-    #define DEFAULT_BT_LE_PERIODIC_ADV                   (CONFIG_BT_NIMBLE_ENABLE_PERIODIC_ADV)
-    #define DEFAULT_BT_LE_EXT_SCAN                       (CONFIG_BT_NIMBLE_EXT_SCAN)
-    #define DEFAULT_BT_LE_PERIODIC_SYNC                  (CONFIG_BT_NIMBLE_ENABLE_PERIODIC_SYNC)
-    #define DEFAULT_BT_LE_PAST                           (CONFIG_BT_NIMBLE_PERIODIC_ADV_SYNC_TRANSFER)
-
    #define DEFAULT_BT_LE_ROLE_OBSERVER                  MYNEWT_VAL(BLE_ROLE_OBSERVER)
    #define DEFAULT_BT_LE_ROLE_CENTROL                   MYNEWT_VAL(BLE_ROLE_CENTRAL)
    #define DEFAULT_BT_LE_ROLE_PERIPHERAL                MYNEWT_VAL(BLE_ROLE_PERIPHERAL)
@@ -130,55 +122,12 @@ extern "C" {
    #else
        #define DEFAULT_BT_LE_HCI_EVT_LO_BUF_COUNT (8)
    #endif
-
    #if defined(CONFIG_BT_LE_50_FEATURE_SUPPORT)
        #define DEFAULT_BT_LE_50_FEATURE_SUPPORT (1)
    #else
        #define DEFAULT_BT_LE_50_FEATURE_SUPPORT (0)
    #endif

-    #if defined(CONFIG_BT_LE_LL_CFG_FEAT_LE_2M_PHY)
-        #define DEGAULT_BT_LE_2M_PHY (CONFIG_BT_LE_LL_CFG_FEAT_LE_2M_PHY)
-    #else
-        #define DEGAULT_BT_LE_2M_PHY (0)
-    #endif
-
-    #if defined(CONFIG_BT_LE_LL_CFG_FEAT_LE_CODED_PHY)
-        #define DEGAULT_BT_LE_CODED_PHY (CONFIG_BT_LE_LL_CFG_FEAT_LE_CODED_PHY)
-    #else
-        #define DEGAULT_BT_LE_CODED_PHY (0)
-    #endif
-
-    #if defined(CONFIG_BT_LE_EXT_ADV)
-        #define DEFAULT_BT_LE_EXT_ADV       (CONFIG_BT_LE_EXT_ADV)
-    #else
-        #define DEFAULT_BT_LE_EXT_ADV       (0)
-    #endif
-
-    #if defined(CONFIG_BT_LE_ENABLE_PERIODIC_ADV)
-        #define DEFAULT_BT_LE_PERIODIC_ADV  (CONFIG_BT_LE_ENABLE_PERIODIC_ADV)
-    #else
-        #define DEFAULT_BT_LE_PERIODIC_ADV  (0)
-    #endif
-
-    #if defined(CONFIG_BT_LE_EXT_SCAN)
-        #define DEFAULT_BT_LE_EXT_SCAN      (CONFIG_BT_LE_EXT_SCAN)
-    #else
-        #define DEFAULT_BT_LE_EXT_SCAN      (0)
-    #endif
-
-    #if defined(CONFIG_BT_LE_ENABLE_PERIODIC_SYNC)
-        #define DEFAULT_BT_LE_PERIODIC_SYNC  (CONFIG_BT_LE_ENABLE_PERIODIC_SYNC)
-    #else
-        #define DEFAULT_BT_LE_PERIODIC_SYNC  (0)
-    #endif
-
-    #if defined(BT_LE_PERIODIC_ADV_SYNC_TRANSFER)
-        #define DEFAULT_BT_LE_PAST          (BT_LE_PERIODIC_ADV_SYNC_TRANSFER)
-    #else
-        #define DEFAULT_BT_LE_PAST          (0)
-    #endif
-
    #if defined(CONFIG_BT_LE_ROLE_CENTROL_ENABLE)
        #define DEFAULT_BT_LE_ROLE_CENTROL (1)
    #else
--- a/components/bt/controller/esp32c3/Kconfig.in
+++ b/components/bt/controller/esp32c3/Kconfig.in
@@ -226,7 +226,6 @@ config BT_CTRL_DFT_TX_POWER_LEVEL_EFF

 config BT_CTRL_BLE_ADV_REPORT_FLOW_CTRL_SUPP
    bool "BLE adv report flow control supported"
-    depends on (!BT_CTRL_RUN_IN_FLASH_ONLY) || (BT_CTRL_RUN_IN_FLASH_ONLY && BT_CTRL_BLE_SCAN)
    default y
    help
        The function is mainly used to enable flow control for advertising reports. When it is enabled,
@@ -513,38 +512,3 @@ menu "BLE disconnect when instant passed"
            If this option is enabled, Controller will terminate the connection
            when instant passed in PHY update procedure.
 endmenu
-config BT_CTRL_RUN_IN_FLASH_ONLY
-    bool "Put all BLE Controller code in flash"
-    default n
-    help
-        If this option is enabled, all code for the Bluetooth controller will be moved from ROM and IRAM
-        to flash, saving over 20K bytes of memory. However, it will require more flash resources and the
-        performance of Bluetooth will decrease If this option is enabled, Bluetooth may not work properly
-        during erasing flash. It is recommended to turn on the auto suspend function of flash. After auto
-        suspend is turned on, Bluetooth interrupts can be executed normally during erasing flash, with less
-        impact on Bluetooth performance.
-
-config BT_CTRL_DTM_ENABLE
-    depends on BT_CTRL_RUN_IN_FLASH_ONLY
-    bool "Enable direct test mode feature"
-    default n
-
-config BT_CTRL_BLE_MASTER
-    depends on BT_CTRL_RUN_IN_FLASH_ONLY
-    bool "Enable BLE master role feature"
-    default y
-
-config BT_CTRL_BLE_TEST
-    depends on BT_CTRL_RUN_IN_FLASH_ONLY
-    bool "Enable BLE QA test feature"
-    default n
-
-config BT_CTRL_BLE_SCAN
-    depends on BT_CTRL_RUN_IN_FLASH_ONLY
-    bool "Enable BLE scan feature"
-    default y
-
-config BT_CTRL_BLE_SECURITY_ENABLE
-    depends on BT_CTRL_RUN_IN_FLASH_ONLY && BT_CONTROLLER_ONLY
-    bool "Enable BLE security feature"
-    default y
--- a/components/bt/controller/esp32c3/bt.c
+++ b/components/bt/controller/esp32c3/bt.c
@@ -260,6 +260,7 @@ extern int API_vhci_host_register_callback(const vhci_host_callback_t *callback)
 extern int ble_txpwr_set(int power_type, uint16_t handle, int power_level);
 extern int ble_txpwr_get(int power_type, uint16_t handle);

+extern uint16_t l2c_ble_link_get_tx_buf_num(void);
 extern void coex_pti_v2(void);

 extern bool btdm_deep_sleep_mem_init(void);
@@ -498,11 +499,7 @@ static int interrupt_alloc_wrapper(int cpu_id, int source, intr_handler_t handle
 {
    btdm_isr_alloc_t p;
    p.source = source;
-#if CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY
-    p.flags = ESP_INTR_FLAG_LEVEL3;
-#else
    p.flags = ESP_INTR_FLAG_LEVEL3 | ESP_INTR_FLAG_IRAM;
-#endif
    p.fn = handler;
    p.arg = arg;
    p.handle = (intr_handle_t *)ret_handle;
@@ -1429,10 +1426,6 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)

    ESP_LOGI(BT_LOG_TAG, "BT controller compile version [%s]", btdm_controller_get_compile_version());

-#if (CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY)
-    ESP_LOGI(BT_LOG_TAG,"Put all controller code in flash");
-#endif
-
    if ((err = btdm_low_power_mode_init(cfg)) != ESP_OK) {
        ESP_LOGE(BT_LOG_TAG, "Low power module initialization failed");
        goto error;
@@ -1876,6 +1869,11 @@ int IRAM_ATTR esp_bt_h4tl_eif_io_event_notify(int event)
    return btdm_hci_tl_io_event_post(event);
 }

+uint16_t esp_bt_get_tx_buf_num(void)
+{
+    return l2c_ble_link_get_tx_buf_num();
+}
+
 static void coex_wifi_sleep_set_hook(bool sleep)
 {

--- a/components/bt/controller/esp32c5/bt.c
+++ b/components/bt/controller/esp32c5/bt.c
@@ -385,7 +385,7 @@ static esp_err_t sleep_modem_ble_mac_modem_state_init(uint8_t extra)
    int retention_args = extra;
    sleep_retention_module_init_param_t init_param = {
        .cbs     = { .create = { .handle = sleep_modem_ble_mac_retention_init, .arg = &retention_args } },
-        .depends = RETENTION_MODULE_BITMAP_INIT(BT_BB)
+        .depends = BIT(SLEEP_RETENTION_MODULE_BT_BB)
    };
    esp_err_t err = sleep_retention_module_init(SLEEP_RETENTION_MODULE_BLE_MAC, &init_param);
    if (err == ESP_OK) {
--- a/components/bt/controller/esp32c6/Kconfig.in
+++ b/components/bt/controller/esp32c6/Kconfig.in
@@ -689,11 +689,3 @@ config BT_LE_DFT_TX_POWER_LEVEL_DBM_EFF
    default 18 if BT_LE_DFT_TX_POWER_LEVEL_P18
    default 20 if BT_LE_DFT_TX_POWER_LEVEL_P20
    default 0
-
-config BT_LE_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS
-    bool "Enable enhanced Access Address check in CONNECT_IND"
-    default n
-    help
-        Enabling this option will add stricter verification of the Access Address in the CONNECT_IND PDU.
-        This improves security by ensuring that only connection requests with valid Access Addresses are accepted.
-        If disabled, only basic checks are applied, improving compatibility.
--- a/components/bt/controller/esp32c6/bt.c
+++ b/components/bt/controller/esp32c6/bt.c
@@ -593,7 +593,7 @@ static esp_err_t sleep_modem_ble_mac_modem_state_init(uint8_t extra)
    int retention_args = extra;
    sleep_retention_module_init_param_t init_param = {
        .cbs     = { .create = { .handle = sleep_modem_ble_mac_retention_init, .arg = &retention_args } },
-        .depends = RETENTION_MODULE_BITMAP_INIT(BT_BB)
+        .depends = BIT(SLEEP_RETENTION_MODULE_BT_BB)
    };
    esp_err_t err = sleep_retention_module_init(SLEEP_RETENTION_MODULE_BLE_MAC, &init_param);
    if (err == ESP_OK) {
--- a/components/bt/controller/esp32c6/esp_bt_cfg.h
+++ b/components/bt/controller/esp32c6/esp_bt_cfg.h
@@ -148,12 +148,6 @@ extern "C" {

 #define DEFAULT_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF CONFIG_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF

-#ifdef CONFIG_BT_LE_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS
-#define DEFAULT_BT_LE_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS  (CONFIG_BT_LE_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS)
-#else
-#define DEFAULT_BT_LE_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS  (0)
-#endif
-
 #ifdef CONFIG_BT_LE_HCI_INTERFACE_USE_UART
 #define HCI_UART_EN CONFIG_BT_LE_HCI_INTERFACE_USE_UART
 #else
@@ -224,6 +218,7 @@ extern "C" {

 #define BLE_LL_TX_PWR_DBM_N                 (CONFIG_BT_LE_DFT_TX_POWER_LEVEL_DBM_EFF)

+
 #define RUN_BQB_TEST                        (0)
 #define RUN_QA_TEST                         (0)
 #define NIMBLE_DISABLE_SCAN_BACKOFF         (0)
--- a/components/bt/controller/esp32h2/Kconfig.in
+++ b/components/bt/controller/esp32h2/Kconfig.in
@@ -690,11 +690,3 @@ config BT_LE_DFT_TX_POWER_LEVEL_DBM_EFF
    default 18 if BT_LE_DFT_TX_POWER_LEVEL_P18
    default 20 if BT_LE_DFT_TX_POWER_LEVEL_P20
    default 0
-
-config BT_LE_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS
-    bool "Enable enhanced Access Address check in CONNECT_IND"
-    default n
-    help
-        Enabling this option will add stricter verification of the Access Address in the CONNECT_IND PDU.
-        This improves security by ensuring that only connection requests with valid Access Addresses are accepted.
-        If disabled, only basic checks are applied, improving compatibility.
--- a/components/bt/controller/esp32h2/bt.c
+++ b/components/bt/controller/esp32h2/bt.c
@@ -585,7 +585,7 @@ static esp_err_t sleep_modem_ble_mac_modem_state_init(uint8_t extra)
    int retention_args = extra;
    sleep_retention_module_init_param_t init_param = {
        .cbs     = { .create = { .handle = sleep_modem_ble_mac_retention_init, .arg = &retention_args } },
-        .depends = RETENTION_MODULE_BITMAP_INIT(BT_BB)
+        .depends = BIT(SLEEP_RETENTION_MODULE_BT_BB)
    };
    esp_err_t err = sleep_retention_module_init(SLEEP_RETENTION_MODULE_BLE_MAC, &init_param);
    if (err == ESP_OK) {
--- a/components/bt/controller/esp32h2/esp_bt_cfg.h
+++ b/components/bt/controller/esp32h2/esp_bt_cfg.h
@@ -148,12 +148,6 @@ extern "C" {

 #define DEFAULT_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF CONFIG_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF

-#ifdef CONFIG_BT_LE_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS
-#define DEFAULT_BT_LE_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS  (CONFIG_BT_LE_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS)
-#else
-#define DEFAULT_BT_LE_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS  (0)
-#endif
-
 #ifdef CONFIG_BT_LE_HCI_INTERFACE_USE_UART
 #define HCI_UART_EN CONFIG_BT_LE_HCI_INTERFACE_USE_UART
 #else
--- a/components/bt/controller/lib_esp32
+++ b/components/bt/controller/lib_esp32
--- a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib
+++ b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib
--- a/components/bt/controller/lib_esp32c3_family
+++ b/components/bt/controller/lib_esp32c3_family
--- a/components/bt/controller/lib_esp32c6/esp32c6-bt-lib
+++ b/components/bt/controller/lib_esp32c6/esp32c6-bt-lib
--- a/components/bt/controller/lib_esp32h2/esp32h2-bt-lib
+++ b/components/bt/controller/lib_esp32h2/esp32h2-bt-lib
--- a/components/bt/esp_ble_mesh/core/bluedroid_host/adapter.c
+++ b/components/bt/esp_ble_mesh/core/bluedroid_host/adapter.c
@@ -1198,7 +1198,6 @@ uint16_t bt_mesh_gattc_get_service_uuid(struct bt_mesh_conn *conn)

 int bt_mesh_gattc_conn_create(const bt_mesh_addr_t *addr, uint16_t service_uuid)
 {
-    tBTA_BLE_CONN_PARAMS  conn_1m_param = {0};
    uint8_t zero[6] = {0};
    int i;

@@ -1252,14 +1251,10 @@ int bt_mesh_gattc_conn_create(const bt_mesh_addr_t *addr, uint16_t service_uuid)
     * Slave_latency: 0x0
     * Supervision_timeout: 1s
     */
-    conn_1m_param.interval_min = 0x18;
-    conn_1m_param.interval_max = 0x18;
-    conn_1m_param.latency = 0;
-    conn_1m_param.supervision_timeout = 0x64;
+    BTA_DmSetBlePrefConnParams(bt_mesh_gattc_info[i].addr.val, 0x18, 0x18, 0x00, 0x64);

-    BTA_GATTC_Enh_Open(bt_mesh_gattc_if, bt_mesh_gattc_info[i].addr.val,
-                   bt_mesh_gattc_info[i].addr.type, true, BTA_GATT_TRANSPORT_LE, FALSE, BLE_ADDR_UNKNOWN_TYPE,
-                   BTA_BLE_PHY_1M_MASK, &conn_1m_param, NULL, NULL);
+    BTA_GATTC_Open(bt_mesh_gattc_if, bt_mesh_gattc_info[i].addr.val,
+                   bt_mesh_gattc_info[i].addr.type, true, BTA_GATT_TRANSPORT_LE, FALSE);

    return 0;
 }
--- a/components/bt/esp_ble_mesh/core/storage/settings.c
+++ b/components/bt/esp_ble_mesh/core/storage/settings.c
@@ -1483,8 +1483,6 @@ int settings_core_commit(void)
        struct bt_mesh_hb_pub *hb_pub = NULL;
        struct bt_mesh_cfg_srv *cfg = NULL;

-        bt_mesh_atomic_set_bit(bt_mesh.flags, BLE_MESH_VALID);
-
        hb_pub = bt_mesh_hb_pub_get();
        if (hb_pub && hb_pub->dst != BLE_MESH_ADDR_UNASSIGNED &&
            hb_pub->count && hb_pub->period) {
@@ -1503,6 +1501,7 @@ int settings_core_commit(void)
            cfg->default_ttl = stored_cfg.cfg.default_ttl;
        }

+        bt_mesh_atomic_set_bit(bt_mesh.flags, BLE_MESH_VALID);
        bt_mesh_net_start();
    }
 #endif /* CONFIG_BLE_MESH_NODE */
--- a/components/bt/host/bluedroid/Kconfig.in
+++ b/components/bt/host/bluedroid/Kconfig.in
@@ -1217,23 +1217,19 @@ config BT_BLE_RPA_TIMEOUT
        Default is 900 s (15 minutes). Range is 1 s to 1 hour (3600 s).

 config BT_BLE_50_FEATURES_SUPPORTED
-    bool "Enable BLE 5.0 features(please disable BLE 4.2 if enable BLE 5.0)"
+    bool "Enable BLE 5.0 features"
    depends on (BT_BLE_ENABLED && ((BT_CONTROLLER_ENABLED && SOC_BLE_50_SUPPORTED) || BT_CONTROLLER_DISABLED))
    default y
    help
        Enabling this option activates BLE 5.0 features.
        This option is universally supported in chips that support BLE, except for ESP32.
-        BLE 4.2 and BLE 5.0 cannot be used simultaneously.
-

 config BT_BLE_42_FEATURES_SUPPORTED
-    bool "Enable BLE 4.2 features(please disable BLE 5.0 if enable BLE 4.2)"
+    bool "Enable BLE 4.2 features"
    depends on (BT_BLE_ENABLED && ((BT_CONTROLLER_ENABLED && SOC_BLE_SUPPORTED) || BT_CONTROLLER_DISABLED))
    default n
    help
        This enables BLE 4.2 features.
-        This option is universally supported by all ESP chips with BLE capabilities.
-        BLE 4.2 and BLE 5.0 cannot be used simultaneously.

 config BT_BLE_FEAT_PERIODIC_ADV_SYNC_TRANSFER
    bool "Enable BLE periodic advertising sync transfer feature"
--- a/components/bt/host/bluedroid/api/esp_gattc_api.c
+++ b/components/bt/host/bluedroid/api/esp_gattc_api.c
@@ -67,134 +67,46 @@ esp_err_t esp_ble_gattc_app_unregister(esp_gatt_if_t gattc_if)

    return (btc_transfer_context(&msg, &arg, sizeof(btc_ble_gattc_args_t), NULL, NULL) == BT_STATUS_SUCCESS ? ESP_OK : ESP_FAIL);
 }
-
-esp_err_t esp_ble_gattc_enh_open(esp_gatt_if_t gattc_if, esp_ble_gatt_creat_conn_params_t *creat_conn_params)
+#if (BLE_42_FEATURE_SUPPORT == TRUE)
+esp_err_t esp_ble_gattc_open(esp_gatt_if_t gattc_if, esp_bd_addr_t remote_bda, esp_ble_addr_type_t remote_addr_type, bool is_direct)
 {
    btc_msg_t msg = {0};
    btc_ble_gattc_args_t arg;
-    const esp_ble_conn_params_t *conn_params;

    ESP_BLUEDROID_STATUS_CHECK(ESP_BLUEDROID_STATUS_ENABLED);

-    if (!creat_conn_params) {
-        return ESP_ERR_INVALID_ARG;
-    }
-
    msg.sig = BTC_SIG_API_CALL;
    msg.pid = BTC_PID_GATTC;
    msg.act = BTC_GATTC_ACT_OPEN;
    arg.open.gattc_if = gattc_if;
-    memcpy(arg.open.remote_bda, creat_conn_params->remote_bda, ESP_BD_ADDR_LEN);
-    arg.open.remote_addr_type = creat_conn_params->remote_addr_type;
-    arg.open.is_direct = creat_conn_params->is_direct;
-    arg.open.is_aux= creat_conn_params->is_aux;
-    arg.open.own_addr_type = creat_conn_params->own_addr_type;
-    arg.open.phy_mask = creat_conn_params->phy_mask;
-
-    // If not aux open, shouldn't set 2M and coded PHY connection params
-    if (!creat_conn_params->is_aux &&
-        ((creat_conn_params->phy_mask & ESP_BLE_PHY_2M_PREF_MASK) ||
-        (creat_conn_params->phy_mask & ESP_BLE_PHY_CODED_PREF_MASK))) {
-        return ESP_ERR_INVALID_ARG;
-    }
-
-    if (creat_conn_params->phy_mask & ESP_BLE_PHY_1M_PREF_MASK) {
-        if (!creat_conn_params->phy_1m_conn_params) {
-            return ESP_ERR_INVALID_ARG;
-        }
-
-        conn_params = creat_conn_params->phy_1m_conn_params;
-        if (ESP_BLE_IS_VALID_PARAM(conn_params->interval_min, ESP_BLE_CONN_INT_MIN, ESP_BLE_CONN_INT_MAX) &&
-            ESP_BLE_IS_VALID_PARAM(conn_params->interval_max, ESP_BLE_CONN_INT_MIN, ESP_BLE_CONN_INT_MAX) &&
-            ESP_BLE_IS_VALID_PARAM(conn_params->supervision_timeout, ESP_BLE_CONN_SUP_TOUT_MIN, ESP_BLE_CONN_SUP_TOUT_MAX) &&
-            (conn_params->latency <= ESP_BLE_CONN_LATENCY_MAX) &&
-            ((conn_params->supervision_timeout * 10) >= ((1 + conn_params->latency) * ((conn_params->interval_max * 5) >> 1))) &&
-            (conn_params->interval_min <= conn_params->interval_max)) {
-            memcpy(&arg.open.phy_1m_conn_params, conn_params, sizeof(esp_ble_conn_params_t));
-        } else {
-            LOG_ERROR("%s, invalid 1M PHY connection params: min_int = %d, max_int = %d, latency = %d, timeout = %d", __func__,
-                                    conn_params->interval_min,
-                                    conn_params->interval_max,
-                                    conn_params->latency,
-                                    conn_params->supervision_timeout);
-            return ESP_ERR_INVALID_ARG;
-        }
-    }
-
-    if (creat_conn_params->phy_mask & ESP_BLE_PHY_2M_PREF_MASK) {
-        if (!creat_conn_params->phy_2m_conn_params) {
-            return ESP_ERR_INVALID_ARG;
-        }
-
-        conn_params = creat_conn_params->phy_2m_conn_params;
-        if (ESP_BLE_IS_VALID_PARAM(conn_params->interval_min, ESP_BLE_CONN_INT_MIN, ESP_BLE_CONN_INT_MAX) &&
-            ESP_BLE_IS_VALID_PARAM(conn_params->interval_max, ESP_BLE_CONN_INT_MIN, ESP_BLE_CONN_INT_MAX) &&
-            ESP_BLE_IS_VALID_PARAM(conn_params->supervision_timeout, ESP_BLE_CONN_SUP_TOUT_MIN, ESP_BLE_CONN_SUP_TOUT_MAX) &&
-            (conn_params->latency <= ESP_BLE_CONN_LATENCY_MAX) &&
-            ((conn_params->supervision_timeout * 10) >= ((1 + conn_params->latency) * ((conn_params->interval_max * 5) >> 1))) &&
-            (conn_params->interval_min <= conn_params->interval_max)) {
-            memcpy(&arg.open.phy_2m_conn_params, conn_params, sizeof(esp_ble_conn_params_t));
-        } else {
-            LOG_ERROR("%s, invalid 2M PHY connection params: min_int = %d, max_int = %d, latency = %d, timeout = %d", __func__,
-                                    conn_params->interval_min,
-                                    conn_params->interval_max,
-                                    conn_params->latency,
-                                    conn_params->supervision_timeout);
-            return ESP_ERR_INVALID_ARG;
-        }
-    }
-
-    if (creat_conn_params->phy_mask & ESP_BLE_PHY_CODED_PREF_MASK) {
-        if (!creat_conn_params->phy_coded_conn_params) {
-            return ESP_ERR_INVALID_ARG;
-        }
-
-        conn_params = creat_conn_params->phy_coded_conn_params;
-        if (ESP_BLE_IS_VALID_PARAM(conn_params->interval_min, ESP_BLE_CONN_INT_MIN, ESP_BLE_CONN_INT_MAX) &&
-            ESP_BLE_IS_VALID_PARAM(conn_params->interval_max, ESP_BLE_CONN_INT_MIN, ESP_BLE_CONN_INT_MAX) &&
-            ESP_BLE_IS_VALID_PARAM(conn_params->supervision_timeout, ESP_BLE_CONN_SUP_TOUT_MIN, ESP_BLE_CONN_SUP_TOUT_MAX) &&
-            (conn_params->latency <= ESP_BLE_CONN_LATENCY_MAX) &&
-            ((conn_params->supervision_timeout * 10) >= ((1 + conn_params->latency) * ((conn_params->interval_max * 5) >> 1))) &&
-            (conn_params->interval_min <= conn_params->interval_max)) {
-            memcpy(&arg.open.phy_coded_conn_params, conn_params, sizeof(esp_ble_conn_params_t));
-        } else {
-            LOG_ERROR("%s, invalid Coded PHY connection params: min_int = %d, max_int = %d, latency = %d, timeout = %d", __func__,
-                                    conn_params->interval_min,
-                                    conn_params->interval_max,
-                                    conn_params->latency,
-                                    conn_params->supervision_timeout);
-            return ESP_ERR_INVALID_ARG;
-        }
-    }
+    memcpy(arg.open.remote_bda, remote_bda, ESP_BD_ADDR_LEN);
+    arg.open.remote_addr_type = remote_addr_type;
+    arg.open.is_direct = is_direct;
+    arg.open.is_aux = false;

    return (btc_transfer_context(&msg, &arg, sizeof(btc_ble_gattc_args_t), NULL, NULL) == BT_STATUS_SUCCESS ? ESP_OK : ESP_FAIL);
 }
-
-#if (BLE_42_FEATURE_SUPPORT == TRUE)
-esp_err_t esp_ble_gattc_open(esp_gatt_if_t gattc_if, esp_bd_addr_t remote_bda, esp_ble_addr_type_t remote_addr_type, bool is_direct)
-{
-    esp_ble_gatt_creat_conn_params_t creat_conn_params = {0};
-    memcpy(creat_conn_params.remote_bda, remote_bda, ESP_BD_ADDR_LEN);
-    creat_conn_params.remote_addr_type = remote_addr_type;
-    creat_conn_params.is_direct = is_direct;
-    creat_conn_params.is_aux = false;
-    creat_conn_params.own_addr_type = 0xff; //undefined, will use local value
-    creat_conn_params.phy_mask = 0x0;
-    return esp_ble_gattc_enh_open(gattc_if, &creat_conn_params);
-}
 #endif // #if (BLE_42_FEATURE_SUPPORT == TRUE)

 #if (BLE_50_FEATURE_SUPPORT == TRUE)
 esp_err_t esp_ble_gattc_aux_open(esp_gatt_if_t gattc_if, esp_bd_addr_t remote_bda, esp_ble_addr_type_t remote_addr_type, bool is_direct)
 {
-    esp_ble_gatt_creat_conn_params_t creat_conn_params = {0};
-    memcpy(creat_conn_params.remote_bda, remote_bda, ESP_BD_ADDR_LEN);
-    creat_conn_params.remote_addr_type = remote_addr_type;
-    creat_conn_params.is_direct = is_direct;
-    creat_conn_params.is_aux = true;
-    creat_conn_params.own_addr_type = 0xff; //undefined, will use local value
-    creat_conn_params.phy_mask = 0x0;
-    return esp_ble_gattc_enh_open(gattc_if, &creat_conn_params);
+    btc_msg_t msg;
+    btc_ble_gattc_args_t arg;
+
+    ESP_BLUEDROID_STATUS_CHECK(ESP_BLUEDROID_STATUS_ENABLED);
+
+    msg.sig = BTC_SIG_API_CALL;
+    msg.pid = BTC_PID_GATTC;
+    msg.act = BTC_GATTC_ACT_AUX_OPEN;
+    arg.open.gattc_if = gattc_if;
+    memcpy(arg.open.remote_bda, remote_bda, ESP_BD_ADDR_LEN);
+    arg.open.remote_addr_type = remote_addr_type;
+    arg.open.is_direct = is_direct;
+    arg.open.is_aux = true;
+
+    return (btc_transfer_context(&msg, &arg, sizeof(btc_ble_gattc_args_t), NULL, NULL) == BT_STATUS_SUCCESS ? ESP_OK : ESP_FAIL);
+
 }
 #endif // #if (BLE_50_FEATURE_SUPPORT == TRUE)

--- a/components/bt/host/bluedroid/api/include/api/esp_bt_defs.h
+++ b/components/bt/host/bluedroid/api/include/api/esp_bt_defs.h
@@ -145,25 +145,6 @@ typedef uint8_t esp_link_key[ESP_BT_OCTET16_LEN];      /* Link Key */
 #define ESP_BLE_CONN_SUP_TOUT_MIN           0x000A       /*!< relate to BTM_BLE_CONN_SUP_TOUT_MIN in stack/btm_ble_api.h */
 #define ESP_BLE_CONN_SUP_TOUT_MAX           0x0C80       /*!< relate to ESP_BLE_CONN_SUP_TOUT_MAX in stack/btm_ble_api.h */

-#define ESP_BLE_PHY_1M_PREF_MASK       (1 << 0) /*!< The Host prefers use the LE1M transmitter or receiver PHY */
-#define ESP_BLE_PHY_2M_PREF_MASK       (1 << 1) /*!< The Host prefers use the LE2M transmitter or receiver PHY */
-#define ESP_BLE_PHY_CODED_PREF_MASK    (1 << 2) /*!< The Host prefers use the LE CODED transmitter or receiver PHY */
-typedef uint8_t esp_ble_phy_mask_t;
-
-/**
-* @brief create connection parameters
-*/
-typedef struct {
-    uint16_t scan_interval;       /*!< Initial scan interval, in units of 0.625ms, the range is 0x0004(2.5ms) to 0xFFFF(10.24s). */
-    uint16_t scan_window;         /*!< Initial scan window, in units of 0.625ms, the range is 0x0004(2.5ms) to 0xFFFF(10.24s). */
-    uint16_t interval_min;        /*!< Minimum connection interval, in units of 1.25ms, the range is 0x0006(7.5ms) to 0x0C80(4s). */
-    uint16_t interval_max;        /*!< Maximum connection interval, in units of 1.25ms, the range is 0x0006(7.5ms) to 0x0C80(4s). */
-    uint16_t latency;             /*!< Connection latency, the range is 0x0000(0) to 0x01F3(499). */
-    uint16_t supervision_timeout; /*!< Connection supervision timeout, in units of 10ms, the range is from 0x000A(100ms) to 0x0C80(32s). */
-    uint16_t min_ce_len;          /*!< Minimum connection event length, in units of 0.625ms, setting to 0 for no preferred parameters. */
-    uint16_t max_ce_len;          /*!< Maximum connection event length, in units of 0.625ms, setting to 0 for no preferred parameters. */
-} esp_ble_conn_params_t;
-
 /// Check the param is valid or not
 #define ESP_BLE_IS_VALID_PARAM(x, min, max)  (((x) >= (min) && (x) <= (max)) )

--- a/components/bt/host/bluedroid/api/include/api/esp_gatt_defs.h
+++ b/components/bt/host/bluedroid/api/include/api/esp_gatt_defs.h
@@ -682,19 +682,6 @@ typedef struct {
    esp_bt_uuid_t uuid;                       /*!< Included service UUID. */
 } esp_gattc_incl_svc_elem_t;

-/** @brief Represents a creat connection element. */
-typedef struct {
-    esp_bd_addr_t remote_bda;                              /*!< The Bluetooth address of the remote device */
-    esp_ble_addr_type_t remote_addr_type;                  /*!< Address type of the remote device */
-    bool is_direct;                                        /*!< Direct connection or background auto connection(by now, background auto connection is not supported */
-    bool is_aux;                                           /*!< Set to true for BLE 5.0 or higher to enable auxiliary connections; set to false for BLE 4.2 or lower. */
-    esp_ble_addr_type_t own_addr_type;                     /*!< Specifies the address type used in the connection request. Set to 0xFF if the address type is unknown. */
-    esp_ble_phy_mask_t phy_mask;                           /*!< Indicates which PHY connection parameters will be used. When is_aux is false, only the connection params for 1M PHY can be specified */
-    const esp_ble_conn_params_t *phy_1m_conn_params;       /*!< Connection parameters for the LE 1M PHY */
-    const esp_ble_conn_params_t *phy_2m_conn_params;       /*!< Connection parameters for the LE 2M PHY */
-    const esp_ble_conn_params_t *phy_coded_conn_params;    /*!< Connection parameters for the LE Coded PHY */
-} esp_ble_gatt_creat_conn_params_t;
-
 #ifdef __cplusplus
 }
 #endif
--- a/components/bt/host/bluedroid/api/include/api/esp_gattc_api.h
+++ b/components/bt/host/bluedroid/api/include/api/esp_gattc_api.h
@@ -314,20 +314,7 @@ esp_err_t esp_ble_gattc_app_register(uint16_t app_id);
 */
 esp_err_t esp_ble_gattc_app_unregister(esp_gatt_if_t gattc_if);

-/**
- * @brief           Open a direct connection or add a background auto connection.
- *                  Note: Do not enable both BLE_42_FEATURE_SUPPORT and BLE_50_FEATURE_SUPPORT configuration options simultaneously.
- *
- * @param[in]       gattc_if: GATT client access interface.
- * @param[in]       esp_gatt_create_conn: Pointer to the structure containing connection parameters.
- *
- * @return
- *                  - ESP_OK: Operation successful
- *                  - others: Operation failed
- *
- */
-esp_err_t esp_ble_gattc_enh_open(esp_gatt_if_t gattc_if, esp_ble_gatt_creat_conn_params_t *esp_gatt_create_conn);
-
+#if (BLE_42_FEATURE_SUPPORT == TRUE)
 /**
 * @brief           Open a direct connection or add a background auto connection
 *
@@ -341,14 +328,12 @@ esp_err_t esp_ble_gattc_enh_open(esp_gatt_if_t gattc_if, esp_ble_gatt_creat_conn
 *                  - other: failed
 *
 */
-#if (BLE_42_FEATURE_SUPPORT == TRUE)
 esp_err_t esp_ble_gattc_open(esp_gatt_if_t gattc_if, esp_bd_addr_t remote_bda, esp_ble_addr_type_t remote_addr_type, bool is_direct);
 #endif // #if (BLE_42_FEATURE_SUPPORT == TRUE)

 #if (BLE_50_FEATURE_SUPPORT == TRUE)
 esp_err_t esp_ble_gattc_aux_open(esp_gatt_if_t gattc_if, esp_bd_addr_t remote_bda, esp_ble_addr_type_t remote_addr_type, bool is_direct);
 #endif // #if (BLE_50_FEATURE_SUPPORT == TRUE)
-
 /**
 * @brief           Close the virtual connection to the GATT server. gattc may have multiple virtual GATT server connections when multiple app_id registered,
 *                  this API only close one virtual GATT server connection. if there exist other virtual GATT server connections,
--- a/components/bt/host/bluedroid/api/include/api/esp_hf_ag_api.h
+++ b/components/bt/host/bluedroid/api/include/api/esp_hf_ag_api.h
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
 *
 * SPDX-License-Identifier: Apache-2.0
 */
@@ -63,7 +63,6 @@ typedef enum
    ESP_HF_WBS_RESPONSE_EVT,                  /*!< Codec Status */
    ESP_HF_BCS_RESPONSE_EVT,                  /*!< Final Codec Choice */
    ESP_HF_PKT_STAT_NUMS_GET_EVT,             /*!< Request number of packet different status */
-    ESP_HF_PROF_STATE_EVT,                    /*!< Indicate HF init or deinit complete */
 } esp_hf_cb_event_t;

 /// Dial type of ESP_HF_DIAL_EVT
@@ -224,13 +223,6 @@ typedef union
        uint32_t tx_discarded;    /*!< the total number of packets send lost */
    } pkt_nums;                   /*!< AG callback param of ESP_HF_PKT_STAT_NUMS_GET_EVT */

-    /**
-     * @brief ESP_HF_PROF_STATE_EVT
-     */
-    struct ag_prof_stat_param {
-        esp_hf_prof_state_t state;                /*!< hf profile state param */
-    } prof_stat;                                  /*!< status to indicate hf prof init or deinit */
-
 } esp_hf_cb_param_t;                              /*!< HFP AG callback param compound*/

 /**
@@ -292,7 +284,6 @@ esp_err_t esp_hf_ag_register_callback(esp_hf_cb_t callback);
 *
 * @brief           Initialize the bluetooth HF AG module.
 *                  This function should be called after esp_bluedroid_enable() completes successfully.
- *                  ESP_HF_PROF_STATE_EVT with ESP_HF_INIT_SUCCESS will reported to the APP layer.
 *
 * @return
 *                  - ESP_OK: if the initialization request is sent successfully
@@ -306,7 +297,6 @@ esp_err_t esp_hf_ag_init(void);
 *
 * @brief           De-initialize for HF AG module.
 *                  This function should be called only after esp_bluedroid_enable() completes successfully.
- *                  ESP_HF_PROF_STATE_EVT with ESP_HF_DEINIT_SUCCESS will reported to the APP layer.
 *
 * @return
 *                  - ESP_OK: success
@@ -514,13 +504,13 @@ esp_err_t esp_hf_ag_cind_response(esp_bd_addr_t remote_addr,

 /**
 *
- * @brief           Response for AT+COPS command from HF Client.
+ * @brief           Reponse for AT+COPS command from HF Client.
 *                  As a precondition to use this API, Service Level Connection shall exist with HFP client.
 *
 * @param[in]       remote_addr: remote bluetooth device address
 * @param[in]       name: current operator name
 * @return
- *                  - ESP_OK: response for AT+COPS command is sent to lower layer
+ *                  - ESP_OK: reponse for AT+COPS command is sent to lower layer
 *                  - ESP_ERR_INVALID_STATE: if bluetooth stack is not yet enabled
 *                  - ESP_FAIL: others
 *
@@ -539,7 +529,7 @@ esp_err_t esp_hf_ag_cops_response(esp_bd_addr_t remote_addr, char *name);
 * @param[in]       mode: current call mode (voice/data/fax)
 * @param[in]       mpty: single or multi type
 * @param[in]       number: current call number
- * @param[in]       type: international type or unknown
+ * @param[in]       type: international type or unknow
 * @return
 *                  - ESP_OK: response to AT+CLCC command is sent to lower layer
 *                  - ESP_ERR_INVALID_STATE: if bluetooth stack is not yet enabled
--- a/components/bt/host/bluedroid/api/include/api/esp_hf_client_api.h
+++ b/components/bt/host/bluedroid/api/include/api/esp_hf_client_api.h
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
 *
 * SPDX-License-Identifier: Apache-2.0
 */
@@ -97,7 +97,6 @@ typedef enum {
    ESP_HF_CLIENT_BINP_EVT,                          /*!< requested number of last voice tag from AG */
    ESP_HF_CLIENT_RING_IND_EVT,                      /*!< ring indication event */
    ESP_HF_CLIENT_PKT_STAT_NUMS_GET_EVT,             /*!< requested number of packet different status */
-    ESP_HF_CLIENT_PROF_STATE_EVT,                    /*!< Indicate HF CLIENT init or deinit complete */
 } esp_hf_client_cb_event_t;

 /// HFP client callback parameters
@@ -267,13 +266,6 @@ typedef union {
        uint32_t tx_discarded;    /*!< the total number of packets send lost */
    } pkt_nums;                   /*!< HF callback param of ESP_HF_CLIENT_PKT_STAT_NUMS_GET_EVT */

-    /**
-     * @brief ESP_HF_CLIENT_PROF_STATE_EVT
-     */
-    struct hf_client_prof_stat_param {
-        esp_hf_prof_state_t state;               /*!< hf client profile state param */
-    } prof_stat;                                 /*!< status to indicate hf client prof init or deinit */
-
 } esp_hf_client_cb_param_t;                      /*!< HFP client callback parameters */

 /**
@@ -331,7 +323,6 @@ esp_err_t esp_hf_client_register_callback(esp_hf_client_cb_t callback);
 *
 * @brief           Initialize the bluetooth HFP client module.
 *                  This function should be called after esp_bluedroid_enable() completes successfully.
- *                  ESP_HF_CLIENT_PROF_STATE_EVT with ESP_HF_INIT_SUCCESS will reported to the APP layer.
 *
 * @return
 *                  - ESP_OK: if the initialization request is sent successfully
@@ -345,7 +336,6 @@ esp_err_t esp_hf_client_init(void);
 *
 * @brief           De-initialize for HFP client module.
 *                  This function should be called only after esp_bluedroid_enable() completes successfully.
- *                  ESP_HF_CLIENT_PROF_STATE_EVT with ESP_HF_DEINIT_SUCCESS will reported to the APP layer.
 *
 * @return
 *                  - ESP_OK: success
@@ -432,7 +422,7 @@ esp_err_t esp_hf_client_start_voice_recognition(void);
 *                  As a precondition to use this API, Service Level Connection shall exist with AG.
 *
 * @return
- *                  - ESP_OK: stopping voice recognition is sent to lower layer
+ *                  - ESP_OK: stoping voice recognition is sent to lower layer
 *                  - ESP_ERR_INVALID_STATE: if bluetooth stack is not yet enabled
 *                  - ESP_FAIL: others
 *
--- a/components/bt/host/bluedroid/api/include/api/esp_hf_defs.h
+++ b/components/bt/host/bluedroid/api/include/api/esp_hf_defs.h
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
 *
 * SPDX-License-Identifier: Apache-2.0
 */
@@ -13,16 +13,6 @@
 extern "C" {
 #endif

-/// profile states
-typedef enum {
-    ESP_HF_INIT_SUCCESS = 0,                /*!< Indicate init successful */
-    ESP_HF_INIT_ALREADY,                    /*!< Indicate init repeated */
-    ESP_HF_INIT_FAIL,                       /*!< Indicate init fail */
-    ESP_HF_DEINIT_SUCCESS,                  /*!< Indicate deinit successful */
-    ESP_HF_DEINIT_ALREADY,                  /*!< Indicate deinit repeated */
-    ESP_HF_DEINIT_FAIL,                     /*!< Indicate deinit fail */
-} esp_hf_prof_state_t;
-
 /// in-band ring tone state
 typedef enum {
    ESP_HF_IN_BAND_RINGTONE_NOT_PROVIDED = 0,
@@ -138,7 +128,7 @@ typedef enum {

 /// +CLCC address type
 typedef enum {
-    ESP_HF_CALL_ADDR_TYPE_UNKNOWN = 0x81,            /*!< unknown address type */
+    ESP_HF_CALL_ADDR_TYPE_UNKNOWN = 0x81,            /*!< unkown address type */
    ESP_HF_CALL_ADDR_TYPE_INTERNATIONAL = 0x91,      /*!< international address */
 } esp_hf_call_addr_type_t;

@@ -170,7 +160,7 @@ typedef enum
    ESP_HF_NREC_START
 } esp_hf_nrec_t;

-///+CCWA response status
+///+CCWA resposne status
 typedef enum {
    ESP_HF_CALL_WAITING_INACTIVE,
    ESP_HF_CALL_WAITING_ACTIVE,
--- a/components/bt/host/bluedroid/bta/dm/bta_dm_act.c
+++ b/components/bt/host/bluedroid/bta/dm/bta_dm_act.c
@@ -6049,7 +6049,7 @@ void bta_dm_ble_gap_set_prefer_ext_conn_params(tBTA_DM_MSG *p_data)
               sizeof(tBTA_DM_BLE_CONN_PARAMS));
    }

-    if (conn_params.phy_mask & BTA_PHY_CODED_MASK) {
+    if (conn_params.phy_mask & BTAS_PHY_CODED_MASK) {
        memcpy(&conn_params.phy_coded_conn_params, &p_data->ble_set_per_ext_conn_params.phy_coded_conn_params,
               sizeof(tBTA_DM_BLE_CONN_PARAMS));
    }
@@ -6673,9 +6673,7 @@ void btm_dm_start_gatt_discovery (BD_ADDR bd_addr)
        btm_dm_start_disc_gatt_services(bta_dm_search_cb.conn_id);
    } else {
        //TODO need to add addr_type in future
-        BTA_GATTC_Enh_Open(bta_dm_search_cb.client_if, bd_addr, BLE_ADDR_UNKNOWN_TYPE, TRUE,
-            BTA_GATT_TRANSPORT_LE, FALSE, BLE_ADDR_UNKNOWN_TYPE, 0, NULL, NULL, NULL);
-
+        BTA_GATTC_Open(bta_dm_search_cb.client_if, bd_addr, BLE_ADDR_UNKNOWN_TYPE, TRUE, BTA_GATT_TRANSPORT_LE, FALSE);
    }
 }
 #endif /* #if (GATTC_INCLUDED == TRUE) */
--- a/components/bt/host/bluedroid/bta/dm/include/bta_dm_int.h
+++ b/components/bt/host/bluedroid/bta/dm/include/bta_dm_int.h
@@ -1040,7 +1040,7 @@ typedef struct {

 #define BTA_PHY_1M_MASK                   (1 << 0)
 #define BTA_PHY_2M_MASK                   (1 << 1)
-#define BTA_PHY_CODED_MASK                (1 << 2)
+#define BTAS_PHY_CODED_MASK               (1 << 2)
 typedef struct {
    BT_HDR                          hdr;
    BD_ADDR                         bd_addr;
--- a/components/bt/host/bluedroid/bta/gatt/bta_gattc_act.c
+++ b/components/bt/host/bluedroid/bta/gatt/bta_gattc_act.c
@@ -36,7 +36,6 @@
 #include "osi/allocator.h"
 #include "osi/mutex.h"
 #include "bta_hh_int.h"
-#include "btm_int.h"

 #if (defined BTA_HH_LE_INCLUDED && BTA_HH_LE_INCLUDED == TRUE)
 #include "bta_hh_int.h"
@@ -71,7 +70,6 @@ static void bta_gattc_req_cback (UINT16 conn_id, UINT32 trans_id, tGATTS_REQ_TYP
 static tBTA_GATTC_FIND_SERVICE_CB bta_gattc_register_service_change_notify(UINT16 conn_id, BD_ADDR remote_bda);

 extern void btc_gattc_congest_callback(tBTA_GATTC *param);
-extern uint32_t BTM_BleUpdateOwnType(uint8_t *own_bda_type, tBTM_START_ADV_CMPL_CBACK *cb);

 static const tGATT_CBACK bta_gattc_cl_cback = {
    bta_gattc_conn_cback,
@@ -338,10 +336,6 @@ void bta_gattc_process_api_open (tBTA_GATTC_CB *p_cb, tBTA_GATTC_DATA *p_msg)
    UNUSED(p_cb);

    if (p_clreg != NULL) {
-        if (p_msg->api_conn.own_addr_type <= BLE_ADDR_TYPE_MAX) {
-            // update own address type for creating connection
-            BTM_BleUpdateOwnType(&p_msg->api_conn.own_addr_type, NULL);
-        }
        if (p_msg->api_conn.is_direct) {
            if ((p_clcb = bta_gattc_find_alloc_clcb(p_msg->api_conn.client_if,
                                                    p_msg->api_conn.remote_bda,
@@ -509,7 +503,6 @@ void bta_gattc_open(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
    tBTA_GATTC_DATA gattc_data;
    BOOLEAN found_app = FALSE;
    tGATT_TCB *p_tcb;
-    tBTM_SEC_DEV_REC *p_dev_rec = NULL;

    if (!p_clcb || !p_data) {
        return;
@@ -519,33 +512,6 @@ void bta_gattc_open(tBTA_GATTC_CLCB *p_clcb, tBTA_GATTC_DATA *p_data)
    if(p_tcb) {
        found_app = gatt_find_specific_app_in_hold_link(p_tcb, p_clcb->p_rcb->client_if);
    }
-
-    if (p_data->api_conn.phy_mask) {
-        p_dev_rec = btm_find_or_alloc_dev(p_data->api_conn.remote_bda);
-        if (p_dev_rec) {
-            if (p_data->api_conn.is_aux) {
-#if (BLE_50_FEATURE_SUPPORT == TRUE)
-                p_dev_rec->ext_conn_params.phy_mask = p_data->api_conn.phy_mask;
-                if (p_data->api_conn.phy_mask & BTA_BLE_PHY_1M_MASK) {
-                    memcpy(&p_dev_rec->ext_conn_params.phy_1m_conn_params, &p_data->api_conn.phy_1m_conn_params, sizeof(tBTA_BLE_CONN_PARAMS));
-                }
-                if (p_data->api_conn.phy_mask & BTA_BLE_PHY_2M_MASK) {
-                    memcpy(&p_dev_rec->ext_conn_params.phy_2m_conn_params, &p_data->api_conn.phy_2m_conn_params, sizeof(tBTA_BLE_CONN_PARAMS));
-                }
-                if (p_data->api_conn.phy_mask & BTA_BLE_PHY_CODED_MASK) {
-                    memcpy(&p_dev_rec->ext_conn_params.phy_coded_conn_params, &p_data->api_conn.phy_coded_conn_params, sizeof(tBTA_BLE_CONN_PARAMS));
-                }
-#endif
-            } else {
-                if (p_data->api_conn.phy_mask & BTA_BLE_PHY_1M_MASK) {
-                    memcpy(&p_dev_rec->conn_params, &p_data->api_conn.phy_1m_conn_params, sizeof(tBTA_BLE_CONN_PARAMS));
-                }
-            }
-        } else {
-            APPL_TRACE_ERROR("Unknown Device, setting rejected");
-        }
-    }
-
    /* open/hold a connection */
    if (!GATT_Connect(p_clcb->p_rcb->client_if, p_data->api_conn.remote_bda, p_data->api_conn.remote_addr_type,
                      TRUE, p_data->api_conn.transport, p_data->api_conn.is_aux)) {
@@ -1841,8 +1807,8 @@ static void bta_gattc_enc_cmpl_cback(tGATT_IF gattc_if, BD_ADDR bda)
 *******************************************************************************/
 void bta_gattc_process_api_refresh(tBTA_GATTC_CB *p_cb, tBTA_GATTC_DATA *p_msg)
 {
-    tBTA_GATTC_SERV *p_srvc_cb = bta_gattc_find_srvr_cache(p_msg->api_refresh.remote_bda);
-    tBTA_GATTC_CLCB *p_clcb = &bta_gattc_cb.clcb[0];
+    tBTA_GATTC_SERV *p_srvc_cb = bta_gattc_find_srvr_cache(p_msg->api_conn.remote_bda);
+    tBTA_GATTC_CLCB      *p_clcb = &bta_gattc_cb.clcb[0];
    BOOLEAN         found = FALSE;
    UINT8           i;
    UNUSED(p_cb);
@@ -1962,7 +1928,7 @@ void bta_gattc_process_api_cache_get_addr_list(tBTA_GATTC_CB *p_cb, tBTA_GATTC_D
 *******************************************************************************/
 void bta_gattc_process_api_cache_clean(tBTA_GATTC_CB *p_cb, tBTA_GATTC_DATA *p_msg)
 {
-    tBTA_GATTC_SERV *p_srvc_cb = bta_gattc_find_srvr_cache(p_msg->api_clean.remote_bda);
+    tBTA_GATTC_SERV *p_srvc_cb = bta_gattc_find_srvr_cache(p_msg->api_conn.remote_bda);
    UNUSED(p_cb);

    if (p_srvc_cb != NULL && p_srvc_cb->p_srvc_cache != NULL) {
--- a/components/bt/host/bluedroid/bta/gatt/bta_gattc_api.c
+++ b/components/bt/host/bluedroid/bta/gatt/bta_gattc_api.c
@@ -128,7 +128,7 @@ void BTA_GATTC_AppDeregister(tBTA_GATTC_IF client_if)

 /*******************************************************************************
 **
-** Function         BTA_GATTC_Enh_Open
+** Function         BTA_GATTC_Open
 **
 ** Description      Open a direct connection or add a background auto connection
 **                  bd address
@@ -142,10 +142,8 @@ void BTA_GATTC_AppDeregister(tBTA_GATTC_IF client_if)
 ** Returns          void
 **
 *******************************************************************************/
-void BTA_GATTC_Enh_Open(tBTA_GATTC_IF client_if, BD_ADDR remote_bda, tBTA_ADDR_TYPE remote_addr_type,
-                        BOOLEAN is_direct, tBTA_GATT_TRANSPORT transport, BOOLEAN is_aux, tBTA_ADDR_TYPE own_addr_type,
-                        UINT8 phy_mask, tBTA_BLE_CONN_PARAMS *phy_1m_conn_params, tBTA_BLE_CONN_PARAMS *phy_2m_conn_params,
-                        tBTA_BLE_CONN_PARAMS *phy_coded_conn_params)
+void BTA_GATTC_Open(tBTA_GATTC_IF client_if, BD_ADDR remote_bda, tBTA_ADDR_TYPE remote_addr_type,
+                    BOOLEAN is_direct, tBTA_GATT_TRANSPORT transport, BOOLEAN is_aux)
 {
    tBTA_GATTC_API_OPEN  *p_buf;

@@ -157,18 +155,8 @@ void BTA_GATTC_Enh_Open(tBTA_GATTC_IF client_if, BD_ADDR remote_bda, tBTA_ADDR_T
        p_buf->transport = transport;
        p_buf->is_aux = is_aux;
        p_buf->remote_addr_type = remote_addr_type;
-        p_buf->own_addr_type = own_addr_type;
-        p_buf->phy_mask = phy_mask;
        memcpy(p_buf->remote_bda, remote_bda, BD_ADDR_LEN);
-        if ((phy_mask & BTA_BLE_PHY_1M_MASK) && phy_1m_conn_params) {
-            memcpy(&p_buf->phy_1m_conn_params, phy_1m_conn_params, sizeof(tBTA_BLE_CONN_PARAMS));
-        }
-        if ((phy_mask & BTA_BLE_PHY_2M_MASK) && phy_2m_conn_params) {
-            memcpy(&p_buf->phy_2m_conn_params, phy_2m_conn_params, sizeof(tBTA_BLE_CONN_PARAMS));
-        }
-        if ((phy_mask & BTA_BLE_PHY_CODED_MASK) && phy_coded_conn_params) {
-            memcpy(&p_buf->phy_coded_conn_params, phy_coded_conn_params, sizeof(tBTA_BLE_CONN_PARAMS));
-        }
+

        bta_sys_sendmsg(p_buf);
    }
@@ -484,7 +472,7 @@ void  BTA_GATTC_GetGattDb(UINT16 conn_id, UINT16 start_handle, UINT16 end_handle
 ** Description      This function is called to read a characteristics value
 **
 ** Parameters       conn_id - connection ID.
-**                  handle - characteristic handle to read.
+**                  handle - characteritic handle to read.
 **
 ** Returns          None
 **
@@ -619,7 +607,7 @@ void BTA_GATTC_ReadMultipleVariable(UINT16 conn_id, tBTA_GATTC_MULTI *p_read_mul
 **
 ** Parameters       conn_id - connection ID.
 **                  s_handle - start handle.
-**                  e_handle - end handle
+**                  e_handle - end hanle
 **                  uuid - The attribute UUID.
 **
 ** Returns          None
@@ -699,7 +687,7 @@ void BTA_GATTC_WriteCharValue ( UINT16 conn_id,
 ** Description      This function is called to write descriptor value.
 **
 ** Parameters       conn_id - connection ID
-**                  handle - descriptor handle to write.
+**                  handle - descriptor hadle to write.
 **                  write_type - write type.
 **                  p_value - the value to be written.
 **
@@ -750,7 +738,7 @@ void BTA_GATTC_WriteCharDescr (UINT16 conn_id,
 ** Description      This function is called to prepare write a characteristic value.
 **
 ** Parameters       conn_id - connection ID.
-**                    p_char_id - GATT characteristic ID of the service.
+**                    p_char_id - GATT characteritic ID of the service.
 **                  offset - offset of the write value.
 **                  len: length of the data to be written.
 **                  p_value - the value to be written.
@@ -793,7 +781,7 @@ void BTA_GATTC_PrepareWrite  (UINT16 conn_id, UINT16 handle,
 ** Description      This function is called to prepare write a characteristic descriptor value.
 **
 ** Parameters       conn_id - connection ID.
-**                  p_char_descr_id - GATT characteristic descriptor ID of the service.
+**                  p_char_descr_id - GATT characteritic descriptor ID of the service.
 **                  offset - offset of the write value.
 **                  len: length of the data to be written.
 **                  p_value - the value to be written.
@@ -1022,9 +1010,9 @@ void BTA_GATTC_Refresh(BD_ADDR remote_bda, bool erase_flash)
    if(bta_sys_is_register(BTA_ID_GATTC) == FALSE) {
        return;
    }
-    tBTA_GATTC_API_CACHE_REFRESH  *p_buf;
+    tBTA_GATTC_API_OPEN  *p_buf;

-    if ((p_buf = (tBTA_GATTC_API_CACHE_REFRESH *) osi_malloc(sizeof(tBTA_GATTC_API_CACHE_REFRESH))) != NULL) {
+    if ((p_buf = (tBTA_GATTC_API_OPEN *) osi_malloc(sizeof(tBTA_GATTC_API_OPEN))) != NULL) {
        p_buf->hdr.event = BTA_GATTC_API_REFRESH_EVT;
        memcpy(p_buf->remote_bda, remote_bda, BD_ADDR_LEN);

@@ -1080,9 +1068,9 @@ void BTA_GATTC_Clean(BD_ADDR remote_bda)
    bta_gattc_cache_reset(remote_bda);
 #endif

-    tBTA_GATTC_API_CACHE_CLEAN  *p_buf;
+    tBTA_GATTC_API_OPEN  *p_buf;

-    if ((p_buf = (tBTA_GATTC_API_CACHE_CLEAN *) osi_malloc(sizeof(tBTA_GATTC_API_CACHE_CLEAN))) != NULL) {
+    if ((p_buf = (tBTA_GATTC_API_OPEN *) osi_malloc(sizeof(tBTA_GATTC_API_OPEN))) != NULL) {
        p_buf->hdr.event = BTA_GATTC_API_CACHE_CLEAN_EVT;
        memcpy(p_buf->remote_bda, remote_bda, BD_ADDR_LEN);

--- a/components/bt/host/bluedroid/bta/gatt/include/bta_gattc_int.h
+++ b/components/bt/host/bluedroid/bta/gatt/include/bta_gattc_int.h
@@ -110,7 +110,7 @@ typedef enum {
 #define BTA_GATTC_WRITE_PREPARE          GATT_WRITE_PREPARE
 #define BTA_GATTC_INVALID_HANDLE         0

-/* internal structure for GATTC register API  */
+/* internal strucutre for GATTC register API  */
 typedef struct {
    BT_HDR                  hdr;
    tBT_UUID                app_uuid;
@@ -133,20 +133,9 @@ typedef struct {
    BOOLEAN                 is_direct;
    BOOLEAN                 is_aux;
    tBTA_TRANSPORT          transport;
-    tBTA_ADDR_TYPE          own_addr_type;
-    UINT8                   phy_mask;
-    tBTA_BLE_CONN_PARAMS    phy_1m_conn_params;
-    tBTA_BLE_CONN_PARAMS    phy_2m_conn_params;
-    tBTA_BLE_CONN_PARAMS    phy_coded_conn_params;
 } tBTA_GATTC_API_OPEN;

-typedef struct {
-    BT_HDR                  hdr;
-    BD_ADDR                 remote_bda;
-    tBTA_ADDR_TYPE          remote_addr_type;
-    tBTA_GATTC_IF           client_if;
-    BOOLEAN                 is_direct;
-} tBTA_GATTC_API_CANCEL_OPEN;
+typedef tBTA_GATTC_API_OPEN tBTA_GATTC_API_CANCEL_OPEN;

 typedef struct {
    BT_HDR                  hdr;
@@ -213,11 +202,6 @@ typedef struct {
    BT_HDR              hdr;
 } tBTA_GATTC_API_CFG_MTU;

-typedef struct {
-    BT_HDR             hdr;
-    BD_ADDR            remote_bda;
-} tBTA_GATTC_API_CACHE_REFRESH;
-
 typedef struct {
    BT_HDR             hdr;
    tBTA_GATTC_IF      client_if;
@@ -231,11 +215,6 @@ typedef struct {
    tBTA_GATTC_IF      client_if;
 } tBTA_GATTC_API_GET_ADDR;

-typedef struct {
-    BT_HDR             hdr;
-    BD_ADDR            remote_bda;
-} tBTA_GATTC_API_CACHE_CLEAN;
-
 typedef struct {
    BT_HDR                  hdr;
    BD_ADDR                 remote_bda;
@@ -268,10 +247,8 @@ typedef union {
    tBTA_GATTC_API_EXEC         api_exec;
    tBTA_GATTC_API_READ_MULTI   api_read_multi;
    tBTA_GATTC_API_CFG_MTU      api_mtu;
-    tBTA_GATTC_API_CACHE_REFRESH    api_refresh;
    tBTA_GATTC_API_CACHE_ASSOC  api_assoc;
    tBTA_GATTC_API_GET_ADDR     api_get_addr;
-    tBTA_GATTC_API_CACHE_CLEAN  api_clean;
    tBTA_GATTC_OP_CMPL          op_cmpl;
    tBTA_GATTC_INT_CONN         int_conn;
    tBTA_GATTC_ENC_CMPL         enc_cmpl;
@@ -336,7 +313,7 @@ typedef struct {
    UINT16               total_char;
    UINT16              total_attr;
    UINT8               srvc_hdl_chg;   /* service handle change indication pending */
-    UINT16              attr_index;     /* cache NV saving/loading attribute index */
+    UINT16              attr_index;     /* cahce NV saving/loading attribute index */

    UINT16              mtu;
    bool                update_incl_srvc;
--- a/components/bt/host/bluedroid/bta/hh/bta_hh_le.c
+++ b/components/bt/host/bluedroid/bta/hh/bta_hh_le.c
@@ -117,7 +117,7 @@ static void bta_hh_le_hid_report_dbg(tBTA_HH_DEV_CB *p_cb)
        if (p_cb->hid_srvc[i].in_use) {
            p_rpt = &p_cb->hid_srvc[i].report[0];

-            APPL_TRACE_DEBUG("\t HID service inst: %d", i);
+            APPL_TRACE_DEBUG("\t HID serivce inst: %d", i);

            for (j = 0; j < BTA_HH_LE_RPT_MAX; j ++, p_rpt++) {
                rpt_name = "Unknown";
@@ -334,15 +334,14 @@ void bta_hh_le_open_conn(tBTA_HH_DEV_CB *p_cb, BD_ADDR remote_bda)
    bta_hh_cb.le_cb_index[BTA_HH_GET_LE_CB_IDX(p_cb->hid_handle)] = p_cb->index;
    p_cb->in_use = TRUE;

-    BTA_GATTC_Enh_Open(bta_hh_cb.gatt_if, remote_bda, BLE_ADDR_UNKNOWN_TYPE, TRUE,
-            BTA_GATT_TRANSPORT_LE, FALSE, BLE_ADDR_UNKNOWN_TYPE, 0, NULL, NULL, NULL);
+    BTA_GATTC_Open(bta_hh_cb.gatt_if, remote_bda, BLE_ADDR_UNKNOWN_TYPE, TRUE, BTA_GATT_TRANSPORT_LE, FALSE);
 }

 /*******************************************************************************
 **
 ** Function         bta_hh_le_fill_16bits_gatt_id
 **
-** Description      Utility function to fill a GATT ID structure
+** Description      Utility function to fill a GATT ID strucure
 **
 *******************************************************************************/
 void bta_hh_le_fill_16bits_gatt_id(UINT8 inst_id, UINT16 uuid,  tBTA_GATT_ID *p_output)
@@ -356,7 +355,7 @@ void bta_hh_le_fill_16bits_gatt_id(UINT8 inst_id, UINT16 uuid,  tBTA_GATT_ID *p_
 **
 ** Function         bta_hh_le_fill_16bits_srvc_id
 **
-** Description      Utility function to fill a service ID structure with a 16 bits
+** Description      Utility function to fill a service ID strucure with a 16 bits
 **                  service UUID.
 **
 *******************************************************************************/
@@ -373,7 +372,7 @@ void bta_hh_le_fill_16bits_srvc_id(BOOLEAN is_pri, UINT8 inst_id, UINT16 srvc_uu
 **
 ** Function         bta_hh_le_fill_16bits_char_id
 **
-** Description      Utility function to fill a char ID structure with a 16 bits
+** Description      Utility function to fill a char ID strucure with a 16 bits
 **                  char UUID.
 **
 *******************************************************************************/
@@ -625,7 +624,7 @@ tBTA_HH_STATUS bta_hh_le_read_char_dscrpt(tBTA_HH_DEV_CB *p_cb, UINT16 srvc_uuid
 **
 ** Function         bta_hh_le_read_rpt_ref_descr
 **
-** Description      read report reference descriptors in service discovery process
+** Description      read report refernece descriptors in service discovery process
 **
 *******************************************************************************/
 void bta_hh_le_read_rpt_ref_descr(tBTA_HH_DEV_CB *p_dev_cb, tBTA_HH_LE_RPT *p_rpt)
@@ -842,7 +841,7 @@ void bta_hh_le_register_input_notif(tBTA_HH_DEV_CB *p_dev_cb, UINT8 srvc_inst,
                }
            }
            /*
-            else unknown protocol mode */
+            else unknow protocol mode */
        }
    }
 }
@@ -1487,7 +1486,7 @@ void bta_hh_le_gatt_disc_cmpl(tBTA_HH_DEV_CB *p_cb, tBTA_HH_STATUS status)
 {
    APPL_TRACE_DEBUG("bta_hh_le_gatt_disc_cmpl ");

-    /* if open successful or protocol mode not desired, keep the connection open but inform app */
+    /* if open sucessful or protocol mode not desired, keep the connection open but inform app */
    if (status == BTA_HH_OK || status == BTA_HH_ERR_PROTO) {
        /* assign a special APP ID temp, since device type unknown */
        p_cb->app_id = BTA_HH_APP_ID_LE;
@@ -1505,7 +1504,7 @@ void bta_hh_le_gatt_disc_cmpl(tBTA_HH_DEV_CB *p_cb, tBTA_HH_STATUS status)
 **
 ** Function         bta_hh_le_srvc_expl_srvc
 **
-** Description      This function discover the next available HID service.
+** Description      This function discover the next avaible HID service.
 **
 ** Parameters:
 **
@@ -2077,7 +2076,7 @@ void bta_hh_w4_le_read_descr_cmpl(tBTA_HH_DEV_CB *p_dev_cb, tBTA_HH_DATA *p_buf)
 **
 ** Function         bta_hh_w4_le_write_cmpl
 **
-** Description      Write characteristic complete event at W4_CONN st.
+** Description      Write charactersitic complete event at W4_CONN st.
 **
 ** Parameters:
 **
@@ -2105,7 +2104,7 @@ void bta_hh_w4_le_write_cmpl(tBTA_HH_DEV_CB *p_dev_cb, tBTA_HH_DATA *p_buf)
 **
 ** Function         bta_hh_le_write_cmpl
 **
-** Description      Write characteristic complete event at CONN st.
+** Description      Write charactersitic complete event at CONN st.
 **
 ** Parameters:
 **
@@ -2163,7 +2162,7 @@ void bta_hh_le_write_cmpl(tBTA_HH_DEV_CB *p_dev_cb, tBTA_HH_DATA *p_buf)
 **
 ** Function         bta_hh_le_write_char_descr_cmpl
 **
-** Description      Write characteristic descriptor complete event
+** Description      Write charactersitic descriptor complete event
 **
 ** Parameters:
 **
@@ -2217,7 +2216,7 @@ void bta_hh_le_write_char_descr_cmpl(tBTA_HH_DEV_CB *p_dev_cb, tBTA_HH_DATA *p_b
 **
 ** Function         bta_hh_le_input_rpt_notify
 **
-** Description      process the notification event, most likely for input report.
+** Description      process the notificaton event, most likely for input report.
 **
 ** Parameters:
 **
@@ -2358,7 +2357,7 @@ void bta_hh_gatt_close(tBTA_HH_DEV_CB *p_cb, tBTA_HH_DATA *p_data)
 **
 ** Function         bta_hh_le_api_disc_act
 **
-** Description      initiate a Close API to a remote HID device
+** Description      initaite a Close API to a remote HID device
 **
 ** Returns          void
 **
@@ -2602,8 +2601,7 @@ static void bta_hh_le_add_dev_bg_conn(tBTA_HH_DEV_CB *p_cb, BOOLEAN check_bond)
    if (/*p_cb->dscp_info.flag & BTA_HH_LE_NORMAL_CONN &&*/
        !p_cb->in_bg_conn && to_add) {
        /* add device into BG connection to accept remote initiated connection */
-        BTA_GATTC_Enh_Open(bta_hh_cb.gatt_if, p_cb->addr, BLE_ADDR_UNKNOWN_TYPE, FALSE,
-                BTA_GATT_TRANSPORT_LE, FALSE, BLE_ADDR_UNKNOWN_TYPE, 0, NULL, NULL);
+        BTA_GATTC_Open(bta_hh_cb.gatt_if, p_cb->addr, BLE_ADDR_UNKNOWN_TYPE, FALSE, BTA_GATT_TRANSPORT_LE, FALSE);
        p_cb->in_bg_conn = TRUE;

        BTA_DmBleSetBgConnType(BTA_DM_BLE_CONN_AUTO, NULL);
@@ -2684,7 +2682,7 @@ void bta_hh_le_update_scpp(tBTA_HH_DEV_CB *p_dev_cb, tBTA_HH_DATA *p_buf)
    if (!p_dev_cb->is_le_device ||
            p_dev_cb->mode != BTA_HH_PROTO_RPT_MODE ||
            p_dev_cb->scps_supported == FALSE) {
-        APPL_TRACE_ERROR("Can not set ScPP scan parameter as boot host, or remote does not support ScPP ");
+        APPL_TRACE_ERROR("Can not set ScPP scan paramter as boot host, or remote does not support ScPP ");

        cback_data.handle = p_dev_cb->hid_handle;
        cback_data.status = BTA_HH_ERR;
@@ -2910,7 +2908,7 @@ static void bta_hh_le_search_scps_chars(tBTA_HH_DEV_CB *p_cb)
 **
 ** Function         bta_hh_le_register_scpp_notif
 **
-** Description      register scan parameter refresh notification complete
+** Description      register scan parameter refresh notitication complete
 **
 **
 ** Parameters:
@@ -2921,7 +2919,7 @@ static void bta_hh_le_register_scpp_notif(tBTA_HH_DEV_CB *p_dev_cb, tBTA_GATT_ST
    UINT8               sec_flag = 0;
    tBTA_GATTC_CHAR_ID  char_id;

-    /* if write scan parameter successful */
+    /* if write scan parameter sucessful */
    /* if bonded and notification is not enabled, configure the client configuration */
    if (status == BTA_GATT_OK &&
            (p_dev_cb->scps_notify & BTA_HH_LE_SCPS_NOTIFY_SPT) != 0 &&
@@ -2951,7 +2949,7 @@ static void bta_hh_le_register_scpp_notif(tBTA_HH_DEV_CB *p_dev_cb, tBTA_GATT_ST
 **
 ** Function         bta_hh_le_register_scpp_notif_cmpl
 **
-** Description      action function to register scan parameter refresh notification
+** Description      action function to register scan parameter refresh notitication
 **
 ** Parameters:
 **
--- a/components/bt/host/bluedroid/bta/include/bta/bta_gatt_api.h
+++ b/components/bt/host/bluedroid/bta/include/bta/bta_gatt_api.h
@@ -180,7 +180,7 @@ typedef UINT8 tBTA_GATT_STATUS;
 #define BTA_GATTC_ADV_VSC_EVT           34 /* ADV VSC event */
 #define BTA_GATTC_CONNECT_EVT           35 /* GATTC CONNECT  event */
 #define BTA_GATTC_DISCONNECT_EVT        36 /* GATTC DISCONNECT  event */
-#define BTA_GATTC_READ_MULTIPLE_EVT     37 /* GATTC Read multiple event */
+#define BTA_GATTC_READ_MULTIPLE_EVT     37 /* GATTC Read mutiple event */
 #define BTA_GATTC_QUEUE_FULL_EVT        38 /* GATTC queue full event */
 #define BTA_GATTC_ASSOC_EVT             39 /* GATTC association address event */
 #define BTA_GATTC_GET_ADDR_LIST_EVT     40 /* GATTC get address list in the cache event */
@@ -728,21 +728,6 @@ typedef struct
    tBTA_GATTC_SERVICE     *included_service;
 } __attribute__((packed)) tBTA_GATTC_INCLUDED_SVC;

-typedef struct {
-    UINT16 scan_interval;
-    UINT16 scan_window;
-    UINT16 interval_min;
-    UINT16 interval_max;
-    UINT16 latency;
-    UINT16 supervision_timeout;
-    UINT16 min_ce_len;
-    UINT16 max_ce_len;
-} tBTA_BLE_CONN_PARAMS;
-
-#define BTA_BLE_PHY_1M_MASK     (1 << 0)
-#define BTA_BLE_PHY_2M_MASK     (1 << 1)
-#define BTA_BLE_PHY_CODED_MASK  (1 << 2)
-
 /*****************************************************************************
 **  External Function Declarations
 *****************************************************************************/
@@ -798,10 +783,9 @@ extern void BTA_GATTC_AppRegister(tBT_UUID *p_app_uuid, tBTA_GATTC_CBACK *p_clie
 *******************************************************************************/
 extern void BTA_GATTC_AppDeregister (tBTA_GATTC_IF client_if);

-
 /*******************************************************************************
 **
-** Function         BTA_GATTC_Enh_Open
+** Function         BTA_GATTC_Open
 **
 ** Description      Open a direct connection or add a background auto connection
 **                  bd address
@@ -809,16 +793,13 @@ extern void BTA_GATTC_AppDeregister (tBTA_GATTC_IF client_if);
 ** Parameters       client_if: server interface.
 **                  remote_bda: remote device BD address.
 **                  remote_addr_type: remote device BD address type.
-**                  is_direct: direct connection or background auto connection.
-**                  own_addr_type: own address type.
+**                  is_direct: direct connection or background auto connection
 **
 ** Returns          void
 **
 *******************************************************************************/
-extern void BTA_GATTC_Enh_Open(tBTA_GATTC_IF client_if, BD_ADDR remote_bda, tBTA_ADDR_TYPE remote_addr_type,
-                    BOOLEAN is_direct, tBTA_GATT_TRANSPORT transport, BOOLEAN is_aux, tBTA_ADDR_TYPE own_addr_type,
-                    UINT8 phy_mask, tBTA_BLE_CONN_PARAMS *phy_1m_conn_params, tBTA_BLE_CONN_PARAMS *phy_2m_conn_params,
-                    tBTA_BLE_CONN_PARAMS *phy_coded_conn_params);
+extern void BTA_GATTC_Open(tBTA_GATTC_IF client_if, BD_ADDR remote_bda, tBTA_ADDR_TYPE remote_addr_type,
+                    BOOLEAN is_direct, tBTA_GATT_TRANSPORT transport, BOOLEAN is_aux);

 /*******************************************************************************
 **
@@ -956,8 +937,8 @@ extern void BTA_GATTC_GetGattDb(UINT16 conn_id, UINT16 start_handle, UINT16 end_
 **
 ** Description      This function is called to read a characteristics value
 **
-** Parameters       conn_id - connection ID.
-**                  handle - characteristic handle to read.
+** Parameters       conn_id - connectino ID.
+**                  handle - characteritic handle to read.
 **
 ** Returns          None
 **
@@ -972,7 +953,7 @@ void BTA_GATTC_ReadCharacteristic(UINT16 conn_id, UINT16 handle, tBTA_GATT_AUTH_
 **
 ** Parameters       conn_id - connection ID.
 **                  s_handle - start handle.
-**                  e_handle - end handle
+**                  e_handle - end hanle
 **                  uuid - The attribute UUID.
 **
 ** Returns          None
@@ -1091,7 +1072,7 @@ extern tBTA_GATT_STATUS BTA_GATTC_DeregisterForNotifications (tBTA_GATTC_IF
 ** Description      This function is called to prepare write a characteristic value.
 **
 ** Parameters       conn_id - connection ID.
-**                  handle - GATT characteristic handle.
+**                  handle - GATT characteritic handle.
 **                  offset - offset of the write value.
 **                  len - length of the data to be written.
 **                  p_value - the value to be written.
@@ -1113,7 +1094,7 @@ extern void BTA_GATTC_PrepareWrite  (UINT16 conn_id,
 ** Description      This function is called to prepare write a characteristic descriptor value.
 **
 ** Parameters       conn_id - connection ID.
-**                  p_char_descr_id - GATT characteristic descriptor ID of the service.
+**                  p_char_descr_id - GATT characteritic descriptor ID of the service.
 **                  offset - offset of the write value.
 **                  len: length of the data to be written.
 **                  p_value - the value to be written.
@@ -1257,7 +1238,7 @@ extern void BTA_GATTC_ConfigureMTU (UINT16 conn_id);
 **
 ** Function         BTA_GATTS_Init
 **
-** Description      This function is called to initialize GATTS module
+** Description      This function is called to initalize GATTS module
 **
 ** Parameters       None
 **
--- a/components/bt/host/bluedroid/btc/profile/std/avrc/btc_avrc.c
+++ b/components/bt/host/bluedroid/btc/profile/std/avrc/btc_avrc.c
@@ -175,7 +175,8 @@ bool btc_avrc_ct_init_p(void)
 bool btc_avrc_tg_connected_p(void)
 {
    return (s_rc_tg_init == BTC_RC_TG_INIT_MAGIC) &&
-           (btc_rc_cb.rc_connected == TRUE);
+           (btc_rc_cb.rc_connected == TRUE) &&
+           (btc_rc_cb.rc_features & BTA_AV_FEAT_RCCT);
 }

 bool btc_avrc_ct_connected_p(void)
@@ -506,7 +507,7 @@ static void handle_rc_connect (tBTA_AV_RC_OPEN *p_rc_open)
            btc_avrc_ct_cb_to_app(ESP_AVRC_CT_CONNECTION_STATE_EVT, &param);
        }

-        if (btc_avrc_tg_init_p()) {
+        if (p_rc_open->peer_features & BTA_AV_FEAT_RCCT) {
            esp_avrc_tg_cb_param_t param;
            memset(&param, 0, sizeof(esp_avrc_tg_cb_param_t));
            param.conn_stat.connected = true;
@@ -579,7 +580,7 @@ static void handle_rc_disconnect (tBTA_AV_RC_CLOSE *p_rc_close)
        btc_avrc_ct_cb_to_app(ESP_AVRC_CT_CONNECTION_STATE_EVT, &param);
    }

-    if (btc_avrc_tg_init_p()) {
+    if (rc_features & BTA_AV_FEAT_RCCT) {
        esp_avrc_tg_cb_param_t param;
        memset(&param, 0, sizeof(esp_avrc_ct_cb_param_t));
        param.conn_stat.connected = false;
@@ -1005,10 +1006,14 @@ void btc_rc_handler(tBTA_AV_EVT event, tBTA_AV *p_data)
                memcpy(param.conn_stat.remote_bda, btc_rc_cb.rc_addr, sizeof(esp_bd_addr_t));
                btc_avrc_ct_cb_to_app(ESP_AVRC_CT_CONNECTION_STATE_EVT, &param);
            }
-            /**
-             * @note ESP_AVRC_TG_CONNECTION_STATE_EVT has been reported on rc connect/disconnect event,
-             * it doesn't rely on the SDP results.
-             */
+            if ((p_data->rc_feat.peer_features & BTA_AV_FEAT_RCCT) &&
+                !(old_feats & BTA_AV_FEAT_RCCT)) {
+                esp_avrc_tg_cb_param_t param;
+                memset(&param, 0, sizeof(esp_avrc_ct_cb_param_t));
+                param.conn_stat.connected = true;
+                memcpy(param.conn_stat.remote_bda, btc_rc_cb.rc_addr, sizeof(esp_bd_addr_t));
+                btc_avrc_tg_cb_to_app(ESP_AVRC_TG_CONNECTION_STATE_EVT, &param);
+            }
        } while (0);
        btc_rc_cb.rc_features = p_data->rc_feat.peer_features;
        btc_rc_cb.rc_ct_features = p_data->rc_feat.peer_ct_features;
--- a/components/bt/host/bluedroid/btc/profile/std/gatt/btc_gattc.c
+++ b/components/bt/host/bluedroid/btc/profile/std/gatt/btc_gattc.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD

 *
 * SPDX-License-Identifier: Apache-2.0
@@ -212,12 +212,9 @@ static void btc_gattc_app_unregister(btc_ble_gattc_args_t *arg)
 static void btc_gattc_open(btc_ble_gattc_args_t *arg)
 {
    tBTA_GATT_TRANSPORT transport = BTA_GATT_TRANSPORT_LE;
-
-    BTA_GATTC_Enh_Open(arg->open.gattc_if, arg->open.remote_bda,
+    BTA_GATTC_Open(arg->open.gattc_if, arg->open.remote_bda,
                   arg->open.remote_addr_type, arg->open.is_direct,
-                   transport, arg->open.is_aux, arg->open.own_addr_type,
-                   arg->open.phy_mask, (void *)&arg->open.phy_1m_conn_params,
-                   (void *)&arg->open.phy_2m_conn_params, (void *)&arg->open.phy_coded_conn_params);
+                   transport, arg->open.is_aux);
 }

 static void btc_gattc_close(btc_ble_gattc_args_t *arg)
--- a/components/bt/host/bluedroid/btc/profile/std/hf_ag/btc_hf_ag.c
+++ b/components/bt/host/bluedroid/btc/profile/std/hf_ag/btc_hf_ag.c
@@ -316,19 +316,6 @@ bt_status_t btc_hf_init(void)
 {
    int idx = 0;

-#if HFP_DYNAMIC_MEMORY == TRUE
-    if (hf_local_param)
-#endif
-    {
-        if (hf_local_param[idx].btc_hf_cb.initialized) {
-            esp_hf_cb_param_t param = {
-                .prof_stat.state = ESP_HF_INIT_ALREADY,
-            };
-            btc_hf_cb_to_app(ESP_HF_PROF_STATE_EVT, &param);
-            return BT_STATUS_SUCCESS;
-        }
-    }
-
    BTC_TRACE_DEBUG("%s - max_hf_clients=%d", __func__, btc_max_hf_clients);

 #if HFP_DYNAMIC_MEMORY == TRUE
@@ -351,6 +338,8 @@ bt_status_t btc_hf_init(void)
 #endif
    clear_phone_state();
    memset(&hf_local_param[idx].btc_hf_cb, 0, sizeof(btc_hf_cb_t));
+    // custom initialization here
+    hf_local_param[idx].btc_hf_cb.initialized = true;
 // set audio path
 #if (BT_CONTROLLER_INCLUDED == TRUE)
 #if BTM_SCO_HCI_INCLUDED
@@ -360,30 +349,14 @@ bt_status_t btc_hf_init(void)
 #endif
    esp_bredr_sco_datapath_set(data_path);
 #endif
-
    return BT_STATUS_SUCCESS;
 }

 void btc_hf_deinit(void)
 {
    BTC_TRACE_EVENT("%s", __FUNCTION__);
-
-    int idx = 0;
-
-#if HFP_DYNAMIC_MEMORY == TRUE
-    if (hf_local_param)
-#endif
-    {
-        if (!hf_local_param[idx].btc_hf_cb.initialized) {
-            esp_hf_cb_param_t param = {
-                .prof_stat.state = ESP_HF_DEINIT_ALREADY,
-            };
-            btc_hf_cb_to_app(ESP_HF_PROF_STATE_EVT, &param);
-            return;
-        }
-    }
-
    btc_dm_disable_service(BTA_HFP_SERVICE_ID);
+    hf_local_param[0].btc_hf_cb.initialized = false;
 }

 static void btc_hf_cb_release(void)
@@ -1295,18 +1268,7 @@ void btc_hf_cb_handler(btc_msg_t *msg)
            break;
        case BTA_AG_DISABLE_EVT:
        {
-            idx = 0;
-#if HFP_DYNAMIC_MEMORY == TRUE
-            if (hf_local_param)
-#endif
-            {
-                if (hf_local_param[idx].btc_hf_cb.initialized) {
-                    hf_local_param[idx].btc_hf_cb.initialized = false;
-                    btc_hf_cb_release();
-                    param.prof_stat.state = ESP_HF_DEINIT_SUCCESS;
-                    btc_hf_cb_to_app(ESP_HF_PROF_STATE_EVT, &param);
-                }
-            }
+            btc_hf_cb_release();
            break;
        }
        case BTA_AG_REGISTER_EVT:
@@ -1316,11 +1278,6 @@ void btc_hf_cb_handler(btc_msg_t *msg)
            hf_local_param[idx].btc_hf_cb.handle = p_data->reg.hdr.handle;
            BTC_TRACE_DEBUG("%s: BTA_AG_REGISTER_EVT," "hf_local_param[%d].btc_hf_cb.handle = %d",
                            __FUNCTION__, idx, hf_local_param[idx].btc_hf_cb.handle);
-            if (!hf_local_param[idx].btc_hf_cb.initialized) {
-                param.prof_stat.state = ESP_HF_INIT_SUCCESS;
-                btc_hf_cb_to_app(ESP_HF_PROF_STATE_EVT, &param);
-            }
-            hf_local_param[idx].btc_hf_cb.initialized = true;
            break;
        }

--- a/components/bt/host/bluedroid/btc/profile/std/hf_client/btc_hf_client.c
+++ b/components/bt/host/bluedroid/btc/profile/std/hf_client/btc_hf_client.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
 *
 * SPDX-License-Identifier: Apache-2.0
 */
@@ -169,18 +169,12 @@ bt_status_t btc_hf_client_init(void)
 {
    BTC_TRACE_EVENT("%s", __FUNCTION__);

-    if (hf_client_local_param.btc_hf_client_cb.initialized) {
-        esp_hf_client_cb_param_t param = {
-            .prof_stat.state = ESP_HF_INIT_ALREADY,
-        };
-        btc_hf_client_cb_to_app(ESP_HF_CLIENT_PROF_STATE_EVT, &param);
-        return BT_STATUS_SUCCESS;
-    }
-
    btc_dm_enable_service(BTA_HFP_HS_SERVICE_ID);

    clear_state();

+    hf_client_local_param.btc_hf_client_cb.initialized = true;
+
 #if (BT_CONTROLLER_INCLUDED == TRUE)
 #if BTM_SCO_HCI_INCLUDED
    uint8_t data_path = ESP_SCO_DATA_PATH_HCI;
@@ -238,15 +232,9 @@ void  btc_hf_client_deinit( void )
 {
    BTC_TRACE_EVENT("%s", __FUNCTION__);

-    if (!hf_client_local_param.btc_hf_client_cb.initialized) {
-        esp_hf_client_cb_param_t param = {
-            .prof_stat.state = ESP_HF_DEINIT_ALREADY,
-        };
-        btc_hf_client_cb_to_app(ESP_HF_CLIENT_PROF_STATE_EVT, &param);
-        return;
-    }
-
    btc_dm_disable_service(BTA_HFP_HS_SERVICE_ID);
+
+    hf_client_local_param.btc_hf_client_cb.initialized = false;
 }

 /*******************************************************************************
@@ -864,21 +852,10 @@ void btc_hf_client_cb_handler(btc_msg_t *msg)
    switch (event)
    {
        case BTA_HF_CLIENT_ENABLE_EVT:
-            break;
        case BTA_HF_CLIENT_DISABLE_EVT:
-            if (hf_client_local_param.btc_hf_client_cb.initialized) {
-                param.prof_stat.state = ESP_HF_DEINIT_SUCCESS,
-                btc_hf_client_cb_to_app(ESP_HF_CLIENT_PROF_STATE_EVT, &param);
-            }
-            hf_client_local_param.btc_hf_client_cb.initialized = false;
            break;
        case BTA_HF_CLIENT_REGISTER_EVT:
            hf_client_local_param.btc_hf_client_cb.handle = p_data->reg.handle;
-            if (!hf_client_local_param.btc_hf_client_cb.initialized) {
-                param.prof_stat.state = ESP_HF_INIT_SUCCESS,
-                btc_hf_client_cb_to_app(ESP_HF_CLIENT_PROF_STATE_EVT, &param);
-            }
-            hf_client_local_param.btc_hf_client_cb.initialized = true;
            break;
        case BTA_HF_CLIENT_OPEN_EVT:
            if (p_data->open.status == BTA_HF_CLIENT_SUCCESS)
--- a/components/bt/host/bluedroid/btc/profile/std/include/btc_gap_ble.h
+++ b/components/bt/host/bluedroid/btc/profile/std/include/btc_gap_ble.h
@@ -11,13 +11,11 @@
 #include "esp_gap_ble_api.h"

 #if BTC_DYNAMIC_MEMORY == TRUE
-#if (BLE_42_FEATURE_SUPPORT == TRUE)
 #include "bta/bta_api.h"
 extern tBTA_BLE_ADV_DATA *gl_bta_adv_data_ptr;
 extern tBTA_BLE_ADV_DATA *gl_bta_scan_rsp_data_ptr;
 #define gl_bta_adv_data     (*gl_bta_adv_data_ptr)
 #define gl_bta_scan_rsp_data    (*gl_bta_scan_rsp_data_ptr)
-#endif // BLE_42_FEATURE_SUPPORT
 #endif

 #define BLE_ISVALID_PARAM(x, min, max)  (((x) >= (min) && (x) <= (max)))
--- a/components/bt/host/bluedroid/btc/profile/std/include/btc_gattc.h
+++ b/components/bt/host/bluedroid/btc/profile/std/include/btc_gattc.h
@@ -57,11 +57,6 @@ typedef union {
        esp_ble_addr_type_t remote_addr_type;
        bool is_direct;
        bool is_aux;
-        esp_ble_addr_type_t own_addr_type;
-        esp_ble_phy_mask_t phy_mask;
-        esp_ble_conn_params_t phy_1m_conn_params;
-        esp_ble_conn_params_t phy_2m_conn_params;
-        esp_ble_conn_params_t phy_coded_conn_params;
    } open;
    //BTC_GATTC_ACT_CLOSE,
    struct close_arg {
--- a/components/bt/host/bluedroid/btc/profile/std/l2cap/btc_l2cap.c
+++ b/components/bt/host/bluedroid/btc/profile/std/l2cap/btc_l2cap.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
 *
 * SPDX-License-Identifier: Apache-2.0
 */
@@ -281,7 +281,7 @@ static void close_timeout_handler(void *arg)
    status = btc_transfer_context(&msg, slot->alarm_arg, sizeof(tBTA_JV), NULL, NULL);

    if (slot->alarm_arg) {
-        osi_free(slot->alarm_arg);
+        free(slot->alarm_arg);
        slot->alarm_arg = NULL;
    }

@@ -832,7 +832,7 @@ void btc_l2cap_cb_handler(btc_msg_t *msg)
            // if rx still has data, delay free slot
            if (slot->close_alarm == NULL && slot->rx.queue && fixed_queue_length(slot->rx.queue) > 0) {
                tBTA_JV *p_arg = NULL;
-                if ((p_arg = osi_malloc(sizeof(tBTA_JV))) == NULL) {
+                if ((p_arg = malloc(sizeof(tBTA_JV))) == NULL) {
                    param.close.status = ESP_BT_L2CAP_NO_RESOURCE;
                    osi_mutex_unlock(&l2cap_local_param.l2cap_slot_mutex);
                    BTC_TRACE_ERROR("%s unable to malloc slot close_alarm arg!", __func__);
@@ -842,7 +842,7 @@ void btc_l2cap_cb_handler(btc_msg_t *msg)
                slot->alarm_arg = (void *)p_arg;
                if ((slot->close_alarm =
                            osi_alarm_new("slot", close_timeout_handler, (void *)slot, VFS_CLOSE_TIMEOUT)) == NULL) {
-                    osi_free(p_arg);
+                    free(p_arg);
                    slot->alarm_arg = NULL;
                    param.close.status = ESP_BT_L2CAP_NO_RESOURCE;
                    osi_mutex_unlock(&l2cap_local_param.l2cap_slot_mutex);
@@ -850,7 +850,7 @@ void btc_l2cap_cb_handler(btc_msg_t *msg)
                    break;
                }
                if (osi_alarm_set(slot->close_alarm, VFS_CLOSE_TIMEOUT) != OSI_ALARM_ERR_PASS) {
-                    osi_free(p_arg);
+                    free(p_arg);
                    slot->alarm_arg = NULL;
                    osi_alarm_free(slot->close_alarm);
                    param.close.status = ESP_BT_L2CAP_BUSY;
--- a/components/bt/host/bluedroid/btc/profile/std/spp/btc_spp.c
+++ b/components/bt/host/bluedroid/btc/profile/std/spp/btc_spp.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
 *
 * SPDX-License-Identifier: Apache-2.0
 */
@@ -1199,7 +1199,7 @@ void btc_spp_cb_handler(btc_msg_t *msg)
                    slot->alarm_arg = (void *)p_arg;
                    if ((slot->close_alarm =
                             osi_alarm_new("slot", close_timeout_handler, (void *)slot, VFS_CLOSE_TIMEOUT)) == NULL) {
-                        osi_free(p_arg);
+                        free(p_arg);
                        slot->alarm_arg = NULL;
                        param.close.status = ESP_SPP_NO_RESOURCE;
                        osi_mutex_unlock(&spp_local_param.spp_slot_mutex);
@@ -1207,7 +1207,7 @@ void btc_spp_cb_handler(btc_msg_t *msg)
                        break;
                    }
                    if (osi_alarm_set(slot->close_alarm, VFS_CLOSE_TIMEOUT) != OSI_ALARM_ERR_PASS) {
-                        osi_free(p_arg);
+                        free(p_arg);
                        slot->alarm_arg = NULL;
                        osi_alarm_free(slot->close_alarm);
                        param.close.status = ESP_SPP_BUSY;
@@ -1488,7 +1488,7 @@ static ssize_t spp_vfs_write(int fd, const void * data, size_t size)
            BTC_TRACE_DEBUG("%s items_waiting:%d, fd:%d\n", __func__, items_waiting, fd);
            osi_mutex_unlock(&spp_local_param.spp_slot_mutex);

-            // block until under water level, be closed or time out
+            // block untill under water level, be closed or time out
            tx_event_group_val =
                xEventGroupWaitBits(spp_local_param.tx_event_group, SLOT_WRITE_BIT(serial) | SLOT_CLOSE_BIT(serial), pdTRUE,
                                    pdFALSE, VFS_WRITE_TIMEOUT / portTICK_PERIOD_MS);
--- a/components/bt/host/bluedroid/common/include/common/bt_target.h
+++ b/components/bt/host/bluedroid/common/include/common/bt_target.h
@@ -215,16 +215,11 @@
 #define BLE_50_FEATURE_SUPPORT   FALSE
 #endif

-#if (UC_BT_BLE_ENABLED ==TRUE)
 #if (UC_BT_BLE_42_FEATURES_SUPPORTED == TRUE || BLE_50_FEATURE_SUPPORT == FALSE)
 #define BLE_42_FEATURE_SUPPORT   TRUE
 #else
 #define BLE_42_FEATURE_SUPPORT   FALSE
 #endif
-#else
-#define BLE_42_FEATURE_SUPPORT   FALSE
-#define BLE_50_FEATURE_SUPPORT   FALSE
-#endif /* UC_BT_BLE_ENABLED */

 #if (UC_BT_BLE_FEAT_PERIODIC_ADV_SYNC_TRANSFER == TRUE)
 #define BLE_FEAT_PERIODIC_ADV_SYNC_TRANSFER   TRUE
--- a/components/bt/host/bluedroid/hci/hci_hal_h4.c
+++ b/components/bt/host/bluedroid/hci/hci_hal_h4.c
@@ -593,11 +593,7 @@ static int host_recv_pkt_cb(uint8_t *data, uint16_t len)
        }
 #endif
        pkt_size = BT_PKT_LINKED_HDR_SIZE + BT_HDR_SIZE + len;
-        #if HEAP_MEMORY_DEBUG
-        linked_pkt = (pkt_linked_item_t *) osi_calloc(pkt_size);
-        #else
        linked_pkt = (pkt_linked_item_t *) osi_calloc_base(pkt_size);
-        #endif
        if (!linked_pkt) {
 #if (BLE_ADV_REPORT_FLOW_CONTROL == TRUE)
            hci_adv_credits_consumed(1);
--- a/components/bt/host/bluedroid/hci/hci_packet_parser.c
+++ b/components/bt/host/bluedroid/hci/hci_packet_parser.c
@@ -219,6 +219,7 @@ static void parse_ble_read_adv_max_len_response(
        // Size: 2 Octets ; Value: 0x001F – 0x0672 ; Maximum supported advertising data length
        STREAM_TO_UINT16(*adv_max_len_ptr, stream);
    }
+
    osi_free(response);
 }
 #endif // #if (BLE_50_FEATURE_SUPPORT == TRUE)
--- a/components/bt/host/bluedroid/stack/avrc/avrc_pars_tg.c
+++ b/components/bt/host/bluedroid/stack/avrc/avrc_pars_tg.c
@@ -71,7 +71,7 @@ static tAVRC_STS avrc_pars_vendor_cmd(tAVRC_MSG_VENDOR *p_msg, tAVRC_COMMAND *p_
    p++; /* skip the reserved byte */
    BE_STREAM_TO_UINT16 (len, p);
    if ((len + 4) != (p_msg->vendor_len)) {
-        status = AVRC_STS_NOT_FOUND;
+        status = AVRC_STS_INTERNAL_ERR;
    }

    if (status != AVRC_STS_NO_ERROR) {
--- a/components/bt/host/bluedroid/stack/btm/btm_main.c
+++ b/components/bt/host/bluedroid/stack/btm/btm_main.c
@@ -110,9 +110,6 @@ void btm_free(void)
    fixed_queue_free(btm_cb.sec_pending_q, osi_free_func);
    btm_acl_free();
    btm_sec_dev_free();
-#if BTM_SCO_INCLUDED == TRUE
-    btm_sco_free();
-#endif
 #if BTM_DYNAMIC_MEMORY
    FREE_AND_RESET(btm_cb_ptr);
 #endif
--- a/components/bt/host/bluedroid/stack/btm/btm_sco.c
+++ b/components/bt/host/bluedroid/stack/btm/btm_sco.c
@@ -123,22 +123,6 @@ void btm_sco_init (void)
    btm_cb.sco_cb.desired_sco_mode = BTM_DEFAULT_SCO_MODE;
 }

-/*******************************************************************************
-**
-** Function         btm_sco_free
-**
-** Description      Free sco specific fixed_queue from btm control block
-**
-*******************************************************************************/
-void btm_sco_free(void)
-{
-#if (BTM_SCO_HCI_INCLUDED == TRUE)
-    for (int i = 0; i < BTM_MAX_SCO_LINKS; i++) {
-        fixed_queue_free(btm_cb.sco_cb.sco_db[i].xmit_data_q, osi_free_func);
-    }
-#endif
-}
-
 /*******************************************************************************
 **
 ** Function         btm_esco_conn_rsp
@@ -249,7 +233,7 @@ void btm_sco_process_num_bufs (UINT16 num_lm_sco_bufs)
 **                               pointer is used, PCM parameter maintained in
 **                               the control block will be used; otherwise update
 **                               control block value.
-**                  err_data_rpt: Lisbon feature to enable the erroneous data report
+**                  err_data_rpt: Lisbon feature to enable the erronous data report
 **                                or not.
 **
 ** Returns          BTM_SUCCESS if the successful.
@@ -963,7 +947,7 @@ void btm_sco_conn_req (BD_ADDR bda,  DEV_CLASS dev_class, UINT8 link_type)
    for (xx = 0; xx < BTM_MAX_SCO_LINKS; xx++, p++) {
        /*
         * If the sco state is in the SCO_ST_CONNECTING state, we still need
-         * to return accept sco to avoid race condition for sco creation
+         * to return accept sco to avoid race conditon for sco creation
         */
        int rem_bd_matches = p->rem_bd_known &&
                             !memcmp (p->esco.data.bd_addr, bda, BD_ADDR_LEN);
--- a/components/bt/host/bluedroid/stack/btm/include/btm_ble_int.h
+++ b/components/bt/host/bluedroid/stack/btm/include/btm_ble_int.h
@@ -212,14 +212,11 @@ typedef struct {
 #define BTM_BLE_MAX_BG_CONN_DEV_NUM    10

 typedef struct {
-    UINT16              scan_interval;
-    UINT16              scan_window;
    UINT16              min_conn_int;
    UINT16              max_conn_int;
    UINT16              slave_latency;
    UINT16              supervision_tout;
-    UINT16              min_ce_len;
-    UINT16              max_ce_len;
+
 } tBTM_LE_CONN_PRAMS;


--- a/components/bt/host/bluedroid/stack/btm/include/btm_int.h
+++ b/components/bt/host/bluedroid/stack/btm/include/btm_int.h
@@ -1119,7 +1119,6 @@ void btm_ble_periodic_adv_sync_trans_complete(UINT16 op_code, UINT8 hci_status,
 ********************************************
 */
 void btm_sco_init (void);
-void btm_sco_free(void);
 void btm_sco_connected (UINT8 hci_status, BD_ADDR bda, UINT16 hci_handle,
                        tBTM_ESCO_DATA *p_esco_data);
 void btm_esco_proc_conn_chg (UINT8 status, UINT16 handle, UINT8 tx_interval,
--- a/components/bt/host/bluedroid/stack/hcic/hciblecmds.c
+++ b/components/bt/host/bluedroid/stack/hcic/hciblecmds.c
@@ -349,8 +349,8 @@ BOOLEAN btsnd_hcic_ble_create_ll_conn (UINT16 scan_int, UINT16 scan_win,
    UINT16_TO_STREAM (pp, conn_latency);
    UINT16_TO_STREAM (pp, conn_timeout);

-    UINT16_TO_STREAM (pp, min_ce_len ? min_ce_len : BLE_CE_LEN_MIN);
-    UINT16_TO_STREAM (pp, max_ce_len ? max_ce_len : BLE_CE_LEN_MIN);
+    UINT16_TO_STREAM (pp, min_ce_len);
+    UINT16_TO_STREAM (pp, max_ce_len);

    btu_hcif_send_cmd (LOCAL_BR_EDR_CONTROLLER_ID,  p);
    return (TRUE);
@@ -1594,8 +1594,8 @@ BOOLEAN btsnd_hcic_ble_create_ext_conn(tHCI_CreatExtConn *p_conn)
        UINT16_TO_STREAM(pp, params->conn_interval_max);
        UINT16_TO_STREAM(pp, params->conn_latency);
        UINT16_TO_STREAM(pp, params->sup_timeout);
-        UINT16_TO_STREAM(pp, params->min_ce_len ? params->min_ce_len : BLE_CE_LEN_MIN);
-        UINT16_TO_STREAM(pp, params->max_ce_len ? params->max_ce_len : BLE_CE_LEN_MIN);
+        UINT16_TO_STREAM(pp, BLE_CE_LEN_MIN);
+        UINT16_TO_STREAM(pp, BLE_CE_LEN_MIN);
    }

    if (p_conn->init_phy_mask & 0x02) {
@@ -1606,8 +1606,8 @@ BOOLEAN btsnd_hcic_ble_create_ext_conn(tHCI_CreatExtConn *p_conn)
        UINT16_TO_STREAM(pp, params->conn_interval_max);
        UINT16_TO_STREAM(pp, params->conn_latency);
        UINT16_TO_STREAM(pp, params->sup_timeout);
-        UINT16_TO_STREAM(pp, params->min_ce_len ? params->min_ce_len : BLE_CE_LEN_MIN);
-        UINT16_TO_STREAM(pp, params->max_ce_len ? params->max_ce_len : BLE_CE_LEN_MIN);
+        UINT16_TO_STREAM(pp, BLE_CE_LEN_MIN);
+        UINT16_TO_STREAM(pp, BLE_CE_LEN_MIN);
    }

    if (p_conn->init_phy_mask & 0x04) {
@@ -1618,8 +1618,8 @@ BOOLEAN btsnd_hcic_ble_create_ext_conn(tHCI_CreatExtConn *p_conn)
        UINT16_TO_STREAM(pp, params->conn_interval_max);
        UINT16_TO_STREAM(pp, params->conn_latency);
        UINT16_TO_STREAM(pp, params->sup_timeout);
-        UINT16_TO_STREAM(pp, params->min_ce_len ? params->min_ce_len : BLE_CE_LEN_MIN);
-        UINT16_TO_STREAM(pp, params->max_ce_len ? params->max_ce_len : BLE_CE_LEN_MIN);
+        UINT16_TO_STREAM(pp, BLE_CE_LEN_MIN);
+        UINT16_TO_STREAM(pp, BLE_CE_LEN_MIN);
    }

    btu_hcif_send_cmd(LOCAL_BR_EDR_CONTROLLER_ID, p);
--- a/components/bt/host/bluedroid/stack/l2cap/l2c_ble.c
+++ b/components/bt/host/bluedroid/stack/l2cap/l2c_ble.c
@@ -902,12 +902,6 @@ BOOLEAN l2cble_init_direct_conn (tL2C_LCB *p_lcb)

    scan_int = (p_cb->scan_int == BTM_BLE_SCAN_PARAM_UNDEF) ? BTM_BLE_SCAN_FAST_INT : p_cb->scan_int;
    scan_win = (p_cb->scan_win == BTM_BLE_SCAN_PARAM_UNDEF) ? BTM_BLE_SCAN_FAST_WIN : p_cb->scan_win;
-    if (p_dev_rec->conn_params.scan_interval && p_dev_rec->conn_params.scan_interval != BTM_BLE_CONN_PARAM_UNDEF) {
-        scan_int = p_dev_rec->conn_params.scan_interval;
-    }
-    if (p_dev_rec->conn_params.scan_window && p_dev_rec->conn_params.scan_window != BTM_BLE_CONN_PARAM_UNDEF) {
-        scan_win = p_dev_rec->conn_params.scan_window;
-    }

    peer_addr_type = p_lcb->ble_addr_type;
    memcpy(peer_addr, p_lcb->remote_bd_addr, BD_ADDR_LEN);
@@ -972,24 +966,22 @@ BOOLEAN l2cble_init_direct_conn (tL2C_LCB *p_lcb)
    }

    if (!p_lcb->is_aux) {
-        if (!btsnd_hcic_ble_create_ll_conn (scan_int, /* UINT16 scan_int */
-                                            scan_win, /* UINT16 scan_win */
-                                            FALSE, /* UINT8 white_list */
-                                            peer_addr_type, /* UINT8 addr_type_peer */
-                                            peer_addr, /* BD_ADDR bda_peer */
-                                            own_addr_type, /* UINT8 addr_type_own */
+        if (!btsnd_hcic_ble_create_ll_conn (scan_int,/* UINT16 scan_int      */
+                                            scan_win, /* UINT16 scan_win      */
+                                            FALSE,                   /* UINT8 white_list     */
+                                            peer_addr_type,          /* UINT8 addr_type_peer */
+                                            peer_addr,               /* BD_ADDR bda_peer     */
+                                            own_addr_type,         /* UINT8 addr_type_own  */
                                            (UINT16) ((p_dev_rec->conn_params.min_conn_int != BTM_BLE_CONN_PARAM_UNDEF) ?
-                                                    p_dev_rec->conn_params.min_conn_int : BTM_BLE_CONN_INT_MIN_DEF), /* UINT16 conn_int_min */
+                                                    p_dev_rec->conn_params.min_conn_int : BTM_BLE_CONN_INT_MIN_DEF),  /* UINT16 conn_int_min  */
                                            (UINT16) ((p_dev_rec->conn_params.max_conn_int != BTM_BLE_CONN_PARAM_UNDEF) ?
-                                                    p_dev_rec->conn_params.max_conn_int : BTM_BLE_CONN_INT_MAX_DEF), /* UINT16 conn_int_max */
+                                                    p_dev_rec->conn_params.max_conn_int : BTM_BLE_CONN_INT_MAX_DEF),  /* UINT16 conn_int_max  */
                                            (UINT16) ((p_dev_rec->conn_params.slave_latency != BTM_BLE_CONN_PARAM_UNDEF) ?
-                                                    p_dev_rec->conn_params.slave_latency : BTM_BLE_CONN_SLAVE_LATENCY_DEF), /* UINT16 conn_latency */
+                                                    p_dev_rec->conn_params.slave_latency : BTM_BLE_CONN_SLAVE_LATENCY_DEF), /* UINT16 conn_latency  */
                                            (UINT16) ((p_dev_rec->conn_params.supervision_tout != BTM_BLE_CONN_PARAM_UNDEF) ?
-                                                    p_dev_rec->conn_params.supervision_tout : BTM_BLE_CONN_TIMEOUT_DEF), /* UINT16 conn_timeout */
-                                            (UINT16) ((p_dev_rec->conn_params.min_ce_len != BTM_BLE_CONN_PARAM_UNDEF) ?
-                                                    p_dev_rec->conn_params.min_ce_len : BLE_CE_LEN_MIN), /* UINT16 min_ce_len */
-                                            (UINT16) ((p_dev_rec->conn_params.max_ce_len != BTM_BLE_CONN_PARAM_UNDEF) ?
-                                                    p_dev_rec->conn_params.max_ce_len : BLE_CE_LEN_MIN) /* UINT16 max_ce_len */)) {
+                                                    p_dev_rec->conn_params.supervision_tout : BTM_BLE_CONN_TIMEOUT_DEF), /* conn_timeout */
+                                            BLE_CE_LEN_MIN,                       /* UINT16 min_len       */
+                                            BLE_CE_LEN_MIN)) {                    /* UINT16 max_len       */
            l2cu_release_lcb (p_lcb);
            L2CAP_TRACE_ERROR("initiate direct connection fail, no resources");
            return (FALSE);
--- a/components/bt/host/bluedroid/stack/sdp/sdp_discovery.c
+++ b/components/bt/host/bluedroid/stack/sdp/sdp_discovery.c
@@ -453,7 +453,7 @@ static void process_service_attr_rsp (tCONN_CB *p_ccb, UINT8 *p_reply)
        }
    }

-    /* Now, ask for the next handle. Reuse the buffer we just got. */
+    /* Now, ask for the next handle. Re-use the buffer we just got. */
    if (p_ccb->cur_handle < p_ccb->num_handles) {
        BT_HDR  *p_msg = (BT_HDR *) osi_malloc(SDP_DATA_BUF_SIZE);
        UINT8   *p;
@@ -669,7 +669,6 @@ static void process_service_search_attr_rsp (tCONN_CB *p_ccb, UINT8 *p_reply)

    if ((type >> 3) != DATA_ELE_SEQ_DESC_TYPE) {
        SDP_TRACE_WARNING ("SDP - Wrong type: 0x%02x in attr_rsp\n", type);
-        sdp_disconnect (p_ccb, SDP_ILLEGAL_PARAMETER);
        return;
    }
    p = sdpu_get_len_from_type (p, type, &seq_len);
--- a/components/bt/host/nimble/Kconfig.in
+++ b/components/bt/host/nimble/Kconfig.in
@@ -551,156 +551,138 @@ menuconfig BT_NIMBLE_50_FEATURE_SUPPORT
    help
            Enable BLE 5 feature

-if BT_NIMBLE_50_FEATURE_SUPPORT
-    config BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY
-        bool "Enable 2M Phy"
-        depends on BT_NIMBLE_50_FEATURE_SUPPORT
+config BT_NIMBLE_LL_CFG_FEAT_LE_2M_PHY
+    bool "Enable 2M Phy"
+    depends on BT_NIMBLE_50_FEATURE_SUPPORT
+    default y
+    help
+            Enable 2M-PHY
+
+config BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY
+    bool "Enable coded Phy"
+    depends on BT_NIMBLE_50_FEATURE_SUPPORT
+    default y
+    help
+            Enable coded-PHY
+
+config BT_NIMBLE_EXT_ADV
+    bool "Enable extended advertising"
+    depends on BT_NIMBLE_50_FEATURE_SUPPORT
+    default n
+    help
+        Enable this option to do extended advertising. Extended advertising
+        will be supported from BLE 5.0 onwards.
+
+if BT_NIMBLE_EXT_ADV
+    config BT_NIMBLE_MAX_EXT_ADV_INSTANCES
+        int "Maximum number of extended advertising instances."
+        range 0 4
+        default 1 if BT_NIMBLE_EXT_ADV
+        default 0
+        depends on BT_NIMBLE_EXT_ADV
+        help
+            Change this option to set maximum number of extended advertising
+            instances. Minimum there is always one instance of
+            advertising. Enter how many more advertising instances you
+            want.
+            For ESP32C2, ESP32C6 and ESP32H2, each extended advertising instance
+            will take about 0.5k DRAM.
+
+    config BT_NIMBLE_EXT_ADV_MAX_SIZE
+        int "Maximum length of the advertising data."
+        range 0 1650
+        default 1650 if BT_NIMBLE_EXT_ADV
+        default 0
+        depends on BT_NIMBLE_EXT_ADV
+        help
+            Defines the length of the extended adv data. The value should not
+            exceed 1650.
+
+    config BT_NIMBLE_ENABLE_PERIODIC_ADV
+        bool "Enable periodic advertisement."
+        default y
+        depends on BT_NIMBLE_EXT_ADV
+        help
+            Enable this option to start periodic advertisement.
+
+    config BT_NIMBLE_PERIODIC_ADV_SYNC_TRANSFER
+        bool "Enable Transfer Sync Events"
+        depends on BT_NIMBLE_ENABLE_PERIODIC_ADV
        default y
        help
-                Enable 2M-PHY
-
-    config BT_NIMBLE_LL_CFG_FEAT_LE_CODED_PHY
-        bool "Enable coded Phy"
-        depends on BT_NIMBLE_50_FEATURE_SUPPORT
-        default y
-        help
-                Enable coded-PHY
-
-    config BT_NIMBLE_EXT_ADV
-        bool "Enable extended advertising"
-        depends on BT_NIMBLE_50_FEATURE_SUPPORT
-        default n
-        help
-            Enable this option to do extended advertising. Extended advertising
-            will be supported from BLE 5.0 onwards.
-
-    if BT_NIMBLE_EXT_ADV
-        config BT_NIMBLE_MAX_EXT_ADV_INSTANCES
-            int "Maximum number of extended advertising instances."
-            range 0 4
-            default 1 if BT_NIMBLE_EXT_ADV
-            default 0
-            depends on BT_NIMBLE_EXT_ADV
-            help
-                Change this option to set maximum number of extended advertising
-                instances. Minimum there is always one instance of
-                advertising. Enter how many more advertising instances you
-                want.
-                For ESP32C2, ESP32C6 and ESP32H2, each extended advertising instance
-                will take about 0.5k DRAM.
-
-        config BT_NIMBLE_EXT_ADV_MAX_SIZE
-            int "Maximum length of the advertising data."
-            range 0 1650
-            default 1650 if BT_NIMBLE_EXT_ADV
-            default 0
-            depends on BT_NIMBLE_EXT_ADV
-            help
-                Defines the length of the extended adv data. The value should not
-                exceed 1650.
-
-        config BT_NIMBLE_ENABLE_PERIODIC_ADV
-            bool "Enable periodic advertisement."
-            default y
-            depends on BT_NIMBLE_EXT_ADV
-            help
-                Enable this option to start periodic advertisement.
-
-        config BT_NIMBLE_PERIODIC_ADV_ENH
-            bool "Periodic adv enhancements(adi support)"
-            depends on BT_NIMBLE_ENABLE_PERIODIC_ADV && SOC_BLE_PERIODIC_ADV_ENH_SUPPORTED
-            help
-                Enable the periodic advertising enhancements
-
-        config BT_NIMBLE_PERIODIC_ADV_SYNC_TRANSFER
-            bool "Enable Transfer Sync Events"
-            depends on BT_NIMBLE_ENABLE_PERIODIC_ADV
-            default y
-            help
-                    This enables controller transfer periodic sync events to host
-    endif
-
-    config BT_NIMBLE_EXT_SCAN
-        bool "Enable extended scanning"
-        depends on BT_NIMBLE_50_FEATURE_SUPPORT && BT_NIMBLE_ROLE_OBSERVER
-        default y
-        help
-            Enable this option to do extended scanning.
-
-    config BT_NIMBLE_ENABLE_PERIODIC_SYNC
-        bool "Enable periodic sync"
-        default y
-        depends on BT_NIMBLE_EXT_SCAN
-        help
-            Enable this option to receive periodic advertisement.
-
-    if BT_NIMBLE_ENABLE_PERIODIC_SYNC
-        config BT_NIMBLE_MAX_PERIODIC_SYNCS
-            int "Maximum number of periodic advertising syncs"
-            range 0 3 if IDF_TARGET_ESP32C2
-            range 0 8
-            default 1 if BT_NIMBLE_ENABLE_PERIODIC_ADV
-            default 0
-            help
-                Set this option to set the upper limit for number of periodic sync
-                connections. This should be less than maximum connections allowed by
-                controller.
-
-        config BT_NIMBLE_MAX_PERIODIC_ADVERTISER_LIST
-            int "Maximum number of periodic advertiser list"
-            depends on SOC_ESP_NIMBLE_CONTROLLER
-            range 1 5
-            default 5 if BT_NIMBLE_50_FEATURE_SUPPORT
-            help
-                Set this option to set the upper limit for number of periodic advertiser list.
-    endif
-
-    config BT_NIMBLE_BLE_POWER_CONTROL
-        bool "Enable support for BLE Power Control"
-        depends on BT_NIMBLE_50_FEATURE_SUPPORT && SOC_BLE_POWER_CONTROL_SUPPORTED
-        default n
-        help
-            Set this option to enable the Power Control feature
-
-    config BT_NIMBLE_AOA_AOD
-        bool "Direction Finding"
-        depends on BT_NIMBLE_50_FEATURE_SUPPORT && (BT_CONTROLLER_DISABLED || SOC_BLE_CTE_SUPPORTED)
-        default n
-        help
-            Enable support for Connectionless and Connection Oriented Direction Finding
-
-    menuconfig BT_NIMBLE_GATT_CACHING
-        bool "Enable GATT caching"
-        depends on BT_NIMBLE_ENABLED && BT_NIMBLE_50_FEATURE_SUPPORT
-        select BT_NIMBLE_DYNAMIC_SERVICE
-        help
-            Enable GATT caching
-    config BT_NIMBLE_GATT_CACHING_MAX_CONNS
-        int "Maximum connections to be cached"
-        depends on BT_NIMBLE_GATT_CACHING
-        default 1
-        help
-            Set this option to set the upper limit on number of connections to be cached.
-    config BT_NIMBLE_GATT_CACHING_MAX_SVCS
-        int "Maximum number of services per connection"
-        depends on BT_NIMBLE_GATT_CACHING
-        default 64
-        help
-            Set this option to set the upper limit on number of services per connection to be cached.
-    config BT_NIMBLE_GATT_CACHING_MAX_CHRS
-        int "Maximum number of characteristics per connection"
-        depends on BT_NIMBLE_GATT_CACHING
-        default 64
-        help
-            Set this option to set the upper limit on number of characteristics per connection to be cached.
-    config BT_NIMBLE_GATT_CACHING_MAX_DSCS
-        int "Maximum number of descriptors per connection"
-        depends on BT_NIMBLE_GATT_CACHING
-        default 64
-        help
-            Set this option to set the upper limit on number of descriptors per connection to be cached.
+                This enables controller transfer periodic sync events to host
 endif

+config BT_NIMBLE_MAX_PERIODIC_SYNCS
+    int "Maximum number of periodic advertising syncs"
+    depends on BT_NIMBLE_50_FEATURE_SUPPORT
+    range 0 3 if IDF_TARGET_ESP32C2
+    range 0 8
+    default 1 if BT_NIMBLE_ENABLE_PERIODIC_ADV
+    default 0
+    help
+        Set this option to set the upper limit for number of periodic sync
+        connections. This should be less than maximum connections allowed by
+        controller.
+
+config BT_NIMBLE_MAX_PERIODIC_ADVERTISER_LIST
+    int "Maximum number of periodic advertiser list"
+    depends on BT_NIMBLE_50_FEATURE_SUPPORT && SOC_ESP_NIMBLE_CONTROLLER
+    range 1 5
+    default 5 if BT_NIMBLE_50_FEATURE_SUPPORT
+    help
+        Set this option to set the upper limit for number of periodic advertiser list.
+
+config BT_NIMBLE_BLE_POWER_CONTROL
+    bool "Enable support for BLE Power Control"
+    depends on BT_NIMBLE_50_FEATURE_SUPPORT && SOC_BLE_POWER_CONTROL_SUPPORTED
+    default n
+    help
+        Set this option to enable the Power Control feature
+
+config BT_NIMBLE_PERIODIC_ADV_ENH
+    bool "Periodic adv enhancements(adi support)"
+    depends on BT_NIMBLE_ENABLE_PERIODIC_ADV && BT_NIMBLE_50_FEATURE_SUPPORT && SOC_BLE_PERIODIC_ADV_ENH_SUPPORTED
+    help
+        Enable the periodic advertising enhancements
+
+config BT_NIMBLE_AOA_AOD
+    bool "Direction Finding"
+    depends on BT_NIMBLE_50_FEATURE_SUPPORT && (BT_CONTROLLER_DISABLED || SOC_BLE_CTE_SUPPORTED)
+    default n
+    help
+        Enable support for Connectionless and Connection Oriented Direction Finding
+
+menuconfig BT_NIMBLE_GATT_CACHING
+    bool "Enable GATT caching"
+    depends on BT_NIMBLE_ENABLED && BT_NIMBLE_50_FEATURE_SUPPORT
+    select BT_NIMBLE_DYNAMIC_SERVICE
+    help
+        Enable GATT caching
+config BT_NIMBLE_GATT_CACHING_MAX_CONNS
+    int "Maximum connections to be cached"
+    depends on BT_NIMBLE_GATT_CACHING
+    default 1
+    help
+        Set this option to set the upper limit on number of connections to be cached.
+config BT_NIMBLE_GATT_CACHING_MAX_SVCS
+    int "Maximum number of services per connection"
+    depends on BT_NIMBLE_GATT_CACHING
+    default 64
+    help
+        Set this option to set the upper limit on number of services per connection to be cached.
+config BT_NIMBLE_GATT_CACHING_MAX_CHRS
+    int "Maximum number of characteristics per connection"
+    depends on BT_NIMBLE_GATT_CACHING
+    default 64
+    help
+        Set this option to set the upper limit on number of characteristics per connection to be cached.
+config BT_NIMBLE_GATT_CACHING_MAX_DSCS
+    int "Maximum number of descriptors per connection"
+    depends on BT_NIMBLE_GATT_CACHING
+    default 64
+    help
+        Set this option to set the upper limit on number of descriptors per connection to be cached.

 config BT_NIMBLE_WHITELIST_SIZE
    int "BLE white list size"
--- a/components/bt/host/nimble/nimble
+++ b/components/bt/host/nimble/nimble
--- a/components/bt/include/esp32/include/esp_bt.h
+++ b/components/bt/include/esp32/include/esp_bt.h
@@ -55,7 +55,7 @@ extern "C" {
 *
 * @note Please do not modify this value
 */
-#define ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL  0x20241015
+#define ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL  0x20240926

 /**
 * @brief Bluetooth Controller mode
@@ -193,12 +193,6 @@ the advertising packet will be discarded until the memory is restored. */

 #define BTDM_BLE_LLCP_DISC_FLAG (BTDM_BLE_LLCP_CONN_UPDATE | BTDM_BLE_LLCP_CHAN_MAP_UPDATE)

-#ifdef CONFIG_BTDM_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS
-#define BTDM_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS_ENABLED CONFIG_BTDM_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS
-#else
-#define BTDM_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS_ENABLED 0
-#endif
-
 /**
 * @brief  Default Bluetooth Controller configuration
 */
@@ -228,7 +222,6 @@ the advertising packet will be discarded until the memory is restored. */
    .dup_list_refresh_period = SCAN_DUPL_CACHE_REFRESH_PERIOD,             \
    .ble_scan_backoff = BTDM_CTRL_SCAN_BACKOFF_UPPERLIMITMAX,              \
    .ble_llcp_disc_flag = BTDM_BLE_LLCP_DISC_FLAG,                         \
-    .ble_aa_check = BTDM_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS_ENABLED,    \
    .magic = ESP_BT_CONTROLLER_CONFIG_MAGIC_VAL,                           \
 }

@@ -282,7 +275,6 @@ typedef struct {
    uint16_t dup_list_refresh_period;       /*!< Scan duplicate filtering list refresh period in seconds. Configurable in menuconfig */
    bool ble_scan_backoff;                  /*!< True if BLE scan backoff is enabled; false otherwise. Configurable in menuconfig */
    uint8_t ble_llcp_disc_flag;             /*!< BLE disconnect flag when instant passed. Configurable in menuconfig */
-    bool ble_aa_check;                      /*!< True if adds a verification step for the Access Address within the CONNECT_IND PDU; false otherwise. Configurable in menuconfig */
    uint32_t magic;                         /*!< Magic number */
 } esp_bt_controller_config_t;

@@ -637,16 +629,30 @@ esp_err_t esp_bt_sleep_disable(void);
 * @brief Manually clear the scan duplicate list
 *
 * @note
- *       The scan duplicate list will be automatically cleared when the maximum amount of devices in the filter is reached. The amount of devices in the filter can be configured in menuconfig.
+ *      1. This function name is incorrectly spelled, it will be fixed in release 5.x version.
+ *      2. The scan duplicate list will be automatically cleared when the maximum amount of devices in the filter is reached.
+ *         The amount of devices in the filter can be configured in menuconfig.
 *
 * @return
 *       - ESP_OK: Success
 *       - ESP_ERR_INVALID_STATE: Invalid Bluetooth Controller state
 */
-esp_err_t esp_ble_scan_duplicate_list_flush(void);
-
 esp_err_t esp_ble_scan_dupilcate_list_flush(void);

+/**
+ * @brief Power on Bluetooth Wi-Fi power domain
+ *
+ * @note This function is not recommended to use due to potential risk.
+*/
+void esp_wifi_bt_power_domain_on(void);
+
+/**
+ * @brief Power off Bluetooth Wi-Fi power domain
+ *
+ * @note This function is not recommended to use due to potential risk.
+*/
+void esp_wifi_bt_power_domain_off(void);
+
 #ifdef __cplusplus
 }
 #endif
--- a/components/bt/include/esp32c3/include/esp_bt.h
+++ b/components/bt/include/esp32c3/include/esp_bt.h
@@ -19,7 +19,7 @@ extern "C" {
 #endif

 #define ESP_BT_CTRL_CONFIG_MAGIC_VAL    0x5A5AA5A5
-#define ESP_BT_CTRL_CONFIG_VERSION      0x02410230
+#define ESP_BT_CTRL_CONFIG_VERSION      0x02409260

 #define ESP_BT_HCI_TL_MAGIC_VALUE   0xfadebead
 #define ESP_BT_HCI_TL_VERSION       0x00010000
@@ -236,60 +236,6 @@ typedef void (* esp_bt_hci_tl_callback_t) (void *arg, uint8_t status);
 #endif

 #define BT_CTRL_BLE_LLCP_DISC_FLAG (BT_CTRL_BLE_LLCP_CONN_UPDATE | BT_CTRL_BLE_LLCP_CHAN_MAP_UPDATE | BT_CTRL_BLE_LLCP_PHY_UPDATE)
-#if defined(CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY)
-#define BT_CTRL_RUN_IN_FLASH_ONLY  CONFIG_BT_CTRL_RUN_IN_FLASH_ONLY
-#else
-#define BT_CTRL_RUN_IN_FLASH_ONLY  (0)
-#endif
-
-#if (BT_CTRL_RUN_IN_FLASH_ONLY == 1)
-
-#if defined(CONFIG_BT_CTRL_DTM_ENABLE)
-#define BT_CTRL_DTM_ENABLE  CONFIG_BT_CTRL_DTM_ENABLE
-#else
-#define BT_CTRL_DTM_ENABLE  (0)
-#endif
-
-#if defined(CONFIG_BT_CTRL_BLE_MASTER)
-#define BT_CTRL_BLE_MASTER  CONFIG_BT_CTRL_BLE_MASTER
-#else
-#define BT_CTRL_BLE_MASTER  (0)
-#endif
-
-#if defined(CONFIG_BT_CTRL_BLE_TEST)
-#define BT_CTRL_BLE_TEST  CONFIG_BT_CTRL_BLE_TEST
-#else
-#define BT_CTRL_BLE_TEST  (0)
-#endif
-
-#if defined (CONFIG_BT_NIMBLE_SECURITY_ENABLE) || defined (CONFIG_BT_BLE_SMP_ENABLE)
-#ifdef CONFIG_BT_NIMBLE_SECURITY_ENABLE
-#define BLE_SECURITY_ENABLE  (CONFIG_BT_NIMBLE_SECURITY_ENABLE)
-#endif //CONFIG_BT_NIMBLE_SECURITY_ENABLE
-#ifdef CONFIG_BT_BLE_SMP_ENABLE
-#define BLE_SECURITY_ENABLE  (CONFIG_BT_BLE_SMP_ENABLE)
-#endif //CONFIG_BT_BLE_SMP_ENABLE
-#else
-#if defined (CONFIG_BT_CTRL_BLE_SECURITY_ENABLE)
-#define BLE_SECURITY_ENABLE  (CONFIG_BT_CTRL_BLE_SECURITY_ENABLE)
-#else
-#define BLE_SECURITY_ENABLE  (0)
-#endif
-#endif // (CONFIG_BT_NIMBLE_SECURITY_ENABLE) || (CONFIG_BT_BLE_SMP_ENABLE)
-
-#if defined (CONFIG_BT_CTRL_BLE_SCAN)
-#define BT_CTRL_BLE_SCAN    CONFIG_BT_CTRL_BLE_SCAN
-#else
-#define BT_CTRL_BLE_SCAN    (0)
-#endif
-
-#else
-#define BT_CTRL_BLE_MASTER   (1)
-#define BT_CTRL_DTM_ENABLE   (1)
-#define BT_CTRL_BLE_TEST     (1)
-#define BLE_SECURITY_ENABLE  (1)
-#define BT_CTRL_BLE_SCAN     (1)
-#endif // (BT_CTRL_RUN_IN_FLASH_ONLY == 1)

 #define BT_CONTROLLER_INIT_CONFIG_DEFAULT() {                              \
    .magic = ESP_BT_CTRL_CONFIG_MAGIC_VAL,                                 \
@@ -330,12 +276,6 @@ typedef void (* esp_bt_hci_tl_callback_t) (void *arg, uint8_t status);
    .ble_chan_ass_en = BT_CTRL_CHAN_ASS_EN,                                \
    .ble_ping_en = BT_CTRL_LE_PING_EN,                                     \
    .ble_llcp_disc_flag = BT_CTRL_BLE_LLCP_DISC_FLAG,                      \
-    .run_in_flash = BT_CTRL_RUN_IN_FLASH_ONLY,                             \
-    .dtm_en = BT_CTRL_DTM_ENABLE,                                          \
-    .enc_en = BLE_SECURITY_ENABLE,                                         \
-    .qa_test = BT_CTRL_BLE_TEST,                                           \
-    .master_en = BT_CTRL_BLE_MASTER,                                       \
-    .scan_en = BT_CTRL_BLE_SCAN,                                           \
 }

 #else
@@ -411,12 +351,6 @@ typedef struct {
    uint8_t ble_chan_ass_en;                /*!< BLE channel assessment enable */
    uint8_t ble_ping_en;                    /*!< BLE ping procedure enable */
    uint8_t ble_llcp_disc_flag;             /*!< BLE disconnect flag when instant passed */
-    bool run_in_flash;                      /*!< Check if controller code is in flash */
-    bool dtm_en;                            /*!< Controller DTM feature is enabled or not */
-    bool enc_en;                            /*!< Controller encryption feature is enabled or not */
-    bool qa_test;                           /*!< Controller QA test feature is enabled or not */
-    bool master_en;                         /*!< Controller master feature is enabled or not */
-    bool scan_en;                           /*!< Controller scan feature is enabled or not */
 } esp_bt_controller_config_t;

 /**
@@ -570,6 +504,8 @@ esp_err_t esp_bt_controller_disable(void);
 */
 esp_bt_controller_status_t esp_bt_controller_get_status(void);

+uint16_t esp_bt_get_tx_buf_num(void);
+
 /** @brief esp_vhci_host_callback
 *  used for vhci call host function to notify what host need to do
 */
@@ -724,6 +660,16 @@ void esp_bt_controller_wakeup_request(void);
 */
 int esp_bt_h4tl_eif_io_event_notify(int event);

+/**
+ * @brief bt Wi-Fi power domain power on
+ */
+void esp_wifi_bt_power_domain_on(void);
+
+/**
+ * @brief bt Wi-Fi power domain power off
+ */
+void esp_wifi_bt_power_domain_off(void);
+
 /**
 * @brief Get the Bluetooth module sleep clock source.
 *
--- a/components/bt/include/esp32c6/include/esp_bt.h
+++ b/components/bt/include/esp32c6/include/esp_bt.h
@@ -156,7 +156,7 @@ esp_err_t esp_ble_tx_power_set_enhanced(esp_ble_enhanced_power_type_t power_type
 */
 esp_power_level_t esp_ble_tx_power_get_enhanced(esp_ble_enhanced_power_type_t power_type, uint16_t handle);

-#define CONFIG_VERSION  0x20241121
+#define CONFIG_VERSION  0x20240422
 #define CONFIG_MAGIC    0x5A5AA5A5

 /**
@@ -213,8 +213,6 @@ typedef struct {
    uint8_t ignore_wl_for_direct_adv;                /*!< Ignore the whitelist for direct advertising */
    uint8_t enable_pcl;                              /*!< Enable power control */
    uint8_t csa2_select;                             /*!< Select CSA#2*/
-    uint8_t enable_csr;                              /*!< Enable CSR */
-    uint8_t ble_aa_check;                            /*!< True if adds a verification step for the Access Address within the CONNECT_IND PDU; false otherwise. Configurable in menuconfig */
    uint32_t config_magic;                           /*!< Magic number for configuration validation */
 } esp_bt_controller_config_t;

@@ -264,8 +262,6 @@ typedef struct {
    .ignore_wl_for_direct_adv   = 0,                                                    \
    .enable_pcl                 = DEFAULT_BT_LE_POWER_CONTROL_ENABLED,                  \
    .csa2_select                = DEFAULT_BT_LE_50_FEATURE_SUPPORT,                     \
-    .enable_csr                 = 0,                                                    \
-    .ble_aa_check               = DEFAULT_BT_LE_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS,  \
    .config_magic = CONFIG_MAGIC,                                                       \
 }
 #elif CONFIG_IDF_TARGET_ESP32C61
@@ -313,8 +309,6 @@ typedef struct {
    .ignore_wl_for_direct_adv   = 0,                                                    \
    .enable_pcl                 = DEFAULT_BT_LE_POWER_CONTROL_ENABLED,                  \
    .csa2_select                = DEFAULT_BT_LE_50_FEATURE_SUPPORT,                     \
-    .enable_csr                 = 0,                                                    \
-    .ble_aa_check               = DEFAULT_BT_LE_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS,  \
    .config_magic = CONFIG_MAGIC,                                                       \
 }
 #endif
--- a/components/bt/include/esp32h2/include/esp_bt.h
+++ b/components/bt/include/esp32h2/include/esp_bt.h
@@ -161,7 +161,7 @@ esp_err_t esp_ble_tx_power_set_enhanced(esp_ble_enhanced_power_type_t power_type
 */
 esp_power_level_t esp_ble_tx_power_get_enhanced(esp_ble_enhanced_power_type_t power_type, uint16_t handle);

-#define CONFIG_VERSION  0x20241121
+#define CONFIG_VERSION  0x20240422
 #define CONFIG_MAGIC    0x5A5AA5A5

 /**
@@ -214,9 +214,7 @@ typedef struct {
    uint8_t cpu_freq_mhz;                        /*!< CPU frequency in megahertz */
    uint8_t ignore_wl_for_direct_adv;            /*!< Ignore the white list for directed advertising */
    uint8_t enable_pcl;                          /*!< Enable power control */
-    uint8_t csa2_select;                         /*!< Select CSA#2*/
-    uint8_t enable_csr;                          /*!< Enable CSR */
-    uint8_t ble_aa_check;                        /*!< True if adds a verification step for the Access Address within the CONNECT_IND PDU; false otherwise. Configurable in menuconfig */
+    uint8_t csa2_select;                             /*!< Select CSA#2*/
    uint32_t config_magic;                       /*!< Configuration magic value */
 } esp_bt_controller_config_t;

@@ -264,9 +262,7 @@ typedef struct {
    .cpu_freq_mhz               = CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ,                      \
    .ignore_wl_for_direct_adv   = 0,                                                    \
    .enable_pcl                 = 0,                                                    \
-    .csa2_select                = DEFAULT_BT_LE_50_FEATURE_SUPPORT,                     \
-    .enable_csr                 = 0,                                                    \
-    .ble_aa_check               = DEFAULT_BT_LE_CTRL_CHECK_CONNECT_IND_ACCESS_ADDRESS,  \
+    .csa2_select                = DEFAULT_BT_LE_50_FEATURE_SUPPORT,                      \
    .config_magic = CONFIG_MAGIC,                                                       \
 }

--- a/components/bt/linker_esp32c2.lf
+++ b/components/bt/linker_esp32c2.lf
@@ -2,14 +2,6 @@
 entries:
    .iram1+

-[sections:bt_isr_iram_text]
-entries:
-    .isr_iram1+
-
-[sections:bt_conn_iram_text]
-entries:
-    .conn_iram1+
-
 [sections:bt_bss]
 entries:
    .bss+
@@ -27,26 +19,10 @@ entries:

 [scheme:bt_default]
 entries:
-    if BT_CTRL_RUN_IN_FLASH_ONLY = y:
-        bt_iram_text -> flash_text
-        bt_bss -> dram0_bt_bss
-        bt_common -> dram0_bt_bss
-        bt_data -> dram0_bt_data
-
-        if BT_LE_PLACE_CONN_RELATED_INTO_IRAM = y:
-            bt_conn_iram_text -> iram0_bt_text
-            bt_isr_iram_text -> iram0_bt_text
-        else:
-            bt_conn_iram_text -> flash_text
-            bt_isr_iram_text -> flash_text
-    else:
-        bt_iram_text -> iram0_bt_text
-        bt_bss -> dram0_bt_bss
-        bt_common -> dram0_bt_bss
-        bt_data -> dram0_bt_data
-
-        bt_conn_iram_text -> iram0_bt_text
-        bt_isr_iram_text -> iram0_bt_text
+    bt_iram_text -> iram0_bt_text
+    bt_bss -> dram0_bt_bss
+    bt_common -> dram0_bt_bss
+    bt_data -> dram0_bt_data

 # For the following fragments, order matters for
 # 'ALIGN(4) ALIGN(4, post) SURROUND(sym)', which generates:
@@ -72,11 +48,3 @@ entries:
        bt_bss -> dram0_bt_bss ALIGN(4) ALIGN(4, post) SURROUND(bt_controller_bss),
        bt_common -> dram0_bt_bss ALIGN(4) ALIGN(4, post) SURROUND(bt_controller_common),
        bt_data -> dram0_bt_data ALIGN(4) ALIGN(4, post) SURROUND(bt_controller_data)
-
-[mapping:ble_app_flash]
-archive: libble_app_flash.a
-entries:
-    * (bt_default);
-        bt_bss -> dram0_bt_bss ALIGN(4) ALIGN(4, post) SURROUND(bt_controller_bss),
-        bt_common -> dram0_bt_bss ALIGN(4) ALIGN(4, post) SURROUND(bt_controller_common),
-        bt_data -> dram0_bt_data ALIGN(4) ALIGN(4, post) SURROUND(bt_controller_data)
--- a/components/bt/porting/mem/bt_osi_mem.c
+++ b/components/bt/porting/mem/bt_osi_mem.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
 *
 * SPDX-License-Identifier: Apache-2.0
 */
@@ -7,31 +7,18 @@
 #include "esp_attr.h"
 #include "esp_heap_caps.h"
 #include "sdkconfig.h"
-#include "esp_log.h"
-#include <assert.h>

-static uint8_t log_count;
 IRAM_ATTR void *bt_osi_mem_malloc(size_t size)
 {
-    void *mem = NULL;
 #ifdef CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_INTERNAL
-    mem = heap_caps_malloc(size, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
+    return heap_caps_malloc(size, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
 #elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_EXTERNAL
-    mem =  heap_caps_malloc(size, MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT);
+    return heap_caps_malloc(size, MALLOC_CAP_SPIRAM|MALLOC_CAP_8BIT);
 #elif CONFIG_BT_NIMBLE_MEM_ALLOC_MODE_IRAM_8BIT
-    mem =  heap_caps_malloc_prefer(size, 2, MALLOC_CAP_INTERNAL|MALLOC_CAP_IRAM_8BIT, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
+    return heap_caps_malloc_prefer(size, 2, MALLOC_CAP_INTERNAL|MALLOC_CAP_IRAM_8BIT, MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT);
 #else
-    mem =  malloc(size);
+    return malloc(size);
 #endif
-    if (!mem) {
-        log_count ++;
-        if ((log_count % 40) == 0) {
-            esp_rom_printf("malloc failed (size %zu)",size);
-            log_count = 0;
-        }
-       assert(mem != NULL);
-    }
-    return mem;
 }

 IRAM_ATTR void *bt_osi_mem_calloc(size_t n, size_t size)
--- a/components/driver/i2c/i2c.c
+++ b/components/driver/i2c/i2c.c
@@ -810,7 +810,7 @@ esp_err_t i2c_param_config(i2c_port_t i2c_num, const i2c_config_t *i2c_conf)
 #if SOC_I2C_SUPPORT_SLAVE
    if (i2c_conf->mode == I2C_MODE_SLAVE) {  //slave mode
        i2c_hal_slave_init(&(i2c_context[i2c_num].hal));
-        i2c_ll_slave_enable_auto_start(i2c_context[i2c_num].hal.dev, true);
+        i2c_ll_slave_tx_auto_start_en(i2c_context[i2c_num].hal.dev, true);
        I2C_CLOCK_SRC_ATOMIC() {
            i2c_ll_set_source_clk(i2c_context[i2c_num].hal.dev, src_clk);
        }
@@ -1504,7 +1504,7 @@ static void IRAM_ATTR i2c_master_cmd_begin_static(i2c_port_t i2c_num, BaseType_t
        }
    }
    i2c_ll_update(i2c_context[i2c_num].hal.dev);
-    i2c_ll_start_trans(i2c_context[i2c_num].hal.dev);
+    i2c_ll_master_trans_start(i2c_context[i2c_num].hal.dev);
    return;
 }

--- a/components/driver/twai/twai.c
+++ b/components/driver/twai/twai.c
@@ -18,14 +18,14 @@
 #include "esp_heap_caps.h"
 #include "esp_clk_tree.h"
 #include "clk_ctrl_os.h"
+#include "driver/gpio.h"
 #include "esp_private/periph_ctrl.h"
 #include "esp_private/esp_clk.h"
-#include "esp_private/gpio.h"
 #include "driver/twai.h"
 #include "soc/soc_caps.h"
 #include "soc/soc.h"
-#include "soc/io_mux_reg.h"
 #include "soc/twai_periph.h"
+#include "soc/gpio_sig_map.h"
 #include "hal/twai_hal.h"
 #include "esp_rom_gpio.h"
 #if SOC_TWAI_SUPPORT_SLEEP_RETENTION
@@ -34,7 +34,6 @@

 /* ---------------------------- Definitions --------------------------------- */
 //Internal Macros
-#define TWAI_TAG "TWAI"
 #define TWAI_CHECK(cond, ret_val) ({                                        \
            if (!(cond)) {                                                  \
                return (ret_val);                                           \
@@ -47,6 +46,7 @@
 #ifdef CONFIG_TWAI_ISR_IN_IRAM
 #define TWAI_MALLOC_CAPS    (MALLOC_CAP_INTERNAL | MALLOC_CAP_8BIT)
 #else
+#define TWAI_TAG "TWAI"
 #define TWAI_MALLOC_CAPS    MALLOC_CAP_DEFAULT
 #endif  //CONFIG_TWAI_ISR_IN_IRAM

@@ -289,26 +289,37 @@ static void twai_configure_gpio(int controller_id, gpio_num_t tx, gpio_num_t rx,
 {
    // assert the GPIO number is not a negative number (shift operation on a negative number is undefined)
    assert(tx >= 0 && rx >= 0);
-
+    // if TX and RX set to the same GPIO, which means we want to create a loop-back in the GPIO matrix
+    bool io_loop_back = (tx == rx);
+    gpio_config_t gpio_conf = {
+        .intr_type = GPIO_INTR_DISABLE,
+        .pull_down_en = false,
+        .pull_up_en = false,
+    };
    //Set RX pin
-    gpio_func_sel(rx, PIN_FUNC_GPIO);
-    gpio_input_enable(rx);
+    gpio_conf.mode = GPIO_MODE_INPUT | (io_loop_back ? GPIO_MODE_OUTPUT : 0);
+    gpio_conf.pin_bit_mask = 1ULL << rx;
+    gpio_config(&gpio_conf);
    esp_rom_gpio_connect_in_signal(rx, twai_controller_periph_signals.controllers[controller_id].rx_sig, false);

    //Set TX pin
-    gpio_func_sel(tx, PIN_FUNC_GPIO);
+    gpio_conf.mode = GPIO_MODE_OUTPUT | (io_loop_back ? GPIO_MODE_INPUT : 0);
+    gpio_conf.pin_bit_mask = 1ULL << tx;
+    gpio_config(&gpio_conf);
    esp_rom_gpio_connect_out_signal(tx, twai_controller_periph_signals.controllers[controller_id].tx_sig, false, false);

    //Configure output clock pin (Optional)
    if (clkout >= 0 && clkout < GPIO_NUM_MAX) {
-        gpio_func_sel(clkout, PIN_FUNC_GPIO);
+        gpio_set_pull_mode(clkout, GPIO_FLOATING);
        esp_rom_gpio_connect_out_signal(clkout, twai_controller_periph_signals.controllers[controller_id].clk_out_sig, false, false);
+        esp_rom_gpio_pad_select_gpio(clkout);
    }

    //Configure bus status pin (Optional)
    if (bus_status >= 0 && bus_status < GPIO_NUM_MAX) {
-        gpio_func_sel(bus_status, PIN_FUNC_GPIO);
+        gpio_set_pull_mode(bus_status, GPIO_FLOATING);
        esp_rom_gpio_connect_out_signal(bus_status, twai_controller_periph_signals.controllers[controller_id].bus_off_sig, false, false);
+        esp_rom_gpio_pad_select_gpio(bus_status);
    }
 }

@@ -336,11 +347,11 @@ static void twai_free_driver_obj(twai_obj_t *p_obj)

 #if TWAI_USE_RETENTION_LINK
    const periph_retention_module_t retention_id = twai_reg_retention_info[p_obj->controller_id].module_id;
-    if (sleep_retention_is_module_created(retention_id)) {
-        assert(sleep_retention_is_module_inited(retention_id));
+    if (sleep_retention_get_created_modules() & BIT(retention_id)) {
+        assert(sleep_retention_get_inited_modules() & BIT(retention_id));
        sleep_retention_module_free(retention_id);
    }
-    if (sleep_retention_is_module_inited(retention_id)) {
+    if (sleep_retention_get_inited_modules() & BIT(retention_id)) {
        sleep_retention_module_deinit(retention_id);
    }

@@ -408,7 +419,7 @@ static esp_err_t twai_alloc_driver_obj(const twai_general_config_t *g_config, tw
                .arg = p_obj,
            },
        },
-        .depends = RETENTION_MODULE_BITMAP_INIT(CLOCK_SYSTEM)
+        .depends = BIT(SLEEP_RETENTION_MODULE_CLOCK_SYSTEM)
    };
    if (sleep_retention_module_init(module, &init_param) != ESP_OK) {
        ESP_LOGW(TWAI_TAG, "init sleep retention failed for TWAI%d, power domain may be turned off during sleep", controller_id);
--- a/components/efuse/esp32c5/esp_efuse_table.c
+++ b/components/efuse/esp32c5/esp_efuse_table.c
@@ -9,7 +9,7 @@
 #include <assert.h>
 #include "esp_efuse_table.h"

-// md5_digest_table b26e7466c400977081a142076ef1a5bb
+// md5_digest_table 13b0a8106fd483a0fcfa8b2f7388a95f
 // This file was generated from the file esp_efuse_table.csv. DO NOT CHANGE THIS FILE MANUALLY.
 // If you want to change some fields, you need to change esp_efuse_table.csv file
 // then run `efuse_common_table` or `efuse_custom_table` command it will generate this file.
@@ -287,102 +287,14 @@ static const esp_efuse_desc_t WR_DIS_SYS_DATA_PART1[] = {
    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of BLOCK2,
 };

-static const esp_efuse_desc_t WR_DIS_ACTIVE_HP_DBIAS[] = {
-    {EFUSE_BLK0, 20, 1}, 	 // [] wr_dis of ACTIVE_HP_DBIAS,
-};
-
-static const esp_efuse_desc_t WR_DIS_ACTIVE_LP_DBIAS[] = {
-    {EFUSE_BLK0, 20, 1}, 	 // [] wr_dis of ACTIVE_LP_DBIAS,
-};
-
-static const esp_efuse_desc_t WR_DIS_LSLP_HP_DBG[] = {
-    {EFUSE_BLK0, 20, 1}, 	 // [] wr_dis of LSLP_HP_DBG,
-};
-
-static const esp_efuse_desc_t WR_DIS_LSLP_HP_DBIAS[] = {
-    {EFUSE_BLK0, 20, 1}, 	 // [] wr_dis of LSLP_HP_DBIAS,
-};
-
-static const esp_efuse_desc_t WR_DIS_DSLP_LP_DBG[] = {
-    {EFUSE_BLK0, 20, 1}, 	 // [] wr_dis of DSLP_LP_DBG,
-};
-
-static const esp_efuse_desc_t WR_DIS_DSLP_LP_DBIAS[] = {
-    {EFUSE_BLK0, 20, 1}, 	 // [] wr_dis of DSLP_LP_DBIAS,
-};
-
-static const esp_efuse_desc_t WR_DIS_LP_HP_DBIAS_VOL_GAP[] = {
-    {EFUSE_BLK0, 20, 1}, 	 // [] wr_dis of LP_HP_DBIAS_VOL_GAP,
-};
-
 static const esp_efuse_desc_t WR_DIS_OPTIONAL_UNIQUE_ID[] = {
    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of OPTIONAL_UNIQUE_ID,
 };

-static const esp_efuse_desc_t WR_DIS_TEMPERATURE_SENSOR[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of TEMPERATURE_SENSOR,
-};
-
 static const esp_efuse_desc_t WR_DIS_OCODE[] = {
    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of OCODE,
 };

-static const esp_efuse_desc_t WR_DIS_ADC1_AVE_INITCODE_ATTEN0[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_AVE_INITCODE_ATTEN0,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_AVE_INITCODE_ATTEN1[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_AVE_INITCODE_ATTEN1,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_AVE_INITCODE_ATTEN2[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_AVE_INITCODE_ATTEN2,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_AVE_INITCODE_ATTEN3[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_AVE_INITCODE_ATTEN3,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_HI_DOUT_ATTEN0[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_HI_DOUT_ATTEN0,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_HI_DOUT_ATTEN1[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_HI_DOUT_ATTEN1,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_HI_DOUT_ATTEN2[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_HI_DOUT_ATTEN2,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_HI_DOUT_ATTEN3[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_HI_DOUT_ATTEN3,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_CH0_ATTEN0_INITCODE_DIFF[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_CH0_ATTEN0_INITCODE_DIFF,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_CH1_ATTEN0_INITCODE_DIFF[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_CH1_ATTEN0_INITCODE_DIFF,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_CH2_ATTEN0_INITCODE_DIFF[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_CH2_ATTEN0_INITCODE_DIFF,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_CH3_ATTEN0_INITCODE_DIFF[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_CH3_ATTEN0_INITCODE_DIFF,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_CH4_ATTEN0_INITCODE_DIFF[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_CH4_ATTEN0_INITCODE_DIFF,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_CH5_ATTEN0_INITCODE_DIFF[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_CH5_ATTEN0_INITCODE_DIFF,
-};
-
 static const esp_efuse_desc_t WR_DIS_BLOCK_USR_DATA[] = {
    {EFUSE_BLK0, 22, 1}, 	 // [WR_DIS.USER_DATA] wr_dis of BLOCK_USR_DATA,
 };
@@ -736,102 +648,14 @@ static const esp_efuse_desc_t TRIM_P_BIAS[] = {
    {EFUSE_BLK1, 101, 5}, 	 // [] PADC CAL P bias,
 };

-static const esp_efuse_desc_t ACTIVE_HP_DBIAS[] = {
-    {EFUSE_BLK1, 106, 4}, 	 // [] Active HP DBIAS of fixed voltage,
-};
-
-static const esp_efuse_desc_t ACTIVE_LP_DBIAS[] = {
-    {EFUSE_BLK1, 110, 4}, 	 // [] Active LP DBIAS of fixed voltage,
-};
-
-static const esp_efuse_desc_t LSLP_HP_DBG[] = {
-    {EFUSE_BLK1, 114, 2}, 	 // [] LSLP HP DBG of fixed voltage,
-};
-
-static const esp_efuse_desc_t LSLP_HP_DBIAS[] = {
-    {EFUSE_BLK1, 116, 4}, 	 // [] LSLP HP DBIAS of fixed voltage,
-};
-
-static const esp_efuse_desc_t DSLP_LP_DBG[] = {
-    {EFUSE_BLK1, 120, 4}, 	 // [] DSLP LP DBG of fixed voltage,
-};
-
-static const esp_efuse_desc_t DSLP_LP_DBIAS[] = {
-    {EFUSE_BLK1, 124, 5}, 	 // [] DSLP LP DBIAS of fixed voltage,
-};
-
-static const esp_efuse_desc_t LP_HP_DBIAS_VOL_GAP[] = {
-    {EFUSE_BLK1, 129, 5}, 	 // [] DBIAS gap between LP and HP,
-};
-
 static const esp_efuse_desc_t OPTIONAL_UNIQUE_ID[] = {
    {EFUSE_BLK2, 0, 128}, 	 // [] Optional unique 128-bit ID,
 };

-static const esp_efuse_desc_t TEMPERATURE_SENSOR[] = {
-    {EFUSE_BLK2, 128, 9}, 	 // [] Temperature calibration data,
-};
-
 static const esp_efuse_desc_t OCODE[] = {
    {EFUSE_BLK2, 137, 8}, 	 // [] ADC OCode,
 };

-static const esp_efuse_desc_t ADC1_AVE_INITCODE_ATTEN0[] = {
-    {EFUSE_BLK2, 145, 10}, 	 // [] Average initcode of ADC1 atten0,
-};
-
-static const esp_efuse_desc_t ADC1_AVE_INITCODE_ATTEN1[] = {
-    {EFUSE_BLK2, 155, 10}, 	 // [] Average initcode of ADC1 atten0,
-};
-
-static const esp_efuse_desc_t ADC1_AVE_INITCODE_ATTEN2[] = {
-    {EFUSE_BLK2, 165, 10}, 	 // [] Average initcode of ADC1 atten0,
-};
-
-static const esp_efuse_desc_t ADC1_AVE_INITCODE_ATTEN3[] = {
-    {EFUSE_BLK2, 175, 10}, 	 // [] Average initcode of ADC1 atten0,
-};
-
-static const esp_efuse_desc_t ADC1_HI_DOUT_ATTEN0[] = {
-    {EFUSE_BLK2, 185, 10}, 	 // [] HI DOUT of ADC1 atten0,
-};
-
-static const esp_efuse_desc_t ADC1_HI_DOUT_ATTEN1[] = {
-    {EFUSE_BLK2, 195, 10}, 	 // [] HI DOUT of ADC1 atten1,
-};
-
-static const esp_efuse_desc_t ADC1_HI_DOUT_ATTEN2[] = {
-    {EFUSE_BLK2, 205, 10}, 	 // [] HI DOUT of ADC1 atten2,
-};
-
-static const esp_efuse_desc_t ADC1_HI_DOUT_ATTEN3[] = {
-    {EFUSE_BLK2, 215, 10}, 	 // [] HI DOUT of ADC1 atten3,
-};
-
-static const esp_efuse_desc_t ADC1_CH0_ATTEN0_INITCODE_DIFF[] = {
-    {EFUSE_BLK2, 225, 4}, 	 // [] Gap between ADC1 CH0 and average initcode,
-};
-
-static const esp_efuse_desc_t ADC1_CH1_ATTEN0_INITCODE_DIFF[] = {
-    {EFUSE_BLK2, 229, 4}, 	 // [] Gap between ADC1 CH1 and average initcode,
-};
-
-static const esp_efuse_desc_t ADC1_CH2_ATTEN0_INITCODE_DIFF[] = {
-    {EFUSE_BLK2, 233, 4}, 	 // [] Gap between ADC1 CH2 and average initcode,
-};
-
-static const esp_efuse_desc_t ADC1_CH3_ATTEN0_INITCODE_DIFF[] = {
-    {EFUSE_BLK2, 237, 4}, 	 // [] Gap between ADC1 CH3 and average initcode,
-};
-
-static const esp_efuse_desc_t ADC1_CH4_ATTEN0_INITCODE_DIFF[] = {
-    {EFUSE_BLK2, 241, 4}, 	 // [] Gap between ADC1 CH4 and average initcode,
-};
-
-static const esp_efuse_desc_t ADC1_CH5_ATTEN0_INITCODE_DIFF[] = {
-    {EFUSE_BLK2, 245, 4}, 	 // [] Gap between ADC1 CH5 and average initcode,
-};
-
 static const esp_efuse_desc_t USER_DATA[] = {
    {EFUSE_BLK3, 0, 256}, 	 // [BLOCK_USR_DATA] User data,
 };
@@ -1212,126 +1036,16 @@ const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_SYS_DATA_PART1[] = {
    NULL
 };

-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ACTIVE_HP_DBIAS[] = {
-    &WR_DIS_ACTIVE_HP_DBIAS[0],    		// [] wr_dis of ACTIVE_HP_DBIAS
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ACTIVE_LP_DBIAS[] = {
-    &WR_DIS_ACTIVE_LP_DBIAS[0],    		// [] wr_dis of ACTIVE_LP_DBIAS
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_LSLP_HP_DBG[] = {
-    &WR_DIS_LSLP_HP_DBG[0],    		// [] wr_dis of LSLP_HP_DBG
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_LSLP_HP_DBIAS[] = {
-    &WR_DIS_LSLP_HP_DBIAS[0],    		// [] wr_dis of LSLP_HP_DBIAS
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_DSLP_LP_DBG[] = {
-    &WR_DIS_DSLP_LP_DBG[0],    		// [] wr_dis of DSLP_LP_DBG
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_DSLP_LP_DBIAS[] = {
-    &WR_DIS_DSLP_LP_DBIAS[0],    		// [] wr_dis of DSLP_LP_DBIAS
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_LP_HP_DBIAS_VOL_GAP[] = {
-    &WR_DIS_LP_HP_DBIAS_VOL_GAP[0],    		// [] wr_dis of LP_HP_DBIAS_VOL_GAP
-    NULL
-};
-
 const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_OPTIONAL_UNIQUE_ID[] = {
    &WR_DIS_OPTIONAL_UNIQUE_ID[0],    		// [] wr_dis of OPTIONAL_UNIQUE_ID
    NULL
 };

-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_TEMPERATURE_SENSOR[] = {
-    &WR_DIS_TEMPERATURE_SENSOR[0],    		// [] wr_dis of TEMPERATURE_SENSOR
-    NULL
-};
-
 const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_OCODE[] = {
    &WR_DIS_OCODE[0],    		// [] wr_dis of OCODE
    NULL
 };

-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_AVE_INITCODE_ATTEN0[] = {
-    &WR_DIS_ADC1_AVE_INITCODE_ATTEN0[0],    		// [] wr_dis of ADC1_AVE_INITCODE_ATTEN0
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_AVE_INITCODE_ATTEN1[] = {
-    &WR_DIS_ADC1_AVE_INITCODE_ATTEN1[0],    		// [] wr_dis of ADC1_AVE_INITCODE_ATTEN1
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_AVE_INITCODE_ATTEN2[] = {
-    &WR_DIS_ADC1_AVE_INITCODE_ATTEN2[0],    		// [] wr_dis of ADC1_AVE_INITCODE_ATTEN2
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_AVE_INITCODE_ATTEN3[] = {
-    &WR_DIS_ADC1_AVE_INITCODE_ATTEN3[0],    		// [] wr_dis of ADC1_AVE_INITCODE_ATTEN3
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_HI_DOUT_ATTEN0[] = {
-    &WR_DIS_ADC1_HI_DOUT_ATTEN0[0],    		// [] wr_dis of ADC1_HI_DOUT_ATTEN0
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_HI_DOUT_ATTEN1[] = {
-    &WR_DIS_ADC1_HI_DOUT_ATTEN1[0],    		// [] wr_dis of ADC1_HI_DOUT_ATTEN1
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_HI_DOUT_ATTEN2[] = {
-    &WR_DIS_ADC1_HI_DOUT_ATTEN2[0],    		// [] wr_dis of ADC1_HI_DOUT_ATTEN2
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_HI_DOUT_ATTEN3[] = {
-    &WR_DIS_ADC1_HI_DOUT_ATTEN3[0],    		// [] wr_dis of ADC1_HI_DOUT_ATTEN3
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH0_ATTEN0_INITCODE_DIFF[] = {
-    &WR_DIS_ADC1_CH0_ATTEN0_INITCODE_DIFF[0],    		// [] wr_dis of ADC1_CH0_ATTEN0_INITCODE_DIFF
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH1_ATTEN0_INITCODE_DIFF[] = {
-    &WR_DIS_ADC1_CH1_ATTEN0_INITCODE_DIFF[0],    		// [] wr_dis of ADC1_CH1_ATTEN0_INITCODE_DIFF
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH2_ATTEN0_INITCODE_DIFF[] = {
-    &WR_DIS_ADC1_CH2_ATTEN0_INITCODE_DIFF[0],    		// [] wr_dis of ADC1_CH2_ATTEN0_INITCODE_DIFF
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH3_ATTEN0_INITCODE_DIFF[] = {
-    &WR_DIS_ADC1_CH3_ATTEN0_INITCODE_DIFF[0],    		// [] wr_dis of ADC1_CH3_ATTEN0_INITCODE_DIFF
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH4_ATTEN0_INITCODE_DIFF[] = {
-    &WR_DIS_ADC1_CH4_ATTEN0_INITCODE_DIFF[0],    		// [] wr_dis of ADC1_CH4_ATTEN0_INITCODE_DIFF
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH5_ATTEN0_INITCODE_DIFF[] = {
-    &WR_DIS_ADC1_CH5_ATTEN0_INITCODE_DIFF[0],    		// [] wr_dis of ADC1_CH5_ATTEN0_INITCODE_DIFF
-    NULL
-};
-
 const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_BLOCK_USR_DATA[] = {
    &WR_DIS_BLOCK_USR_DATA[0],    		// [WR_DIS.USER_DATA] wr_dis of BLOCK_USR_DATA
    NULL
@@ -1772,126 +1486,16 @@ const esp_efuse_desc_t* ESP_EFUSE_TRIM_P_BIAS[] = {
    NULL
 };

-const esp_efuse_desc_t* ESP_EFUSE_ACTIVE_HP_DBIAS[] = {
-    &ACTIVE_HP_DBIAS[0],    		// [] Active HP DBIAS of fixed voltage
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ACTIVE_LP_DBIAS[] = {
-    &ACTIVE_LP_DBIAS[0],    		// [] Active LP DBIAS of fixed voltage
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_LSLP_HP_DBG[] = {
-    &LSLP_HP_DBG[0],    		// [] LSLP HP DBG of fixed voltage
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_LSLP_HP_DBIAS[] = {
-    &LSLP_HP_DBIAS[0],    		// [] LSLP HP DBIAS of fixed voltage
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_DSLP_LP_DBG[] = {
-    &DSLP_LP_DBG[0],    		// [] DSLP LP DBG of fixed voltage
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_DSLP_LP_DBIAS[] = {
-    &DSLP_LP_DBIAS[0],    		// [] DSLP LP DBIAS of fixed voltage
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_LP_HP_DBIAS_VOL_GAP[] = {
-    &LP_HP_DBIAS_VOL_GAP[0],    		// [] DBIAS gap between LP and HP
-    NULL
-};
-
 const esp_efuse_desc_t* ESP_EFUSE_OPTIONAL_UNIQUE_ID[] = {
    &OPTIONAL_UNIQUE_ID[0],    		// [] Optional unique 128-bit ID
    NULL
 };

-const esp_efuse_desc_t* ESP_EFUSE_TEMPERATURE_SENSOR[] = {
-    &TEMPERATURE_SENSOR[0],    		// [] Temperature calibration data
-    NULL
-};
-
 const esp_efuse_desc_t* ESP_EFUSE_OCODE[] = {
    &OCODE[0],    		// [] ADC OCode
    NULL
 };

-const esp_efuse_desc_t* ESP_EFUSE_ADC1_AVE_INITCODE_ATTEN0[] = {
-    &ADC1_AVE_INITCODE_ATTEN0[0],    		// [] Average initcode of ADC1 atten0
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_AVE_INITCODE_ATTEN1[] = {
-    &ADC1_AVE_INITCODE_ATTEN1[0],    		// [] Average initcode of ADC1 atten0
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_AVE_INITCODE_ATTEN2[] = {
-    &ADC1_AVE_INITCODE_ATTEN2[0],    		// [] Average initcode of ADC1 atten0
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_AVE_INITCODE_ATTEN3[] = {
-    &ADC1_AVE_INITCODE_ATTEN3[0],    		// [] Average initcode of ADC1 atten0
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_HI_DOUT_ATTEN0[] = {
-    &ADC1_HI_DOUT_ATTEN0[0],    		// [] HI DOUT of ADC1 atten0
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_HI_DOUT_ATTEN1[] = {
-    &ADC1_HI_DOUT_ATTEN1[0],    		// [] HI DOUT of ADC1 atten1
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_HI_DOUT_ATTEN2[] = {
-    &ADC1_HI_DOUT_ATTEN2[0],    		// [] HI DOUT of ADC1 atten2
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_HI_DOUT_ATTEN3[] = {
-    &ADC1_HI_DOUT_ATTEN3[0],    		// [] HI DOUT of ADC1 atten3
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH0_ATTEN0_INITCODE_DIFF[] = {
-    &ADC1_CH0_ATTEN0_INITCODE_DIFF[0],    		// [] Gap between ADC1 CH0 and average initcode
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH1_ATTEN0_INITCODE_DIFF[] = {
-    &ADC1_CH1_ATTEN0_INITCODE_DIFF[0],    		// [] Gap between ADC1 CH1 and average initcode
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH2_ATTEN0_INITCODE_DIFF[] = {
-    &ADC1_CH2_ATTEN0_INITCODE_DIFF[0],    		// [] Gap between ADC1 CH2 and average initcode
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH3_ATTEN0_INITCODE_DIFF[] = {
-    &ADC1_CH3_ATTEN0_INITCODE_DIFF[0],    		// [] Gap between ADC1 CH3 and average initcode
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH4_ATTEN0_INITCODE_DIFF[] = {
-    &ADC1_CH4_ATTEN0_INITCODE_DIFF[0],    		// [] Gap between ADC1 CH4 and average initcode
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH5_ATTEN0_INITCODE_DIFF[] = {
-    &ADC1_CH5_ATTEN0_INITCODE_DIFF[0],    		// [] Gap between ADC1 CH5 and average initcode
-    NULL
-};
-
 const esp_efuse_desc_t* ESP_EFUSE_USER_DATA[] = {
    &USER_DATA[0],    		// [BLOCK_USR_DATA] User data
    NULL
--- a/components/efuse/esp32c5/esp_efuse_table.csv
+++ b/components/efuse/esp32c5/esp_efuse_table.csv
@@ -9,7 +9,7 @@
 # this will generate new source files, next rebuild all the sources.
 # !!!!!!!!!!! #

-# This file was generated by regtools.py based on the efuses.yaml file with the version: 287a0ed4951aba84b9571a5f31000275
+# This file was generated by regtools.py based on the efuses.yaml file with the version: b09fa417de505238a601eddce188b696

 WR_DIS,                                          EFUSE_BLK0,   0,  32, [] Disable programming of individual eFuses
 WR_DIS.RD_DIS,                                   EFUSE_BLK0,   0,   1, [] wr_dis of RD_DIS
@@ -79,30 +79,8 @@ WR_DIS.PA_TRIM_VERSION,                          EFUSE_BLK0,  20,   1, [] wr_dis
 WR_DIS.TRIM_N_BIAS,                              EFUSE_BLK0,  20,   1, [] wr_dis of TRIM_N_BIAS
 WR_DIS.TRIM_P_BIAS,                              EFUSE_BLK0,  20,   1, [] wr_dis of TRIM_P_BIAS
 WR_DIS.SYS_DATA_PART1,                           EFUSE_BLK0,  21,   1, [] wr_dis of BLOCK2
-WR_DIS.ACTIVE_HP_DBIAS,                          EFUSE_BLK0,  20,   1, [] wr_dis of ACTIVE_HP_DBIAS
-WR_DIS.ACTIVE_LP_DBIAS,                          EFUSE_BLK0,  20,   1, [] wr_dis of ACTIVE_LP_DBIAS
-WR_DIS.LSLP_HP_DBG,                              EFUSE_BLK0,  20,   1, [] wr_dis of LSLP_HP_DBG
-WR_DIS.LSLP_HP_DBIAS,                            EFUSE_BLK0,  20,   1, [] wr_dis of LSLP_HP_DBIAS
-WR_DIS.DSLP_LP_DBG,                              EFUSE_BLK0,  20,   1, [] wr_dis of DSLP_LP_DBG
-WR_DIS.DSLP_LP_DBIAS,                            EFUSE_BLK0,  20,   1, [] wr_dis of DSLP_LP_DBIAS
-WR_DIS.LP_HP_DBIAS_VOL_GAP,                      EFUSE_BLK0,  20,   1, [] wr_dis of LP_HP_DBIAS_VOL_GAP
 WR_DIS.OPTIONAL_UNIQUE_ID,                       EFUSE_BLK0,  21,   1, [] wr_dis of OPTIONAL_UNIQUE_ID
-WR_DIS.TEMPERATURE_SENSOR,                       EFUSE_BLK0,  21,   1, [] wr_dis of TEMPERATURE_SENSOR
 WR_DIS.OCODE,                                    EFUSE_BLK0,  21,   1, [] wr_dis of OCODE
-WR_DIS.ADC1_AVE_INITCODE_ATTEN0,                 EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_AVE_INITCODE_ATTEN0
-WR_DIS.ADC1_AVE_INITCODE_ATTEN1,                 EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_AVE_INITCODE_ATTEN1
-WR_DIS.ADC1_AVE_INITCODE_ATTEN2,                 EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_AVE_INITCODE_ATTEN2
-WR_DIS.ADC1_AVE_INITCODE_ATTEN3,                 EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_AVE_INITCODE_ATTEN3
-WR_DIS.ADC1_HI_DOUT_ATTEN0,                      EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_HI_DOUT_ATTEN0
-WR_DIS.ADC1_HI_DOUT_ATTEN1,                      EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_HI_DOUT_ATTEN1
-WR_DIS.ADC1_HI_DOUT_ATTEN2,                      EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_HI_DOUT_ATTEN2
-WR_DIS.ADC1_HI_DOUT_ATTEN3,                      EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_HI_DOUT_ATTEN3
-WR_DIS.ADC1_CH0_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_CH0_ATTEN0_INITCODE_DIFF
-WR_DIS.ADC1_CH1_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_CH1_ATTEN0_INITCODE_DIFF
-WR_DIS.ADC1_CH2_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_CH2_ATTEN0_INITCODE_DIFF
-WR_DIS.ADC1_CH3_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_CH3_ATTEN0_INITCODE_DIFF
-WR_DIS.ADC1_CH4_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_CH4_ATTEN0_INITCODE_DIFF
-WR_DIS.ADC1_CH5_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_CH5_ATTEN0_INITCODE_DIFF
 WR_DIS.BLOCK_USR_DATA,                           EFUSE_BLK0,  22,   1, [WR_DIS.USER_DATA] wr_dis of BLOCK_USR_DATA
 WR_DIS.CUSTOM_MAC,                               EFUSE_BLK0,  22,   1, [WR_DIS.MAC_CUSTOM WR_DIS.USER_DATA_MAC_CUSTOM] wr_dis of CUSTOM_MAC
 WR_DIS.BLOCK_KEY0,                               EFUSE_BLK0,  23,   1, [WR_DIS.KEY0] wr_dis of BLOCK_KEY0
@@ -195,30 +173,8 @@ PKG_VERSION,                                     EFUSE_BLK1,  90,   3, [] Packag
 PA_TRIM_VERSION,                                 EFUSE_BLK1,  93,   3, [] PADC CAL PA trim version
 TRIM_N_BIAS,                                     EFUSE_BLK1,  96,   5, [] PADC CAL N bias
 TRIM_P_BIAS,                                     EFUSE_BLK1, 101,   5, [] PADC CAL P bias
-ACTIVE_HP_DBIAS,                                 EFUSE_BLK1, 106,   4, [] Active HP DBIAS of fixed voltage
-ACTIVE_LP_DBIAS,                                 EFUSE_BLK1, 110,   4, [] Active LP DBIAS of fixed voltage
-LSLP_HP_DBG,                                     EFUSE_BLK1, 114,   2, [] LSLP HP DBG of fixed voltage
-LSLP_HP_DBIAS,                                   EFUSE_BLK1, 116,   4, [] LSLP HP DBIAS of fixed voltage
-DSLP_LP_DBG,                                     EFUSE_BLK1, 120,   4, [] DSLP LP DBG of fixed voltage
-DSLP_LP_DBIAS,                                   EFUSE_BLK1, 124,   5, [] DSLP LP DBIAS of fixed voltage
-LP_HP_DBIAS_VOL_GAP,                             EFUSE_BLK1, 129,   5, [] DBIAS gap between LP and HP
 OPTIONAL_UNIQUE_ID,                              EFUSE_BLK2,   0, 128, [] Optional unique 128-bit ID
-TEMPERATURE_SENSOR,                              EFUSE_BLK2, 128,   9, [] Temperature calibration data
 OCODE,                                           EFUSE_BLK2, 137,   8, [] ADC OCode
-ADC1_AVE_INITCODE_ATTEN0,                        EFUSE_BLK2, 145,  10, [] Average initcode of ADC1 atten0
-ADC1_AVE_INITCODE_ATTEN1,                        EFUSE_BLK2, 155,  10, [] Average initcode of ADC1 atten0
-ADC1_AVE_INITCODE_ATTEN2,                        EFUSE_BLK2, 165,  10, [] Average initcode of ADC1 atten0
-ADC1_AVE_INITCODE_ATTEN3,                        EFUSE_BLK2, 175,  10, [] Average initcode of ADC1 atten0
-ADC1_HI_DOUT_ATTEN0,                             EFUSE_BLK2, 185,  10, [] HI DOUT of ADC1 atten0
-ADC1_HI_DOUT_ATTEN1,                             EFUSE_BLK2, 195,  10, [] HI DOUT of ADC1 atten1
-ADC1_HI_DOUT_ATTEN2,                             EFUSE_BLK2, 205,  10, [] HI DOUT of ADC1 atten2
-ADC1_HI_DOUT_ATTEN3,                             EFUSE_BLK2, 215,  10, [] HI DOUT of ADC1 atten3
-ADC1_CH0_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK2, 225,   4, [] Gap between ADC1 CH0 and average initcode
-ADC1_CH1_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK2, 229,   4, [] Gap between ADC1 CH1 and average initcode
-ADC1_CH2_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK2, 233,   4, [] Gap between ADC1 CH2 and average initcode
-ADC1_CH3_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK2, 237,   4, [] Gap between ADC1 CH3 and average initcode
-ADC1_CH4_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK2, 241,   4, [] Gap between ADC1 CH4 and average initcode
-ADC1_CH5_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK2, 245,   4, [] Gap between ADC1 CH5 and average initcode
 USER_DATA,                                       EFUSE_BLK3,   0, 256, [BLOCK_USR_DATA] User data
 USER_DATA.MAC_CUSTOM,                            EFUSE_BLK3, 200,  48, [MAC_CUSTOM CUSTOM_MAC] Custom MAC
 KEY0,                                            EFUSE_BLK4,   0, 256, [BLOCK_KEY0] Key0 or user data
--- a/components/efuse/esp32c5/include/esp_efuse_table.h
+++ b/components/efuse/esp32c5/include/esp_efuse_table.h
@@ -10,7 +10,7 @@ extern "C" {

 #include "esp_efuse.h"

-// md5_digest_table b26e7466c400977081a142076ef1a5bb
+// md5_digest_table 13b0a8106fd483a0fcfa8b2f7388a95f
 // This file was generated from the file esp_efuse_table.csv. DO NOT CHANGE THIS FILE MANUALLY.
 // If you want to change some fields, you need to change esp_efuse_table.csv file
 // then run `efuse_common_table` or `efuse_custom_table` command it will generate this file.
@@ -92,30 +92,8 @@ extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_PA_TRIM_VERSION[];
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_TRIM_N_BIAS[];
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_TRIM_P_BIAS[];
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_SYS_DATA_PART1[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ACTIVE_HP_DBIAS[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ACTIVE_LP_DBIAS[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_LSLP_HP_DBG[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_LSLP_HP_DBIAS[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_DSLP_LP_DBG[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_DSLP_LP_DBIAS[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_LP_HP_DBIAS_VOL_GAP[];
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_OPTIONAL_UNIQUE_ID[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_TEMPERATURE_SENSOR[];
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_OCODE[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_AVE_INITCODE_ATTEN0[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_AVE_INITCODE_ATTEN1[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_AVE_INITCODE_ATTEN2[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_AVE_INITCODE_ATTEN3[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_HI_DOUT_ATTEN0[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_HI_DOUT_ATTEN1[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_HI_DOUT_ATTEN2[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_HI_DOUT_ATTEN3[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH0_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH1_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH2_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH3_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH4_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH5_ATTEN0_INITCODE_DIFF[];
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_BLOCK_USR_DATA[];
 #define ESP_EFUSE_WR_DIS_USER_DATA ESP_EFUSE_WR_DIS_BLOCK_USR_DATA
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_CUSTOM_MAC[];
@@ -227,30 +205,8 @@ extern const esp_efuse_desc_t* ESP_EFUSE_PKG_VERSION[];
 extern const esp_efuse_desc_t* ESP_EFUSE_PA_TRIM_VERSION[];
 extern const esp_efuse_desc_t* ESP_EFUSE_TRIM_N_BIAS[];
 extern const esp_efuse_desc_t* ESP_EFUSE_TRIM_P_BIAS[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ACTIVE_HP_DBIAS[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ACTIVE_LP_DBIAS[];
-extern const esp_efuse_desc_t* ESP_EFUSE_LSLP_HP_DBG[];
-extern const esp_efuse_desc_t* ESP_EFUSE_LSLP_HP_DBIAS[];
-extern const esp_efuse_desc_t* ESP_EFUSE_DSLP_LP_DBG[];
-extern const esp_efuse_desc_t* ESP_EFUSE_DSLP_LP_DBIAS[];
-extern const esp_efuse_desc_t* ESP_EFUSE_LP_HP_DBIAS_VOL_GAP[];
 extern const esp_efuse_desc_t* ESP_EFUSE_OPTIONAL_UNIQUE_ID[];
-extern const esp_efuse_desc_t* ESP_EFUSE_TEMPERATURE_SENSOR[];
 extern const esp_efuse_desc_t* ESP_EFUSE_OCODE[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_AVE_INITCODE_ATTEN0[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_AVE_INITCODE_ATTEN1[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_AVE_INITCODE_ATTEN2[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_AVE_INITCODE_ATTEN3[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_HI_DOUT_ATTEN0[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_HI_DOUT_ATTEN1[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_HI_DOUT_ATTEN2[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_HI_DOUT_ATTEN3[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH0_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH1_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH2_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH3_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH4_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH5_ATTEN0_INITCODE_DIFF[];
 extern const esp_efuse_desc_t* ESP_EFUSE_USER_DATA[];
 #define ESP_EFUSE_BLOCK_USR_DATA ESP_EFUSE_USER_DATA
 extern const esp_efuse_desc_t* ESP_EFUSE_USER_DATA_MAC_CUSTOM[];
--- a/components/efuse/esp32c61/esp_efuse_table.c
+++ b/components/efuse/esp32c61/esp_efuse_table.c
@@ -9,7 +9,7 @@
 #include <assert.h>
 #include "esp_efuse_table.h"

-// md5_digest_table af9aaa79feb0970d90f35360a5113f03
+// md5_digest_table 52aee23d9256003919a3d01945678355
 // This file was generated from the file esp_efuse_table.csv. DO NOT CHANGE THIS FILE MANUALLY.
 // If you want to change some fields, you need to change esp_efuse_table.csv file
 // then run `efuse_common_table` or `efuse_custom_table` command it will generate this file.
@@ -235,62 +235,6 @@ static const esp_efuse_desc_t WR_DIS_OPTIONAL_UNIQUE_ID[] = {
    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of OPTIONAL_UNIQUE_ID,
 };

-static const esp_efuse_desc_t WR_DIS_TEMPERATURE_SENSOR[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of TEMPERATURE_SENSOR,
-};
-
-static const esp_efuse_desc_t WR_DIS_OCODE[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of OCODE,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_AVE_INIT_CODE_ATTEN0[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_AVE_INIT_CODE_ATTEN0,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_AVE_INIT_CODE_ATTEN1[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_AVE_INIT_CODE_ATTEN1,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_AVE_INIT_CODE_ATTEN2[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_AVE_INIT_CODE_ATTEN2,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_AVE_INIT_CODE_ATTEN3[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_AVE_INIT_CODE_ATTEN3,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_HI_DOUT_ATTEN0[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_HI_DOUT_ATTEN0,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_HI_DOUT_ATTEN1[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_HI_DOUT_ATTEN1,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_HI_DOUT_ATTEN2[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_HI_DOUT_ATTEN2,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_HI_DOUT_ATTEN3[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_HI_DOUT_ATTEN3,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_CH0_ATTEN0_INITCODE_DIFF[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_CH0_ATTEN0_INITCODE_DIFF,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_CH1_ATTEN0_INITCODE_DIFF[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_CH1_ATTEN0_INITCODE_DIFF,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_CH2_ATTEN0_INITCODE_DIFF[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_CH2_ATTEN0_INITCODE_DIFF,
-};
-
-static const esp_efuse_desc_t WR_DIS_ADC1_CH3_ATTEN0_INITCODE_DIFF[] = {
-    {EFUSE_BLK0, 21, 1}, 	 // [] wr_dis of ADC1_CH3_ATTEN0_INITCODE_DIFF,
-};
-
 static const esp_efuse_desc_t WR_DIS_BLOCK_USR_DATA[] = {
    {EFUSE_BLK0, 22, 1}, 	 // [WR_DIS.USER_DATA] wr_dis of BLOCK_USR_DATA,
 };
@@ -584,62 +528,6 @@ static const esp_efuse_desc_t OPTIONAL_UNIQUE_ID[] = {
    {EFUSE_BLK2, 0, 128}, 	 // [] Optional unique 128-bit ID,
 };

-static const esp_efuse_desc_t TEMPERATURE_SENSOR[] = {
-    {EFUSE_BLK2, 128, 9}, 	 // [] Temperature calibration data,
-};
-
-static const esp_efuse_desc_t OCODE[] = {
-    {EFUSE_BLK2, 137, 8}, 	 // [] ADC OCode calibration,
-};
-
-static const esp_efuse_desc_t ADC1_AVE_INIT_CODE_ATTEN0[] = {
-    {EFUSE_BLK2, 145, 10}, 	 // [] Average initcode of ADC1 atten0,
-};
-
-static const esp_efuse_desc_t ADC1_AVE_INIT_CODE_ATTEN1[] = {
-    {EFUSE_BLK2, 155, 10}, 	 // [] Average initcode of ADC1 atten1,
-};
-
-static const esp_efuse_desc_t ADC1_AVE_INIT_CODE_ATTEN2[] = {
-    {EFUSE_BLK2, 165, 10}, 	 // [] Average initcode of ADC1 atten2,
-};
-
-static const esp_efuse_desc_t ADC1_AVE_INIT_CODE_ATTEN3[] = {
-    {EFUSE_BLK2, 175, 10}, 	 // [] Average initcode of ADC1 atten3,
-};
-
-static const esp_efuse_desc_t ADC1_HI_DOUT_ATTEN0[] = {
-    {EFUSE_BLK2, 185, 10}, 	 // [] HI_DOUT of ADC1 atten0,
-};
-
-static const esp_efuse_desc_t ADC1_HI_DOUT_ATTEN1[] = {
-    {EFUSE_BLK2, 195, 10}, 	 // [] HI_DOUT of ADC1 atten1,
-};
-
-static const esp_efuse_desc_t ADC1_HI_DOUT_ATTEN2[] = {
-    {EFUSE_BLK2, 205, 10}, 	 // [] HI_DOUT of ADC1 atten2,
-};
-
-static const esp_efuse_desc_t ADC1_HI_DOUT_ATTEN3[] = {
-    {EFUSE_BLK2, 215, 10}, 	 // [] HI_DOUT of ADC1 atten3,
-};
-
-static const esp_efuse_desc_t ADC1_CH0_ATTEN0_INITCODE_DIFF[] = {
-    {EFUSE_BLK2, 225, 4}, 	 // [] Gap between ADC1 CH0 and average initcode,
-};
-
-static const esp_efuse_desc_t ADC1_CH1_ATTEN0_INITCODE_DIFF[] = {
-    {EFUSE_BLK2, 229, 4}, 	 // [] Gap between ADC1 CH1 and average initcode,
-};
-
-static const esp_efuse_desc_t ADC1_CH2_ATTEN0_INITCODE_DIFF[] = {
-    {EFUSE_BLK2, 233, 4}, 	 // [] Gap between ADC1 CH2 and average initcode,
-};
-
-static const esp_efuse_desc_t ADC1_CH3_ATTEN0_INITCODE_DIFF[] = {
-    {EFUSE_BLK2, 237, 4}, 	 // [] Gap between ADC1 CH3 and average initcode,
-};
-
 static const esp_efuse_desc_t USER_DATA[] = {
    {EFUSE_BLK3, 0, 256}, 	 // [BLOCK_USR_DATA] User data,
 };
@@ -955,76 +843,6 @@ const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_OPTIONAL_UNIQUE_ID[] = {
    NULL
 };

-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_TEMPERATURE_SENSOR[] = {
-    &WR_DIS_TEMPERATURE_SENSOR[0],    		// [] wr_dis of TEMPERATURE_SENSOR
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_OCODE[] = {
-    &WR_DIS_OCODE[0],    		// [] wr_dis of OCODE
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_AVE_INIT_CODE_ATTEN0[] = {
-    &WR_DIS_ADC1_AVE_INIT_CODE_ATTEN0[0],    		// [] wr_dis of ADC1_AVE_INIT_CODE_ATTEN0
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_AVE_INIT_CODE_ATTEN1[] = {
-    &WR_DIS_ADC1_AVE_INIT_CODE_ATTEN1[0],    		// [] wr_dis of ADC1_AVE_INIT_CODE_ATTEN1
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_AVE_INIT_CODE_ATTEN2[] = {
-    &WR_DIS_ADC1_AVE_INIT_CODE_ATTEN2[0],    		// [] wr_dis of ADC1_AVE_INIT_CODE_ATTEN2
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_AVE_INIT_CODE_ATTEN3[] = {
-    &WR_DIS_ADC1_AVE_INIT_CODE_ATTEN3[0],    		// [] wr_dis of ADC1_AVE_INIT_CODE_ATTEN3
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_HI_DOUT_ATTEN0[] = {
-    &WR_DIS_ADC1_HI_DOUT_ATTEN0[0],    		// [] wr_dis of ADC1_HI_DOUT_ATTEN0
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_HI_DOUT_ATTEN1[] = {
-    &WR_DIS_ADC1_HI_DOUT_ATTEN1[0],    		// [] wr_dis of ADC1_HI_DOUT_ATTEN1
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_HI_DOUT_ATTEN2[] = {
-    &WR_DIS_ADC1_HI_DOUT_ATTEN2[0],    		// [] wr_dis of ADC1_HI_DOUT_ATTEN2
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_HI_DOUT_ATTEN3[] = {
-    &WR_DIS_ADC1_HI_DOUT_ATTEN3[0],    		// [] wr_dis of ADC1_HI_DOUT_ATTEN3
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH0_ATTEN0_INITCODE_DIFF[] = {
-    &WR_DIS_ADC1_CH0_ATTEN0_INITCODE_DIFF[0],    		// [] wr_dis of ADC1_CH0_ATTEN0_INITCODE_DIFF
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH1_ATTEN0_INITCODE_DIFF[] = {
-    &WR_DIS_ADC1_CH1_ATTEN0_INITCODE_DIFF[0],    		// [] wr_dis of ADC1_CH1_ATTEN0_INITCODE_DIFF
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH2_ATTEN0_INITCODE_DIFF[] = {
-    &WR_DIS_ADC1_CH2_ATTEN0_INITCODE_DIFF[0],    		// [] wr_dis of ADC1_CH2_ATTEN0_INITCODE_DIFF
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH3_ATTEN0_INITCODE_DIFF[] = {
-    &WR_DIS_ADC1_CH3_ATTEN0_INITCODE_DIFF[0],    		// [] wr_dis of ADC1_CH3_ATTEN0_INITCODE_DIFF
-    NULL
-};
-
 const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_BLOCK_USR_DATA[] = {
    &WR_DIS_BLOCK_USR_DATA[0],    		// [WR_DIS.USER_DATA] wr_dis of BLOCK_USR_DATA
    NULL
@@ -1390,76 +1208,6 @@ const esp_efuse_desc_t* ESP_EFUSE_OPTIONAL_UNIQUE_ID[] = {
    NULL
 };

-const esp_efuse_desc_t* ESP_EFUSE_TEMPERATURE_SENSOR[] = {
-    &TEMPERATURE_SENSOR[0],    		// [] Temperature calibration data
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_OCODE[] = {
-    &OCODE[0],    		// [] ADC OCode calibration
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_AVE_INIT_CODE_ATTEN0[] = {
-    &ADC1_AVE_INIT_CODE_ATTEN0[0],    		// [] Average initcode of ADC1 atten0
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_AVE_INIT_CODE_ATTEN1[] = {
-    &ADC1_AVE_INIT_CODE_ATTEN1[0],    		// [] Average initcode of ADC1 atten1
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_AVE_INIT_CODE_ATTEN2[] = {
-    &ADC1_AVE_INIT_CODE_ATTEN2[0],    		// [] Average initcode of ADC1 atten2
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_AVE_INIT_CODE_ATTEN3[] = {
-    &ADC1_AVE_INIT_CODE_ATTEN3[0],    		// [] Average initcode of ADC1 atten3
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_HI_DOUT_ATTEN0[] = {
-    &ADC1_HI_DOUT_ATTEN0[0],    		// [] HI_DOUT of ADC1 atten0
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_HI_DOUT_ATTEN1[] = {
-    &ADC1_HI_DOUT_ATTEN1[0],    		// [] HI_DOUT of ADC1 atten1
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_HI_DOUT_ATTEN2[] = {
-    &ADC1_HI_DOUT_ATTEN2[0],    		// [] HI_DOUT of ADC1 atten2
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_HI_DOUT_ATTEN3[] = {
-    &ADC1_HI_DOUT_ATTEN3[0],    		// [] HI_DOUT of ADC1 atten3
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH0_ATTEN0_INITCODE_DIFF[] = {
-    &ADC1_CH0_ATTEN0_INITCODE_DIFF[0],    		// [] Gap between ADC1 CH0 and average initcode
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH1_ATTEN0_INITCODE_DIFF[] = {
-    &ADC1_CH1_ATTEN0_INITCODE_DIFF[0],    		// [] Gap between ADC1 CH1 and average initcode
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH2_ATTEN0_INITCODE_DIFF[] = {
-    &ADC1_CH2_ATTEN0_INITCODE_DIFF[0],    		// [] Gap between ADC1 CH2 and average initcode
-    NULL
-};
-
-const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH3_ATTEN0_INITCODE_DIFF[] = {
-    &ADC1_CH3_ATTEN0_INITCODE_DIFF[0],    		// [] Gap between ADC1 CH3 and average initcode
-    NULL
-};
-
 const esp_efuse_desc_t* ESP_EFUSE_USER_DATA[] = {
    &USER_DATA[0],    		// [BLOCK_USR_DATA] User data
    NULL
--- a/components/efuse/esp32c61/esp_efuse_table.csv
+++ b/components/efuse/esp32c61/esp_efuse_table.csv
@@ -9,7 +9,7 @@
 # this will generate new source files, next rebuild all the sources.
 # !!!!!!!!!!! #

-# This file was generated by regtools.py based on the efuses.yaml file with the version: 8f05ff9d292b10d2360200fae1d15e8d
+# This file was generated by regtools.py based on the efuses.yaml file with the version: e564f8042b56a475a7714bb28ecdadfa

 WR_DIS,                                          EFUSE_BLK0,   0,  32, [] Disable programming of individual eFuses
 WR_DIS.RD_DIS,                                   EFUSE_BLK0,   0,   1, [] wr_dis of RD_DIS
@@ -66,20 +66,6 @@ WR_DIS.TEMP,                                     EFUSE_BLK0,  20,   1, [] wr_dis
 WR_DIS.PKG_VERSION,                              EFUSE_BLK0,  20,   1, [] wr_dis of PKG_VERSION
 WR_DIS.SYS_DATA_PART1,                           EFUSE_BLK0,  21,   1, [] wr_dis of BLOCK2
 WR_DIS.OPTIONAL_UNIQUE_ID,                       EFUSE_BLK0,  21,   1, [] wr_dis of OPTIONAL_UNIQUE_ID
-WR_DIS.TEMPERATURE_SENSOR,                       EFUSE_BLK0,  21,   1, [] wr_dis of TEMPERATURE_SENSOR
-WR_DIS.OCODE,                                    EFUSE_BLK0,  21,   1, [] wr_dis of OCODE
-WR_DIS.ADC1_AVE_INIT_CODE_ATTEN0,                EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_AVE_INIT_CODE_ATTEN0
-WR_DIS.ADC1_AVE_INIT_CODE_ATTEN1,                EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_AVE_INIT_CODE_ATTEN1
-WR_DIS.ADC1_AVE_INIT_CODE_ATTEN2,                EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_AVE_INIT_CODE_ATTEN2
-WR_DIS.ADC1_AVE_INIT_CODE_ATTEN3,                EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_AVE_INIT_CODE_ATTEN3
-WR_DIS.ADC1_HI_DOUT_ATTEN0,                      EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_HI_DOUT_ATTEN0
-WR_DIS.ADC1_HI_DOUT_ATTEN1,                      EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_HI_DOUT_ATTEN1
-WR_DIS.ADC1_HI_DOUT_ATTEN2,                      EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_HI_DOUT_ATTEN2
-WR_DIS.ADC1_HI_DOUT_ATTEN3,                      EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_HI_DOUT_ATTEN3
-WR_DIS.ADC1_CH0_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_CH0_ATTEN0_INITCODE_DIFF
-WR_DIS.ADC1_CH1_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_CH1_ATTEN0_INITCODE_DIFF
-WR_DIS.ADC1_CH2_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_CH2_ATTEN0_INITCODE_DIFF
-WR_DIS.ADC1_CH3_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_CH3_ATTEN0_INITCODE_DIFF
 WR_DIS.BLOCK_USR_DATA,                           EFUSE_BLK0,  22,   1, [WR_DIS.USER_DATA] wr_dis of BLOCK_USR_DATA
 WR_DIS.CUSTOM_MAC,                               EFUSE_BLK0,  22,   1, [WR_DIS.MAC_CUSTOM WR_DIS.USER_DATA_MAC_CUSTOM] wr_dis of CUSTOM_MAC
 WR_DIS.BLOCK_KEY0,                               EFUSE_BLK0,  23,   1, [WR_DIS.KEY0] wr_dis of BLOCK_KEY0
@@ -157,20 +143,6 @@ PSRAM_VENDOR,                                    EFUSE_BLK1,  86,   2, [] PSRAM
 TEMP,                                            EFUSE_BLK1,  88,   2, [] Temperature
 PKG_VERSION,                                     EFUSE_BLK1,  90,   3, [] Package version
 OPTIONAL_UNIQUE_ID,                              EFUSE_BLK2,   0, 128, [] Optional unique 128-bit ID
-TEMPERATURE_SENSOR,                              EFUSE_BLK2, 128,   9, [] Temperature calibration data
-OCODE,                                           EFUSE_BLK2, 137,   8, [] ADC OCode calibration
-ADC1_AVE_INIT_CODE_ATTEN0,                       EFUSE_BLK2, 145,  10, [] Average initcode of ADC1 atten0
-ADC1_AVE_INIT_CODE_ATTEN1,                       EFUSE_BLK2, 155,  10, [] Average initcode of ADC1 atten1
-ADC1_AVE_INIT_CODE_ATTEN2,                       EFUSE_BLK2, 165,  10, [] Average initcode of ADC1 atten2
-ADC1_AVE_INIT_CODE_ATTEN3,                       EFUSE_BLK2, 175,  10, [] Average initcode of ADC1 atten3
-ADC1_HI_DOUT_ATTEN0,                             EFUSE_BLK2, 185,  10, [] HI_DOUT of ADC1 atten0
-ADC1_HI_DOUT_ATTEN1,                             EFUSE_BLK2, 195,  10, [] HI_DOUT of ADC1 atten1
-ADC1_HI_DOUT_ATTEN2,                             EFUSE_BLK2, 205,  10, [] HI_DOUT of ADC1 atten2
-ADC1_HI_DOUT_ATTEN3,                             EFUSE_BLK2, 215,  10, [] HI_DOUT of ADC1 atten3
-ADC1_CH0_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK2, 225,   4, [] Gap between ADC1 CH0 and average initcode
-ADC1_CH1_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK2, 229,   4, [] Gap between ADC1 CH1 and average initcode
-ADC1_CH2_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK2, 233,   4, [] Gap between ADC1 CH2 and average initcode
-ADC1_CH3_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK2, 237,   4, [] Gap between ADC1 CH3 and average initcode
 USER_DATA,                                       EFUSE_BLK3,   0, 256, [BLOCK_USR_DATA] User data
 USER_DATA.MAC_CUSTOM,                            EFUSE_BLK3, 200,  48, [MAC_CUSTOM CUSTOM_MAC] Custom MAC
 KEY0,                                            EFUSE_BLK4,   0, 256, [BLOCK_KEY0] Key0 or user data
--- a/components/efuse/esp32c61/include/esp_efuse_table.h
+++ b/components/efuse/esp32c61/include/esp_efuse_table.h
@@ -10,7 +10,7 @@ extern "C" {

 #include "esp_efuse.h"

-// md5_digest_table af9aaa79feb0970d90f35360a5113f03
+// md5_digest_table 52aee23d9256003919a3d01945678355
 // This file was generated from the file esp_efuse_table.csv. DO NOT CHANGE THIS FILE MANUALLY.
 // If you want to change some fields, you need to change esp_efuse_table.csv file
 // then run `efuse_common_table` or `efuse_custom_table` command it will generate this file.
@@ -79,20 +79,6 @@ extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_TEMP[];
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_PKG_VERSION[];
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_SYS_DATA_PART1[];
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_OPTIONAL_UNIQUE_ID[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_TEMPERATURE_SENSOR[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_OCODE[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_AVE_INIT_CODE_ATTEN0[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_AVE_INIT_CODE_ATTEN1[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_AVE_INIT_CODE_ATTEN2[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_AVE_INIT_CODE_ATTEN3[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_HI_DOUT_ATTEN0[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_HI_DOUT_ATTEN1[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_HI_DOUT_ATTEN2[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_HI_DOUT_ATTEN3[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH0_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH1_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH2_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH3_ATTEN0_INITCODE_DIFF[];
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_BLOCK_USR_DATA[];
 #define ESP_EFUSE_WR_DIS_USER_DATA ESP_EFUSE_WR_DIS_BLOCK_USR_DATA
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_CUSTOM_MAC[];
@@ -189,20 +175,6 @@ extern const esp_efuse_desc_t* ESP_EFUSE_PSRAM_VENDOR[];
 extern const esp_efuse_desc_t* ESP_EFUSE_TEMP[];
 extern const esp_efuse_desc_t* ESP_EFUSE_PKG_VERSION[];
 extern const esp_efuse_desc_t* ESP_EFUSE_OPTIONAL_UNIQUE_ID[];
-extern const esp_efuse_desc_t* ESP_EFUSE_TEMPERATURE_SENSOR[];
-extern const esp_efuse_desc_t* ESP_EFUSE_OCODE[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_AVE_INIT_CODE_ATTEN0[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_AVE_INIT_CODE_ATTEN1[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_AVE_INIT_CODE_ATTEN2[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_AVE_INIT_CODE_ATTEN3[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_HI_DOUT_ATTEN0[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_HI_DOUT_ATTEN1[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_HI_DOUT_ATTEN2[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_HI_DOUT_ATTEN3[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH0_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH1_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH2_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH3_ATTEN0_INITCODE_DIFF[];
 extern const esp_efuse_desc_t* ESP_EFUSE_USER_DATA[];
 #define ESP_EFUSE_BLOCK_USR_DATA ESP_EFUSE_USER_DATA
 extern const esp_efuse_desc_t* ESP_EFUSE_USER_DATA_MAC_CUSTOM[];
--- a/components/efuse/esp32p4/esp_efuse_table.c
+++ b/components/efuse/esp32p4/esp_efuse_table.c
--- a/components/efuse/esp32p4/esp_efuse_table.csv
+++ b/components/efuse/esp32p4/esp_efuse_table.csv
@@ -9,7 +9,7 @@
 # this will generate new source files, next rebuild all the sources.
 # !!!!!!!!!!! #

-# This file was generated by regtools.py based on the efuses.yaml file with the version: 73787d3f5ae45b80abca925a7562120b
+# This file was generated by regtools.py based on the efuses.yaml file with the version: d4a48929387e281bd05db8cfb3a85f60

 WR_DIS,                                          EFUSE_BLK0,   0,  32, [] Disable programming of individual eFuses
 WR_DIS.RD_DIS,                                   EFUSE_BLK0,   0,   1, [] wr_dis of RD_DIS
@@ -79,35 +79,7 @@ WR_DIS.TEMP,                                     EFUSE_BLK0,  20,   1, [] wr_dis
 WR_DIS.PSRAM_VENDOR,                             EFUSE_BLK0,  20,   1, [] wr_dis of PSRAM_VENDOR
 WR_DIS.PKG_VERSION,                              EFUSE_BLK0,  20,   1, [] wr_dis of PKG_VERSION
 WR_DIS.SYS_DATA_PART1,                           EFUSE_BLK0,  21,   1, [] wr_dis of BLOCK2
-WR_DIS.LDO_VO1_DREF,                             EFUSE_BLK0,  20,   1, [] wr_dis of LDO_VO1_DREF
-WR_DIS.LDO_VO2_DREF,                             EFUSE_BLK0,  20,   1, [] wr_dis of LDO_VO2_DREF
-WR_DIS.LDO_VO1_MUL,                              EFUSE_BLK0,  20,   1, [] wr_dis of LDO_VO1_MUL
-WR_DIS.LDO_VO2_MUL,                              EFUSE_BLK0,  20,   1, [] wr_dis of LDO_VO2_MUL
-WR_DIS.LDO_VO3_K,                                EFUSE_BLK0,  20,   1, [] wr_dis of LDO_VO3_K
-WR_DIS.LDO_VO3_VOS,                              EFUSE_BLK0,  20,   1, [] wr_dis of LDO_VO3_VOS
-WR_DIS.LDO_VO3_C,                                EFUSE_BLK0,  20,   1, [] wr_dis of LDO_VO3_C
-WR_DIS.LDO_VO4_K,                                EFUSE_BLK0,  20,   1, [] wr_dis of LDO_VO4_K
-WR_DIS.LDO_VO4_VOS,                              EFUSE_BLK0,  20,   1, [] wr_dis of LDO_VO4_VOS
-WR_DIS.LDO_VO4_C,                                EFUSE_BLK0,  20,   1, [] wr_dis of LDO_VO4_C
-WR_DIS.ACTIVE_HP_DBIAS,                          EFUSE_BLK0,  20,   1, [] wr_dis of ACTIVE_HP_DBIAS
-WR_DIS.ACTIVE_LP_DBIAS,                          EFUSE_BLK0,  20,   1, [] wr_dis of ACTIVE_LP_DBIAS
-WR_DIS.LSLP_HP_DBIAS,                            EFUSE_BLK0,  20,   1, [] wr_dis of LSLP_HP_DBIAS
-WR_DIS.DSLP_DBG,                                 EFUSE_BLK0,  20,   1, [] wr_dis of DSLP_DBG
-WR_DIS.DSLP_LP_DBIAS,                            EFUSE_BLK0,  20,   1, [] wr_dis of DSLP_LP_DBIAS
-WR_DIS.LP_DCDC_DBIAS_VOL_GAP,                    EFUSE_BLK0,  20,   1, [] wr_dis of LP_DCDC_DBIAS_VOL_GAP
 WR_DIS.OPTIONAL_UNIQUE_ID,                       EFUSE_BLK0,  21,   1, [] wr_dis of OPTIONAL_UNIQUE_ID
-WR_DIS.ADC1_AVE_INITCODE_ATTEN0,                 EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_AVE_INITCODE_ATTEN0
-WR_DIS.ADC1_AVE_INITCODE_ATTEN1,                 EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_AVE_INITCODE_ATTEN1
-WR_DIS.ADC1_AVE_INITCODE_ATTEN2,                 EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_AVE_INITCODE_ATTEN2
-WR_DIS.ADC1_AVE_INITCODE_ATTEN3,                 EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_AVE_INITCODE_ATTEN3
-WR_DIS.ADC2_AVE_INITCODE_ATTEN0,                 EFUSE_BLK0,  21,   1, [] wr_dis of ADC2_AVE_INITCODE_ATTEN0
-WR_DIS.ADC2_AVE_INITCODE_ATTEN1,                 EFUSE_BLK0,  21,   1, [] wr_dis of ADC2_AVE_INITCODE_ATTEN1
-WR_DIS.ADC2_AVE_INITCODE_ATTEN2,                 EFUSE_BLK0,  21,   1, [] wr_dis of ADC2_AVE_INITCODE_ATTEN2
-WR_DIS.ADC2_AVE_INITCODE_ATTEN3,                 EFUSE_BLK0,  21,   1, [] wr_dis of ADC2_AVE_INITCODE_ATTEN3
-WR_DIS.ADC1_HI_DOUT_ATTEN0,                      EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_HI_DOUT_ATTEN0
-WR_DIS.ADC1_HI_DOUT_ATTEN1,                      EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_HI_DOUT_ATTEN1
-WR_DIS.ADC1_HI_DOUT_ATTEN2,                      EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_HI_DOUT_ATTEN2
-WR_DIS.ADC1_HI_DOUT_ATTEN3,                      EFUSE_BLK0,  21,   1, [] wr_dis of ADC1_HI_DOUT_ATTEN3
 WR_DIS.BLOCK_USR_DATA,                           EFUSE_BLK0,  22,   1, [WR_DIS.USER_DATA] wr_dis of BLOCK_USR_DATA
 WR_DIS.CUSTOM_MAC,                               EFUSE_BLK0,  22,   1, [WR_DIS.MAC_CUSTOM WR_DIS.USER_DATA_MAC_CUSTOM] wr_dis of CUSTOM_MAC
 WR_DIS.BLOCK_KEY0,                               EFUSE_BLK0,  23,   1, [WR_DIS.KEY0] wr_dis of BLOCK_KEY0
@@ -117,25 +89,6 @@ WR_DIS.BLOCK_KEY3,                               EFUSE_BLK0,  26,   1, [WR_DIS.K
 WR_DIS.BLOCK_KEY4,                               EFUSE_BLK0,  27,   1, [WR_DIS.KEY4] wr_dis of BLOCK_KEY4
 WR_DIS.BLOCK_KEY5,                               EFUSE_BLK0,  28,   1, [WR_DIS.KEY5] wr_dis of BLOCK_KEY5
 WR_DIS.BLOCK_SYS_DATA2,                          EFUSE_BLK0,  29,   1, [WR_DIS.SYS_DATA_PART2] wr_dis of BLOCK_SYS_DATA2
-WR_DIS.ADC2_HI_DOUT_ATTEN0,                      EFUSE_BLK0,  29,   1, [] wr_dis of ADC2_HI_DOUT_ATTEN0
-WR_DIS.ADC2_HI_DOUT_ATTEN1,                      EFUSE_BLK0,  29,   1, [] wr_dis of ADC2_HI_DOUT_ATTEN1
-WR_DIS.ADC2_HI_DOUT_ATTEN2,                      EFUSE_BLK0,  29,   1, [] wr_dis of ADC2_HI_DOUT_ATTEN2
-WR_DIS.ADC2_HI_DOUT_ATTEN3,                      EFUSE_BLK0,  29,   1, [] wr_dis of ADC2_HI_DOUT_ATTEN3
-WR_DIS.ADC1_CH0_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  29,   1, [] wr_dis of ADC1_CH0_ATTEN0_INITCODE_DIFF
-WR_DIS.ADC1_CH1_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  29,   1, [] wr_dis of ADC1_CH1_ATTEN0_INITCODE_DIFF
-WR_DIS.ADC1_CH2_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  29,   1, [] wr_dis of ADC1_CH2_ATTEN0_INITCODE_DIFF
-WR_DIS.ADC1_CH3_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  29,   1, [] wr_dis of ADC1_CH3_ATTEN0_INITCODE_DIFF
-WR_DIS.ADC1_CH4_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  29,   1, [] wr_dis of ADC1_CH4_ATTEN0_INITCODE_DIFF
-WR_DIS.ADC1_CH5_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  29,   1, [] wr_dis of ADC1_CH5_ATTEN0_INITCODE_DIFF
-WR_DIS.ADC1_CH6_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  29,   1, [] wr_dis of ADC1_CH6_ATTEN0_INITCODE_DIFF
-WR_DIS.ADC1_CH7_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  29,   1, [] wr_dis of ADC1_CH7_ATTEN0_INITCODE_DIFF
-WR_DIS.ADC2_CH0_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  29,   1, [] wr_dis of ADC2_CH0_ATTEN0_INITCODE_DIFF
-WR_DIS.ADC2_CH1_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  29,   1, [] wr_dis of ADC2_CH1_ATTEN0_INITCODE_DIFF
-WR_DIS.ADC2_CH2_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  29,   1, [] wr_dis of ADC2_CH2_ATTEN0_INITCODE_DIFF
-WR_DIS.ADC2_CH3_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  29,   1, [] wr_dis of ADC2_CH3_ATTEN0_INITCODE_DIFF
-WR_DIS.ADC2_CH4_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  29,   1, [] wr_dis of ADC2_CH4_ATTEN0_INITCODE_DIFF
-WR_DIS.ADC2_CH5_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  29,   1, [] wr_dis of ADC2_CH5_ATTEN0_INITCODE_DIFF
-WR_DIS.TEMPERATURE_SENSOR,                       EFUSE_BLK0,  29,   1, [] wr_dis of TEMPERATURE_SENSOR
 WR_DIS.USB_DEVICE_EXCHG_PINS,                    EFUSE_BLK0,  30,   1, [] wr_dis of USB_DEVICE_EXCHG_PINS
 WR_DIS.USB_OTG11_EXCHG_PINS,                     EFUSE_BLK0,  30,   1, [] wr_dis of USB_OTG11_EXCHG_PINS
 WR_DIS.USB_PHY_SEL,                              EFUSE_BLK0,  30,   1, [] wr_dis of USB_PHY_SEL
@@ -148,25 +101,6 @@ RD_DIS.BLOCK_KEY3,                               EFUSE_BLK0,  35,   1, [RD_DIS.K
 RD_DIS.BLOCK_KEY4,                               EFUSE_BLK0,  36,   1, [RD_DIS.KEY4] rd_dis of BLOCK_KEY4
 RD_DIS.BLOCK_KEY5,                               EFUSE_BLK0,  37,   1, [RD_DIS.KEY5] rd_dis of BLOCK_KEY5
 RD_DIS.BLOCK_SYS_DATA2,                          EFUSE_BLK0,  38,   1, [RD_DIS.SYS_DATA_PART2] rd_dis of BLOCK_SYS_DATA2
-RD_DIS.ADC2_HI_DOUT_ATTEN0,                      EFUSE_BLK0,  38,   1, [] rd_dis of ADC2_HI_DOUT_ATTEN0
-RD_DIS.ADC2_HI_DOUT_ATTEN1,                      EFUSE_BLK0,  38,   1, [] rd_dis of ADC2_HI_DOUT_ATTEN1
-RD_DIS.ADC2_HI_DOUT_ATTEN2,                      EFUSE_BLK0,  38,   1, [] rd_dis of ADC2_HI_DOUT_ATTEN2
-RD_DIS.ADC2_HI_DOUT_ATTEN3,                      EFUSE_BLK0,  38,   1, [] rd_dis of ADC2_HI_DOUT_ATTEN3
-RD_DIS.ADC1_CH0_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  38,   1, [] rd_dis of ADC1_CH0_ATTEN0_INITCODE_DIFF
-RD_DIS.ADC1_CH1_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  38,   1, [] rd_dis of ADC1_CH1_ATTEN0_INITCODE_DIFF
-RD_DIS.ADC1_CH2_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  38,   1, [] rd_dis of ADC1_CH2_ATTEN0_INITCODE_DIFF
-RD_DIS.ADC1_CH3_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  38,   1, [] rd_dis of ADC1_CH3_ATTEN0_INITCODE_DIFF
-RD_DIS.ADC1_CH4_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  38,   1, [] rd_dis of ADC1_CH4_ATTEN0_INITCODE_DIFF
-RD_DIS.ADC1_CH5_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  38,   1, [] rd_dis of ADC1_CH5_ATTEN0_INITCODE_DIFF
-RD_DIS.ADC1_CH6_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  38,   1, [] rd_dis of ADC1_CH6_ATTEN0_INITCODE_DIFF
-RD_DIS.ADC1_CH7_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  38,   1, [] rd_dis of ADC1_CH7_ATTEN0_INITCODE_DIFF
-RD_DIS.ADC2_CH0_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  38,   1, [] rd_dis of ADC2_CH0_ATTEN0_INITCODE_DIFF
-RD_DIS.ADC2_CH1_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  38,   1, [] rd_dis of ADC2_CH1_ATTEN0_INITCODE_DIFF
-RD_DIS.ADC2_CH2_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  38,   1, [] rd_dis of ADC2_CH2_ATTEN0_INITCODE_DIFF
-RD_DIS.ADC2_CH3_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  38,   1, [] rd_dis of ADC2_CH3_ATTEN0_INITCODE_DIFF
-RD_DIS.ADC2_CH4_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  38,   1, [] rd_dis of ADC2_CH4_ATTEN0_INITCODE_DIFF
-RD_DIS.ADC2_CH5_ATTEN0_INITCODE_DIFF,            EFUSE_BLK0,  38,   1, [] rd_dis of ADC2_CH5_ATTEN0_INITCODE_DIFF
-RD_DIS.TEMPERATURE_SENSOR,                       EFUSE_BLK0,  38,   1, [] rd_dis of TEMPERATURE_SENSOR
 USB_DEVICE_EXCHG_PINS,                           EFUSE_BLK0,  39,   1, [] Enable usb device exchange pins of D+ and D-
 USB_OTG11_EXCHG_PINS,                            EFUSE_BLK0,  40,   1, [] Enable usb otg11 exchange pins of D+ and D-
 DIS_USB_JTAG,                                    EFUSE_BLK0,  41,   1, [] Represents whether the function of usb switch to jtag is disabled or enabled. 1: disabled. 0: enabled
@@ -243,35 +177,7 @@ PSRAM_CAP,                                       EFUSE_BLK1,  77,   3, [] PSRAM
 TEMP,                                            EFUSE_BLK1,  80,   2, [] Operating temperature of the ESP chip
 PSRAM_VENDOR,                                    EFUSE_BLK1,  82,   2, [] PSRAM vendor
 PKG_VERSION,                                     EFUSE_BLK1,  84,   3, [] Package version
-LDO_VO1_DREF,                                    EFUSE_BLK1,  88,   4, [] Output VO1 parameter
-LDO_VO2_DREF,                                    EFUSE_BLK1,  92,   4, [] Output VO2 parameter
-LDO_VO1_MUL,                                     EFUSE_BLK1,  96,   3, [] Output VO1 parameter
-LDO_VO2_MUL,                                     EFUSE_BLK1,  99,   3, [] Output VO2 parameter
-LDO_VO3_K,                                       EFUSE_BLK1, 102,   8, [] Output VO3 calibration parameter
-LDO_VO3_VOS,                                     EFUSE_BLK1, 110,   6, [] Output VO3 calibration parameter
-LDO_VO3_C,                                       EFUSE_BLK1, 116,   6, [] Output VO3 calibration parameter
-LDO_VO4_K,                                       EFUSE_BLK1, 122,   8, [] Output VO4 calibration parameter
-LDO_VO4_VOS,                                     EFUSE_BLK1, 130,   6, [] Output VO4 calibration parameter
-LDO_VO4_C,                                       EFUSE_BLK1, 136,   6, [] Output VO4 calibration parameter
-ACTIVE_HP_DBIAS,                                 EFUSE_BLK1, 144,   4, [] Active HP DBIAS of fixed voltage
-ACTIVE_LP_DBIAS,                                 EFUSE_BLK1, 148,   4, [] Active LP DBIAS of fixed voltage
-LSLP_HP_DBIAS,                                   EFUSE_BLK1, 152,   4, [] LSLP HP DBIAS of fixed voltage
-DSLP_DBG,                                        EFUSE_BLK1, 156,   4, [] DSLP BDG of fixed voltage
-DSLP_LP_DBIAS,                                   EFUSE_BLK1, 160,   5, [] DSLP LP DBIAS of fixed voltage
-LP_DCDC_DBIAS_VOL_GAP,                           EFUSE_BLK1, 165,   5, [] DBIAS gap between LP and DCDC
 OPTIONAL_UNIQUE_ID,                              EFUSE_BLK2,   0, 128, [] Optional unique 128-bit ID
-ADC1_AVE_INITCODE_ATTEN0,                        EFUSE_BLK2, 128,  10, [] Average initcode of ADC1 atten0
-ADC1_AVE_INITCODE_ATTEN1,                        EFUSE_BLK2, 138,  10, [] Average initcode of ADC1 atten1
-ADC1_AVE_INITCODE_ATTEN2,                        EFUSE_BLK2, 148,  10, [] Average initcode of ADC1 atten2
-ADC1_AVE_INITCODE_ATTEN3,                        EFUSE_BLK2, 158,  10, [] Average initcode of ADC1 atten3
-ADC2_AVE_INITCODE_ATTEN0,                        EFUSE_BLK2, 168,  10, [] Average initcode of ADC2 atten0
-ADC2_AVE_INITCODE_ATTEN1,                        EFUSE_BLK2, 178,  10, [] Average initcode of ADC2 atten1
-ADC2_AVE_INITCODE_ATTEN2,                        EFUSE_BLK2, 188,  10, [] Average initcode of ADC2 atten2
-ADC2_AVE_INITCODE_ATTEN3,                        EFUSE_BLK2, 198,  10, [] Average initcode of ADC2 atten3
-ADC1_HI_DOUT_ATTEN0,                             EFUSE_BLK2, 208,  10, [] HI_DOUT of ADC1 atten0
-ADC1_HI_DOUT_ATTEN1,                             EFUSE_BLK2, 218,  10, [] HI_DOUT of ADC1 atten1
-ADC1_HI_DOUT_ATTEN2,                             EFUSE_BLK2, 228,  10, [] HI_DOUT of ADC1 atten2
-ADC1_HI_DOUT_ATTEN3,                             EFUSE_BLK2, 238,  10, [] HI_DOUT of ADC1 atten3
 USER_DATA,                                       EFUSE_BLK3,   0, 256, [BLOCK_USR_DATA] User data
 USER_DATA.MAC_CUSTOM,                            EFUSE_BLK3, 200,  48, [MAC_CUSTOM CUSTOM_MAC] Custom MAC
 KEY0,                                            EFUSE_BLK4,   0, 256, [BLOCK_KEY0] Key0 or user data
@@ -280,22 +186,4 @@ KEY2,                                            EFUSE_BLK6,   0, 256, [BLOCK_KE
 KEY3,                                            EFUSE_BLK7,   0, 256, [BLOCK_KEY3] Key3 or user data
 KEY4,                                            EFUSE_BLK8,   0, 256, [BLOCK_KEY4] Key4 or user data
 KEY5,                                            EFUSE_BLK9,   0, 256, [BLOCK_KEY5] Key5 or user data
-ADC2_HI_DOUT_ATTEN0,                             EFUSE_BLK10,   0,  10, [] HI_DOUT of ADC2 atten0
-ADC2_HI_DOUT_ATTEN1,                             EFUSE_BLK10,  10,  10, [] HI_DOUT of ADC2 atten1
-ADC2_HI_DOUT_ATTEN2,                             EFUSE_BLK10,  20,  10, [] HI_DOUT of ADC2 atten2
-ADC2_HI_DOUT_ATTEN3,                             EFUSE_BLK10,  30,  10, [] HI_DOUT of ADC2 atten3
-ADC1_CH0_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK10,  40,   4, [] Gap between ADC1_ch0 and average initcode
-ADC1_CH1_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK10,  44,   4, [] Gap between ADC1_ch1 and average initcode
-ADC1_CH2_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK10,  48,   4, [] Gap between ADC1_ch2 and average initcode
-ADC1_CH3_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK10,  52,   4, [] Gap between ADC1_ch3 and average initcode
-ADC1_CH4_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK10,  56,   4, [] Gap between ADC1_ch4 and average initcode
-ADC1_CH5_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK10,  60,   4, [] Gap between ADC1_ch5 and average initcode
-ADC1_CH6_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK10,  64,   4, [] Gap between ADC1_ch6 and average initcode
-ADC1_CH7_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK10,  68,   4, [] Gap between ADC1_ch7 and average initcode
-ADC2_CH0_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK10,  72,   4, [] Gap between ADC2_ch0 and average initcode
-ADC2_CH1_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK10,  76,   4, [] Gap between ADC2_ch1 and average initcode
-ADC2_CH2_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK10,  80,   4, [] Gap between ADC2_ch2 and average initcode
-ADC2_CH3_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK10,  84,   4, [] Gap between ADC2_ch3 and average initcode
-ADC2_CH4_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK10,  88,   4, [] Gap between ADC2_ch4 and average initcode
-ADC2_CH5_ATTEN0_INITCODE_DIFF,                   EFUSE_BLK10,  92,   4, [] Gap between ADC2_ch5 and average initcode
-TEMPERATURE_SENSOR,                              EFUSE_BLK10,  96,   9, [] Temperature calibration data
+SYS_DATA_PART2,                                  EFUSE_BLK10,   0, 256, [BLOCK_SYS_DATA2] System data part 2 (reserved)
--- a/components/efuse/esp32p4/include/esp_efuse_table.h
+++ b/components/efuse/esp32p4/include/esp_efuse_table.h
@@ -10,7 +10,7 @@ extern "C" {

 #include "esp_efuse.h"

-// md5_digest_table c56ed98dde7a08c8f70d57a01faba96a
+// md5_digest_table 0d4e1f49db99de4dd9d3eac8d8e6078b
 // This file was generated from the file esp_efuse_table.csv. DO NOT CHANGE THIS FILE MANUALLY.
 // If you want to change some fields, you need to change esp_efuse_table.csv file
 // then run `efuse_common_table` or `efuse_custom_table` command it will generate this file.
@@ -92,35 +92,7 @@ extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_TEMP[];
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_PSRAM_VENDOR[];
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_PKG_VERSION[];
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_SYS_DATA_PART1[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_LDO_VO1_DREF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_LDO_VO2_DREF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_LDO_VO1_MUL[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_LDO_VO2_MUL[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_LDO_VO3_K[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_LDO_VO3_VOS[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_LDO_VO3_C[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_LDO_VO4_K[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_LDO_VO4_VOS[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_LDO_VO4_C[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ACTIVE_HP_DBIAS[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ACTIVE_LP_DBIAS[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_LSLP_HP_DBIAS[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_DSLP_DBG[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_DSLP_LP_DBIAS[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_LP_DCDC_DBIAS_VOL_GAP[];
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_OPTIONAL_UNIQUE_ID[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_AVE_INITCODE_ATTEN0[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_AVE_INITCODE_ATTEN1[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_AVE_INITCODE_ATTEN2[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_AVE_INITCODE_ATTEN3[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC2_AVE_INITCODE_ATTEN0[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC2_AVE_INITCODE_ATTEN1[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC2_AVE_INITCODE_ATTEN2[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC2_AVE_INITCODE_ATTEN3[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_HI_DOUT_ATTEN0[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_HI_DOUT_ATTEN1[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_HI_DOUT_ATTEN2[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_HI_DOUT_ATTEN3[];
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_BLOCK_USR_DATA[];
 #define ESP_EFUSE_WR_DIS_USER_DATA ESP_EFUSE_WR_DIS_BLOCK_USR_DATA
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_CUSTOM_MAC[];
@@ -140,25 +112,6 @@ extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_BLOCK_KEY5[];
 #define ESP_EFUSE_WR_DIS_KEY5 ESP_EFUSE_WR_DIS_BLOCK_KEY5
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_BLOCK_SYS_DATA2[];
 #define ESP_EFUSE_WR_DIS_SYS_DATA_PART2 ESP_EFUSE_WR_DIS_BLOCK_SYS_DATA2
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC2_HI_DOUT_ATTEN0[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC2_HI_DOUT_ATTEN1[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC2_HI_DOUT_ATTEN2[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC2_HI_DOUT_ATTEN3[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH0_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH1_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH2_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH3_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH4_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH5_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH6_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC1_CH7_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC2_CH0_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC2_CH1_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC2_CH2_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC2_CH3_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC2_CH4_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_ADC2_CH5_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_TEMPERATURE_SENSOR[];
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_USB_DEVICE_EXCHG_PINS[];
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_USB_OTG11_EXCHG_PINS[];
 extern const esp_efuse_desc_t* ESP_EFUSE_WR_DIS_USB_PHY_SEL[];
@@ -178,25 +131,6 @@ extern const esp_efuse_desc_t* ESP_EFUSE_RD_DIS_BLOCK_KEY5[];
 #define ESP_EFUSE_RD_DIS_KEY5 ESP_EFUSE_RD_DIS_BLOCK_KEY5
 extern const esp_efuse_desc_t* ESP_EFUSE_RD_DIS_BLOCK_SYS_DATA2[];
 #define ESP_EFUSE_RD_DIS_SYS_DATA_PART2 ESP_EFUSE_RD_DIS_BLOCK_SYS_DATA2
-extern const esp_efuse_desc_t* ESP_EFUSE_RD_DIS_ADC2_HI_DOUT_ATTEN0[];
-extern const esp_efuse_desc_t* ESP_EFUSE_RD_DIS_ADC2_HI_DOUT_ATTEN1[];
-extern const esp_efuse_desc_t* ESP_EFUSE_RD_DIS_ADC2_HI_DOUT_ATTEN2[];
-extern const esp_efuse_desc_t* ESP_EFUSE_RD_DIS_ADC2_HI_DOUT_ATTEN3[];
-extern const esp_efuse_desc_t* ESP_EFUSE_RD_DIS_ADC1_CH0_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_RD_DIS_ADC1_CH1_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_RD_DIS_ADC1_CH2_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_RD_DIS_ADC1_CH3_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_RD_DIS_ADC1_CH4_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_RD_DIS_ADC1_CH5_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_RD_DIS_ADC1_CH6_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_RD_DIS_ADC1_CH7_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_RD_DIS_ADC2_CH0_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_RD_DIS_ADC2_CH1_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_RD_DIS_ADC2_CH2_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_RD_DIS_ADC2_CH3_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_RD_DIS_ADC2_CH4_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_RD_DIS_ADC2_CH5_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_RD_DIS_TEMPERATURE_SENSOR[];
 extern const esp_efuse_desc_t* ESP_EFUSE_USB_DEVICE_EXCHG_PINS[];
 extern const esp_efuse_desc_t* ESP_EFUSE_USB_OTG11_EXCHG_PINS[];
 extern const esp_efuse_desc_t* ESP_EFUSE_DIS_USB_JTAG[];
@@ -275,35 +209,7 @@ extern const esp_efuse_desc_t* ESP_EFUSE_PSRAM_CAP[];
 extern const esp_efuse_desc_t* ESP_EFUSE_TEMP[];
 extern const esp_efuse_desc_t* ESP_EFUSE_PSRAM_VENDOR[];
 extern const esp_efuse_desc_t* ESP_EFUSE_PKG_VERSION[];
-extern const esp_efuse_desc_t* ESP_EFUSE_LDO_VO1_DREF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_LDO_VO2_DREF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_LDO_VO1_MUL[];
-extern const esp_efuse_desc_t* ESP_EFUSE_LDO_VO2_MUL[];
-extern const esp_efuse_desc_t* ESP_EFUSE_LDO_VO3_K[];
-extern const esp_efuse_desc_t* ESP_EFUSE_LDO_VO3_VOS[];
-extern const esp_efuse_desc_t* ESP_EFUSE_LDO_VO3_C[];
-extern const esp_efuse_desc_t* ESP_EFUSE_LDO_VO4_K[];
-extern const esp_efuse_desc_t* ESP_EFUSE_LDO_VO4_VOS[];
-extern const esp_efuse_desc_t* ESP_EFUSE_LDO_VO4_C[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ACTIVE_HP_DBIAS[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ACTIVE_LP_DBIAS[];
-extern const esp_efuse_desc_t* ESP_EFUSE_LSLP_HP_DBIAS[];
-extern const esp_efuse_desc_t* ESP_EFUSE_DSLP_DBG[];
-extern const esp_efuse_desc_t* ESP_EFUSE_DSLP_LP_DBIAS[];
-extern const esp_efuse_desc_t* ESP_EFUSE_LP_DCDC_DBIAS_VOL_GAP[];
 extern const esp_efuse_desc_t* ESP_EFUSE_OPTIONAL_UNIQUE_ID[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_AVE_INITCODE_ATTEN0[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_AVE_INITCODE_ATTEN1[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_AVE_INITCODE_ATTEN2[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_AVE_INITCODE_ATTEN3[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC2_AVE_INITCODE_ATTEN0[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC2_AVE_INITCODE_ATTEN1[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC2_AVE_INITCODE_ATTEN2[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC2_AVE_INITCODE_ATTEN3[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_HI_DOUT_ATTEN0[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_HI_DOUT_ATTEN1[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_HI_DOUT_ATTEN2[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_HI_DOUT_ATTEN3[];
 extern const esp_efuse_desc_t* ESP_EFUSE_USER_DATA[];
 #define ESP_EFUSE_BLOCK_USR_DATA ESP_EFUSE_USER_DATA
 extern const esp_efuse_desc_t* ESP_EFUSE_USER_DATA_MAC_CUSTOM[];
@@ -321,25 +227,8 @@ extern const esp_efuse_desc_t* ESP_EFUSE_KEY4[];
 #define ESP_EFUSE_BLOCK_KEY4 ESP_EFUSE_KEY4
 extern const esp_efuse_desc_t* ESP_EFUSE_KEY5[];
 #define ESP_EFUSE_BLOCK_KEY5 ESP_EFUSE_KEY5
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC2_HI_DOUT_ATTEN0[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC2_HI_DOUT_ATTEN1[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC2_HI_DOUT_ATTEN2[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC2_HI_DOUT_ATTEN3[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH0_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH1_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH2_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH3_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH4_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH5_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH6_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC1_CH7_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC2_CH0_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC2_CH1_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC2_CH2_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC2_CH3_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC2_CH4_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_ADC2_CH5_ATTEN0_INITCODE_DIFF[];
-extern const esp_efuse_desc_t* ESP_EFUSE_TEMPERATURE_SENSOR[];
+extern const esp_efuse_desc_t* ESP_EFUSE_SYS_DATA_PART2[];
+#define ESP_EFUSE_BLOCK_SYS_DATA2 ESP_EFUSE_SYS_DATA_PART2

 #ifdef __cplusplus
 }
--- a/components/esp_adc/adc_continuous.c
+++ b/components/esp_adc/adc_continuous.c
@@ -294,22 +294,6 @@ esp_err_t adc_continuous_start(adc_continuous_handle_t handle)
    }
 #endif  //#if SOC_ADC_ARBITER_SUPPORTED

-#if SOC_ADC_MONITOR_SUPPORTED
-    adc_ll_digi_monitor_clear_intr();
-    for (int i = 0; i < SOC_ADC_DIGI_MONITOR_NUM; i++) {
-        adc_monitor_t *monitor_ctx = handle->adc_monitor[i];
-        if (monitor_ctx) {
-            // config monitor hardware
-            adc_hal_digi_monitor_set_thres(monitor_ctx->monitor_id, monitor_ctx->config.adc_unit, monitor_ctx->config.channel, monitor_ctx->config.h_threshold, monitor_ctx->config.l_threshold);
-            // if monitor not enabled now, just using monitor api later
-            if (monitor_ctx->fsm == ADC_MONITOR_FSM_ENABLED) {
-                // restore the started FSM
-                adc_ll_digi_monitor_user_start(monitor_ctx->monitor_id, ((monitor_ctx->config.h_threshold >= 0) || (monitor_ctx->config.l_threshold >= 0)));
-            }
-        }
-    }
-#endif  //#if SOC_ADC_MONITOR_SUPPORTED
-
    if (handle->use_adc1) {
        adc_hal_set_controller(ADC_UNIT_1, ADC_HAL_CONTINUOUS_READ_MODE);
    }
--- a/components/esp_adc/adc_monitor.c
+++ b/components/esp_adc/adc_monitor.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
 *
 * SPDX-License-Identifier: Apache-2.0
 */
@@ -173,6 +173,10 @@ esp_err_t adc_new_continuous_monitor(adc_continuous_handle_t handle, const adc_m
        ESP_GOTO_ON_ERROR(adc_monitor_intr_alloc(), intr_err, MNTOR_TAG, "esp intr alloc failed");
    }

+    // config hardware
+    adc_ll_digi_monitor_clear_intr();
+    adc_ll_digi_monitor_set_thres(monitor_ctx->monitor_id, monitor_ctx->config.adc_unit, monitor_ctx->config.channel, monitor_ctx->config.h_threshold, monitor_ctx->config.l_threshold);
+
    *ret_handle = monitor_ctx;
    return ESP_OK;

@@ -187,6 +191,7 @@ esp_err_t adc_continuous_monitor_register_event_callbacks(adc_monitor_handle_t m
 {
    ESP_RETURN_ON_FALSE(monitor_handle && cbs, ESP_ERR_INVALID_ARG, MNTOR_TAG, "invalid argument: null pointer");
    ESP_RETURN_ON_FALSE(monitor_handle->fsm == ADC_MONITOR_FSM_INIT, ESP_ERR_INVALID_STATE, MNTOR_TAG, "monitor should be in init state");
+    ESP_RETURN_ON_FALSE(!(monitor_handle->cbs.on_over_high_thresh || monitor_handle->cbs.on_below_low_thresh), ESP_ERR_INVALID_STATE, MNTOR_TAG, "callbacks had been registered");
 #if CONFIG_IDF_TARGET_ESP32S2
    ESP_RETURN_ON_FALSE(!(cbs->on_below_low_thresh && cbs->on_over_high_thresh), ESP_ERR_NOT_SUPPORTED, MNTOR_TAG, "ESP32S2 support only one threshold");
 #endif
@@ -211,31 +216,45 @@ esp_err_t adc_continuous_monitor_register_event_callbacks(adc_monitor_handle_t m

 esp_err_t adc_continuous_monitor_enable(adc_monitor_handle_t monitor_handle)
 {
-    ESP_RETURN_ON_FALSE_ISR(monitor_handle, ESP_ERR_INVALID_ARG, MNTOR_TAG, "invalid argument: null pointer");
-    ESP_RETURN_ON_FALSE_ISR(monitor_handle->fsm == ADC_MONITOR_FSM_INIT, ESP_ERR_INVALID_STATE, MNTOR_TAG, "monitor should be in init state");
+    ESP_RETURN_ON_FALSE(monitor_handle, ESP_ERR_INVALID_ARG, MNTOR_TAG, "invalid argument: null pointer");
+    ESP_RETURN_ON_FALSE(monitor_handle->fsm == ADC_MONITOR_FSM_INIT, ESP_ERR_INVALID_STATE, MNTOR_TAG, "monitor should be in init state");

-    // start monitor
-    adc_ll_digi_monitor_user_start(monitor_handle->monitor_id, ((monitor_handle->config.h_threshold >= 0) || (monitor_handle->config.l_threshold >= 0)));
+    // enable peripheral intr_ena
+    if ((monitor_handle->config.h_threshold >= 0)) {
+        adc_ll_digi_monitor_enable_intr(monitor_handle->monitor_id, ADC_MONITOR_MODE_HIGH, true);
+    }
+    if ((monitor_handle->config.l_threshold >= 0)) {
+        adc_ll_digi_monitor_enable_intr(monitor_handle->monitor_id, ADC_MONITOR_MODE_LOW, true);
+    }
+
+    adc_ll_digi_monitor_user_start(monitor_handle->monitor_id, true);
    monitor_handle->fsm = ADC_MONITOR_FSM_ENABLED;
-    return ESP_OK;
+    return esp_intr_enable(s_adc_monitor_platform.monitor_intr_handle);
 }

 esp_err_t adc_continuous_monitor_disable(adc_monitor_handle_t monitor_handle)
 {
-    ESP_RETURN_ON_FALSE_ISR(monitor_handle, ESP_ERR_INVALID_ARG, MNTOR_TAG, "invalid argument: null pointer");
-    ESP_RETURN_ON_FALSE_ISR(monitor_handle->fsm == ADC_MONITOR_FSM_ENABLED, ESP_ERR_INVALID_STATE, MNTOR_TAG, "monitor not in running");
+    ESP_RETURN_ON_FALSE(monitor_handle, ESP_ERR_INVALID_ARG, MNTOR_TAG, "invalid argument: null pointer");
+    ESP_RETURN_ON_FALSE(monitor_handle->fsm == ADC_MONITOR_FSM_ENABLED, ESP_ERR_INVALID_STATE, MNTOR_TAG, "monitor not in running");
+
+    // disable peripheral intr_ena
+    if ((monitor_handle->config.h_threshold >= 0)) {
+        adc_ll_digi_monitor_enable_intr(monitor_handle->monitor_id, ADC_MONITOR_MODE_HIGH, false);
+    }
+    if ((monitor_handle->config.l_threshold >= 0)) {
+        adc_ll_digi_monitor_enable_intr(monitor_handle->monitor_id, ADC_MONITOR_MODE_LOW, false);
+    }

-    // stop monitor
    adc_ll_digi_monitor_user_start(monitor_handle->monitor_id, false);
    monitor_handle->fsm = ADC_MONITOR_FSM_INIT;
-    return ESP_OK;
+    return esp_intr_disable(s_adc_monitor_platform.monitor_intr_handle);
 }

 esp_err_t adc_del_continuous_monitor(adc_monitor_handle_t monitor_handle)
 {
    ESP_RETURN_ON_FALSE(monitor_handle, ESP_ERR_INVALID_ARG, MNTOR_TAG, "invalid argument: null pointer");
    ESP_RETURN_ON_FALSE((monitor_handle->fsm == ADC_MONITOR_FSM_INIT) && (s_adc_monitor_platform.continuous_ctx->fsm == ADC_FSM_INIT), \
-                        ESP_ERR_INVALID_STATE, MNTOR_TAG, "monitor and ADC continuous driver should all stopped");
+                        ESP_ERR_INVALID_STATE, MNTOR_TAG, "monitor and ADC continuous driver should all be in init state");
    ESP_RETURN_ON_ERROR(s_adc_monitor_release(monitor_handle), MNTOR_TAG, "monitor not find or isn't in use");

    for (int i = 0; i < SOC_ADC_DIGI_MONITOR_NUM; i++) {
@@ -246,7 +265,7 @@ esp_err_t adc_del_continuous_monitor(adc_monitor_handle_t monitor_handle)
        }
    }

-    // If no monitor is using, then release intr handle as well
+    // If no monitor is using, the release intr handle as well
    ESP_RETURN_ON_ERROR(esp_intr_free(s_adc_monitor_platform.monitor_intr_handle), MNTOR_TAG, "esp intr release failed\n");
    s_adc_monitor_platform.monitor_intr_handle = NULL;
    free(monitor_handle);
--- a/components/esp_adc/include/esp_adc/adc_monitor.h
+++ b/components/esp_adc/include/esp_adc/adc_monitor.h
@@ -65,8 +65,7 @@ typedef struct {
 esp_err_t adc_new_continuous_monitor(adc_continuous_handle_t handle, const adc_monitor_config_t *monitor_cfg, adc_monitor_handle_t *ret_handle);

 /**
- * @brief Register/Unregister threshold interrupt callbacks for allocated monitor.
- *        Passing `cbs` contain the NULL `over_high/below_low` will unregister relative callbacks.
+ * @brief Register threshold interrupt callbacks for allocated monitor.
 *
 * @param[in]  monitor_handle       Monitor handle
 * @param[in]  cbs                  Pointer to a adc_monitor_evt_cbs_t struct
--- a/components/esp_adc/test_apps/adc/main/test_adc.c
+++ b/components/esp_adc/test_apps/adc/main/test_adc.c
@@ -382,6 +382,9 @@ TEST_CASE("ADC continuous monitor init_deinit", "[adc]")
    TEST_ESP_OK(adc_del_continuous_monitor(monitor_handle_2));
    TEST_ESP_ERR(ESP_ERR_INVALID_ARG, adc_del_continuous_monitor(monitor_handle_3));

+    //try register cbs again
+    TEST_ESP_ERR(ESP_ERR_INVALID_STATE, adc_continuous_monitor_register_event_callbacks(monitor_handle, &monitor_cb, &monitor_cb));
+
    //try delete it when adc is running but monitor not running
    TEST_ESP_OK(adc_continuous_start(handle));
    TEST_ESP_ERR(ESP_ERR_INVALID_STATE, adc_del_continuous_monitor(monitor_handle));
@@ -397,8 +400,23 @@ TEST_CASE("ADC continuous monitor init_deinit", "[adc]")
    TEST_ESP_OK(adc_continuous_deinit(handle));
 }

-#if SOC_ADC_CALIBRATION_V1_SUPPORTED
-#define TEST_ADC_CHANNEL    ADC_CHANNEL_0
+/**
+ * NOTE: To run this special feature test case, you need wire ADC channel pin you want to monit
+ *       to a wave output pin defined below.
+ *
+ *       +---------+
+ *       |         |
+ *       |    (adc)|------------+
+ *       |         |            |
+ *       |   (wave)|------------+
+ *       |         |
+ *       |  ESP32  |
+ *       +---------+
+ *
+ *       or you can connect your signals from signal generator to ESP32 pin which you monitoring
+ **/
+#define TEST_ADC_CHANNEL    ADC_CHANNEL_0   //GPIO_1
+#define TEST_WAVE_OUT_PIN   GPIO_NUM_2      //GPIO_2
 static uint32_t m1h_cnt, m1l_cnt;

 bool IRAM_ATTR m1h_cb(adc_monitor_handle_t monitor_handle, const adc_monitor_evt_data_t *event_data, void *user_data)
@@ -411,7 +429,7 @@ bool IRAM_ATTR m1l_cb(adc_monitor_handle_t monitor_handle, const adc_monitor_evt
    m1l_cnt ++;
    return false;
 }
-TEST_CASE("ADC continuous monitor functionary", "[adc]")
+TEST_CASE("ADC continuous monitor functionary", "[adc][manual][ignore]")
 {
    adc_continuous_handle_t handle = NULL;
    adc_continuous_handle_cfg_t adc_config = {
@@ -444,9 +462,9 @@ TEST_CASE("ADC continuous monitor functionary", "[adc]")
 #if CONFIG_IDF_TARGET_ESP32S2
        .h_threshold = -1,      //S2 support only one threshold for one monitor
 #else
-        .h_threshold = ADC_TEST_HIGH_VAL_DMA - (ADC_TEST_HIGH_VAL_DMA - ADC_TEST_LOW_VAL) / 4,
+        .h_threshold = 3000,
 #endif
-        .l_threshold = ADC_TEST_LOW_VAL + (ADC_TEST_HIGH_VAL_DMA - ADC_TEST_LOW_VAL) / 4,
+        .l_threshold = 1000,
    };
    adc_monitor_evt_cbs_t monitor_cb = {
 #if !CONFIG_IDF_TARGET_ESP32S2
@@ -456,40 +474,35 @@ TEST_CASE("ADC continuous monitor functionary", "[adc]")
    };
    TEST_ESP_OK(adc_new_continuous_monitor(handle, &adc_monitor_cfg, &monitor_handle));
    TEST_ESP_OK(adc_continuous_monitor_register_event_callbacks(monitor_handle, &monitor_cb, NULL));
+
+    //config a pin to generate wave
+    gpio_config_t gpio_cfg = {
+        .pin_bit_mask = (1ULL << TEST_WAVE_OUT_PIN),
+        .mode = GPIO_MODE_INPUT_OUTPUT,
+        .pull_up_en = GPIO_PULLDOWN_ENABLE,
+    };
+    TEST_ESP_OK(gpio_config(&gpio_cfg));
+
    TEST_ESP_OK(adc_continuous_monitor_enable(monitor_handle));
    TEST_ESP_OK(adc_continuous_start(handle));

-    int adc_io;
-    adc_continuous_channel_to_io(ADC_UNIT_1, TEST_ADC_CHANNEL, &adc_io);
-    printf("Using ADC_CHANNEL_%d on GPIO%d\n", TEST_ADC_CHANNEL, adc_io);
-
-    // Test with internal gpio pull up/down, detail and order refer to `gpio_pull_mode_t`
-    // pull_up + pull_down to get half ADC convert
    for (uint8_t i = 0; i < 8; i++) {
-        int pull_mode = i % GPIO_FLOATING;
-        gpio_set_pull_mode(adc_io, pull_mode);
-        vTaskDelay(10); // wait some time for GPIO level be stable
-        m1h_cnt = 0;
-        m1l_cnt = 0;
-        vTaskDelay(1000);   //time to count monitor interrupt
-        printf("%d\t %s\t high_cnt %4ld\tlow_cnt %4ld\n", i, (pull_mode == 0) ? "up  " : (pull_mode == 1) ? "down" : "mid ", m1h_cnt, m1l_cnt);
+        vTaskDelay(1000);

-        switch (pull_mode) {
-        case GPIO_PULLUP_ONLY:
+        // check monitor cb
+        printf("%d\t high_cnt %4ld\tlow_cnt %4ld\n", i, m1h_cnt, m1l_cnt);
+        if (gpio_get_level(TEST_WAVE_OUT_PIN)) {
 #if !CONFIG_IDF_TARGET_ESP32S2
-            TEST_ASSERT_UINT32_WITHIN(SOC_ADC_SAMPLE_FREQ_THRES_LOW * 0.1, SOC_ADC_SAMPLE_FREQ_THRES_LOW, m1h_cnt);
-            TEST_ASSERT_EQUAL(0, m1l_cnt);  //low limit should NOT triggrted when pull_up
+            // TEST_ASSERT_UINT32_WITHIN(SOC_ADC_SAMPLE_FREQ_THRES_LOW*0.1, SOC_ADC_SAMPLE_FREQ_THRES_LOW, m1h_cnt);
+            // TEST_ASSERT_LESS_THAN_UINT32(5, m1l_cnt);   //Actually, it will still encountered 1~2 times because hardware run very quickly
 #endif
-            break;
-        case GPIO_PULLDOWN_ONLY:
+            m1h_cnt = 0;
+            gpio_set_level(TEST_WAVE_OUT_PIN, 0);
+        } else {
            TEST_ASSERT_UINT32_WITHIN(SOC_ADC_SAMPLE_FREQ_THRES_LOW * 0.1, SOC_ADC_SAMPLE_FREQ_THRES_LOW, m1l_cnt);
-            TEST_ASSERT_EQUAL(0, m1h_cnt);
-            break;
-        case GPIO_PULLUP_PULLDOWN:
-            TEST_ASSERT_EQUAL(0, m1h_cnt);  //half votage, both limit should NOT triggered
-            TEST_ASSERT_EQUAL(0, m1l_cnt);
-            break;
-        default: printf("unknown gpio pull mode !!!\n");
+            TEST_ASSERT_LESS_THAN_UINT32(5, m1h_cnt);   //Actually, it will still encountered 1~2 times because hardware run very quickly
+            m1l_cnt = 0;
+            gpio_set_level(TEST_WAVE_OUT_PIN, 1);
        }
    }
    TEST_ESP_OK(adc_continuous_stop(handle));
@@ -497,5 +510,5 @@ TEST_CASE("ADC continuous monitor functionary", "[adc]")
    TEST_ESP_OK(adc_del_continuous_monitor(monitor_handle));
    TEST_ESP_OK(adc_continuous_deinit(handle));
 }
-#endif  //SOC_ADC_CALIBRATION_V1_SUPPORTED
+
 #endif  //SOC_ADC_MONITOR_SUPPORTED && CONFIG_SOC_ADC_DMA_SUPPORTED
--- a/components/esp_app_format/esp_app_desc.c
+++ b/components/esp_app_format/esp_app_desc.c
@@ -59,7 +59,6 @@ const __attribute__((weak)) __attribute__((section(".rodata_desc")))  esp_app_de
 #endif
    .min_efuse_blk_rev_full = CONFIG_ESP_EFUSE_BLOCK_REV_MIN_FULL,
    .max_efuse_blk_rev_full = CONFIG_ESP_EFUSE_BLOCK_REV_MAX_FULL,
-    .mmu_page_size = 31 - __builtin_clz(CONFIG_MMU_PAGE_SIZE),
 };

 #ifndef CONFIG_APP_EXCLUDE_PROJECT_VER_VAR
--- a/components/esp_app_format/include/esp_app_desc.h
+++ b/components/esp_app_format/include/esp_app_desc.h
@@ -35,9 +35,7 @@ typedef struct {
    uint8_t app_elf_sha256[32]; /*!< sha256 of elf file */
    uint16_t min_efuse_blk_rev_full; /*!< Minimal eFuse block revision supported by image, in format: major * 100 + minor */
    uint16_t max_efuse_blk_rev_full; /*!< Maximal eFuse block revision supported by image, in format: major * 100 + minor */
-    uint8_t mmu_page_size;      /*!< MMU page size in log base 2 format */
-    uint8_t reserv3[3];         /*!< reserv3 */
-    uint32_t reserv2[18];       /*!< reserv2 */
+    uint32_t reserv2[19];       /*!< reserv2 */
 } esp_app_desc_t;

 /** @cond */
--- a/components/esp_coex/include/esp_coex_i154.h
+++ b/components/esp_coex/include/esp_coex_i154.h
@@ -18,8 +18,6 @@ typedef enum {
 void esp_coex_ieee802154_txrx_pti_set(ieee802154_coex_event_t event);
 void esp_coex_ieee802154_ack_pti_set(ieee802154_coex_event_t event);
 void esp_coex_ieee802154_coex_break_notify(void);
-void esp_coex_ieee802154_extcoex_tx_stage(void);
-void esp_coex_ieee802154_extcoex_rx_stage(void);
 #endif

 #endif
--- a/Show More
+++ b/Show More