conf/imx_hab4: clean up scripts and extra SPL templates by mike-scott · Pull Request #55 · foundriesio/lmp-manifest

mike-scott · 2019-12-05T01:19:23Z

conf/imx_hab4: clean up scripts and extra SPL templates

rename sign-spl.sh -> sign-file.sh
new usage of sign-file.sh is:
--cst <cst path/filename> (default: cst)
--spl
--m4app
--csf-template (default: u-boot-spl-sign.csf-template)
--key-dir (default: .)
--fix-sdp-dcd (default: no)
remove mfgtools csf template
remove hard-coded block data from std template
support M4 signing logic

NOTES:

script will copy the original binary as *.mod
if needed: modify it for: DCD handling, CSF address injection, etc.
Make sure we don't touch original binary
template is turned into *.csf-config
- translates @@KEY_ROOT@@ into --key-dir setting
- uses "od" to get the DCD/HAB block information
  and appends this to the config
- for DCD handling: uses the 0x20 header offset as the first block hex
  (0x2f010000) as mkimage currently has a bug.
cleans up copied files at the end

Signed-off-by: Michael Scott [email protected]

mike-scott · 2019-12-05T01:19:57Z

Ugh, the script requires mkimage be installed. I might need to add a check to make sure it's in the path when it runs.

mike-scott · 2019-12-05T01:20:14Z

CRAP posted this against master

ricardosalveti · 2020-01-08T23:41:41Z

Mind rebasing against master?

ricardosalveti · 2020-01-09T10:50:29Z

+    echo "  --cst: set cst binary path/filename   [default: ${CST_BINARY}]"
+    echo "  --csf-template: set CSF template file [default: ${CSF_TEMPLATE}]"
+    echo "  --spl: SPL binary to sign             [required]"
+    echo "  --m4app: M4 binary to sign            [required]"


Is m4app required or optional?

Has to have either --spl or --m4app to specify binary

Maybe change usage to say one or other required? Both with [required] is confusing.

ricardosalveti · 2020-01-09T10:52:39Z

+if [ "${SIGN_M4APP}" == "1" ]; then
+    BINARY_LEN=$(od -An -t x4 -j 0x1024 -N 0x4 ${WORK_FILE}.mod | cut -d' ' -f2)
+    BINARY_LEN=$(printf "%08x" $(((0x${BINARY_LEN} / 0x1000 + 1) * 0x1000)))
+    objcopy -I binary -O binary --pad-to 0x${BINARY_LEN} --gap-fill=0x5A ${WORK_FILE}.mod ${WORK_FILE}.mod


While objcopy and other tools are commonly available, it is probably a good idea to use 'set -e' as part of this script, in case one of the tools are not available at the host side.

Good catch will add that.

mike-scott · 2020-01-09T18:42:52Z

@ricardosalveti rebased

- rename sign-spl.sh -> sign-file.sh - new usage of sign-file.sh is: --cst <cst path/filename> (default: cst) --spl <spl binary to sign> --m4app <M4 binary to sign> --csf-template <template file to use> (default: u-boot-spl-sign.csf-template) --key-dir <directory where keys are located> (default: .) --fix-sdp-dcd (default: no) - remove mfgtools csf template - remove hard-coded block data from std template - support M4 signing logic NOTES: - script will copy the original binary as *.mod if needed: modify it for: DCD handling, CSF address injection, etc. Make sure we don't touch original binary - template is turned into *.csf-config - translates @@KEY_ROOT@@ into --key-dir setting - uses "od" to get the DCD/HAB block information and appends this to the config - for DCD handling: uses the 0x20 header offset as the first block hex (0x2f010000) as mkimage currently has a bug. - cleans up copied files at the end Change-Id: Ie7d930040c746991388832fa7d749bf3632e4a0b Signed-off-by: Michael Scott <[email protected]>

ricardosalveti · 2020-01-09T19:16:17Z

ci-retest

ricardosalveti

Looks better, let's get this in and improve if needed.

Relevant changes: - 7935897 Merge pull request foundriesio#55 from quaresmajose/bbfatal_log - 3e7c55c image_types_ostree: use bbfatal_log when do_image_garagesign fails - ee7322c Merge pull request foundriesio#53 from quaresmajose/errcode - dd129dc image_types_ostree: show the errorcode on the push failed warning - 0207f86 Merge pull request foundriesio#50 from mdfr74/kirkstone - a2d9042 Fix typos created by 6159909 Signed-off-by: Ricardo Salveti <[email protected]>

