Skip to content
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

zephyr: namespace the generated version.h #34

Open
wants to merge 14 commits into
base: zephyr
Choose a base branch
from
Open

zephyr: namespace the generated version.h #34

wants to merge 14 commits into from

Conversation

ycsin
Copy link
Member

@ycsin ycsin commented Dec 7, 2023 •
edited
Loading

Zephyr's build time generated version.h is now in the zephyr to provide proper namespace, update the includes of this module accordingly.

See zephyrproject-rtos/zephyr#63973

See also thesofproject#8502 (comment):

@ycsin So can you get the Zephyr thing merged by reopening zephyrproject-rtos#31 and use that in Zephyr west.yml, and when we update SOF to new Zephyr, we'll merged this PR as part of the west.yml update. I think that's what @marc-hb wanted , and this, too, is ok for me. If Zephyr maintainers ask, you can point to this comment.

@ycsin ycsin mentioned this pull request Dec 7, 2023
Merged
6 tasks
kv2019i
kv2019i approved these changes Dec 7, 2023
View reviewed changes
Copy link
Collaborator

@kv2019i kv2019i left a comment

Choose a reason for hiding this comment

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

Thanks @ycsin !

@ycsin
Copy link
Member Author

ycsin commented Dec 12, 2023

@kv2019i if I'm not wrong, is this PR supposed to be merged before #63973, so that #63973 can update the revision to point at this commit?

marc-hb
marc-hb approved these changes Dec 12, 2023
View reviewed changes
Copy link

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

@kv2019i if I'm not wrong, is this PR supposed to be merged before #63973, so that #63973 can update the revision to point at this commit?

100% yes.

Also, merging this PR #34 will have no effect until some west.yml points at it.

@kv2019i kv2019i requested a review from nashif December 12, 2023 10:52
@kv2019i
Copy link
Collaborator

kv2019i commented Dec 12, 2023

@nashif This is ready to go to enable merging of zephyrproject-rtos/zephyr#63973 . We'll cherry-pick this patch to upstream SOF when we update Zephyr after 63973 is merged.

dcpleung and others added 5 commits January 22, 2024 12:39
@dcpleung @nashif
zephyr: cpu: use arch_cpu_start instead of arch_start_cpu
b22ce6d 
This uses arch_cpu_start() instead of arch_start_cpu() as it has
been renamed to align with the CPU namespace.

Signed-off-by: Daniel Leung <[email protected]>
@dcpleung @nashif
zephyr: use k_smp_cpu_start/_resume for secondary core power up
11c251a 
This changes the seconday core power up routine to use the newly
introduced k_smp_cpu_start() and k_smp_cpu_resume(). This removes
the need to mirror part of the SMP start up code from Zephyr, and
no longer need to call into Zephyr private kernel code.

Signed-off-by: Daniel Leung <[email protected]>
@nashif
app: fix filter in sample.yaml
5553bcf 
nxp_adsp_imx8ulp needs to be in allowed platforms.

Signed-off-by: Anas Nashif <[email protected]>
@nashif
zephyr: use arch_xtensa_uncached_ptr/arch_xtensa_cached_ptr
b4214e5 
Use direct call to function instead of going over a redefine.

Signed-off-by: Anas Nashif <[email protected]>
@nashif
app: zephyr still requires cmake version 3.20.0
7a0ff76 
Set min. cmake version required to what zephyr uses.

Signed-off-by: Anas Nashif <[email protected]>
@nashif nashif force-pushed the zephyr branch 2 times, most recently from d406826 to 7a0ff76 Compare January 26, 2024 16:32
nashif added 2 commits January 26, 2024 16:32
@nashif
Revert "zephyr: use arch_xtensa_uncached_ptr/arch_xtensa_cached_ptr"
4d714ec 
This reverts commit b4214e5.
@nashif
zephyr: use system cache APIs instead of custom soc calls
0606152 
Use system cache API instead of soc specific calls.

Signed-off-by: Anas Nashif <[email protected]>
@marc-hb
Copy link

marc-hb commented Jan 30, 2024

The target branch has been force-pushed, so you must rebase.

This is something GitHub should really send notifications about. But Github doesn't care much about force-pushes in general (zephyrproject-rtos/zephyr#53566), so it doesn't.

