diff options
| author | xengineering <me@xengineering.eu> | 2025-03-22 21:39:13 +0100 |
|---|---|---|
| committer | xengineering <me@xengineering.eu> | 2025-03-22 22:30:41 +0100 |
| commit | 62be0c0585b147686ad3a41fdce181c8a7e95cd1 (patch) | |
| tree | c59339340f5b9fd405acc7e6c2a90380299f6bd0 | |
| parent | 09722ba833f4af39dc9b5894de15c1e823cb6ea8 (diff) | |
| download | iot-contact-62be0c0585b147686ad3a41fdce181c8a7e95cd1.tar iot-contact-62be0c0585b147686ad3a41fdce181c8a7e95cd1.tar.zst iot-contact-62be0c0585b147686ad3a41fdce181c8a7e95cd1.zip | |
fw: btl: Move MCUboot build here
The directory structure should be less nested and with shorter paths.
This is a first step.
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | fw/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | fw/btl/bootloader.conf (renamed from fw/zephyrproject/bootloader/bootloader.conf) | 0 | ||||
| m--------- | fw/btl/mcuboot (renamed from fw/zephyrproject/bootloader/mcuboot) | 0 | ||||
| -rwxr-xr-x | fw/nucleo.sh | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/.gitmodules b/.gitmodules index d26a2ad..f12e67b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,5 +11,5 @@ path = fw/zephyrproject/modules/crypto/mbedtls url = https://github.com/zephyrproject-rtos/mbedtls.git [submodule "fw/zephyrproject/bootloader/mcuboot"] - path = fw/zephyrproject/bootloader/mcuboot + path = fw/btl/mcuboot url = https://github.com/zephyrproject-rtos/mcuboot.git diff --git a/fw/CMakeLists.txt b/fw/CMakeLists.txt index 1b978b7..6be1c21 100644 --- a/fw/CMakeLists.txt +++ b/fw/CMakeLists.txt @@ -9,7 +9,7 @@ set(ZEPHYR_MODULES "${CMAKE_CURRENT_SOURCE_DIR}/zephyrproject/modules/hal/cmsis" "${CMAKE_CURRENT_SOURCE_DIR}/zephyrproject/modules/hal/stm32" "${CMAKE_CURRENT_SOURCE_DIR}/zephyrproject/modules/crypto/mbedtls" - "${CMAKE_CURRENT_SOURCE_DIR}/zephyrproject/bootloader/mcuboot" + "${CMAKE_CURRENT_SOURCE_DIR}/btl/mcuboot" ) string(REPLACE ";" "," ZEPHYR_MODULES_COMMA "${ZEPHYR_MODULES}") @@ -17,14 +17,14 @@ include(ExternalProject) ExternalProject_Add( bootloader PREFIX bootloader - SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/zephyrproject/bootloader/mcuboot/boot/zephyr" - BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/bootloader" + SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/btl/mcuboot/boot/zephyr" + BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/btl" INSTALL_COMMAND "" LIST_SEPARATOR "," CMAKE_ARGS "-DBOARD=nucleo_f767zi" "-DZEPHYR_MODULES=${ZEPHYR_MODULES_COMMA}" - "-DEXTRA_CONF_FILE=${CMAKE_CURRENT_SOURCE_DIR}/zephyrproject/bootloader/bootloader.conf" + "-DEXTRA_CONF_FILE=${CMAKE_CURRENT_SOURCE_DIR}/btl/bootloader.conf" -DCONFIG_BOOT_SIGNATURE_KEY_FILE="${KEY}" ) diff --git a/fw/zephyrproject/bootloader/bootloader.conf b/fw/btl/bootloader.conf index c42b7fc..c42b7fc 100644 --- a/fw/zephyrproject/bootloader/bootloader.conf +++ b/fw/btl/bootloader.conf diff --git a/fw/zephyrproject/bootloader/mcuboot b/fw/btl/mcuboot -Subproject 346f7374ff4467e40b5594658f8ac67a5e9813c +Subproject 346f7374ff4467e40b5594658f8ac67a5e9813c diff --git a/fw/nucleo.sh b/fw/nucleo.sh index be694b8..f625ce6 100755 --- a/fw/nucleo.sh +++ b/fw/nucleo.sh @@ -23,12 +23,12 @@ SCRIPT="$(realpath "$0")" FW="$(dirname "$SCRIPT")" ROOT="$(dirname "$FW")" BUILD="${ROOT}/nucleo" -BOOTLOADER_FIRMWARE="${BUILD}/fw/bootloader/zephyr/zephyr.bin" +BOOTLOADER_FIRMWARE="${BUILD}/fw/btl/zephyr/zephyr.bin" APPLICATION_FIRMWARE="${BUILD}/fw/zephyr/zephyr.bin" APPLICATION_FIRMWARE_SIGNED="${BUILD}/fw/zephyr/zephyr.signed.bin" BOOTLOADER_FLASH_ADDRESS='0x8000000' APPLICATION_FLASH_ADDRESS='0x8040000' -MCUBOOT="${ROOT}/fw/zephyrproject/bootloader/mcuboot" +MCUBOOT="${ROOT}/fw/btl/mcuboot" IMGTOOL="${MCUBOOT}/scripts/imgtool.py" KEY="${HOME}/mcuboot/key.pem" BOARD='nucleo_f767zi' |