Skip to content

LMDK: fixed rimage and private key paths discovery #7608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
kv2019i merged 1 commit into from
May 16, 2023
Merged

LMDK: fixed rimage and private key paths discovery #7608

kv2019i merged 1 commit into from
May 16, 2023

Conversation

@aborisovich
Copy link
Contributor

@aborisovich aborisovich commented May 15, 2023 •
edited
Loading

Path to rimage and private key had been failing to be used while provided in form of relative path using dots.
Changed how rimage is discovered in the scripts:

  • rimage is searched for using find_program with paths and hints provided
  • changed RIMAGE_COMMAND to RIMAGE_INSTALL_DIR so end-user may specify directory where rimage executable is placed. It will be used by find_program.
  • If RIMAGE_INSTALL_DIR is not provided, find_program will try to search for rimage in the directory where SOF project installs it (west_dir/build-rimage).
  • Updated README.md with instructions on how to build:
    • simplified configure and build commands
    • updated explanations on how to use RIMAGE_INSTALL_DIR
    • added information on how to use toolchain file
  • private key path was parsed incorrectly when provided windows path style using backslashes. It was passed to rimage as is resulting in the invalid path as the last slash was made by rimage as forward slash. Added path normalization what fixed the problem.

This addresses issues I've described during code review in #7354 (review) .

Signed-off-by: Andrey Borisovich andrey.borisovich@intel.com

LMDK: fixed rimage and key paths and discovery
0ab31ab 
Path to rimage and private key had been failing to be used while
provided in form of relative path using dots.
Changed how rimage is discovered in the scripts:
* rimage is searched for using find_program with paths and hints provided
* changed RIMAGE_COMMAND to RIMAGE_INSTALL_DIR so end-user may specify
directory where rimage executable is placed. It will be used by
find_program.
* If RIMAGE_INSTALL_DIR is not provided, find_program will try to
search for rimage in the directory where SOF project installs it
(west_dir/build-rimage).
* Updated README.md with instructions on how to build:
  - simplified configure and build commands
  - updated explanations on how to use RIMAGE_INSTALL_DIR
  - added information on how to use toolchain file
* private key path was parsed incorrectly when provided windows path
style using backslashes. It was passed to rimage as is resulting in the
invalid path as the last slash was made by rimage as forward slash.
Added path normalization what fixed the problem.

Signed-off-by: Andrey Borisovich <andrey.borisovich@intel.com>
@aborisovich aborisovich requested a review from marc-hb May 15, 2023 09:45
@marc-hb
Copy link
Collaborator

marc-hb commented May 15, 2023 •
edited
Loading

LDMK is new to me so I unfortunately don't know enough to review this.

I've been working on removing the explicit west sign invocation from xtensa-build-zephyr.py and let west build do it instead, still a draft PR but already tested OK, @aborisovich please take a quick look: #7595

I hope this is independent from LMDK and does not conflict in any way?

The first step is #7546 which is NOT a draft, ready to review thanks!

@aborisovich
Copy link
Contributor Author

aborisovich commented May 16, 2023

LDMK is new to me so I unfortunately don't know enough to review this.

I've been working on removing the explicit west sign invocation from xtensa-build-zephyr.py and let west build do it instead, still a draft PR tested OK, @aborisovich please take a quick look: #7595

I hope this is independent from LMDK and does not conflict in any way?

The first step is #7546 which is NOT a draft, ready to review thanks!

Currently LMDK is completely separate instance in terms of a build system.
We have no dependencies to west, zephyr or xtensa-build-zephyr.py script.
I'll have a look in a moment.

@kv2019i kv2019i merged commit a675edf into thesofproject:main May 16, 2023
@aborisovich aborisovich deleted the lmdk_dummy_module_upgrades branch June 11, 2023 15:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dnikodem dnikodem dnikodem approved these changes

@pjdobrowolski pjdobrowolski pjdobrowolski approved these changes

@tmleman tmleman tmleman approved these changes

@softwarecki softwarecki softwarecki approved these changes

@serhiy-katsyuba-intel serhiy-katsyuba-intel serhiy-katsyuba-intel approved these changes

@lgirdwood lgirdwood Awaiting requested review from lgirdwood lgirdwood is a code owner

@plbossart plbossart Awaiting requested review from plbossart plbossart is a code owner

@mmaka1 mmaka1 Awaiting requested review from mmaka1 mmaka1 is a code owner

@lbetlej lbetlej Awaiting requested review from lbetlej lbetlej is a code owner

@dbaluta dbaluta Awaiting requested review from dbaluta dbaluta is a code owner

@marcinszkudlinski marcinszkudlinski Awaiting requested review from marcinszkudlinski

@marc-hb marc-hb Awaiting requested review from marc-hb

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@aborisovich @marc-hb @dnikodem @pjdobrowolski @tmleman @softwarecki @serhiy-katsyuba-intel @kv2019i