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

[nrf fromlist] soc: nordic: dmm: Fix DMM_REG_ALIGN_SIZE macro when CO… #2210

Merged
merged 1 commit into from
Nov 1, 2024

Conversation

57300
Copy link
Contributor

@57300 57300 commented Oct 31, 2024

…NFIG_DCACHE=n

Upstream PR #: 80676

Make sure this expansion doesn't include CONFIG_DCACHE_LINE_SIZE, which would be undefined and produce a build error.

Signed-off-by: Grzegorz Swiderski [email protected]
(cherry picked from commit a2988cae16afc4444d98f9fd9453271a250ac63c)

…NFIG_DCACHE=n

Upstream PR #: 80676

Make sure this expansion doesn't include `CONFIG_DCACHE_LINE_SIZE`,
which would be undefined and produce a build error.

Signed-off-by: Grzegorz Swiderski <[email protected]>
(cherry picked from commit cf5405a59931a55b34ed7223ec82f30e3548f339)
@karstenkoenig
Copy link
Contributor

I think the commit message should drop the cherry-pick detail for nrf fromlist

@57300
Copy link
Contributor Author

57300 commented Oct 31, 2024

I think the commit message should drop the cherry-pick detail for nrf fromlist

Hmm, I've always kept it. Commit tags check seems to be fine with it.

@nordicjm nordicjm merged commit 3440378 into nrfconnect:main Nov 1, 2024
19 checks passed
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.

4 participants