Skip to content

Commit 3510509

Browse files
committed
change tools.imgtool.build.pattern to tools.imgtool.flags
The property had the same form as the special `tools.TOOL_NAME.ACTION.pattern` properties However, there is not a `build` action, the form of the property gives the impression that it is one that has special treatment by the build system. It looks like the convention is `*.flags`
1 parent c18bbca commit 3510509

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

docs/guides/secure-boot.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ recipe.hooks.objcopy.postobjcopy.1.pattern={build.postbuild.cmd}
2323
# IMGTOOL
2424
#
2525
tools.imgtool.cmd=imgtool
26-
tools.imgtool.build.pattern=sign --key "{build.keys.keychain}/{build.keys.sign_key}" --encrypt "{build.keys.keychain}/{build.keys.encrypt_key}" "{build.path}/{build.project_name}.bin" "{build.path}/{build.project_name}.bin" --align {build.alignment} --max-align {build.alignment} --version {build.version} --header-size {build.header_size} --pad-header --slot-size {build.slot_size}
26+
tools.imgtool.flags=sign --key "{build.keys.keychain}/{build.keys.sign_key}" --encrypt "{build.keys.keychain}/{build.keys.encrypt_key}" "{build.path}/{build.project_name}.bin" "{build.path}/{build.project_name}.bin" --align {build.alignment} --max-align {build.alignment} --version {build.version} --header-size {build.header_size} --pad-header --slot-size {build.slot_size}
2727
[...]
2828
2929
```
3030

31-
By having only `tools.TOOL_NAME.cmd` and `tools.TOOL_NAME.build.pattern`, we can customize the behavior with a
31+
By having only `tools.TOOL_NAME.cmd` and `tools.TOOL_NAME.falgs`, we can customize the behavior with a
3232
[custom board option](../platform-specification.md#custom-board-options). Then in the
3333
[`boards.txt`](../platform-specification.md#boardstxt) we can define the new option to use a different `postbuild.cmd`:
3434

@@ -39,7 +39,7 @@ menu.security=Security setting
3939
envie_m7.menu.security.none=None
4040
envie_m7.menu.security.sien=Signature + Encryption
4141
42-
envie_m7.menu.security.sien.build.postbuild.cmd="{tools.imgtool.cmd}" {tools.imgtool.build.pattern}
42+
envie_m7.menu.security.sien.build.postbuild.cmd="{tools.imgtool.cmd}" {tools.imgtool.flags}
4343
envie_m7.menu.security.none.build.postbuild.cmd="{tools.imgtool.cmd}" exit
4444
4545
envie_m7.menu.security.sien.build.keys.keychain={runtime.hardware.path}/Default_Keys

test/testdata/platform_with_secure_boot/boards.local.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ menu.security=Security setting
33
uno.menu.security.none=None
44
uno.menu.security.sien=Signature + Encryption
55

6-
uno.menu.security.sien.build.postbuild.cmd="{tools.imgtool.cmd}" {tools.imgtool.build.pattern}
6+
uno.menu.security.sien.build.postbuild.cmd="{tools.imgtool.cmd}" {tools.imgtool.flags}
77
uno.menu.security.none.build.postbuild.cmd="{tools.imgtool.cmd}" exit
88

99
uno.menu.security.sien.build.keys.keychain={runtime.hardware.path}/Default_Keys

test/testdata/platform_with_secure_boot/platform.local.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ recipe.hooks.objcopy.postobjcopy.1.pattern={build.postbuild.cmd}
55
#
66

77
tools.imgtool.cmd=echo
8-
tools.imgtool.build.pattern=sign --key "{build.keys.keychain}/{build.keys.sign_key}" --encrypt "{build.keys.keychain}/{build.keys.encrypt_key}" "{build.path}/{build.project_name}.bin" "{build.path}/{build.project_name}.bin" --align {build.alignment} --max-align {build.alignment} --version {build.version} --header-size {build.header_size} --pad-header --slot-size {build.slot_size}
8+
tools.imgtool.flags=sign --key "{build.keys.keychain}/{build.keys.sign_key}" --encrypt "{build.keys.keychain}/{build.keys.encrypt_key}" "{build.path}/{build.project_name}.bin" "{build.path}/{build.project_name}.bin" --align {build.alignment} --max-align {build.alignment} --version {build.version} --header-size {build.header_size} --pad-header --slot-size {build.slot_size}

0 commit comments

Comments
 (0)