Renamed some key paramaters with a more general purpose name

cmaglie · giulcioffi · commit 6934748869fb · 2022-03-22T17:46:43.000+01:00
build.keys.path    -&gt; build.keys.keychain
  build.sign.name    -&gt; build.keys.sign_key
  build.encrypt.name -&gt; build.keys.encrypt_key
diff --git a/boards.txt b/boards.txt
@@ -81,10 +81,9 @@ envie_m7.build.header_size=0x20000
 envie_m7.build.alignment=32
 envie_m7.build.version=1.2.3+4
 envie_m7.menu.security.sien.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" {tools.imgtool.build.pattern}
-## Defaults for secure boot sign and encrypt keys
-envie_m7.menu.security.sien.build.keys.path={runtime.hardware.path}/mbed/libraries/MCUboot/default_keys
-envie_m7.menu.security.sien.build.sign.name=ecdsa-p256-signing-key.pem
-envie_m7.menu.security.sien.build.encrypt.name=ecdsa-p256-encrypt-key.pem
+envie_m7.menu.security.sien.build.keys.keychain={runtime.hardware.path}/mbed/libraries/MCUboot/default_keys
+envie_m7.menu.security.sien.build.keys.sign_key=ecdsa-p256-signing-key.pem
+envie_m7.menu.security.sien.build.keys.encrypt_key=ecdsa-p256-encrypt-key.pem
 envie_m7.menu.security.none.build.postbuild.cmd="{tools.imgtool.path}/{tools.imgtool.cmd}" exit
 envie_m7.compiler.mbed.arch.define=
 envie_m7.compiler.mbed.defines={build.variant.path}/defines.txt
diff --git a/platform.txt b/platform.txt
@@ -193,7 +193,7 @@ tools.picotool.upload.pattern="{path}/{cmd}" {upload.verbose} -D "{build.path}/{
 
 tools.imgtool.path={runtime.tools.imgtool.path}
 tools.imgtool.cmd=imgtool
-tools.imgtool.build.pattern=sign --key "{build.keys.path}/{build.sign.name}" --encrypt "{build.keys.path}/{build.encrypt.name}" "{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}
+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}
 
 #
 # GDB (Debugger)

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ tools.picotool.upload.pattern="{path}/{cmd}" {upload.verbose} -D "{build.path}/{`
`193`	`193`
`194`	`194`	`tools.imgtool.path={runtime.tools.imgtool.path}`
`195`	`195`	`tools.imgtool.cmd=imgtool`
`196`		`-tools.imgtool.build.pattern=sign --key "{build.keys.path}/{build.sign.name}" --encrypt "{build.keys.path}/{build.encrypt.name}" "{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}`
	`196`	`+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}`
`197`	`197`
`198`	`198`	`#`
`199`	`199`	`# GDB (Debugger)`