change(all): Clearing unused efuse rom headers

2024-09-19 14:26:01 -04:00 · 2023-11-14 00:07:17 +08:00 · 2023-11-14 00:07:17 +08:00 · b471d9d22c
commit b471d9d22c
parent 1688c699db
36 changed files with 18 additions and 76 deletions
--- a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c2.c
+++ b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c2.c
@ -11,9 +11,7 @@
 #include "esp_log.h"
 #include "esp_rom_gpio.h"
 #include "esp32c2/rom/spi_flash.h"
-#include "esp32c2/rom/efuse.h"
 #include "soc/gpio_periph.h"
-#include "soc/efuse_reg.h"
 #include "soc/spi_reg.h"
 #include "soc/spi_mem_reg.h"
 #include "soc/soc_caps.h"
--- a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c3.c
+++ b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c3.c
@ -12,9 +12,7 @@
 #include "esp_rom_gpio.h"
 #include "esp_rom_efuse.h"
 #include "esp32c3/rom/spi_flash.h"
-#include "esp32c3/rom/efuse.h"
 #include "soc/gpio_periph.h"
-#include "soc/efuse_reg.h"
 #include "soc/spi_reg.h"
 #include "soc/spi_mem_reg.h"
 #include "soc/soc_caps.h"
--- a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c5.c
+++ b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c5.c
@ -10,11 +10,8 @@
 #include "esp_err.h"
 #include "esp_log.h"
 #include "esp_rom_gpio.h"
-#include "esp_rom_efuse.h"
 #include "esp32c5/rom/spi_flash.h"
-#include "esp32c5/rom/efuse.h"
 #include "soc/gpio_periph.h"
-#include "soc/efuse_reg.h"
 #include "soc/spi_reg.h"
 #include "soc/spi_mem_reg.h"
 #include "soc/soc_caps.h"
--- a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c6.c
+++ b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c6.c
@ -10,11 +10,8 @@
 #include "esp_err.h"
 #include "esp_log.h"
 #include "esp_rom_gpio.h"
-#include "esp_rom_efuse.h"
 #include "esp32c6/rom/spi_flash.h"
-#include "esp32c6/rom/efuse.h"
 #include "soc/gpio_periph.h"
-#include "soc/efuse_reg.h"
 #include "soc/spi_reg.h"
 #include "soc/spi_mem_reg.h"
 #include "soc/soc_caps.h"
--- a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32h2.c
+++ b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32h2.c
@ -10,11 +10,8 @@
 #include "esp_err.h"
 #include "esp_log.h"
 #include "esp_rom_gpio.h"
-#include "esp_rom_efuse.h"
 #include "esp32h2/rom/spi_flash.h"
-#include "esp32h2/rom/efuse.h"
 #include "soc/gpio_periph.h"
-#include "soc/efuse_reg.h"
 #include "soc/spi_reg.h"
 #include "soc/spi_mem_reg.h"
 #include "soc/soc_caps.h"
--- a/components/bootloader_support/src/bootloader_utility.c
+++ b/components/bootloader_support/src/bootloader_utility.c
@ -20,22 +20,18 @@
 #elif CONFIG_IDF_TARGET_ESP32S2
 #elif CONFIG_IDF_TARGET_ESP32S3
 #elif CONFIG_IDF_TARGET_ESP32C3
-#include "esp32c3/rom/efuse.h"
 #include "esp32c3/rom/crc.h"
 #include "esp32c3/rom/uart.h"
 #elif CONFIG_IDF_TARGET_ESP32C2
-#include "esp32c2/rom/efuse.h"
 #include "esp32c2/rom/crc.h"
 #include "esp32c2/rom/rtc.h"
 #include "esp32c2/rom/uart.h"
 #elif CONFIG_IDF_TARGET_ESP32C6
-#include "esp32c6/rom/efuse.h"
 #include "esp32c6/rom/crc.h"
 #include "esp32c6/rom/rtc.h"
 #include "esp32c6/rom/uart.h"
 #elif CONFIG_IDF_TARGET_ESP32C5
 #elif CONFIG_IDF_TARGET_ESP32H2
-#include "esp32h2/rom/efuse.h"
 #include "esp32h2/rom/crc.h"
 #include "esp32h2/rom/rtc.h"
 #include "esp32h2/rom/uart.h"
--- a/components/bootloader_support/src/esp32c2/bootloader_esp32c2.c
+++ b/components/bootloader_support/src/esp32c2/bootloader_esp32c2.c
@ -10,11 +10,9 @@
 #include "esp_image_format.h"
 #include "flash_qio_mode.h"
 #include "esp_rom_gpio.h"
-#include "esp_rom_efuse.h"
 #include "esp_rom_uart.h"
 #include "esp_rom_sys.h"
 #include "esp_rom_spiflash.h"
-#include "soc/efuse_reg.h"
 #include "soc/gpio_sig_map.h"
 #include "soc/io_mux_reg.h"
 #include "soc/assist_debug_reg.h"
@ -24,7 +22,6 @@
 #include "soc/extmem_reg.h"
 #include "soc/io_mux_reg.h"
 #include "soc/system_reg.h"
-#include "esp32c2/rom/efuse.h"
 #include "esp32c2/rom/ets_sys.h"
 #include "esp32c2/rom/rtc.h"
 #include "bootloader_common.h"
--- a/components/bootloader_support/src/esp32c3/bootloader_esp32c3.c
+++ b/components/bootloader_support/src/esp32c3/bootloader_esp32c3.c
@ -10,11 +10,9 @@
 #include "esp_image_format.h"
 #include "flash_qio_mode.h"
 #include "esp_rom_gpio.h"
-#include "esp_rom_efuse.h"
 #include "esp_rom_uart.h"
 #include "esp_rom_sys.h"
 #include "esp_rom_spiflash.h"
-#include "soc/efuse_reg.h"
 #include "soc/gpio_sig_map.h"
 #include "soc/io_mux_reg.h"
 #include "soc/assist_debug_reg.h"
@ -26,7 +24,6 @@
 #include "soc/io_mux_reg.h"
 #include "soc/system_reg.h"
 #include "soc/chip_revision.h"
-#include "esp32c3/rom/efuse.h"
 #include "esp32c3/rom/ets_sys.h"
 #include "bootloader_common.h"
 #include "bootloader_init.h"
--- a/components/bootloader_support/src/esp32c5/bootloader_esp32c5.c
+++ b/components/bootloader_support/src/esp32c5/bootloader_esp32c5.c
@ -10,7 +10,6 @@
 #include "esp_image_format.h"
 #include "flash_qio_mode.h"
 #include "esp_rom_gpio.h"
-#include "esp_rom_efuse.h"
 #include "esp_rom_uart.h"
 #include "esp_rom_sys.h"
 #include "esp_rom_spiflash.h"
@ -23,7 +22,6 @@
 #include "soc/cache_reg.h"
 #include "soc/io_mux_reg.h"
 #include "soc/pcr_reg.h"
-#include "esp32c5/rom/efuse.h"
 #include "esp32c5/rom/ets_sys.h"
 #include "esp32c5/rom/spi_flash.h"
 #include "bootloader_common.h"
--- a/components/bootloader_support/src/esp32c6/bootloader_esp32c6.c
+++ b/components/bootloader_support/src/esp32c6/bootloader_esp32c6.c
@ -10,7 +10,6 @@
 #include "esp_image_format.h"
 #include "flash_qio_mode.h"
 #include "esp_rom_gpio.h"
-#include "esp_rom_efuse.h"
 #include "esp_rom_uart.h"
 #include "esp_rom_sys.h"
 #include "esp_rom_spiflash.h"
@ -23,7 +22,6 @@
 #include "soc/extmem_reg.h"
 #include "soc/io_mux_reg.h"
 #include "soc/pcr_reg.h"
-#include "esp32c6/rom/efuse.h"
 #include "esp32c6/rom/ets_sys.h"
 #include "esp32c6/rom/spi_flash.h"
 #include "bootloader_common.h"
--- a/components/bootloader_support/src/esp32h2/bootloader_esp32h2.c
+++ b/components/bootloader_support/src/esp32h2/bootloader_esp32h2.c
@ -10,7 +10,6 @@
 #include "esp_image_format.h"
 #include "flash_qio_mode.h"
 #include "esp_rom_gpio.h"
-#include "esp_rom_efuse.h"
 #include "esp_rom_uart.h"
 #include "esp_rom_sys.h"
 #include "esp_rom_spiflash.h"
@ -23,7 +22,6 @@
 #include "soc/extmem_reg.h"
 #include "soc/io_mux_reg.h"
 #include "soc/pcr_reg.h"
-#include "esp32h2/rom/efuse.h"
 #include "esp32h2/rom/ets_sys.h"
 #include "bootloader_common.h"
 #include "bootloader_init.h"
--- a/components/bootloader_support/src/esp32p4/bootloader_esp32p4.c
+++ b/components/bootloader_support/src/esp32p4/bootloader_esp32p4.c
@ -10,7 +10,6 @@
 #include "esp_image_format.h"
 #include "flash_qio_mode.h"
 #include "esp_rom_gpio.h"
-#include "esp_rom_efuse.h"
 #include "esp_rom_uart.h"
 #include "esp_rom_sys.h"
 #include "esp_rom_spiflash.h"
@ -22,7 +21,6 @@
 #include "soc/spi_periph.h"
 #include "soc/cache_reg.h"
 #include "soc/io_mux_reg.h"
-#include "esp32p4/rom/efuse.h"
 #include "esp32p4/rom/ets_sys.h"
 #include "esp32p4/rom/spi_flash.h"
 #include "bootloader_common.h"
--- a/components/efuse/esp32c2/esp_efuse_fields.c
+++ b/components/efuse/esp32c2/esp_efuse_fields.c
@ -9,7 +9,6 @@
 #include "esp_efuse_table.h"
 #include "stdlib.h"
 #include "esp_types.h"
-#include "esp32c2/rom/efuse.h"
 #include "assert.h"
 #include "esp_err.h"
 #include "esp_log.h"
--- a/components/efuse/esp32c2/esp_efuse_utility.c
+++ b/components/efuse/esp32c2/esp_efuse_utility.c
@ -11,7 +11,6 @@
 #include "esp_efuse_utility.h"
 #include "soc/efuse_periph.h"
 #include "esp_private/esp_clk.h"
-#include "esp32c2/rom/efuse.h"
 #include "hal/efuse_hal.h"

 static const char *TAG = "efuse";
--- a/components/efuse/esp32c3/esp_efuse_fields.c
+++ b/components/efuse/esp32c3/esp_efuse_fields.c
@ -9,7 +9,6 @@
 #include "esp_efuse_table.h"
 #include "stdlib.h"
 #include "esp_types.h"
-#include "esp32c3/rom/efuse.h"
 #include "assert.h"
 #include "esp_err.h"
 #include "esp_log.h"
--- a/components/efuse/esp32c5/esp_efuse_fields.c
+++ b/components/efuse/esp32c5/esp_efuse_fields.c
@ -9,7 +9,6 @@
 #include "esp_efuse_table.h"
 #include "stdlib.h"
 #include "esp_types.h"
-#include "esp32c5/rom/efuse.h"
 #include "assert.h"
 #include "esp_err.h"
 #include "esp_log.h"
--- a/components/efuse/esp32c6/esp_efuse_fields.c
+++ b/components/efuse/esp32c6/esp_efuse_fields.c
@ -9,7 +9,6 @@
 #include "esp_efuse_table.h"
 #include "stdlib.h"
 #include "esp_types.h"
-#include "esp32c6/rom/efuse.h"
 #include "assert.h"
 #include "esp_err.h"
 #include "esp_log.h"
--- a/components/efuse/esp32h2/esp_efuse_fields.c
+++ b/components/efuse/esp32h2/esp_efuse_fields.c
@ -9,7 +9,6 @@
 #include "esp_efuse_table.h"
 #include "stdlib.h"
 #include "esp_types.h"
-#include "esp32h2/rom/efuse.h"
 #include "assert.h"
 #include "esp_err.h"
 #include "esp_log.h"
--- a/components/efuse/esp32p4/esp_efuse_fields.c
+++ b/components/efuse/esp32p4/esp_efuse_fields.c
@ -9,7 +9,6 @@
 #include "esp_efuse_table.h"
 #include "stdlib.h"
 #include "esp_types.h"
-#include "esp32p4/rom/efuse.h"
 #include "assert.h"
 #include "esp_err.h"
 #include "esp_log.h"
--- a/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/main/test_ds.c
+++ b/components/esp_hw_support/test_apps/esp_hw_support_unity_tests/main/test_ds.c
@ -10,32 +10,27 @@
 #include "soc/soc_caps.h"

 #if SOC_DIG_SIGN_SUPPORTED
+#include "rom/efuse.h"
 #if CONFIG_IDF_TARGET_ESP32S2
-#include "esp32s2/rom/efuse.h"
 #include "esp32s2/rom/digital_signature.h"
 #include "esp32s2/rom/aes.h"
 #include "esp32s2/rom/sha.h"
 #elif CONFIG_IDF_TARGET_ESP32C3
-#include "esp32c3/rom/efuse.h"
 #include "esp32c3/rom/digital_signature.h"
 #include "esp32c3/rom/hmac.h"
 #elif CONFIG_IDF_TARGET_ESP32S3
-#include "esp32s3/rom/efuse.h"
 #include "esp32s3/rom/digital_signature.h"
 #include "esp32s3/rom/aes.h"
 #include "esp32s3/rom/sha.h"
 #elif CONFIG_IDF_TARGET_ESP32C6
-#include "esp32c6/rom/efuse.h"
 #include "esp32c6/rom/digital_signature.h"
 #include "esp32c6/rom/aes.h"
 #include "esp32c6/rom/sha.h"
 #elif CONFIG_IDF_TARGET_ESP32H2
-#include "esp32h2/rom/efuse.h"
 #include "esp32h2/rom/digital_signature.h"
 #include "esp32h2/rom/aes.h"
 #include "esp32h2/rom/sha.h"
 #elif CONFIG_IDF_TARGET_ESP32P4
-#include "esp32p4/rom/efuse.h"
 #include "esp32p4/rom/digital_signature.h"
 #include "esp32p4/rom/aes.h"
 #include "esp32p4/rom/sha.h"
--- a/components/esp_psram/esp32/esp_psram_impl_quad.c
+++ b/components/esp_psram/esp32/esp_psram_impl_quad.c
@ -18,7 +18,7 @@
 #include "../esp_psram_impl.h"
 #include "esp32/rom/spi_flash.h"
 #include "esp32/rom/cache.h"
-#include "esp32/rom/efuse.h"
+#include "rom/efuse.h"
 #include "esp_rom_efuse.h"
 #include "soc/dport_reg.h"
 #include "soc/efuse_periph.h"
--- a/components/esp_psram/esp32s2/esp_psram_impl_quad.c
+++ b/components/esp_psram/esp32s2/esp_psram_impl_quad.c
@ -18,7 +18,7 @@
 #include "../esp_psram_impl.h"
 #include "esp32s2/rom/spi_flash.h"
 #include "esp32s2/rom/opi_flash.h"
-#include "esp32s2/rom/efuse.h"
+#include "rom/efuse.h"
 #include "esp_rom_efuse.h"
 #include "soc/spi_reg.h"
 #include "soc/io_mux_reg.h"
--- a/components/esp_rom/include/esp32/rom/efuse.h
+++ b/components/esp_rom/include/esp32/rom/efuse.h
@ -1,16 +1,9 @@
-// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
+/*
+ * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */

-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.

 #ifndef _ROM_EFUSE_H_
 #define _ROM_EFUSE_H_
--- a/components/hal/esp32c2/include/hal/efuse_ll.h
+++ b/components/hal/esp32c2/include/hal/efuse_ll.h
@ -10,7 +10,7 @@
 #include <stdbool.h>
 #include "soc/efuse_periph.h"
 #include "hal/assert.h"
-#include "esp32c2/rom/efuse.h"
+#include "rom/efuse.h"

 #ifdef __cplusplus
 extern "C" {
--- a/components/hal/esp32c3/include/hal/efuse_ll.h
+++ b/components/hal/esp32c3/include/hal/efuse_ll.h
@ -10,7 +10,7 @@
 #include <stdbool.h>
 #include "soc/efuse_periph.h"
 #include "hal/assert.h"
-#include "esp32c3/rom/efuse.h"
+#include "rom/efuse.h"

 #ifdef __cplusplus
 extern "C" {
--- a/components/hal/esp32c5/include/hal/efuse_ll.h
+++ b/components/hal/esp32c5/include/hal/efuse_ll.h
@ -10,7 +10,6 @@
 #include <stdbool.h>
 #include "soc/efuse_periph.h"
 #include "hal/assert.h"
-#include "esp32p4/rom/efuse.h"

 #ifdef __cplusplus
 extern "C" {
--- a/components/hal/esp32c6/include/hal/efuse_ll.h
+++ b/components/hal/esp32c6/include/hal/efuse_ll.h
@ -10,7 +10,7 @@
 #include <stdbool.h>
 #include "soc/efuse_periph.h"
 #include "hal/assert.h"
-#include "esp32c6/rom/efuse.h"
+#include "rom/efuse.h"

 #ifdef __cplusplus
 extern "C" {
--- a/components/hal/esp32h2/include/hal/efuse_ll.h
+++ b/components/hal/esp32h2/include/hal/efuse_ll.h
@ -10,7 +10,7 @@
 #include <stdbool.h>
 #include "soc/efuse_periph.h"
 #include "hal/assert.h"
-#include "esp32h2/rom/efuse.h"
+#include "rom/efuse.h"

 #ifdef __cplusplus
 extern "C" {
--- a/components/hal/esp32p4/include/hal/efuse_ll.h
+++ b/components/hal/esp32p4/include/hal/efuse_ll.h
@ -10,7 +10,7 @@
 #include <stdbool.h>
 #include "soc/efuse_periph.h"
 #include "hal/assert.h"
-#include "esp32p4/rom/efuse.h"
+#include "rom/efuse.h"

 #ifdef __cplusplus
 extern "C" {
--- a/components/hal/esp32s2/efuse_hal.c
+++ b/components/hal/esp32s2/efuse_hal.c
@ -10,7 +10,7 @@
 #include "hal/assert.h"
 #include "hal/efuse_hal.h"
 #include "hal/efuse_ll.h"
-#include "esp32s2/rom/efuse.h"
+#include "rom/efuse.h"
 #include "esp_attr.h"

 #define ESP_EFUSE_BLOCK_ERROR_BITS(error_reg, block) ((error_reg) & (0x0F << (4 * (block))))
--- a/components/hal/esp32s2/include/hal/efuse_ll.h
+++ b/components/hal/esp32s2/include/hal/efuse_ll.h
@ -10,7 +10,7 @@
 #include <stdbool.h>
 #include "soc/efuse_periph.h"
 #include "hal/assert.h"
-#include "esp32s2/rom/efuse.h"
+#include "rom/efuse.h"

 #ifdef __cplusplus
 extern "C" {
--- a/components/hal/esp32s3/efuse_hal.c
+++ b/components/hal/esp32s3/efuse_hal.c
@ -10,7 +10,7 @@
 #include "hal/assert.h"
 #include "hal/efuse_hal.h"
 #include "hal/efuse_ll.h"
-#include "esp32s3/rom/efuse.h"
+#include "rom/efuse.h"
 #include "esp_attr.h"

 #define ESP_EFUSE_BLOCK_ERROR_BITS(error_reg, block) ((error_reg) & (0x0F << (4 * (block))))
--- a/components/hal/esp32s3/include/hal/efuse_ll.h
+++ b/components/hal/esp32s3/include/hal/efuse_ll.h
@ -10,7 +10,7 @@
 #include <stdbool.h>
 #include "soc/efuse_periph.h"
 #include "hal/assert.h"
-#include "esp32s3/rom/efuse.h"
+#include "rom/efuse.h"

 #ifdef __cplusplus
 extern "C" {
--- a/components/hal/test_apps/crypto/main/ds/test_ds.c
+++ b/components/hal/test_apps/crypto/main/ds/test_ds.c
@ -16,34 +16,29 @@

 const static char *TAG = "test_ds";

+#include "rom/efuse.h"
 #if CONFIG_IDF_TARGET_ESP32S2
-#include "esp32s2/rom/efuse.h"
 #include "esp32s2/rom/digital_signature.h"
 #include "esp32s2/rom/aes.h"
 #include "esp32s2/rom/sha.h"
 #include "esp32s2/rom/hmac.h"
 #include "soc/soc_memory_layout.h"
 #elif CONFIG_IDF_TARGET_ESP32C3
-#include "esp32c3/rom/efuse.h"
 #include "esp32c3/rom/digital_signature.h"
 #include "esp32c3/rom/hmac.h"
 #elif CONFIG_IDF_TARGET_ESP32S3
-#include "esp32s3/rom/efuse.h"
 #include "esp32s3/rom/digital_signature.h"
 #include "esp32s3/rom/aes.h"
 #include "esp32s3/rom/sha.h"
 #elif CONFIG_IDF_TARGET_ESP32C6
-#include "esp32c6/rom/efuse.h"
 #include "esp32c6/rom/digital_signature.h"
 #include "esp32c6/rom/aes.h"
 #include "esp32c6/rom/sha.h"
 #elif CONFIG_IDF_TARGET_ESP32H2
-#include "esp32h2/rom/efuse.h"
 #include "esp32h2/rom/digital_signature.h"
 #include "esp32h2/rom/aes.h"
 #include "esp32h2/rom/sha.h"
 #elif CONFIG_IDF_TARGET_ESP32P4
-#include "esp32p4/rom/efuse.h"
 #include "esp32p4/rom/digital_signature.h"
 #include "esp32p4/rom/aes.h"
 #include "esp32p4/rom/sha.h"
--- a/tools/ci/check_copyright_ignore.txt
+++ b/tools/ci/check_copyright_ignore.txt
@ -455,7 +455,6 @@ components/esp_rom/esp32s3/ld/esp32s3.rom.version.ld
 components/esp_rom/include/esp32/rom/aes.h
 components/esp_rom/include/esp32/rom/bigint.h
 components/esp_rom/include/esp32/rom/crc.h
-components/esp_rom/include/esp32/rom/efuse.h
 components/esp_rom/include/esp32/rom/sha.h
 components/esp_rom/include/esp32/rom/tbconsole.h
 components/esp_rom/include/esp32/rom/tjpgd.h
--- a/tools/ci/check_public_headers_exceptions.txt
+++ b/tools/ci/check_public_headers_exceptions.txt
@ -108,7 +108,6 @@ components/esp_rom/include/esp32s2/rom/spi_flash.h
 components/esp_rom/include/esp32s2/rom/cache.h
 components/esp_rom/include/esp32s2/rom/secure_boot.h
 components/esp_rom/include/esp32s2/rom/opi_flash.h
-components/esp_rom/include/esp32s2/rom/efuse.h
 components/esp_ringbuf/include/freertos/ringbuf.h
 components/esp_netif/include/esp_netif_defaults.h
 components/esp_netif/include/esp_netif_net_stack.h