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

Port NXP ADSP soc/boards to HWMv2 #69398

Merged
merged 7 commits into from
Feb 28, 2024

Conversation

iuliana-prodan
Copy link
Collaborator

Port NXP ADSP SoC family and boards to HWMv2.

@iuliana-prodan
Copy link
Collaborator Author

This PR has a dependency on #69399

soc/nxp/imx/Kconfig Outdated Show resolved Hide resolved
soc/nxp/imx/imx8/Kconfig.defconfig Outdated Show resolved Hide resolved
soc/nxp/imx/imx8/Kconfig.defconfig Outdated Show resolved Hide resolved
soc/nxp/imx/imx8/Kconfig.soc Outdated Show resolved Hide resolved
soc/nxp/imx/imx8/Kconfig.soc Outdated Show resolved Hide resolved
soc/nxp/imx/imx8/Kconfig.soc Outdated Show resolved Hide resolved
soc/nxp/imx/imx8m/CMakeLists.txt Outdated Show resolved Hide resolved
soc/nxp/imx/imx8m/Kconfig.defconfig Outdated Show resolved Hide resolved
soc/nxp/imx/imx8m/Kconfig.defconfig.imx8mp_adsp Outdated Show resolved Hide resolved
soc/nxp/imx/imx8m/Kconfig.soc Outdated Show resolved Hide resolved
boards/nxp/mimx8mp_evk/Kconfig.mimx8mp_evk Outdated Show resolved Hide resolved
boards/nxp/mimx8mp_evk/board.cmake Outdated Show resolved Hide resolved
boards/nxp/mimx8mp_evk/board.yml Outdated Show resolved Hide resolved
@iuliana-prodan
Copy link
Collaborator Author

v2:

  • fix soc name in Kconfig - not it matches the one from soc.yml;
  • fix comments from @nordicjm;
  • fix compliance errors.

Regarding compliance checks - I still have 2 errors.

One is regarding nxp_adsp_rt595 - this is in process of porting to hwmv2 and it has nothing to do with this PR.

Next is:

Missing SoC names or CONFIG_SOC vs soc.yml out of sync:

soc name: mimx8qm6 not found in CONFIG_SOC defaults.
soc name: imx8ulp not found in CONFIG_SOC defaults.
soc name: mimx8ml8 not found in CONFIG_SOC defaults.
soc name: mimx8qx6 not found in CONFIG_SOC defaults.

This is false IMO. I have the CONFIG SOC defined for all 4 socs.
See, for example for mimx8qm6 -
soc.yml - https://github.com/zephyrproject-rtos/zephyr/pull/69398/files#diff-57bf2b8b4543a2b08e7ae3d16f19acbfc8cfedd275cfd3756b1c1000f574268fR6
defconfig - https://github.com/zephyrproject-rtos/zephyr/pull/69398/files#diff-76a8a7d05373ebb56c744e770e0ec4fa8dbcde98057a5ed3a562cd46c197303aR9
So, is something wrong here?

@iuliana-prodan
Copy link
Collaborator Author

This PR has a dependency on #69399

The dependency on #69399 was fixed by having the same soc name in Kconfig and soc.yml.
Now there's a dependency on zephyrproject-rtos/hal_nxp#341

@iuliana-prodan
Copy link
Collaborator Author

@nordicjm for compliance check I get:

Error: See https://docs.zephyrproject.org/latest/build/kconfig/tips.html for more details.

 Found references to undefined Kconfig symbols. If any of these are false
positives, then add them to UNDEF_KCONFIG_WHITELIST in /home/runner/work/zephyr/zephyr/./scripts/ci/check_compliance.py.

If the reference is for a comment like /* CONFIG_FOO_* */ (or
/* CONFIG_FOO_*_... */), then please use exactly that form (with the '*'). The
CI check knows not to flag it.

More generally, a reference followed by $, @, {, *, or ## will never be
flagged.

CONFIG_SOC_NXP_RT595                       boards/boards_legacy/xtensa/nxp_adsp_rt595/nxp_adsp_rt595_defconfig:2
CONFIG_SOC_SERIES_NXP_RT5XX                boards/boards_legacy/xtensa/nxp_adsp_rt595/nxp_adsp_rt595_defconfig:1

and this part if handled in another PR by @danieldegrasse - 56551e3

@nordicjm
Copy link
Collaborator

Did you rebase? There should be no compliance failures

@nordicjm nordicjm added this to the v3.7.0 milestone Feb 27, 2024
@iuliana-prodan iuliana-prodan force-pushed the nxp_adsp_hwmv2 branch 2 times, most recently from 05308e6 to d0710c2 Compare February 27, 2024 16:36
@iuliana-prodan
Copy link
Collaborator Author

Did you rebase? There should be no compliance failures

I did, multiple times, but those errors are still there. :(
Am I missing something?

@iuliana-prodan
Copy link
Collaborator Author

@nordicjm & all, be aware that some intel_adsp tests will fail because I've update the sof repo here.
Before my change it was at pull/39/head (Intel's updates for HWMv2), now I've updated to pull/40/head (NXP's updates for HWMv2).
None of these PRs is merged in sof, yet.

@nordicjm
Copy link
Collaborator

@nordicjm & all, be aware that some intel_adsp tests will fail because I've update the sof repo here. Before my change it was at pull/39/head (Intel's updates for HWMv2), now I've updated to pull/40/head (NXP's updates for HWMv2). None of these PRs is merged in sof, yet.

You need to make a new commit on top of theirs or make a new PR with their commit included, we will not be merging any PRs where there are CI failures

@nordicjm
Copy link
Collaborator

Did you rebase? There should be no compliance failures

I did, multiple times, but those errors are still there. :( Am I missing something?

Then the issues are with your additions here

Port i.MX ADSP family to HWMv2, including series:
- imx8
- imx8m
- imx8x
- imx8ulp

Signed-off-by: Iuliana Prodan <[email protected]>
Convert i.MX ADSP boards to HMV2 including:
- imx8mp_evk
- imx8qxp_mek
- imx8qm_mek
- imx8ulp_evk

Signed-off-by: Iuliana Prodan <[email protected]>
Update board name and rename files for
openamp_rsc_table sample.

Signed-off-by: Iuliana Prodan <[email protected]>
Remove SOC_FAMILY_NXP_ADSP since this is not used
anymore for the ADSP.
With HWMv2 ADSP is part of SOC_FAMILY_IMX.

Signed-off-by: Iuliana Prodan <[email protected]>
Rename SOC_FAMILY_IMX to SOC_FAMILY_NXP_IMX.

I've also kept SOC_FAMILY_IMX since there are
still legacy socs/boards that use it. When all
are ported to HWMv2 this should be removed.

Signed-off-by: Iuliana Prodan <[email protected]>
Update Xtensa HAL to get the
rename of the SoC overlay for
NXP i.MX8ULP.

Signed-off-by: Iuliana Prodan <[email protected]>
Update SOF for NXP's new boards name and configs.

Signed-off-by: Iuliana Prodan <[email protected]>
@iuliana-prodan
Copy link
Collaborator Author

@nordicjm all issues solved, CI is passing.

@nordicjm nordicjm removed the DNM This PR should not be merged (Do Not Merge) label Feb 28, 2024
@nordicjm nordicjm merged commit d243e57 into zephyrproject-rtos:collab-hwm Feb 28, 2024
25 of 26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants