diff options
| author | xengineering <me@xengineering.eu> | 2025-04-06 20:02:56 +0200 |
|---|---|---|
| committer | xengineering <me@xengineering.eu> | 2025-04-06 20:02:56 +0200 |
| commit | ee1dea051b0a43c02cf56dfc6a812c1a32910bc6 (patch) | |
| tree | 6f555191efc74f7ada207990a233466e953175b8 /fw/rtos | |
| parent | d19fc7e34f783b343e77b757c4f37aaadb5b66ca (diff) | |
| parent | da27d61588202d6b460e36d29a8789d206495bd6 (diff) | |
| download | iot-contact-ee1dea051b0a43c02cf56dfc6a812c1a32910bc6.tar iot-contact-ee1dea051b0a43c02cf56dfc6a812c1a32910bc6.tar.zst iot-contact-ee1dea051b0a43c02cf56dfc6a812c1a32910bc6.zip | |
Merge website and CMake to Meson transition
Building a website to structure and deploy the artifacts was planned and
requires a well set-up build system to handle all the file paths targets
and dependencies.
Since multiple CMake Zephyr builds are required for the application
firmware, bootloader firmware and the native_sim application firmware
simulation CMake external project was used.
Since this generates a build tree with a confusing structure Meson was
evaluated.
Finally the Meson build system was a good fit as top-level build system
and allows external projects as an experimental feature if they can
configure a Make-based build system which is given for Zephyr.
Diffstat (limited to 'fw/rtos')
| -rw-r--r-- | fw/rtos/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | fw/rtos/meson.build | 3 | ||||
| -rw-r--r-- | fw/rtos/modules/meson.build | 10 |
3 files changed, 13 insertions, 16 deletions
diff --git a/fw/rtos/CMakeLists.txt b/fw/rtos/CMakeLists.txt deleted file mode 100644 index d9f116c..0000000 --- a/fw/rtos/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public License, -# v. 2.0. If a copy of the MPL was not distributed with this file, You can -# obtain one at https://mozilla.org/MPL/2.0/. - -set(ZEPHYR_MODULES - "${CMAKE_CURRENT_SOURCE_DIR}/modules/cmsis" - "${CMAKE_CURRENT_SOURCE_DIR}/modules/hal_stm32" - "${CMAKE_CURRENT_SOURCE_DIR}/modules/mbedtls" - "${CMAKE_CURRENT_SOURCE_DIR}/modules/mcuboot" - PARENT_SCOPE -) - -set(ZEPHYR_BASE - "${CMAKE_CURRENT_SOURCE_DIR}/zephyr" - PARENT_SCOPE -) diff --git a/fw/rtos/meson.build b/fw/rtos/meson.build new file mode 100644 index 0000000..800153d --- /dev/null +++ b/fw/rtos/meson.build @@ -0,0 +1,3 @@ +subdir('modules') + +zephyr = meson.current_source_dir() / 'zephyr' diff --git a/fw/rtos/modules/meson.build b/fw/rtos/modules/meson.build new file mode 100644 index 0000000..14b14f5 --- /dev/null +++ b/fw/rtos/modules/meson.build @@ -0,0 +1,10 @@ +zephyr_modules = [ + meson.current_source_dir() / 'cmsis', + meson.current_source_dir() / 'hal_stm32', + meson.current_source_dir() / 'mbedtls', + meson.current_source_dir() / 'mcuboot', +] + +mcuboot = meson.current_source_dir() / 'mcuboot' +bootloader_firmware = mcuboot / 'boot' / 'zephyr' +imgtool = mcuboot / 'scripts' / 'imgtool.py' |