Skip to content

imx: clk: Fix zephyr header include - #6098

Merged
lgirdwood merged 1 commit into
thesofproject:mainfrom
dbaluta:fix_compile
Aug 5, 2022
Merged

imx: clk: Fix zephyr header include#6098
lgirdwood merged 1 commit into
thesofproject:mainfrom
dbaluta:fix_compile

Conversation

@dbaluta

@dbaluta dbaluta commented Aug 5, 2022

Copy link
Copy Markdown
Collaborator

After Zephyr commit:

855216f582d2 ("kconfig: default to LEGACY_INCLUDE_PATH=n")

we get a compile time error because legacy include paths are not
supported by default.

Fix this by adding 'zephyr/' prefix in proper places.

Signed-off-by: Daniel Baluta daniel.baluta@nxp.com

After Zephyr commit:

855216f582d2 ("kconfig: default to LEGACY_INCLUDE_PATH=n")

we get a compile time error because legacy include paths are not
supported by default.

Fix this by adding 'zephyr/' prefix in proper places.

Signed-off-by: Daniel Baluta <daniel.baluta@nxp.com>

@lgirdwood lgirdwood 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.

@dbaluta

dbaluta commented Aug 5, 2022

Copy link
Copy Markdown
Collaborator Author

@lgirdwood @kv2019i we need to merge this PR into the same patch of #6079 as we do not want windows where the compile errors is present in our repo.

@marc-hb

marc-hb commented Aug 5, 2022

Copy link
Copy Markdown
Collaborator

Funny enough all IMX builds are fixed in https://github.com/thesofproject/sof/runs/7689817244 with this PR alone.

@dbaluta

dbaluta commented Aug 5, 2022

Copy link
Copy Markdown
Collaborator Author

@marc-hb wait a second I thought that first build where SOF + zephyr gets a compile time error on i.MX is #6079

Because PR #6079 brings in new zephyr, which needs different include paths.

I'm dazed and confused in the same time :)

@lgirdwood

Copy link
Copy Markdown
Member

@marc-hb wait a second I thought that first build where SOF + zephyr gets a compile time error on i.MX is #6079

Because PR #6079 brings in new zephyr, which needs different include paths.

Fwiw, we've had issues in the past where the Zephyr changes would break SOF on Intel from time to time, using the west approach (for devs and CI) now means this should no longer be an issue.

@marc-hb

marc-hb commented Aug 5, 2022

Copy link
Copy Markdown
Collaborator

Because PR #6079 brings in new zephyr, which needs different include paths.

I added github actions yesterday that compile-test BOTH the (static) manifest revision in west.yml AND the latest zephyr main branch. All the tested versions are in the logs

@lgirdwood
lgirdwood merged commit a8918f2 into thesofproject:main Aug 5, 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