diff options
| -rw-r--r-- | fw/app/meson.build | 5 | ||||
| -rw-r--r-- | fw/btl/meson.build | 1 | ||||
| -rw-r--r-- | fw/meson.build | 1 | ||||
| -rw-r--r-- | fw/sim/meson.build | 27 | ||||
| -rwxr-xr-x | tools/build_zephyr.py | 3 | ||||
| -rw-r--r-- | web/layouts/home.html | 1 | 
6 files changed, 36 insertions, 2 deletions
diff --git a/fw/app/meson.build b/fw/app/meson.build index 7f35ebb..d477331 100644 --- a/fw/app/meson.build +++ b/fw/app/meson.build @@ -1,9 +1,11 @@  external_project = import('unstable-external_project') +application_source = meson.current_source_dir() +  external_project.add_project(    configure_zephyr,    configure_options: [ -    '--source-tree', meson.current_source_dir(), +    '--source-tree', application_source,      '--build-tree', meson.current_build_dir() / 'build',      '--board', board,      '--zephyr-base', zephyr, @@ -17,6 +19,7 @@ application = custom_target('application',    command: [      build_zephyr,      '--build-tree', meson.current_build_dir() / 'build', +    '--binary-name', 'zephyr.bin',      '--target-name', 'application.bin',    ],    build_by_default: true, diff --git a/fw/btl/meson.build b/fw/btl/meson.build index b64fd40..4d80a58 100644 --- a/fw/btl/meson.build +++ b/fw/btl/meson.build @@ -19,6 +19,7 @@ bootloader = custom_target('bootloader',    command: [      build_zephyr,      '--build-tree', meson.current_build_dir() / 'build', +    '--binary-name', 'zephyr.bin',      '--target-name', 'bootloader.bin',    ],    build_by_default: true, diff --git a/fw/meson.build b/fw/meson.build index 492465e..8194827 100644 --- a/fw/meson.build +++ b/fw/meson.build @@ -6,3 +6,4 @@ signing_key = fs.expanduser('~') / 'mcuboot' / 'key.pem'  subdir('rtos')  subdir('app')  subdir('btl') +subdir('sim') diff --git a/fw/sim/meson.build b/fw/sim/meson.build new file mode 100644 index 0000000..a4dcb8a --- /dev/null +++ b/fw/sim/meson.build @@ -0,0 +1,27 @@ +external_project = import('unstable-external_project') + +external_project.add_project( +  configure_zephyr, +  configure_options: [ +    '--source-tree', application_source, +    '--build-tree', meson.current_build_dir() / 'build', +    '--board', 'native_sim/native/64', +    '--zephyr-base', zephyr, +    '--zephyr-modules', ';'.join(zephyr_modules), +  ], +  verbose: true, +) + +simulation = custom_target( +  'simulation', +  output: ['simulation-linux-amd64.exe'], +  command: [ +    build_zephyr, +    '--build-tree', meson.current_build_dir() / 'build', +    '--binary-name', 'zephyr.exe', +    '--target-name', 'simulation-linux-amd64.exe', +  ], +  build_by_default: true, +  install: true, +  install_dir: 'website/static', +) diff --git a/tools/build_zephyr.py b/tools/build_zephyr.py index e201bac..1d9e783 100755 --- a/tools/build_zephyr.py +++ b/tools/build_zephyr.py @@ -19,6 +19,7 @@ def main() -> None:      )      parser.add_argument("-B", "--build-tree", required=True) +    parser.add_argument("-b", "--binary-name", required=True)      parser.add_argument("-n", "--target-name", required=True)      args = parser.parse_args() @@ -38,7 +39,7 @@ def main() -> None:      )      shutil.copy( -        build_tree / "zephyr" / "zephyr.bin", +        build_tree / "zephyr" / args.binary_name,          output_dir / args.target_name      ) diff --git a/web/layouts/home.html b/web/layouts/home.html index fe40af2..f4c4e80 100644 --- a/web/layouts/home.html +++ b/web/layouts/home.html @@ -5,5 +5,6 @@  	<li><a href="static/schematic.pdf">schematic.pdf</a></li>  	<li><a href="static/application.bin">application.bin</a></li>  	<li><a href="static/bootloader.bin">bootloader.bin</a></li> +	<li><a href="static/simulation-linux-amd64.exe">simulation-linux-amd64.exe</a></li>  </ul>  {{- end -}}  | 
