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

rk322x: convert dtb patches to dt/overlay directories, support more boards #5762

Merged
merged 5 commits into from Oct 2, 2023

Conversation

paolosabatino
Copy link
Contributor

Description

This PR will convert the existing dtb and dtbo patches into dt/overlay directories as in rockchip64 and other families for easier future handling of device trees.
Also fixes a weird u-boot bug for device tree overlays and bring full support for R29_MXQ, R2B_MXQ and H20 boards.

No other families other than rk322x have been touch by this PR.

How Has This Been Tested?

  • Debian Bookworm images built and tested on live machine
  • Compiled current kernel 6.1 and tested on live installation

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

 * converted dtb/dtbo patches to directories instead of patches
 * add led-conf8 for h20_221_v1.71 board
@rpardini
Copy link
Member

Hey @paolosabatino, thanks

  • I think we can't have rk322x-fixup.scr in git (it is built from rk322x-fixup.scr-cmd, hopefully) and included in .gitignore -- it is not a problem, really, but would make rewriting fail later.

I've noticed the "Makefile Autopatcher" is gagging on arch/arm/boot/dts/rockchip/Makefile's layout -- it's a single make rule (with many line continuations) and that confuses my parser (which I naively tested only on arm64, which uses one-rule-per-dtb), I'll work this so we can get rid of the 2 Makefile patches, and later enjoy automatic patch rebasing/rewriting -- I'll let you know.

@paolosabatino
Copy link
Contributor Author

@rpardini Thanks a lot for spotting the .scr file; I removed that from the repo. Honestly, was also unaware of its purpose, reading the .scr-cmd file content was illuminating 😸

@rpardini
Copy link
Member

rpardini commented Oct 2, 2023

Honestly, was also unaware of its purpose

Oh, and I didn't even realize it was empty. Good thing, fixups (prevalent in rockchip/rockchip64 etc) tie us down to booting via u-boot bootscripts.

Let's merge this, I'll send quality of life improvements later...

@rpardini rpardini merged commit 916c4f8 into armbian:main Oct 2, 2023
3 of 4 checks passed
@paolosabatino paolosabatino deleted the rk322x-r29-mxq branch October 2, 2023 10:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants