From 313c4f2cdc4e816cf9d4360460bb9bfde0688c04 Mon Sep 17 00:00:00 2001 From: Xiao Xufeng Date: Sun, 24 Mar 2024 01:39:40 +0800 Subject: [PATCH] fix(all): remove unused header includes --- components/bootloader_support/src/esp_image_format.c | 1 - .../src/secure_boot_v1/secure_boot_signatures_bootloader.c | 1 - components/esp_hw_support/port/esp32/cache_sram_mmu.c | 1 - components/esp_system/esp_err.c | 1 - components/esp_system/port/arch/riscv/panic_arch.c | 2 -- components/esp_system/port/cpu_start.c | 1 - components/esp_system/port/panic_handler.c | 1 - components/newlib/assert.c | 1 - components/spi_flash/cache_utils.c | 1 - examples/build_system/cmake/idf_as_lib/stubs/esp32/flash_ops.c | 2 -- tools/test_apps/system/longjmp_test/main/hello_world_main.c | 1 - tools/test_apps/system/memprot/main/esp32s2/test_memprot_main.c | 1 - 12 files changed, 14 deletions(-) diff --git a/components/bootloader_support/src/esp_image_format.c b/components/bootloader_support/src/esp_image_format.c index dd099743da..03bb2b0f1e 100644 --- a/components/bootloader_support/src/esp_image_format.c +++ b/components/bootloader_support/src/esp_image_format.c @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include diff --git a/components/bootloader_support/src/secure_boot_v1/secure_boot_signatures_bootloader.c b/components/bootloader_support/src/secure_boot_v1/secure_boot_signatures_bootloader.c index 6cd90b736b..ef39baee03 100644 --- a/components/bootloader_support/src/secure_boot_v1/secure_boot_signatures_bootloader.c +++ b/components/bootloader_support/src/secure_boot_v1/secure_boot_signatures_bootloader.c @@ -11,7 +11,6 @@ #include "esp_log.h" #include "esp_image_format.h" #include "esp_secure_boot.h" -#include "spi_flash_mmap.h" #include "esp_fault.h" #include "esp32/rom/sha.h" #include "uECC_verify_antifault.h" diff --git a/components/esp_hw_support/port/esp32/cache_sram_mmu.c b/components/esp_hw_support/port/esp32/cache_sram_mmu.c index f784a11f79..25b8fa8aa9 100644 --- a/components/esp_hw_support/port/esp32/cache_sram_mmu.c +++ b/components/esp_hw_support/port/esp32/cache_sram_mmu.c @@ -11,7 +11,6 @@ #include "string.h" #include "esp_private/spi_flash_os.h" #include "esp_private/cache_utils.h" -#include "spi_flash_mmap.h" //Errors that can be returned #define MMU_SET_ADDR_ALIGNED_ERROR 1 diff --git a/components/esp_system/esp_err.c b/components/esp_system/esp_err.c index f35fff0334..45751b1a7f 100644 --- a/components/esp_system/esp_err.c +++ b/components/esp_system/esp_err.c @@ -8,7 +8,6 @@ #include #include "esp_err.h" -#include "spi_flash_mmap.h" #include "esp_private/cache_utils.h" #include "esp_rom_sys.h" diff --git a/components/esp_system/port/arch/riscv/panic_arch.c b/components/esp_system/port/arch/riscv/panic_arch.c index 783c809f90..3e7955fad4 100644 --- a/components/esp_system/port/arch/riscv/panic_arch.c +++ b/components/esp_system/port/arch/riscv/panic_arch.c @@ -6,8 +6,6 @@ #include -#include "spi_flash_mmap.h" - #include "soc/soc_caps.h" #include "esp_private/panic_internal.h" #include "esp_private/panic_reason.h" diff --git a/components/esp_system/port/cpu_start.c b/components/esp_system/port/cpu_start.c index 5bcc3a05e3..ab7463b652 100644 --- a/components/esp_system/port/cpu_start.c +++ b/components/esp_system/port/cpu_start.c @@ -104,7 +104,6 @@ #include "soc/periph_defs.h" #include "esp_cpu.h" #include "esp_private/esp_clk.h" -#include "spi_flash_mmap.h" #if CONFIG_ESP32_TRAX || CONFIG_ESP32S2_TRAX || CONFIG_ESP32S3_TRAX #include "esp_private/trax.h" diff --git a/components/esp_system/port/panic_handler.c b/components/esp_system/port/panic_handler.c index 6a1af168bd..4f27c1061d 100644 --- a/components/esp_system/port/panic_handler.c +++ b/components/esp_system/port/panic_handler.c @@ -6,7 +6,6 @@ #include -#include "spi_flash_mmap.h" #include "esp_ipc_isr.h" #include "esp_private/system_internal.h" #include "esp_private/cache_utils.h" diff --git a/components/newlib/assert.c b/components/newlib/assert.c index 869f673f10..633b19af91 100644 --- a/components/newlib/assert.c +++ b/components/newlib/assert.c @@ -7,7 +7,6 @@ #include #include #include "esp_system.h" -#include "spi_flash_mmap.h" #include "soc/soc_memory_layout.h" #include "esp_private/cache_utils.h" diff --git a/components/spi_flash/cache_utils.c b/components/spi_flash/cache_utils.c index 48b3029912..d8622f28a4 100644 --- a/components/spi_flash/cache_utils.c +++ b/components/spi_flash/cache_utils.c @@ -53,7 +53,6 @@ #include "esp_attr.h" #include "esp_memory_utils.h" #include "esp_intr_alloc.h" -#include "spi_flash_mmap.h" #include "spi_flash_override.h" #include "esp_private/spi_flash_os.h" #include "esp_private/freertos_idf_additions_priv.h" diff --git a/examples/build_system/cmake/idf_as_lib/stubs/esp32/flash_ops.c b/examples/build_system/cmake/idf_as_lib/stubs/esp32/flash_ops.c index e2156e3f57..e44eb03361 100644 --- a/examples/build_system/cmake/idf_as_lib/stubs/esp32/flash_ops.c +++ b/examples/build_system/cmake/idf_as_lib/stubs/esp32/flash_ops.c @@ -4,8 +4,6 @@ * SPDX-License-Identifier: Unlicense OR CC0-1.0 */ -#include "spi_flash_mmap.h" - int spi_flash_get_chip_size(void) { return (1024 * 1024 * 1024); diff --git a/tools/test_apps/system/longjmp_test/main/hello_world_main.c b/tools/test_apps/system/longjmp_test/main/hello_world_main.c index b49cb4724c..4d625431fb 100644 --- a/tools/test_apps/system/longjmp_test/main/hello_world_main.c +++ b/tools/test_apps/system/longjmp_test/main/hello_world_main.c @@ -11,7 +11,6 @@ #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "esp_system.h" -#include "spi_flash_mmap.h" #include "esp_timer.h" #include diff --git a/tools/test_apps/system/memprot/main/esp32s2/test_memprot_main.c b/tools/test_apps/system/memprot/main/esp32s2/test_memprot_main.c index b0a596d5d3..d40fcdf6cc 100644 --- a/tools/test_apps/system/memprot/main/esp32s2/test_memprot_main.c +++ b/tools/test_apps/system/memprot/main/esp32s2/test_memprot_main.c @@ -3,7 +3,6 @@ #include #include "sdkconfig.h" #include "esp_log.h" -#include "spi_flash_mmap.h" #include "esp32s2/memprot.h" #include "soc/soc.h"