From 556ec3045713b901452cdf83190c775338696906 Mon Sep 17 00:00:00 2001
From: Darian Leung <darian@espressif.com>
Date: Tue, 7 Jun 2022 14:43:52 +0800
Subject: [PATCH] esp_hw_support: Rename cpu_util.c to cpu.c

---
 components/esp_hw_support/CMakeLists.txt                        | 2 +-
 components/esp_hw_support/{cpu_util.c => cpu.c}                 | 0
 components/esp_hw_support/linker.lf                             | 2 +-
 components/esp_hw_support/port/esp32c2/CMakeLists.txt           | 2 +-
 .../port/esp32c2/{cpu_util_esp32c2.c => cpu_esp32c2.c}          | 0
 components/esp_hw_support/port/esp32c3/CMakeLists.txt           | 2 +-
 .../port/esp32c3/{cpu_util_esp32c3.c => cpu_esp32c3.c}          | 0
 components/esp_hw_support/port/esp32h2/CMakeLists.txt           | 2 +-
 .../port/esp32h2/{cpu_util_esp32h2.c => cpu_esp32h2.c}          | 0
 9 files changed, 5 insertions(+), 5 deletions(-)
 rename components/esp_hw_support/{cpu_util.c => cpu.c} (100%)
 rename components/esp_hw_support/port/esp32c2/{cpu_util_esp32c2.c => cpu_esp32c2.c} (100%)
 rename components/esp_hw_support/port/esp32c3/{cpu_util_esp32c3.c => cpu_esp32c3.c} (100%)
 rename components/esp_hw_support/port/esp32h2/{cpu_util_esp32h2.c => cpu_esp32h2.c} (100%)

diff --git a/components/esp_hw_support/CMakeLists.txt b/components/esp_hw_support/CMakeLists.txt
index 0d06027eab..7b7b01192d 100644
--- a/components/esp_hw_support/CMakeLists.txt
+++ b/components/esp_hw_support/CMakeLists.txt
@@ -3,7 +3,7 @@ idf_build_get_property(target IDF_TARGET)
 set(requires soc)
 set(priv_requires efuse spi_flash bootloader_support)
 
-set(srcs "compare_set.c" "cpu_util.c" "esp_memory_utils.c")
+set(srcs "compare_set.c" "cpu.c" "esp_memory_utils.c")
 if(NOT BOOTLOADER_BUILD)
     list(APPEND srcs "esp_async_memcpy.c"
                      "esp_clk.c"
diff --git a/components/esp_hw_support/cpu_util.c b/components/esp_hw_support/cpu.c
similarity index 100%
rename from components/esp_hw_support/cpu_util.c
rename to components/esp_hw_support/cpu.c
diff --git a/components/esp_hw_support/linker.lf b/components/esp_hw_support/linker.lf
index 7f625fd4f4..4621c917fc 100644
--- a/components/esp_hw_support/linker.lf
+++ b/components/esp_hw_support/linker.lf
@@ -1,7 +1,7 @@
 [mapping:esp_hw_support]
 archive: libesp_hw_support.a
 entries:
-    cpu_util (noflash_text)
+    cpu (noflash_text)
     esp_memory_utils (noflash)
     rtc_clk (noflash)
     rtc_init:rtc_vddsdio_set_config (noflash)
diff --git a/components/esp_hw_support/port/esp32c2/CMakeLists.txt b/components/esp_hw_support/port/esp32c2/CMakeLists.txt
index fe4a2d9b59..77c9a4da76 100644
--- a/components/esp_hw_support/port/esp32c2/CMakeLists.txt
+++ b/components/esp_hw_support/port/esp32c2/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(srcs "cpu_util_esp32c2.c"
+set(srcs "cpu_esp32c2.c"
          "rtc_clk_init.c"
          "rtc_clk.c"
          "rtc_init.c"
diff --git a/components/esp_hw_support/port/esp32c2/cpu_util_esp32c2.c b/components/esp_hw_support/port/esp32c2/cpu_esp32c2.c
similarity index 100%
rename from components/esp_hw_support/port/esp32c2/cpu_util_esp32c2.c
rename to components/esp_hw_support/port/esp32c2/cpu_esp32c2.c
diff --git a/components/esp_hw_support/port/esp32c3/CMakeLists.txt b/components/esp_hw_support/port/esp32c3/CMakeLists.txt
index 6809b0567d..5758853398 100644
--- a/components/esp_hw_support/port/esp32c3/CMakeLists.txt
+++ b/components/esp_hw_support/port/esp32c3/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(srcs "cpu_util_esp32c3.c"
+set(srcs "cpu_esp32c3.c"
          "rtc_clk_init.c"
          "rtc_clk.c"
          "rtc_init.c"
diff --git a/components/esp_hw_support/port/esp32c3/cpu_util_esp32c3.c b/components/esp_hw_support/port/esp32c3/cpu_esp32c3.c
similarity index 100%
rename from components/esp_hw_support/port/esp32c3/cpu_util_esp32c3.c
rename to components/esp_hw_support/port/esp32c3/cpu_esp32c3.c
diff --git a/components/esp_hw_support/port/esp32h2/CMakeLists.txt b/components/esp_hw_support/port/esp32h2/CMakeLists.txt
index 63d425e4f3..f4dd85bed1 100644
--- a/components/esp_hw_support/port/esp32h2/CMakeLists.txt
+++ b/components/esp_hw_support/port/esp32h2/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(srcs "cpu_util_esp32h2.c"
+set(srcs "cpu_esp32h2.c"
          "rtc_clk_init.c"
          "rtc_clk.c"
          "rtc_init.c"
diff --git a/components/esp_hw_support/port/esp32h2/cpu_util_esp32h2.c b/components/esp_hw_support/port/esp32h2/cpu_esp32h2.c
similarity index 100%
rename from components/esp_hw_support/port/esp32h2/cpu_util_esp32h2.c
rename to components/esp_hw_support/port/esp32h2/cpu_esp32h2.c