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.

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

zephyr: namespace the generated version.h #34

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

Conversation

ycsin
Copy link
Member

@ycsin ycsin commented Dec 7, 2023

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.

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?

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
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 <daniel.leung@intel.com>
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 <daniel.leung@intel.com>
nxp_adsp_imx8ulp needs to be in allowed platforms.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
Use direct call to function instead of going over a redefine.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
Set min. cmake version required to what zephyr uses.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
@nashif nashif force-pushed the zephyr branch 2 times, most recently from d406826 to 7a0ff76 Compare January 26, 2024 16:32
Use system cache API instead of soc specific calls.

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
@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
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 <dmitrii.golovanov@intel.com>
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 <dmitrii.golovanov@intel.com>
Update NXP board names and configs with
the ones for HWMv2.

Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
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 <laurentiu.mihalcea@nxp.com>
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 <laurentiu.mihalcea@nxp.com>
CONFIG_SOC_<name> has changed in zephyr in order to
match soc name.
Threfore, update configs with new values.

Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com>
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 <ycsin@meta.com>
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.

@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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants