From b471d9d22cd1444fef8bad29ac4a4c5803389a83 Mon Sep 17 00:00:00 2001 From: KonstantinKondrashov Date: Tue, 14 Nov 2023 00:07:17 +0800 Subject: [PATCH] change(all): Clearing unused efuse rom headers --- .../src/bootloader_flash_config_esp32c2.c | 2 -- .../src/bootloader_flash_config_esp32c3.c | 2 -- .../src/bootloader_flash_config_esp32c5.c | 3 --- .../src/bootloader_flash_config_esp32c6.c | 3 --- .../src/bootloader_flash_config_esp32h2.c | 3 --- .../bootloader_support/src/bootloader_utility.c | 4 ---- .../src/esp32c2/bootloader_esp32c2.c | 3 --- .../src/esp32c3/bootloader_esp32c3.c | 3 --- .../src/esp32c5/bootloader_esp32c5.c | 2 -- .../src/esp32c6/bootloader_esp32c6.c | 2 -- .../src/esp32h2/bootloader_esp32h2.c | 2 -- .../src/esp32p4/bootloader_esp32p4.c | 2 -- components/efuse/esp32c2/esp_efuse_fields.c | 1 - components/efuse/esp32c2/esp_efuse_utility.c | 1 - components/efuse/esp32c3/esp_efuse_fields.c | 1 - components/efuse/esp32c5/esp_efuse_fields.c | 1 - components/efuse/esp32c6/esp_efuse_fields.c | 1 - components/efuse/esp32h2/esp_efuse_fields.c | 1 - components/efuse/esp32p4/esp_efuse_fields.c | 1 - .../esp_hw_support_unity_tests/main/test_ds.c | 7 +------ .../esp_psram/esp32/esp_psram_impl_quad.c | 2 +- .../esp_psram/esp32s2/esp_psram_impl_quad.c | 2 +- components/esp_rom/include/esp32/rom/efuse.h | 17 +++++------------ components/hal/esp32c2/include/hal/efuse_ll.h | 2 +- components/hal/esp32c3/include/hal/efuse_ll.h | 2 +- components/hal/esp32c5/include/hal/efuse_ll.h | 1 - components/hal/esp32c6/include/hal/efuse_ll.h | 2 +- components/hal/esp32h2/include/hal/efuse_ll.h | 2 +- components/hal/esp32p4/include/hal/efuse_ll.h | 2 +- components/hal/esp32s2/efuse_hal.c | 2 +- components/hal/esp32s2/include/hal/efuse_ll.h | 2 +- components/hal/esp32s3/efuse_hal.c | 2 +- components/hal/esp32s3/include/hal/efuse_ll.h | 2 +- .../hal/test_apps/crypto/main/ds/test_ds.c | 7 +------ tools/ci/check_copyright_ignore.txt | 1 - tools/ci/check_public_headers_exceptions.txt | 1 - 36 files changed, 18 insertions(+), 76 deletions(-) diff --git a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c2.c b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c2.c index cf5a56809f..dec91e78ae 100644 --- 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" diff --git a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c3.c b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c3.c index 7b0eecefc4..52dfafa991 100644 --- 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" diff --git a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c5.c b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c5.c index 347a74dcbb..2dd79f2c60 100644 --- 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" diff --git a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c6.c b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32c6.c index 2e9ed60a12..eaa3b161cd 100644 --- 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" diff --git a/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32h2.c b/components/bootloader_support/bootloader_flash/src/bootloader_flash_config_esp32h2.c index e9888da6f9..f4a436f49d 100644 --- 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" diff --git a/components/bootloader_support/src/bootloader_utility.c b/components/bootloader_support/src/bootloader_utility.c index aa30037fca..308c5a926d 100644 --- 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" diff --git a/components/bootloader_support/src/esp32c2/bootloader_esp32c2.c b/components/bootloader_support/src/esp32c2/bootloader_esp32c2.c index 3d9e1af1f4..3aa3946dbf 100644 --- 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" diff --git a/components/bootloader_support/src/esp32c3/bootloader_esp32c3.c b/components/bootloader_support/src/esp32c3/bootloader_esp32c3.c index 199ff65624..c937667dc6 100644 --- 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" diff --git a/components/bootloader_support/src/esp32c5/bootloader_esp32c5.c b/components/bootloader_support/src/esp32c5/bootloader_esp32c5.c index 31fb76f857..94ad7a3f01 100644 --- 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" diff --git a/components/bootloader_support/src/esp32c6/bootloader_esp32c6.c b/components/bootloader_support/src/esp32c6/bootloader_esp32c6.c index d269657992..6e0ff2c1a1 100644 --- 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" diff --git a/components/bootloader_support/src/esp32h2/bootloader_esp32h2.c b/components/bootloader_support/src/esp32h2/bootloader_esp32h2.c index 5cf7869c17..94e7509158 100644 --- 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" diff --git a/components/bootloader_support/src/esp32p4/bootloader_esp32p4.c b/components/bootloader_support/src/esp32p4/bootloader_esp32p4.c index fbd773dd02..a2b764aeff 100644 --- 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" diff --git a/components/efuse/esp32c2/esp_efuse_fields.c b/components/efuse/esp32c2/esp_efuse_fields.c index 8cec4e17bd..b40c635954 100644 --- 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" diff --git a/components/efuse/esp32c2/esp_efuse_utility.c b/components/efuse/esp32c2/esp_efuse_utility.c index 354e6cf8ea..cefe171561 100644 --- 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"; diff --git a/components/efuse/esp32c3/esp_efuse_fields.c b/components/efuse/esp32c3/esp_efuse_fields.c index 7f34d8984c..b2765c7cd5 100644 --- 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" diff --git a/components/efuse/esp32c5/esp_efuse_fields.c b/components/efuse/esp32c5/esp_efuse_fields.c index 1aaa111a44..5e2007604a 100644 --- 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" diff --git a/components/efuse/esp32c6/esp_efuse_fields.c b/components/efuse/esp32c6/esp_efuse_fields.c index a485a9e0e7..e15d9e7547 100644 --- 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" diff --git a/components/efuse/esp32h2/esp_efuse_fields.c b/components/efuse/esp32h2/esp_efuse_fields.c index 140a10ceb7..e15d9e7547 100644 --- 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" diff --git a/components/efuse/esp32p4/esp_efuse_fields.c b/components/efuse/esp32p4/esp_efuse_fields.c index 632265904f..20e614c267 100644 --- 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" diff --git 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 index 216a9f6f75..8756d04963 100644 --- 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" diff --git a/components/esp_psram/esp32/esp_psram_impl_quad.c b/components/esp_psram/esp32/esp_psram_impl_quad.c index 3ef1deafeb..e235ad5607 100644 --- 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" diff --git a/components/esp_psram/esp32s2/esp_psram_impl_quad.c b/components/esp_psram/esp32s2/esp_psram_impl_quad.c index 41fc38e834..b84905cffe 100644 --- 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" diff --git a/components/esp_rom/include/esp32/rom/efuse.h b/components/esp_rom/include/esp32/rom/efuse.h index 337227ab0d..bc31bc62e6 100644 --- 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_ diff --git a/components/hal/esp32c2/include/hal/efuse_ll.h b/components/hal/esp32c2/include/hal/efuse_ll.h index 399652e2de..2d1248dd28 100644 --- a/components/hal/esp32c2/include/hal/efuse_ll.h +++ b/components/hal/esp32c2/include/hal/efuse_ll.h @@ -10,7 +10,7 @@ #include #include "soc/efuse_periph.h" #include "hal/assert.h" -#include "esp32c2/rom/efuse.h" +#include "rom/efuse.h" #ifdef __cplusplus extern "C" { diff --git a/components/hal/esp32c3/include/hal/efuse_ll.h b/components/hal/esp32c3/include/hal/efuse_ll.h index 2041fabc72..c12f99f1a9 100644 --- a/components/hal/esp32c3/include/hal/efuse_ll.h +++ b/components/hal/esp32c3/include/hal/efuse_ll.h @@ -10,7 +10,7 @@ #include #include "soc/efuse_periph.h" #include "hal/assert.h" -#include "esp32c3/rom/efuse.h" +#include "rom/efuse.h" #ifdef __cplusplus extern "C" { diff --git a/components/hal/esp32c5/include/hal/efuse_ll.h b/components/hal/esp32c5/include/hal/efuse_ll.h index cbf1844100..ae66031d5c 100644 --- a/components/hal/esp32c5/include/hal/efuse_ll.h +++ b/components/hal/esp32c5/include/hal/efuse_ll.h @@ -10,7 +10,6 @@ #include #include "soc/efuse_periph.h" #include "hal/assert.h" -#include "esp32p4/rom/efuse.h" #ifdef __cplusplus extern "C" { diff --git a/components/hal/esp32c6/include/hal/efuse_ll.h b/components/hal/esp32c6/include/hal/efuse_ll.h index d9a10ba584..a899a37d1f 100644 --- a/components/hal/esp32c6/include/hal/efuse_ll.h +++ b/components/hal/esp32c6/include/hal/efuse_ll.h @@ -10,7 +10,7 @@ #include #include "soc/efuse_periph.h" #include "hal/assert.h" -#include "esp32c6/rom/efuse.h" +#include "rom/efuse.h" #ifdef __cplusplus extern "C" { diff --git a/components/hal/esp32h2/include/hal/efuse_ll.h b/components/hal/esp32h2/include/hal/efuse_ll.h index 8adf2a4ce1..74b72b45cd 100644 --- a/components/hal/esp32h2/include/hal/efuse_ll.h +++ b/components/hal/esp32h2/include/hal/efuse_ll.h @@ -10,7 +10,7 @@ #include #include "soc/efuse_periph.h" #include "hal/assert.h" -#include "esp32h2/rom/efuse.h" +#include "rom/efuse.h" #ifdef __cplusplus extern "C" { diff --git a/components/hal/esp32p4/include/hal/efuse_ll.h b/components/hal/esp32p4/include/hal/efuse_ll.h index 2dde73ab7e..c5d44d2cab 100644 --- a/components/hal/esp32p4/include/hal/efuse_ll.h +++ b/components/hal/esp32p4/include/hal/efuse_ll.h @@ -10,7 +10,7 @@ #include #include "soc/efuse_periph.h" #include "hal/assert.h" -#include "esp32p4/rom/efuse.h" +#include "rom/efuse.h" #ifdef __cplusplus extern "C" { diff --git a/components/hal/esp32s2/efuse_hal.c b/components/hal/esp32s2/efuse_hal.c index 7dee20eec4..7002ca4d5f 100644 --- 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)))) diff --git a/components/hal/esp32s2/include/hal/efuse_ll.h b/components/hal/esp32s2/include/hal/efuse_ll.h index ccfb01fb03..b77770d21e 100644 --- a/components/hal/esp32s2/include/hal/efuse_ll.h +++ b/components/hal/esp32s2/include/hal/efuse_ll.h @@ -10,7 +10,7 @@ #include #include "soc/efuse_periph.h" #include "hal/assert.h" -#include "esp32s2/rom/efuse.h" +#include "rom/efuse.h" #ifdef __cplusplus extern "C" { diff --git a/components/hal/esp32s3/efuse_hal.c b/components/hal/esp32s3/efuse_hal.c index 4668de24fa..fb11194251 100644 --- 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)))) diff --git a/components/hal/esp32s3/include/hal/efuse_ll.h b/components/hal/esp32s3/include/hal/efuse_ll.h index 0ef1ab7b9d..f724456d9e 100644 --- a/components/hal/esp32s3/include/hal/efuse_ll.h +++ b/components/hal/esp32s3/include/hal/efuse_ll.h @@ -10,7 +10,7 @@ #include #include "soc/efuse_periph.h" #include "hal/assert.h" -#include "esp32s3/rom/efuse.h" +#include "rom/efuse.h" #ifdef __cplusplus extern "C" { diff --git a/components/hal/test_apps/crypto/main/ds/test_ds.c b/components/hal/test_apps/crypto/main/ds/test_ds.c index 631f67947f..b6e5c17647 100644 --- 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" diff --git a/tools/ci/check_copyright_ignore.txt b/tools/ci/check_copyright_ignore.txt index e25ee34887..8e86498527 100644 --- 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 diff --git a/tools/ci/check_public_headers_exceptions.txt b/tools/ci/check_public_headers_exceptions.txt index c319005369..003bb04e5e 100644 --- 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