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

rockchip-rk3588/6.11: backport Marcin Juszkiewicz's "FriendlyELEC NanoPC-T6 improvements" v6 series to fix non-LTS and split LTS version of NanoPC T6 #7272

Conversation

rpardini
Copy link
Member

rockchip-rk3588/6.11: backport Marcin Juszkiewicz's "FriendlyELEC NanoPC-T6 improvements" v6 series to fix non-LTS and split LTS version of NanoPC T6

  • nanopct6-lts: a separate board for the LTS version of the NanoPC T6
    • Split has landed upstream for 6.12, and backported in a separate commit
    • I had already added the -lts version to the vendor (6.1) rockchip kernel a few months ago
  • rockchip-rk3588/6.11: backport Marcin Juszkiewicz's "FriendlyELEC NanoPC-T6 improvements" v6 series to fix non-LTS and split LTS version of NanoPC T6
    • Marcin Juszkiewicz's series https://lore.kernel.org/all/[email protected]/ has landed upstream
      • see torvalds/linux@db1dcbe
      • thus we have 2 separate DTs, one for non-LTS, one for LTS; thus also 2 different Armbian boards (see separate commit)
    • drop my own patch that added SPI NOR to the T6, as that is now included in the base DT
    • this patch shall be dropped when 6.12-rc1 is released

- Split has landed upstream for 6.12, and backported in a separate commit
- I had already added the `-lts` version to the vendor (6.1) rockchip kernel a few months ago
…oPC-T6 improvements" v6 series to fix non-LTS and split LTS version of NanoPC T6

- Marcin Juszkiewicz's series https://lore.kernel.org/all/[email protected]/ has landed upstream
  - see torvalds/linux@db1dcbe
  - thus we have 2 separate DTs, one for non-LTS, one for LTS; thus also 2 different Armbian boards (see separate commit)
- drop my own patch that added SPI NOR to the T6, as that is now included in the base DT
- this patch shall be dropped when `6.12-rc1` is released
@github-actions github-actions bot added the size/large PR with 250 lines or more label Sep 17, 2024
@github-actions github-actions bot added Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels Sep 17, 2024
@rpardini rpardini marked this pull request as ready for review September 17, 2024 12:45
Copy link
Member

@SuperKali SuperKali left a comment

Choose a reason for hiding this comment

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

The NanoPC T6 both versions should work with the same device tree, only in LTS some things have been changed, does it make sense to distinguish the two versions? It should also be maintained on the vendor kernel in this case, I own the first version, I don't know which one was sent to me.

In addition:
In this case we'll have to maintain two different versions, the old version that I think they will no longer produce by now and the new version.

@rpardini
Copy link
Member Author

does it make sense to distinguish the two versions

Already discussed on kernel mailing list.
v6 series has already landed on Torvalds' tree.
No point arguing now...

@rpardini
Copy link
Member Author

To be fair: depending on how u-boot implements this (eg if theres some ADC-based board revision detection code or such) then a single u-boot that decides fdtfile internally could be used, and a single Armbian board that does not specify FDT could be arranged. For now, u-boot is using 6.9's DTs, thus there is no such option.

@igorpecovnik igorpecovnik added Ready to merge Reviewed, tested and ready for merge 11 Milestone: Fourth quarter release labels Sep 18, 2024
@igorpecovnik igorpecovnik merged commit 1ac3f7c into armbian:main Sep 18, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
11 Milestone: Fourth quarter release Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... Ready to merge Reviewed, tested and ready for merge size/large PR with 250 lines or more
Development

Successfully merging this pull request may close these issues.

3 participants