Skip to content

Remove unused soc.h header inclusions - #7467

Merged
kv2019i merged 1 commit into
thesofproject:mainfrom
LaurentiuM1234:soc_include_fix
Apr 24, 2023
Merged

Remove unused soc.h header inclusions#7467
kv2019i merged 1 commit into
thesofproject:mainfrom
LaurentiuM1234:soc_include_fix

Conversation

@LaurentiuM1234

@LaurentiuM1234 LaurentiuM1234 commented Apr 19, 2023 •
edited
Loading

Copy link
Copy Markdown
Contributor

Since i.MX93 doesn't have a soc.h file in Zephyr nor does it need one right now, instead of adding an empty soc.h to Zephyr just encase the '#include <soc.h>' statement in an ifdef block.

Please see #7192 for PR dependency graph.

@LaurentiuM1234 LaurentiuM1234 mentioned this pull request Apr 19, 2023
Closed
@LaurentiuM1234
LaurentiuM1234 marked this pull request as ready for review April 19, 2023 10:06
kv2019i
kv2019i approved these changes Apr 19, 2023
View reviewed changes

@kv2019i kv2019i left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

A bit iffy. but ok with this.

Comment thread zephyr/lib/alloc.c Outdated
@LaurentiuM1234
LaurentiuM1234 marked this pull request as draft April 20, 2023 10:04
@iuliana-prodan iuliana-prodan mentioned this pull request Apr 20, 2023
Merged
@LaurentiuM1234

LaurentiuM1234 commented Apr 21, 2023

Copy link
Copy Markdown
Contributor Author

@kv2019i @lyakh @iuliana-prodan Seems like the usage of soc.h is discouraged on Zephyr ARM64 side of things (please see zephyrproject-rtos/zephyr#57071 and zephyrproject-rtos/zephyr#46147). As such, since I can't make a case that soc.h is something needed (apart from it solving these build issues) I'd say we go with the ifdef guards unless there's a third option which I'm not seeing ATM.

@dbaluta

dbaluta commented Apr 21, 2023

Copy link
Copy Markdown
Collaborator

As @nashif said I think would worth taking a look of why is it necessary. How bad things break if we completely remove it.

paulstelian97
paulstelian97 approved these changes Apr 21, 2023
View reviewed changes

@paulstelian97 paulstelian97 left a comment •
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This looks ready, I'd say update pull request title and we're golden on this one.

(edit: do consider fixing the Checkpatch error about the typo in the commit message)

@LaurentiuM1234 LaurentiuM1234 changed the title Conditionally include <soc.h> Remove unused soc.h header inclusions Apr 21, 2023
@LaurentiuM1234
Remove unused <soc.h> header inclusions
109a1a1 
This commit removes all occurrences of the soc.h header file
since this is not used. This also fixes build problem on i.MX93
caused by the fact that i.MX93 doesn't have a soc.h.

Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
@LaurentiuM1234
LaurentiuM1234 marked this pull request as ready for review April 21, 2023 17:29
@kv2019i

kv2019i commented Apr 24, 2023

Copy link
Copy Markdown
Collaborator

Reviewed fails in https://sof-ci.01.org/sofpr/PR7467/build6245/devicetest/index.html and https://sof-ci.01.org/sofpr/PR7467/build6244/devicetest/index.html and nothing specific to this PR. Proceeding with merge.

@kv2019i
kv2019i merged commit f7d9e76 into thesofproject:main Apr 24, 2023
@LaurentiuM1234 LaurentiuM1234 mentioned this pull request Apr 24, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nashif nashif nashif left review comments
@kv2019i kv2019i kv2019i approved these changes
@dbaluta dbaluta dbaluta approved these changes
@paulstelian97 paulstelian97 paulstelian97 approved these changes
@tmleman tmleman tmleman approved these changes
@dabekjakub dabekjakub Awaiting requested review from dabekjakub dabekjakub is a code owner
@lyakh lyakh Awaiting requested review from lyakh lyakh is a code owner
@iuliana-prodan iuliana-prodan Awaiting requested review from iuliana-prodan iuliana-prodan is a code owner
@abonislawski abonislawski Awaiting requested review from abonislawski abonislawski is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@LaurentiuM1234 @dbaluta @kv2019i @nashif @paulstelian97 @iuliana-prodan @tmleman