Skip to content

build-with-zephyr: fix submodules, get ready for new python script - #412

Merged
lgirdwood merged 2 commits into
thesofproject:masterfrom
marc-hb:submodule-python
Jun 9, 2022
Merged

lgirdwood merged 2 commits into
thesofproject:masterfrom
marc-hb:submodule-python

Conversation

@marc-hb

@marc-hb marc-hb commented Jun 8, 2022

Copy link
Copy Markdown
Collaborator

Add missing git submodule update as reported by @plbossart (thx!)

Also make the documentation ready for xtensa-build-zephyr.py
which... does not have any hack to automatically download git submodules
like the older .sh script has.

As a side-effect, this breaks down the process and adds an intermediate
west build step which removes one layer of indirection in case of some
Zephyr environment issue.

Cannot fully switch to the Python version yet because of bugs like
thesofproject/sof#5906 but do recommend users to
start trying it.

west init knows how to create a directory, no need to ask the user.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
@marc-hb
marc-hb marked this pull request as ready for review June 8, 2022 23:47
@marc-hb

marc-hb commented Jun 8, 2022 •

Copy link
Copy Markdown
Collaborator Author

The many breathe warnings are unrelated to this. They're caused by the recent addition of __sparse_* attributes in the source code.
https://github.com/thesofproject/sof-docs/runs/6803642273?check_suite_focus=true
cc: @lyakh

EDIT: _sparse_cache warnings fixed in

/home/runner/work/sof-docs/sof-docs/api/audio-stream-api.rst:8: WARNING: Error when parsing function declaration.
If the function has no return type:
  Error in declarator or parameters and qualifiers
  Invalid definition: Expected identifier in nested name, got keyword: int [error at 10]
    static int audio_stream_set_params(struct  audio_stream   __sparse_cache  * buffer, struct  sof_ipc_stream_params  * params)
    ----------^
If the function has a return type:
  Error in declarator or parameters and qualifiers
  If pointer to member declarator:
    Invalid definition: Expected '::' in pointer to member (function). [error at 34]
      static int audio_stream_set_params(struct  audio_stream   __sparse_cache  * buffer, struct  sof_ipc_stream_params  * params)
      ----------------------------------^
  If declarator-id:
    Invalid definition: Expecting "," or ")" in parameters_and_qualifiers, got "*". [error at 74]
      static int audio_stream_set_params(struct  audio_stream   __sparse_cache  * buffer, struct  sof_ipc_stream_params  * params)
      --------------------------------------------------------------------------^

@marc-hb
marc-hb requested review from aborisovich and kfrydryx June 8, 2022 23:50
Add missing `git submodule update` as reported by @plbossart (thx!)

Also make the documentation ready for `xtensa-build-zephyr.py`
which... does not have any hack to automatically download git submodules
like the older .sh script has.

As a side-effect, this breaks down the process and adds an intermediate
`west build` step which removes one layer of indirection in case of some
Zephyr environment issue.

Cannot fully switch to the Python version yet because of bugs like
thesofproject/sof#5906 but do recommend users to
start trying it.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
@marc-hb
marc-hb force-pushed the submodule-python branch from 49bc526 to 944f14e Compare June 9, 2022 01:30
@marc-hb

marc-hb commented Jun 9, 2022

Copy link
Copy Markdown
Collaborator Author

As usual to see a rendered version of the modified file go to "Files changed" -> "..." -> "View File"

@plbossart plbossart left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks @marc-hb

@lgirdwood
lgirdwood merged commit ab552a3 into thesofproject:master Jun 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants