Skip to content

Commit 18eee1d

Browse files
author
Konstantin Kondrashov
committed
Merge branch 'feat/esp_timer_systimer_h4_support' into 'master'
feat(systimer): Support systimer/esp_timer/OS tick for esp32h4 Closes IDF-12375, IDF-12377, and IDF-12327 See merge request espressif/esp-idf!43613
2 parents 26a01e8 + 0084024 commit 18eee1d

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

components/hal/esp32h4/include/hal/systimer_ll.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
#include "soc/pcr_struct.h"
1313
#include "hal/assert.h"
1414

15-
//TODO: [ESP32H4] IDF-12375 inherited from verification branch, need check
16-
1715
#ifdef __cplusplus
1816
extern "C" {
1917
#endif

components/soc/esp32h4/include/soc/soc_caps.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
#define SOC_GPSPI_SUPPORTED 1
6262
#define SOC_LEDC_SUPPORTED 1
6363
#define SOC_I2C_SUPPORTED 1
64-
#define SOC_SYSTIMER_SUPPORTED 1 // TODO: [ESP32H4] IDF-12375 IDF-12377
64+
#define SOC_SYSTIMER_SUPPORTED 1
6565
// #define SOC_SUPPORT_COEXISTENCE 1 // TODO: [ESP32H4] IDF-12251 IDF-12252 IDF-12253
6666
// #define SOC_AES_SUPPORTED 0 // TODO: [ESP32H4] IDF-12266
6767
// #define SOC_SHA_SUPPORTED 1 // TODO: [ESP32H4] IDF-12263

0 commit comments

Comments
 (0)