Skip to content

Commit ce3d603

Browse files
committed
Merge branch 'feature/esp32h21_gdma_support' into 'master'
feat(gdma): add GDMA support for ESP32H21 Closes IDF-11603 and IDF-11604 See merge request espressif/esp-idf!37063
2 parents f028125 + a4a28b5 commit ce3d603

File tree

12 files changed

+964
-296
lines changed

12 files changed

+964
-296
lines changed

components/bootloader_support/src/bootloader_mem.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2020-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -12,14 +12,12 @@
1212
#include "bootloader_mem.h"
1313
#include "esp_cpu.h"
1414

15-
#if SOC_APM_SUPPORTED
1615
#include "hal/apm_hal.h"
17-
#endif
1816

1917
void bootloader_init_mem(void)
2018
{
2119

22-
#if !defined(BOOTLOADER_BUILD) && defined(SOC_APM_SUPPORTED)
20+
#if !defined(BOOTLOADER_BUILD)
2321
/* By default, these access path filters are enable and allow the
2422
* access to masters only if they are in TEE mode. Since all masters
2523
* except HP CPU boots in REE mode, default setting of these filters

0 commit comments

Comments
 (0)