golowanow and others added 6 commits March 1, 2024 20:22
@golowanow @carlescufi
zephyr: app: scripts: intel_adsp: change board names to HWMv2
89ebbea 
Change `intel_adsp` board names to HWMv2 scheme:

  `intel_adsp_cavs25`     --> `intel_adsp/cavs25`
  `intel_adsp_ace15_mtpm` --> `intel_adsp/ace15_mtpm`
  `intel_adsp_ace20_lnl`  --> `intel_adsp/ace20_lnl`

Signed-off-by: Dmitrii Golovanov <[email protected]>
@golowanow @carlescufi
zephyr: intel_adsp: Change ACE SoC name to HWMv2
ba093e6 
SoC series ACE changes its name to align with HWMv2 new naming
conventions: SOC_SERIES_INTEL_ACE --> SOC_SERIES_INTEL_ADSP_ACE

Signed-off-by: Dmitrii Golovanov <[email protected]>
@iuliana-prodan @carlescufi
zephyr: sof: update board name for HWMv2
3e70d03 
Update NXP board names and configs with
the ones for HWMv2.

Signed-off-by: Iuliana Prodan <[email protected]>
@LaurentiuM1234 @dbaluta
nxp: imx8ulp: change SOC name to MIMX8UD7
aea02f4 
Zephyr PR#70219 changes i.MX8ULP's SOC name to MIMX8UD7.
As such, we need to update the board configuration file
and the SOC name inside `xtensa-build-zephyr.py` to use
the new SOC name.

Signed-off-by: Laurentiu Mihalcea <[email protected]>
@LaurentiuM1234 @dbaluta
zephyr: CMakeLists.txt: use new CONFIG_SOC_ for 8ULP
1c1dd3d 
Zephyr PR#70219 changes the SOC name of i.MX8ULP from MIMX8ULP
to MIMX8UD7. This means that all `CONFIG_SOC_*` configurations
will be changed from the `MIMX8ULP`-based naming to the
`MIMX8UD7`-based naming. As such, this commit updates the name
of the configuration used by the `zephyr/CMakeLists.txt` file.

Signed-off-by: Laurentiu Mihalcea <[email protected]>
@iuliana-prodan @dbaluta
zephyr: sof: update configs for NXP ADSP
c11a318 
CONFIG_SOC_<name> has changed in zephyr in order to
match soc name.
Threfore, update configs with new values.

Signed-off-by: Iuliana Prodan <[email protected]>
@ycsin ycsin mentioned this pull request May 22, 2024
Closed
@ycsin ycsin mentioned this pull request May 23, 2024
Closed
@ycsin ycsin force-pushed the pr/zephyr_version_h_0 branch from 1eafb5b to 92174f4 Compare May 24, 2024 11:21
@ycsin
build: namespace the generated headers with zephyr/`
8ca7b6a 
Zephyr's build time generated headers are now in the
`zephyr` to provide proper namespace, update the path
accordingly.

See ZephyrProject upstream PR at:
zephyrproject-rtos/zephyr#63973

Signed-off-by: Yong Cong Sin <[email protected]>
@ycsin ycsin force-pushed the pr/zephyr_version_h_0 branch from 92174f4 to 8ca7b6a Compare May 24, 2024 13:26
@marc-hb marc-hb mentioned this pull request May 24, 2024
Closed
marc-hb
marc-hb approved these changes May 24, 2024
View reviewed changes
Copy link

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

Approved as long as it builds successfully.

This was referenced May 24, 2024
Closed
Draft
@kv2019i
Copy link
Collaborator

kv2019i commented May 31, 2024

I needed to do some adaptation already now to SOF side build scripts as the header location has changed for e.g. autoconf.h -> thesofproject#9179

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@iuliana-prodan iuliana-prodan iuliana-prodan approved these changes

@marc-hb marc-hb marc-hb approved these changes

@kv2019i kv2019i kv2019i approved these changes

@dbaluta dbaluta dbaluta approved these changes

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

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

@nashif nashif Awaiting requested review from nashif

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@ycsin @kv2019i @marc-hb @dbaluta @iuliana-prodan @dcpleung @nashif @golowanow @LaurentiuM1234