Skip to content

Conversation

@iuliana-prodan
Copy link
Contributor

Commit 8357dcf ("zephyr: trace: use zephyr utilities when enabled")
added Zephyr's sys/printk.h in order to fix:
warning: implicit declaration of function 'printk'.

Remove #ifdef ZEPHYR macro since this is not needed, because
the whole file is for Zephyr only.

Fixes: 8357dcf ("zephyr: trace: use zephyr utilities when enabled")
Signed-off-by: Iuliana Prodan [email protected]

Commit 8357dcf ("zephyr: trace: use zephyr utilities when enabled")
added Zephyr's sys/printk.h in order to fix:
warning: implicit declaration of function 'printk'.

Remove #ifdef __ZEPHYR__ macro since this is not needed, because
the whole file is for Zephyr only.

Fixes: 8357dcf ("zephyr: trace: use zephyr utilities when enabled")
Signed-off-by: Iuliana Prodan <[email protected]>
Copy link
Collaborator

@paulstelian97 paulstelian97 left a comment

Choose a reason for hiding this comment

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

Are these files supposed to be independent from those outside the Zephyr tree? I don't like the potential for these two versions of essentially the same file having a chance to diverge from one another.

@iuliana-prodan
Copy link
Contributor Author

Are these files supposed to be independent from those outside the Zephyr tree? I don't like the potential for these two versions of essentially the same file having a chance to diverge from one another.

What is under zephy/ is for Zephyr build. There are no corresponding files in Zephyr repo (i.e. there is no trace.h in Zephyr other than the one from modules/audio/sof).
From my understanding, the intention is to gradually remove some of these.
See also this: #4217 (comment)

Copy link
Collaborator

@marc-hb marc-hb left a comment

Choose a reason for hiding this comment

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

Are these files supposed to be independent from those outside the Zephyr tree?

They're temporary hacks to build SOF with Zephyr.

I'm not sure what you mean by "independent".

Also, when you write "the Zephyr tree" do you mean zephyrproject-rtos/zephyr/ or thesofproject/sof/zephyr ?

I don't like the potential for these two versions of essentially the same file having a chance to diverge from one another.

There's already a dozen trace.h files in thesofproject/sof BTW, were you thinking about one in particular?

@lgirdwood
Copy link
Member

CI showing unrelated DUT boot failure.

@lgirdwood lgirdwood merged commit 4475f60 into thesofproject:main May 24, 2021
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.

4 participants