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

Change the soc from ace30_ptl to ace30 #78474

Merged
merged 2 commits into from
Sep 24, 2024

Conversation

gbernatxintel
Copy link
Collaborator

Renamed soc from ace30_ptl to ace30.
We were previously using the wrong soc name.
The correct name is ace30.

There is only one ptl platform, but there can be several ace30 platforms.

Check the commit on the sof project repo:
Change the soc from ace30_ptl to ace30

Dependencies:
thesofproject/sof#9475

Copy link

Hello @gbernatxintel, and thank you very much for your first pull request to the Zephyr project!
Our Continuous Integration pipeline will execute a series of checks on your Pull Request commit messages and code, and you are expected to address any failures by updating the PR. Please take a look at our commit message guidelines to find out how to format your commit messages, and at our contribution workflow to understand how to update your Pull Request. If you haven't already, please make sure to review the project's Contributor Expectations and update (by amending and force-pushing the commits) your pull request if necessary.
If you are stuck or need help please join us on Discord and ask your question there. Additionally, you can escalate the review when applicable. 😊


config SOC
default "ace15_mtpm" if SOC_INTEL_ACE15_MTPM
default "ace20_lnl" if SOC_INTEL_ACE20_LNL
default "ace30_ptl" if SOC_INTEL_ACE30_PTL
default "ace30" if SOC_INTEL_ACE30
Copy link
Collaborator

Choose a reason for hiding this comment

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

these should match SOC_* should be the value of * in the string

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

In my opinion it is ok, if you see other platforms the names are entered without soc_* just simply string. For other manufacturers I randomly checked and also they don't all use soc_* names but just the name of the specific chip

Copy link
Collaborator

Choose a reason for hiding this comment

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

I mean this should either be default "intel_ace30" if SOC_INTEL_ACE30 or default "ace30" if SOC_ACE30 if not then this will fail at some point in the future when the build system generates these symbols automatically from the soc.yml files

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Oki, I changed to "ace30" if SOC_ACE30

@gbernatxintel gbernatxintel force-pushed the gb_ptl_to_ace_3 branch 3 times, most recently from 3674cd4 to ab4f3ee Compare September 18, 2024 09:24
Copy link
Member

@dcpleung dcpleung left a comment

Choose a reason for hiding this comment

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

Also, could you separate the whitespace changes into another commit? A simple rename without any changes should show up in git as a simple rename, and makes it easier to review the diff.

soc/intel/intel_adsp/ace/Kconfig.soc Outdated Show resolved Hide resolved
@gbernatxintel
Copy link
Collaborator Author

Also, could you separate the whitespace changes into another commit? A simple rename without any changes should show up in git as a simple rename, and makes it easier to review the diff.

In fact, it's hard to carve out a separate commit, because the whole commit is a name change from ace30_ptl to ace30. The general problem was that the soc was misspelled. If there is for example another board based on the same soc then there will be confusion with the definitions.
There are no functional changes in this commit

@dcpleung
Copy link
Member

Also, could you separate the whitespace changes into another commit? A simple rename without any changes should show up in git as a simple rename, and makes it easier to review the diff.

In fact, it's hard to carve out a separate commit, because the whole commit is a name change from ace30_ptl to ace30. The general problem was that the soc was misspelled. If there is for example another board based on the same soc then there will be confusion with the definitions. There are no functional changes in this commit

When you look at the diff, there are bunch of header files with only whitespace changes and nothing else. There are not ace30_ptl to ace30 changes in there. All I ask is to separate those simple whitespace changes into another commit so that the renaming would be more simple and direct in git log.

@@ -32,9 +32,9 @@ config SOC_SERIES
config SOC_TOOLCHAIN_NAME
default "intel_ace15_mtpm" if SOC_INTEL_ACE15_MTPM
default "intel_ace15_mtpm" if SOC_INTEL_ACE20_LNL
default "intel_ace30_ptl" if SOC_INTEL_ACE30_PTL
default "intel_ace30" if SOC_INTEL_ACE30
Copy link
Member

Choose a reason for hiding this comment

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

Also, keep the toolchain name as intel_ace30_ptl as it is related to the Zephyr SDK, and the toolchain there is named with _ptl. Changing this would mean Zephyr SDK can no longer build this platform.

@gbernatxintel gbernatxintel force-pushed the gb_ptl_to_ace_3 branch 3 times, most recently from 8c93b25 to fce04e9 Compare September 23, 2024 13:57
No functional changes were made in this update.
Only code formatting issues were corrected.

This commit is necessary to preserve Git history
continuity for future changes involving the switch from ace30_ptl to ace30.

Signed-off-by: Grzegorz Bernat <[email protected]>
Renamed soc from ace30_ptl to ace30.
We were previously using the wrong soc name.
The correct name is ace30.

There is only one ptl platform, but there can be several ace30 platforms.

Signed-off-by: Grzegorz Bernat <[email protected]>
@aescolar aescolar merged commit a654bfb into zephyrproject-rtos:main Sep 24, 2024
28 checks passed
Copy link

Hi @gbernatxintel!
Congratulations on getting your very first Zephyr pull request merged 🎉🥳. This is a fantastic achievement, and we're thrilled to have you as part of our community!

To celebrate this milestone and showcase your contribution, we'd love to award you the Zephyr Technical Contributor badge. If you're interested, please claim your badge by filling out this form: Claim Your Zephyr Badge.

Thank you for your valuable input, and we look forward to seeing more of your contributions in the future! 🪁

@nordicjm
Copy link
Collaborator

@aescolar
Copy link
Member

aescolar commented Sep 24, 2024

This has broken CI https://github.com/zephyrproject-rtos/zephyr/actions/runs/11009734491/job/30570116372 please submit a fix

Thanks @nordicjm, revert queued in #78930

@gbernatxintel
Copy link
Collaborator Author

Thank you @nordicjm ,I'm checking what's happening in this CI test

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: C Library C Standard Library area: DAI area: DMA Direct Memory Access area: Kernel area: Userspace Userspace area: Xtensa Xtensa Architecture platform: Intel ADSP Intel Audio platforms
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants