From fab5b183898e9dee4ea805414afab167acf93e85 Mon Sep 17 00:00:00 2001 From: Peter Siegmund Date: Sun, 15 Mar 2026 23:41:04 +0100 Subject: [PATCH] try to fix action Signed-off-by: Peter Siegmund --- firmware/CMakeLists.txt | 2 -- .../my_boot_hooks/CMakeLists.txt | 3 +-- .../extra_component/CMakeLists.txt | 1 - .../extra_component/extra_component.c | 11 ----------- 4 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 firmware/bootloader_components_extra/extra_component/CMakeLists.txt delete mode 100644 firmware/bootloader_components_extra/extra_component/extra_component.c diff --git a/firmware/CMakeLists.txt b/firmware/CMakeLists.txt index b543594..5515bec 100755 --- a/firmware/CMakeLists.txt +++ b/firmware/CMakeLists.txt @@ -2,8 +2,6 @@ cmake_minimum_required(VERSION 3.5) include($ENV{IDF_PATH}/tools/cmake/project.cmake) -idf_build_set_property(BOOTLOADER_EXTRA_COMPONENT_DIRS "${CMAKE_CURRENT_LIST_DIR}/bootloader_components_extra/" APPEND) - project(system_control) target_add_binary_data(${PROJECT_NAME}.elf "main/isrgrootx1.pem" TEXT) \ No newline at end of file diff --git a/firmware/bootloader_components/my_boot_hooks/CMakeLists.txt b/firmware/bootloader_components/my_boot_hooks/CMakeLists.txt index 9d43803..616384c 100644 --- a/firmware/bootloader_components/my_boot_hooks/CMakeLists.txt +++ b/firmware/bootloader_components/my_boot_hooks/CMakeLists.txt @@ -1,5 +1,4 @@ -idf_component_register(SRCS "hooks.c" - REQUIRES extra_component) +idf_component_register(SRCS "hooks.c") # We need to force GCC to integrate this static library into the # bootloader link. Indeed, by default, as the hooks in the bootloader are weak, diff --git a/firmware/bootloader_components_extra/extra_component/CMakeLists.txt b/firmware/bootloader_components_extra/extra_component/CMakeLists.txt deleted file mode 100644 index ac58fa9..0000000 --- a/firmware/bootloader_components_extra/extra_component/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -idf_component_register(SRCS "extra_component.c") diff --git a/firmware/bootloader_components_extra/extra_component/extra_component.c b/firmware/bootloader_components_extra/extra_component/extra_component.c deleted file mode 100644 index 78b558c..0000000 --- a/firmware/bootloader_components_extra/extra_component/extra_component.c +++ /dev/null @@ -1,11 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD - * - * SPDX-License-Identifier: Unlicense OR CC0-1.0 - */ -#include "esp_log.h" - -void bootloader_extra_dir_function(void) -{ - ESP_LOGI("EXTRA", "This function is called from an extra component"); -}