From 3672144c9f1febb5a6b6b01a13359edd47b45c1b Mon Sep 17 00:00:00 2001 From: Gustavo Henrique Nihei Date: Wed, 8 Feb 2023 16:48:12 -0300 Subject: [PATCH] efuse: Remove dependency on bootloader component headers Signed-off-by: Gustavo Henrique Nihei --- components/efuse/esp32/esp_efuse_fields.c | 1 - components/efuse/esp32c2/esp_efuse_fields.c | 1 - components/efuse/esp32c3/esp_efuse_fields.c | 1 - components/efuse/esp32c6/esp_efuse_fields.c | 3 +-- components/efuse/esp32h2/esp_efuse_fields.c | 3 +-- components/efuse/esp32h4/esp_efuse_fields.c | 1 - components/efuse/esp32s2/esp_efuse_fields.c | 1 - components/efuse/esp32s3/esp_efuse_fields.c | 1 - components/efuse/src/esp_efuse_fields.c | 1 - components/efuse/test_apps/main/one_key_block/test_efuse.c | 2 -- components/efuse/test_apps/main/three_key_blocks/test_efuse.c | 2 -- components/efuse/test_apps/main/with_key_purposes/test_efuse.c | 2 -- components/esp_system/port/soc/esp32c3/clk.c | 1 - 13 files changed, 2 insertions(+), 18 deletions(-) diff --git a/components/efuse/esp32/esp_efuse_fields.c b/components/efuse/esp32/esp_efuse_fields.c index 2981e7e33a..db7fa933ad 100644 --- a/components/efuse/esp32/esp_efuse_fields.c +++ b/components/efuse/esp32/esp_efuse_fields.c @@ -15,7 +15,6 @@ #include "soc/efuse_periph.h" #include "soc/chip_revision.h" #include "hal/efuse_hal.h" -#include "bootloader_random.h" #include "sys/param.h" #include "soc/syscon_reg.h" diff --git a/components/efuse/esp32c2/esp_efuse_fields.c b/components/efuse/esp32c2/esp_efuse_fields.c index c99799598b..8cec4e17bd 100644 --- a/components/efuse/esp32c2/esp_efuse_fields.c +++ b/components/efuse/esp32c2/esp_efuse_fields.c @@ -14,7 +14,6 @@ #include "esp_err.h" #include "esp_log.h" #include "soc/efuse_periph.h" -#include "bootloader_random.h" #include "sys/param.h" static __attribute__((unused)) const char *TAG = "efuse"; diff --git a/components/efuse/esp32c3/esp_efuse_fields.c b/components/efuse/esp32c3/esp_efuse_fields.c index fce7b743ff..7f34d8984c 100644 --- a/components/efuse/esp32c3/esp_efuse_fields.c +++ b/components/efuse/esp32c3/esp_efuse_fields.c @@ -14,7 +14,6 @@ #include "esp_err.h" #include "esp_log.h" #include "soc/efuse_periph.h" -#include "bootloader_random.h" #include "sys/param.h" static __attribute__((unused)) const char *TAG = "efuse"; diff --git a/components/efuse/esp32c6/esp_efuse_fields.c b/components/efuse/esp32c6/esp_efuse_fields.c index ba55a94411..a485a9e0e7 100644 --- a/components/efuse/esp32c6/esp_efuse_fields.c +++ b/components/efuse/esp32c6/esp_efuse_fields.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -14,7 +14,6 @@ #include "esp_err.h" #include "esp_log.h" #include "soc/efuse_periph.h" -#include "bootloader_random.h" #include "sys/param.h" static __attribute__((unused)) const char *TAG = "efuse"; diff --git a/components/efuse/esp32h2/esp_efuse_fields.c b/components/efuse/esp32h2/esp_efuse_fields.c index 38eaf4ab9a..140a10ceb7 100644 --- a/components/efuse/esp32h2/esp_efuse_fields.c +++ b/components/efuse/esp32h2/esp_efuse_fields.c @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -14,7 +14,6 @@ #include "esp_err.h" #include "esp_log.h" #include "soc/efuse_periph.h" -#include "bootloader_random.h" #include "sys/param.h" static __attribute__((unused)) const char *TAG = "efuse"; diff --git a/components/efuse/esp32h4/esp_efuse_fields.c b/components/efuse/esp32h4/esp_efuse_fields.c index 6a0a286cf3..a22003560c 100644 --- a/components/efuse/esp32h4/esp_efuse_fields.c +++ b/components/efuse/esp32h4/esp_efuse_fields.c @@ -14,7 +14,6 @@ #include "esp_err.h" #include "esp_log.h" #include "soc/efuse_periph.h" -#include "bootloader_random.h" #include "sys/param.h" static __attribute__((unused)) const char *TAG = "efuse"; diff --git a/components/efuse/esp32s2/esp_efuse_fields.c b/components/efuse/esp32s2/esp_efuse_fields.c index d172ff84d2..618286882a 100644 --- a/components/efuse/esp32s2/esp_efuse_fields.c +++ b/components/efuse/esp32s2/esp_efuse_fields.c @@ -13,7 +13,6 @@ #include "esp_err.h" #include "esp_log.h" #include "soc/efuse_periph.h" -#include "bootloader_random.h" #include "sys/param.h" static __attribute__((unused)) const char *TAG = "efuse"; diff --git a/components/efuse/esp32s3/esp_efuse_fields.c b/components/efuse/esp32s3/esp_efuse_fields.c index a6448ac652..22b16bd6ad 100644 --- a/components/efuse/esp32s3/esp_efuse_fields.c +++ b/components/efuse/esp32s3/esp_efuse_fields.c @@ -13,7 +13,6 @@ #include "esp_err.h" #include "esp_log.h" #include "soc/efuse_periph.h" -#include "bootloader_random.h" #include "sys/param.h" static __attribute__((unused)) const char *TAG = "efuse"; diff --git a/components/efuse/src/esp_efuse_fields.c b/components/efuse/src/esp_efuse_fields.c index 2f21cf7be4..a73ed03915 100644 --- a/components/efuse/src/esp_efuse_fields.c +++ b/components/efuse/src/esp_efuse_fields.c @@ -15,7 +15,6 @@ #include "esp_fault.h" #include "esp_log.h" #include "soc/efuse_periph.h" -#include "bootloader_random.h" #include "sys/param.h" static __attribute__((unused)) const char *TAG = "efuse"; diff --git a/components/efuse/test_apps/main/one_key_block/test_efuse.c b/components/efuse/test_apps/main/one_key_block/test_efuse.c index ed23c1a4fd..c02b387524 100644 --- a/components/efuse/test_apps/main/one_key_block/test_efuse.c +++ b/components/efuse/test_apps/main/one_key_block/test_efuse.c @@ -15,13 +15,11 @@ #include "esp_efuse_table.h" #include "esp_efuse_utility.h" #include "esp_efuse_test_table.h" -#include "bootloader_random.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "freertos/semphr.h" #include "sdkconfig.h" #include "esp_rom_efuse.h" -#include "bootloader_common.h" __attribute__((unused)) static const char* TAG = "efuse_test"; diff --git a/components/efuse/test_apps/main/three_key_blocks/test_efuse.c b/components/efuse/test_apps/main/three_key_blocks/test_efuse.c index 68a1216397..6fb28bfa13 100644 --- a/components/efuse/test_apps/main/three_key_blocks/test_efuse.c +++ b/components/efuse/test_apps/main/three_key_blocks/test_efuse.c @@ -15,13 +15,11 @@ #include "esp_efuse_table.h" #include "esp_efuse_utility.h" #include "esp_efuse_test_table.h" -#include "bootloader_random.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "freertos/semphr.h" #include "sdkconfig.h" #include "esp_rom_efuse.h" -#include "bootloader_common.h" __attribute__((unused)) static const char* TAG = "efuse_test"; diff --git a/components/efuse/test_apps/main/with_key_purposes/test_efuse.c b/components/efuse/test_apps/main/with_key_purposes/test_efuse.c index 0f276d9e52..9d2600a26d 100644 --- a/components/efuse/test_apps/main/with_key_purposes/test_efuse.c +++ b/components/efuse/test_apps/main/with_key_purposes/test_efuse.c @@ -15,13 +15,11 @@ #include "esp_efuse_table.h" #include "esp_efuse_utility.h" #include "esp_efuse_test_table.h" -#include "bootloader_random.h" #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "freertos/semphr.h" #include "sdkconfig.h" #include "esp_rom_efuse.h" -#include "bootloader_common.h" __attribute__((unused)) static const char* TAG = "efuse_test"; diff --git a/components/esp_system/port/soc/esp32c3/clk.c b/components/esp_system/port/soc/esp32c3/clk.c index 87f8b1c04b..21d256617a 100644 --- a/components/esp_system/port/soc/esp32c3/clk.c +++ b/components/esp_system/port/soc/esp32c3/clk.c @@ -23,7 +23,6 @@ #include "hal/wdt_hal.h" #include "esp_private/periph_ctrl.h" #include "esp_private/esp_clk.h" -#include "bootloader_clock.h" #include "soc/syscon_reg.h" #include "esp_rom_uart.h" #include "esp_rom_sys.h"