diff options
author | xengineering <me@xengineering.eu> | 2025-04-06 17:27:49 +0200 |
---|---|---|
committer | xengineering <me@xengineering.eu> | 2025-04-06 17:27:49 +0200 |
commit | e78341079228b135bee65deb8e0d4e2b4385cf94 (patch) | |
tree | 2b6287e9fe31efc0335358d5cd3f95e3652117e9 /fw | |
parent | 04e504c94db921d45b63c7ea75389d692de6738e (diff) | |
download | iot-contact-e78341079228b135bee65deb8e0d4e2b4385cf94.tar iot-contact-e78341079228b135bee65deb8e0d4e2b4385cf94.tar.zst iot-contact-e78341079228b135bee65deb8e0d4e2b4385cf94.zip |
tools: Add directory and move scripts here
This allows to re-use these scripts. Since they are currently used to
build Zephyr builds and three are intended (application, bootloader and
application as native_sim build) this makes sense.
Diffstat (limited to 'fw')
-rwxr-xr-x | fw/btl/build.py | 29 | ||||
-rwxr-xr-x | fw/btl/configure.py | 30 | ||||
-rw-r--r-- | fw/btl/meson.build | 5 |
3 files changed, 3 insertions, 61 deletions
diff --git a/fw/btl/build.py b/fw/btl/build.py deleted file mode 100755 index 6478701..0000000 --- a/fw/btl/build.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python3 - - -import multiprocessing -import shutil -import subprocess -import sys -import pathlib - - -build_tree = pathlib.Path(sys.argv[1]) -output_dir = build_tree.parent - - -subprocess.run( - [ - "make", - f"-j{multiprocessing.cpu_count()}", - "-C", - f"{str(build_tree)}", - ], - shell=False, - check=True, -) - -shutil.copy( - build_tree / "zephyr" / "zephyr.bin", - output_dir / "bootloader.bin" -) diff --git a/fw/btl/configure.py b/fw/btl/configure.py deleted file mode 100755 index a1f6e38..0000000 --- a/fw/btl/configure.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env python3 - - -import subprocess -import sys - - -source_tree = sys.argv[1] -build_tree = sys.argv[2] -board = sys.argv[3] -zephyr_base = sys.argv[4] -zephyr_modules = sys.argv[5] -extra_conf_file = sys.argv[6] -signing_key_file = sys.argv[7] - - -subprocess.run( - [ - "cmake", - f"-S{source_tree}", - f"-B{build_tree}", - f"-DBOARD={board}", - f"-DZEPHYR_BASE={zephyr_base}", - f"-DZEPHYR_MODULES={zephyr_modules}", - f"-DEXTRA_CONF_FILE={extra_conf_file}", - f"-DCONFIG_BOOT_SIGNATURE_KEY_FILE=\"{signing_key_file}\"" - ], - shell=False, - check=True, -) diff --git a/fw/btl/meson.build b/fw/btl/meson.build index 37c8c25..ed40cd3 100644 --- a/fw/btl/meson.build +++ b/fw/btl/meson.build @@ -1,6 +1,7 @@ external_project = import('unstable-external_project') -bootloader_project = external_project.add_project('configure.py', +bootloader_project = external_project.add_project( + configure_zephyr, configure_options: [ bootloader_firmware, meson.current_build_dir() / 'build', @@ -16,7 +17,7 @@ bootloader_project = external_project.add_project('configure.py', bootloader = custom_target('bootloader', output: ['bootloader.bin'], command: [ - meson.current_source_dir() / 'build.py', + build_zephyr, meson.current_build_dir() / 'build', ], build_by_default: true, |