Relevant changes: - 7935897 Merge pull request #55 from quaresmajose/bbfatal_log - 3e7c55c image_types_ostree: use bbfatal_log when do_image_garagesign fails - ee7322c Merge pull request #53 from quaresmajose/errcode - dd129dc image_types_ostree: show the errorcode on the push failed warning - 0207f86 Merge pull request #50 from mdfr74/kirkstone - a2d9042 Fix typos created by 6159909 Signed-off-by: Ricardo Salveti <[email protected]>

mike-scott requested review from ldts and ricardosalveti December 5, 2019 01:19

mike-scott self-assigned this Dec 5, 2019

mike-scott commented Dec 5, 2019

View reviewed changes

Comment thread conf/imx_hab4/sign-spl.sh Outdated

mike-scott force-pushed the devel-imx-scripts branch from 8d17ebb to 9babf92 Compare December 5, 2019 01:25

mike-scott changed the title ~~conf/imx_hab4: clean up scripts and extra sql templates~~ conf/imx_hab4: clean up scripts and extra SPL templates Dec 5, 2019

mike-scott force-pushed the devel-imx-scripts branch from 9babf92 to 532f243 Compare December 5, 2019 17:12

ricardosalveti reviewed Dec 6, 2019

View reviewed changes

Comment thread conf/imx_hab4/sign-spl.sh Outdated

mike-scott force-pushed the devel-imx-scripts branch 2 times, most recently from 75e42cd to e27fc1a Compare January 6, 2020 19:16

ricardosalveti reviewed Jan 9, 2020

View reviewed changes

mike-scott force-pushed the devel-imx-scripts branch from e27fc1a to 89b4ef6 Compare January 9, 2020 18:42

mike-scott force-pushed the devel-imx-scripts branch from 89b4ef6 to 5280824 Compare January 9, 2020 18:55

ricardosalveti approved these changes Jan 9, 2020

View reviewed changes

ricardosalveti merged commit f87f1a6 into foundriesio:master Jan 9, 2020

mike-scott deleted the devel-imx-scripts branch January 15, 2020 21:02

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

conf/imx_hab4: clean up scripts and extra SPL templates#55

conf/imx_hab4: clean up scripts and extra SPL templates#55
ricardosalveti merged 1 commit intofoundriesio:masterfrom
mike-scott:devel-imx-scripts

mike-scott commented Dec 5, 2019 •

edited

Loading

Uh oh!

mike-scott commented Dec 5, 2019

Uh oh!

mike-scott commented Dec 5, 2019

Uh oh!

Uh oh!

Uh oh!

ricardosalveti commented Jan 8, 2020

Uh oh!

ricardosalveti Jan 9, 2020

Uh oh!

mike-scott Jan 9, 2020

Uh oh!

ricardosalveti Jan 9, 2020

Uh oh!

ricardosalveti Jan 9, 2020

Uh oh!

mike-scott Jan 9, 2020 •

edited

Loading

Uh oh!

mike-scott commented Jan 9, 2020

Uh oh!

ricardosalveti commented Jan 9, 2020

Uh oh!

ricardosalveti left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

mike-scott commented Dec 5, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mike-scott commented Dec 5, 2019

Uh oh!

mike-scott commented Dec 5, 2019

Uh oh!

Uh oh!

Uh oh!

ricardosalveti commented Jan 8, 2020

Uh oh!

ricardosalveti Jan 9, 2020

Choose a reason for hiding this comment

Uh oh!

mike-scott Jan 9, 2020

Choose a reason for hiding this comment

Uh oh!

ricardosalveti Jan 9, 2020

Choose a reason for hiding this comment

Uh oh!

ricardosalveti Jan 9, 2020

Choose a reason for hiding this comment

Uh oh!

mike-scott Jan 9, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mike-scott commented Jan 9, 2020

Uh oh!

ricardosalveti commented Jan 9, 2020

Uh oh!

ricardosalveti left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

mike-scott commented Dec 5, 2019 •

edited

Loading

mike-scott Jan 9, 2020 •

edited

Loading