Jiang Jiang Jian
ece337bf04
Merge branch 'fix/ble_mesh_disable_adv_pkt_discard_log_v6.0' into 'release/v6.0'
...
fix(ble_mesh): Disable warning logging when advertising packets are discarded (6.0)
See merge request espressif/esp-idf!50167
2026-07-06 15:13:19 +08:00
Mahavir Jain
aac5a0bb5b
Merge branch 'fix/revert_redundant_rom_pmp_18769_v6.0' into 'release/v6.0'
...
revert(esp_hw_support): Re-add separate D-ROM PMP entry on C6/H2 (v6.0)
See merge request espressif/esp-idf!50360
2026-07-06 10:01:59 +05:30
Island
797d399dee
Merge branch 'fix/ble-log-64-bit-io-setup-support_v6.0' into 'release/v6.0'
...
fix(ble_log): use BIT64 over BIT to support 64-bit IO setup (6.0)
See merge request espressif/esp-idf!50331
2026-07-06 12:22:07 +08:00
Mahavir Jain
dfba68bc53
Merge branch 'fix/aes_dma_psram_encrypted_mem_s31_v6.0' into 'release/v6.0'
...
fix(mbedtls/aes): Fix AES-DMA over encrypted PSRAM on ESP32-S31 (v6.0)
See merge request espressif/esp-idf!50253
2026-07-06 09:48:36 +05:30
Wang Meng Yang
967825b6e2
Merge branch 'bugfix/bbp_issues_v6.0' into 'release/v6.0'
...
Bugfix/bbp issues v6.0
See merge request espressif/esp-idf!50189
2026-07-06 11:16:54 +08:00
Wang Meng Yang
e865ee1b39
Merge branch 'bugfix/hfp_example_ci_v6.0' into 'release/v6.0'
...
fix: Fix the HFP example fails to discovery target device (v6.0)
See merge request espressif/esp-idf!50289
2026-07-06 10:41:33 +08:00
Mahavir Jain
8ac24e9b8b
Merge branch 'fix/fix_psk_hint_key_null_dereference_v6.0' into 'release/v6.0'
...
Fix/fix psk hint key null dereference (v6.0)
See merge request espressif/esp-idf!50322
2026-07-05 20:42:56 +05:30
nilesh.kale
2f8960a8ed
fix(esp_hw_support): Keep D-ROM PMP entry so newer apps boot on old bootloaders
...
ESP32-C6/H2 bootloaders <= v5.2.1 configure and lock PMP entries 3-4 as their
D-ROM region; a locked PMP entry cannot be reconfigured until CPU reset.
Commit 366e4ee944 ("Remove redundant PMP entry for ROM region") dropped the
D-ROM entry, and commit d4167fea60 (which also restructured C6/H2 PMP setup)
then renumbered the regions down, placing the application IRAM/DRAM split on
entries 3-4. On an already-deployed older bootloader those entries are locked,
so IRAM never gains execute permission and the chip resets before app_main()
(GitHub issue #18769 ).
Restore the separate (redundant) D-ROM PMP entry on indices 3-4 so the
application IRAM/DRAM split stays on entries 5-7, clear of the locked range.
This keeps newer applications bootable on older bootloaders.
Closes https://github.com/espressif/esp-idf/issues/18769
2026-07-03 20:57:18 +05:30
Rahul Tank
37e23c5499
Merge branch 'bugfix/queue_att_cmd_v6.0' into 'release/v6.0'
...
feat(nimble): Defer all ATT commands until connection event is sent to GAP layer (v6.0)
See merge request espressif/esp-idf!48177
2026-07-03 16:07:09 +05:30
Mahavir Jain
c65d0bb434
Merge branch 'feat/psa_its_custom_backend_v6.0' into 'release/v6.0'
...
Support custom storage backend for persistent PSA keys (v6.0)
See merge request espressif/esp-idf!48569
2026-07-03 13:45:11 +05:30
Jiang Jiang Jian
039b46f4cc
Merge branch 'backport/backport_some_wifi_changes_260701_v6.0' into 'release/v6.0'
...
backport/backport some wifi changes 260701 v6.0(backport v6.0)
See merge request espressif/esp-idf!50269
2026-07-03 14:12:37 +08:00
Rahul Tank
c79592004e
fix(nimble): Defer Events / ATT related information from stack
...
Defer Events/ ATT related GAP events from stack until connection
event is sent to GAP layer
2026-07-03 11:17:23 +05:30
harshal.patil
275587ea02
feat(mbedtls/psa_esp_rsa_ds): Expose persistent key buffer format/parse helpers
2026-07-03 10:25:49 +05:30
harshal.patil
bac955ae9d
feat(examples/security): Add example to demonstrate the usage of custom key storages with PSA
2026-07-03 10:25:49 +05:30
harshal.patil
3c4586abff
feat(mbedtls): Support custom storage backend for persistent PSA keys
2026-07-03 10:25:48 +05:30
Zhou Xiao
c83fdad6dd
fix(ble_log): use BIT64 over BIT to support 64-bit IO setup
...
(cherry picked from commit a2876d304e )
Co-authored-by: Zhou Xiao <zhouxiao@espressif.com >
2026-07-03 12:04:59 +08:00
Ashish Sharma
e268dbef61
fix(esp-tls): guard against NULL PSK hint to prevent crash
2026-07-03 11:36:22 +08:00
Mahavir Jain
175d0d844b
Merge branch 'fix/align_sw_psa_drivers_and_hw_esp_psa_drivers_v6.0' into 'release/v6.0'
...
Align s/w and h/w PSA drivers (v6.0)
See merge request espressif/esp-idf!49834
2026-07-03 09:01:38 +05:30
morris
1c04de442d
Merge branch 'feature/psram_halfsleep_mode_support_v6.0' into 'release/v6.0'
...
feat(psram): allow PSRAM to enter halfsleep mode during light sleep (v6.0)
See merge request espressif/esp-idf!49759
2026-07-03 11:14:20 +08:00
Island
cd71c5c45d
Merge branch 'change/ble_update_lib_20260610_v6.0' into 'release/v6.0'
...
change(ble): [AUTO_MR] 20260610 - Update ESP BLE Controller Lib (6.0)
See merge request espressif/esp-idf!50226
2026-07-03 00:54:36 +08:00
Mahavir Jain
9879afa944
Merge branch 'contrib/github_pr_17799_v6.0' into 'release/v6.0'
...
feat(esp_http_server): Make HTTP(S)_SERVER_EVENT events optional (GitHub PR) (v6.0)
See merge request espressif/esp-idf!48352
2026-07-02 15:42:45 +05:30
yangfeng
9e5416b346
fix: Fix the HFP example fails to discovery target device
2026-07-02 15:04:48 +08:00
Mahavir Jain
c24aed7baf
Merge branch 'fix/panic_spiram_xip_irom_drom_alignment_no_gap_v6.0' into 'release/v6.0'
...
Handle absent IROM/DROM alignment gap in SPIRAM-XIP memprot tests (v6.0)
See merge request espressif/esp-idf!50234
2026-07-02 11:54:14 +05:30
Hrushikesh Bhosale
725e0b612d
fix(esp_http_server): merge release/v6.0 to resolve backport conflict
...
Merge branch 'release/v6.0' into backport-48352-resolve to resolve a
conflict in esp_httpd_priv.h between this backport's sdkconfig.h
include and the ctrl-socket semaphore's freertos/semphr.h include.
2026-07-02 11:41:38 +05:30
Mahavir Jain
398265cc65
Merge branch 'docs/add_ws_post_handshake_cb_doc_v6.0' into 'release/v6.0'
...
docs(esp_http_server): adds doc and migration entry for ws server post handshake cb (v6.0)
See merge request espressif/esp-idf!49337
2026-07-02 11:38:29 +05:30
yinqingzhao
3f1217869d
fix(wifi): optimizations keep alive mechanism
2026-07-01 20:48:18 +08:00
yinqingzhao
78a04be15e
fix(wifi): comment out functions from ld files
2026-07-01 20:44:32 +08:00
yinqingzhao
ac9384547d
fix(wifi): comment out pm_process_tim from ld files for esp32c61
2026-07-01 20:41:49 +08:00
yinqingzhao
1bb7f45d4d
fix(wifi): fix cache access error in wifi interrupt with psram enabled
2026-07-01 20:41:34 +08:00
yinqingzhao
38cf2d4158
fix(itwt): fix flow id 0 cannot suspend in itwt example
2026-07-01 20:39:41 +08:00
Martin Vychodil
5d62a7febe
Merge branch 'fix/sd_freq_clamping_v6.0' into 'release/v6.0'
...
fix(sdmmc): Handle nonsensical max freq correctly (v6.0)
See merge request espressif/esp-idf!49531
2026-07-01 19:50:46 +08:00
Martin Vychodil
12ca39350a
Merge branch 'test/vfs_fix_register_check_v6.0' into 'release/v6.0'
...
test(vfs): Test changes regarding VFS register incorrect check fix and fix VFS host test not being run at all (v6.0)
See merge request espressif/esp-idf!49946
2026-07-01 19:26:47 +08:00
harshal.patil
bb5025d983
test(mbedtls): move AES test vectors to a dedicated header
2026-07-01 16:32:18 +05:30
harshal.patil
64570337aa
fix(mbedtls/aes): Fix AES-DMA over encrypted PSRAM on ESP32-S31
...
esp_crypto_shared_gdma_done() polled the AXI RX raw interrupt status
(in_done) but never cleared it, so after the first transfer the set bit
made every subsequent call return immediately without waiting.
2026-07-01 16:32:09 +05:30
Adam Múdry
3d85e64b21
test(vfs): Test changes regarding VFS register incorrect check fix
2026-07-01 12:38:58 +02:00
Adam Múdry
28e22036f6
fix(sdmmc): Handle nonsensical max freq correctly
...
Closes https://github.com/espressif/esp-idf/issues/15250
2026-07-01 12:38:45 +02:00
Island
c2632f8363
Merge branch 'feat/support_ble_uart_more_interfaces_v6.0' into 'release/v6.0'
...
feat(bt/ble_uart): Support ble uart more interfaces (6.0)
See merge request espressif/esp-idf!50047
2026-07-01 18:31:10 +08:00
Martin Vychodil
6e17e8cc9b
Merge branch 'bugfix/idfci-8839-remove-orphan-test-configs_v6.0' into 'release/v6.0'
...
fix(fatfs): re-enable fatfs and vfs psram/ccomp CI tests (v6.0)
See merge request espressif/esp-idf!50185
2026-07-01 16:38:14 +08:00
harshal.patil
d11534bfa1
fix(panic): handle absent IROM/DROM alignment gap in spiram-xip memprot tests
...
The spiram-xip IROM/DROM alignment tests assumed the XIP region always
leaves an alignment gap before the next MMU page: they executed into the
gap and expected an instruction access fault followed by a register dump.
When the section ends exactly on an MMU page boundary there is no gap - the
device prints "<IROM/DROM> alignment gap not added into heap" and returns,
the framework restarts cleanly (esp_restart_noos, no panic), and the test
timed out waiting for a register dump.
2026-07-01 11:00:05 +05:30
Rahul Tank
ed076243bb
Merge branch 'contrib/github_pr_18761_v6.0' into 'release/v6.0'
...
fix(nimble): initialize return value in LED characteristic access cal… (GitHub PR) (v6.0)
See merge request espressif/esp-idf!50151
2026-07-01 09:25:33 +05:30
Zhou Xiao
c4743f1d70
change(ble): [AUTO_MR] Update lib_esp32c6 to a6519790
...
(cherry picked from commit 226a0483b1 )
Co-authored-by: Zhou Xiao <zhouxiao@espressif.com >
2026-07-01 10:35:34 +08:00
Zhou Xiao
db5d0803d9
change(ble): [AUTO_MR] Update lib_esp32c5 to a6519790
...
(cherry picked from commit a43358587c )
Co-authored-by: Zhou Xiao <zhouxiao@espressif.com >
2026-07-01 10:35:34 +08:00
Zhou Xiao
5c11f97421
change(ble): [AUTO_MR] Update lib_esp32h2 to a6519790
...
(cherry picked from commit 8a744e8e93 )
Co-authored-by: Zhou Xiao <zhouxiao@espressif.com >
2026-07-01 10:35:33 +08:00
morris
895bf46bd8
Merge branch 'fix/uart_is_enable_check_error_on_s3_v6.0' into 'release/v6.0'
...
Fix ESP32-S3 uart2 is_enabled check error (v6.0)
See merge request espressif/esp-idf!49339
2026-07-01 10:28:44 +08:00
morris
7a627c71ac
Merge branch 'feat/async_color_converter_v6.0' into 'release/v6.0'
...
feat(esp_driver_dma): add async color convert driver (v6.0)
See merge request espressif/esp-idf!49748
2026-07-01 10:25:10 +08:00
Mahavir Jain
93056b5253
Merge branch 'fix/fix_sbv2_psa_algo_check_v6.0' into 'release/v6.0'
...
fix(secure_boot_v2): select correct secure boot algorithm based on key
See merge request espressif/esp-idf!49856
2026-06-30 18:17:45 +05:30
Euripedes Rocha
3a070009e9
Merge branch 'test/lwip_mbedtls_psa_v6.0' into 'release/v6.0'
...
fix(lwip): Fix mbedtls PSA API (v6.0)
See merge request espressif/esp-idf!48827
2026-06-30 14:06:45 +02:00
Jiang Jiang Jian
b6eebf3c8a
Merge branch 'bugfix/mbedtls_rsa_base_reduction_hw_crt_v6.0' into 'release/v6.0'
...
fix(mbedlts): Enable hardware CRT for RSA-4096 via base reduction (v6.0)
See merge request espressif/esp-idf!49850
2026-06-30 19:34:52 +08:00
Wang Meng Yang
5f4062d827
Merge branch 'bugfix/ai_review_btu_common_v6.0' into 'release/v6.0'
...
fix: Fix the critical issues of btu and bt_common from AI review report (v6.0)
See merge request espressif/esp-idf!50122
2026-06-30 19:25:09 +08:00
Martin Vychodil
484cc4f068
Merge branch 'fix/fatfs_instance_init_v6.0' into 'release/v6.0'
...
Fix: various FATFS/VFS fixes (v6.0)
See merge request espressif/esp-idf!50101
2026-06-30 18:07:13 +08:00