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

arm64: dts: rockchip: Adopt mainline naming for Friendlyelec CM3588 NAS #220

Merged
merged 2 commits into from
Oct 14, 2024

Conversation

ColorfulRhino
Copy link
Contributor

@ColorfulRhino ColorfulRhino commented Aug 13, 2024

Rename the dts file to match the new name from mainline kernel 6.11.
This makes it easier for the board config since no conditionals are needed.

Should be merged at the same time with armbian/build#7082 (Due to the added compatibility patch, merging at the same time is not needed anymore)

This only applies to branch rk-6.1-rkr3 on purpose since old versions are deprecated.

@ColorfulRhino ColorfulRhino force-pushed the cm3588-mainline-rename branch from 72e1b68 to 3844a49 Compare August 20, 2024 19:44
@amazingfate
Copy link
Collaborator

LGTM, feel free to merge when armbian/build#7082 is done.

@ColorfulRhino
Copy link
Contributor Author

ColorfulRhino commented Oct 14, 2024

Let's merge this now since due to the added compatibility support, both dts names are working and thus merging at the same time with the above mentioned PR is not needed anymore.
@amazingfate You need to merge since you have write access :) I have rebased it onto the current branch.

@amazingfate amazingfate merged commit 7d66037 into armbian:rk-6.1-rkr3 Oct 14, 2024
1 check 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.

3 participants