Commit c75b3c74 authored by Shubham Kulkarni's avatar Shubham Kulkarni Committed by David Brown
Browse files

boot/espressif: Add hal subdirectory for IDF sources and headers 



Signed-off-by: default avatarShubham Kulkarni <shubham.kulkarni@espressif.com>
parent 052561dc

.gitmodules

+4 −0
Original line number Diff line number Diff line
@@ -22,3 +22,7 @@ 
[submodule "ext/cddl-gen"]

	path = ext/cddl-gen

	url = https://github.com/NordicSemiconductor/cddl-gen.git

[submodule "boot/espressif/hal/esp-idf"]

	path = boot/espressif/hal/esp-idf

	url = https://github.com/espressif/esp-idf.git

	branch = release/v4.3

boot/espressif/CMakeLists.txt

+13 −2
Original line number Diff line number Diff line
@@ -6,11 +6,15 @@ endif() 


project(mcuboot_${MCUBOOT_TARGET})



add_definitions(-DMCUBOOT_TARGET=${MCUBOOT_TARGET})



if (NOT DEFINED IDF_PATH)

    if (DEFINED ENV{IDF_PATH})

    if (EXISTS "${CMAKE_CURRENT_LIST_DIR}/hal/esp-idf")

        set(IDF_PATH "${CMAKE_CURRENT_LIST_DIR}/hal/esp-idf")

    elseif (DEFINED ENV{IDF_PATH})

        set(IDF_PATH $ENV{IDF_PATH})

    else()

        message(FATAL_ERROR "IDF_PATH not found. Please set IDF_PATH environment variable or pass -DIDF_PATH flag.")

        message(FATAL_ERROR "IDF_PATH not found. Please update submodules or set IDF_PATH environment variable or pass -DIDF_PATH flag.")

    endif()

endif()
@@ -123,6 +127,7 @@ set(LDFLAGS 
    "-lc"

    )



add_subdirectory(hal)

add_executable(

    ${APP_EXECUTABLE}

    ${CMAKE_CURRENT_LIST_DIR}/main.c
@@ -156,3 +161,9 @@ target_link_libraries( 
    -T${CMAKE_CURRENT_LIST_DIR}/port/${MCUBOOT_TARGET}/ld/bootloader.ld

    ${LDFLAGS}

    )



target_link_libraries(

    ${APP_EXECUTABLE}

    PUBLIC

    hal

    )

boot/espressif/hal/CMakeLists.txt

0 → 100644
+128 −0
Original line number Diff line number Diff line 
cmake_minimum_required(VERSION 3.13)



project(hal)



set(esp_idf_dir ${IDF_PATH})



set(SRC_DIR ${CMAKE_CURRENT_LIST_DIR}/src)

set(INCLUDE_DIRS

    ${CMAKE_CURRENT_LIST_DIR}/include

    ${CMAKE_CURRENT_LIST_DIR}/include/${MCUBOOT_TARGET})



list(APPEND INCLUDE_DIRS

    ${esp_idf_dir}/components/esp_common/include

    ${esp_idf_dir}/components/esp_rom/include

    ${esp_idf_dir}/components/xtensa/${MCUBOOT_TARGET}/include

    ${esp_idf_dir}/components/spi_flash/include

    ${esp_idf_dir}/components/spi_flash/private_include

    ${esp_idf_dir}/components/xtensa/include

    ${esp_idf_dir}/components/soc/${MCUBOOT_TARGET}/include

    ${esp_idf_dir}/components/${MCUBOOT_TARGET}/include

    ${esp_idf_dir}/components/soc/include

    ${esp_idf_dir}/components/esp_hw_support/include

    ${esp_idf_dir}/components/hal/${MCUBOOT_TARGET}/include

    ${esp_idf_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}

    ${esp_idf_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/private_include

    ${esp_idf_dir}/components/bootloader_support/include

    ${esp_idf_dir}/components/bootloader_support/include_bootloader

    ${esp_idf_dir}/components/hal/include

    ${esp_idf_dir}/components/efuse/include

    ${esp_idf_dir}/components/efuse/${MCUBOOT_TARGET}/include

    )

set(hal_srcs

    ${SRC_DIR}/bootloader_init.c

    ${SRC_DIR}/bootloader_wdt.c

    ${esp_idf_dir}/components/hal/mpu_hal.c

    ${esp_idf_dir}/components/bootloader_support/src/bootloader_flash.c

    ${esp_idf_dir}/components/bootloader_support/src/bootloader_flash_config_${MCUBOOT_TARGET}.c

    ${esp_idf_dir}/components/bootloader_support/src/bootloader_clock_init.c

    ${esp_idf_dir}/components/bootloader_support/src/bootloader_efuse_${MCUBOOT_TARGET}.c

    ${esp_idf_dir}/components/bootloader_support/src/bootloader_panic.c

    ${esp_idf_dir}/components/bootloader_support/src/bootloader_mem.c

    ${esp_idf_dir}/components/spi_flash/${MCUBOOT_TARGET}/spi_flash_rom_patch.c

    ${esp_idf_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/rtc_init.c

    ${esp_idf_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/rtc_time.c

    ${esp_idf_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/rtc_clk.c

    ${esp_idf_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/rtc_clk_init.c

    ${esp_idf_dir}/components/hal/wdt_hal_iram.c

    ${esp_idf_dir}/components/esp_hw_support/cpu_util.c

    ${esp_idf_dir}/components/esp_rom/patches/esp_rom_uart.c

    ${esp_idf_dir}/components/${MCUBOOT_TARGET}/clk.c

    )



set(CFLAGS

    "-nostdlib"

    "-mlongcalls"

    "-Wno-frame-address"

    "-Wall"

    "-Wextra"

    "-W"

    "-Wwrite-strings"

    "-Wlogical-op"

    "-Wshadow"

    "-ffunction-sections"

    "-fdata-sections"

    "-fstrict-volatile-bitfields"

    "-Werror=all"

    "-Wno-error=unused-function"

    "-Wno-error=unused-but-set-variable"

    "-Wno-error=unused-variable"

    "-Wno-error=deprecated-declarations"

    "-Wno-unused-parameter"

    "-Wno-sign-compare"

    "-ggdb"

    "-Os"

    "-D_GNU_SOURCE"

    "-std=gnu99"

    "-Wno-old-style-declaration"

    "-Wno-implicit-int"

    )



set(LDFLAGS

    "-mlongcalls"

    "-Wno-frame-address"

    "-Wl,--cref"

    "-Wl,--Map=${APP_NAME}.map"

    "-fno-rtti"

    "-fno-lto"

    "-Wl,--gc-sections"

    "-Wl,--undefined=uxTopUsedPriority"

    "-lm"

    "-lgcc"

    "-lgcov"

    "-lstdc++"

    "-lc"

    )



add_library(hal STATIC ${hal_srcs} ${INCLUDE_DIRS})



set_source_files_properties(

    ${esp_idf_dir}/components/bootloader_support/src/bootloader_flash.c

    ${esp_idf_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/rtc_clk_init.c

    ${esp_idf_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/rtc_clk.c

    ${esp_idf_dir}/components/esp_hw_support/port/${MCUBOOT_TARGET}/rtc_time.c

    PROPERTIES COMPILE_FLAGS

    "-Wno-unused-variable")



target_include_directories(

    hal

    PUBLIC

    ${INCLUDE_DIRS}

    )



target_compile_options(

    hal

    PUBLIC

    ${CFLAGS}

    )



target_link_libraries(

    hal

    PUBLIC

    ${LDFLAGS}

    -T${esp_idf_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.ld

    -T${esp_idf_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.libgcc.ld

    -T${esp_idf_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.api.ld

    -T${esp_idf_dir}/components/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.peripherals.ld

    -T${esp_idf_dir}/components/esp_rom/${MCUBOOT_TARGET}/ld/${MCUBOOT_TARGET}.rom.newlib-funcs.ld

    )

esp-idf @ c9646ff0

Original line number Diff line number Diff line 
Subproject commit c9646ff0beffc86d2c6d1bfbad34da16e328e0e3

boot/espressif/hal/include/bootloader_wdt.h

0 → 100644
+8 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2021 Espressif Systems (Shanghai) Co., Ltd.

 *

 * SPDX-License-Identifier: Apache-2.0

 */

#pragma once



void bootloader_wdt_feed(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE