Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 03:00:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/move_system_retention_to_esp_hw_support_v6.1' into 'release/v6.1'

Browse Source 
refactor(esp_hw_support): move system_periph_retention from soc to esp_hw_support (v6.1)

See merge request espressif/esp-idf!49749
This commit is contained in:
Jiang Jiang Jian
2026-06-30 14:14:08 +08:00
parent fd79b505d5 3ad4cfebd6
commit d7053ae578
18 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/esp_hw_support/CMakeLists.txt
+2 -1
View File
@@ -78,7 +78,8 @@ if(NOT non_os_build)
)
if(CONFIG_SOC_PAU_SUPPORTED AND CONFIG_SOC_PM_SUPPORT_TOP_PD)
list(APPEND srcs "sleep_system_peripheral.c")
list(APPEND srcs "port/${target}/peripheral_domain_pd.c")
list(APPEND srcs "port/${target}/peripheral_domain_pd.c"
"port/${target}/system_periph_retention.c")
endif()
endif()
components/soc/esp32c5/include/soc/system_periph_retention.h → components/esp_hw_support/port/esp32c5/include/soc/system_periph_retention.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* SPDX-FileCopyrightText: 2023-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
* SPDX-License-Identifier: Apache-2.0
*/
#pragma once
components/soc/esp32c5/system_retention_periph.c → components/esp_hw_support/port/esp32c5/system_periph_retention.c
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
* SPDX-License-Identifier: Apache-2.0
*/
#include "soc/regdma.h"
components/soc/esp32c6/include/soc/system_periph_retention.h → components/esp_hw_support/port/esp32c6/include/soc/system_periph_retention.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
* SPDX-License-Identifier: Apache-2.0
*/
#pragma once
components/soc/esp32c6/system_retention_periph.c → components/esp_hw_support/port/esp32c6/system_periph_retention.c
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
* SPDX-License-Identifier: Apache-2.0
*/
#include "soc/regdma.h"
components/soc/esp32c61/include/soc/system_periph_retention.h → components/esp_hw_support/port/esp32c61/include/soc/system_periph_retention.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* SPDX-FileCopyrightText: 2023-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
* SPDX-License-Identifier: Apache-2.0
*/
#pragma once
components/soc/esp32c61/system_retention_periph.c → components/esp_hw_support/port/esp32c61/system_periph_retention.c
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* SPDX-FileCopyrightText: 2024-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
* SPDX-License-Identifier: Apache-2.0
*/
#include "soc/regdma.h"
components/soc/esp32h2/include/soc/system_periph_retention.h → components/esp_hw_support/port/esp32h2/include/soc/system_periph_retention.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
* SPDX-License-Identifier: Apache-2.0
*/
#pragma once
components/soc/esp32h2/system_retention_periph.c → components/esp_hw_support/port/esp32h2/system_periph_retention.c
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
* SPDX-License-Identifier: Apache-2.0
*/
#include "soc/regdma.h"
components/soc/esp32h21/include/soc/system_periph_retention.h → components/esp_hw_support/port/esp32h21/include/soc/system_periph_retention.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
* SPDX-License-Identifier: Apache-2.0
*/
#pragma once
components/soc/esp32h21/system_retention_periph.c → components/esp_hw_support/port/esp32h21/system_periph_retention.c
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
* SPDX-License-Identifier: Apache-2.0
*/
#include "soc/regdma.h"
components/soc/esp32h4/include/soc/system_periph_retention.h → components/esp_hw_support/port/esp32h4/include/soc/system_periph_retention.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* SPDX-FileCopyrightText: 2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
* SPDX-License-Identifier: Apache-2.0
*/
#pragma once
components/soc/esp32h4/system_retention_periph.c → components/esp_hw_support/port/esp32h4/system_periph_retention.c
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* SPDX-FileCopyrightText: 2025-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
* SPDX-License-Identifier: Apache-2.0
*/
#include "soc/regdma.h"
components/soc/esp32p4/include/soc/system_periph_retention.h → components/esp_hw_support/port/esp32p4/include/soc/system_periph_retention.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* SPDX-FileCopyrightText: 2023-2025 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
* SPDX-License-Identifier: Apache-2.0
*/
#pragma once
components/soc/esp32p4/system_retention_periph.c → components/esp_hw_support/port/esp32p4/system_periph_retention.c
+2 -1
View File
@@ -1,9 +1,10 @@
/*
* SPDX-FileCopyrightText: 2024-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
* SPDX-License-Identifier: Apache-2.0
*/
#include "sdkconfig.h"
#include "soc/cache_reg.h"
#include "soc/gpio_reg.h"
#include "soc/hp_system_reg.h"
components/soc/esp32s31/include/soc/system_periph_retention.h → components/esp_hw_support/port/esp32s31/include/soc/system_periph_retention.h
+1 -1
View File
@@ -1,7 +1,7 @@
/*
* SPDX-FileCopyrightText: 2025-2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
* SPDX-License-Identifier: Apache-2.0
*/
#pragma once
components/soc/esp32s31/system_retention_periph.c → components/esp_hw_support/port/esp32s31/system_periph_retention.c
+2 -1
View File
@@ -1,8 +1,9 @@
/*
* SPDX-FileCopyrightText: 2026 Espressif Systems (Shanghai) CO LTD
*
* SPDX-License-Identifier: Apache-2.0 OR MIT
* SPDX-License-Identifier: Apache-2.0
*/
#include "sdkconfig.h"
#include "soc/cache_reg.h"
#include "soc/gpio_reg.h"
#include "soc/hp_system_reg.h"
components/soc/CMakeLists.txt
-4
View File
@@ -51,10 +51,6 @@ if(CONFIG_SOC_MPI_SUPPORTED)
list(APPEND srcs "${target_folder}/mpi_periph.c")
endif()
if(CONFIG_SOC_PAU_SUPPORTED AND CONFIG_SOC_LIGHT_SLEEP_SUPPORTED AND CONFIG_SOC_PM_SUPPORT_TOP_PD)
list(APPEND srcs "${target_folder}/system_retention_periph.c")
endif()
if(CONFIG_SOC_BOD_SUPPORTED)
list(APPEND srcs "${target_folder}/power_supply_periph.c")
endif()