Skip to content

Commit c843c2c

Browse files
Merge branch 'feat/apm_api_esp32c61' into 'master'
feat(APM): Add APM APIs for ESP32-C61 See merge request espressif/esp-idf!33567
2 parents 9b3eda0 + b4749b8 commit c843c2c

File tree

6 files changed

+421
-15
lines changed

6 files changed

+421
-15
lines changed

components/bootloader_support/src/bootloader_mem.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616
#include "hal/apm_hal.h"
1717
#endif
1818

19-
#if CONFIG_IDF_TARGET_ESP32C61 // TODO: IDF-9230 Remove the workaround when APM supported on C61!
20-
#include "soc/hp_apm_reg.h"
21-
#include "soc/lp_apm_reg.h"
22-
#endif
23-
24-
2519
void bootloader_init_mem(void)
2620
{
2721

@@ -38,13 +32,6 @@ void bootloader_init_mem(void)
3832
#endif
3933
#endif
4034

41-
#if CONFIG_IDF_TARGET_ESP32C61 // TODO: IDF-9230 Remove the workaround when APM supported on C61!
42-
// disable apm filter
43-
REG_WRITE(LP_APM_FUNC_CTRL_REG, 0);
44-
REG_WRITE(HP_APM_FUNC_CTRL_REG, 0);
45-
#endif
46-
47-
4835
#ifdef CONFIG_BOOTLOADER_REGION_PROTECTION_ENABLE
4936
// protect memory region
5037
esp_cpu_configure_region_protection();

0 commit comments

Comments
 (0)