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

board: NanoPi R6C and R6S: Bump U-Boot from 2024.07 to 2024.10 #7371

Merged
merged 4 commits into from
Oct 22, 2024

Conversation

ColorfulRhino
Copy link
Collaborator

@ColorfulRhino ColorfulRhino commented Oct 14, 2024

Description

Support for the NanoPi R6C and R6S has been added in v2024.10, so don't use the generic-rk3588_defconfig anymore.

Also copy relevant general patches from the 2024.07 patch folder to 2024.10.

@efectn I have bumped the R6S as well. it should work without problems, but you might want to test anyway since your R6S is a .conf board :)

How Has This Been Tested?

  • ./compile.sh uboot BOARD=nanopi-r6c BRANCH=edge BUILD_DESKTOP=no BUILD_MINIMAL=no KERNEL_CONFIGURE=no RELEASE=trixie
  • ./compile.sh uboot BOARD=nanopi-r6s BRANCH=edge BUILD_DESKTOP=no BUILD_MINIMAL=no KERNEL_CONFIGURE=no RELEASE=trixie

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
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

@github-actions github-actions bot added size/medium PR with more then 50 and less then 250 lines Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels Oct 14, 2024
@ColorfulRhino ColorfulRhino added the 11 Milestone: Fourth quarter release label Oct 14, 2024
@igorpecovnik igorpecovnik added the Work in progress Unfinished / work in progress label Oct 18, 2024
@ColorfulRhino ColorfulRhino added Needs review Seeking for review and removed Work in progress Unfinished / work in progress labels Oct 18, 2024
Copy link
Member

@rpardini rpardini left a comment

Choose a reason for hiding this comment

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

Cherry picked. Tested on R6C, works, incl NVMe.

The OTG port (and thus ums and rockusb etc) don't work. I've tried enabling otg stuff in DT and defconfig, but no game.
I'll PR as draft separately.

I've also re-enabled & fixed the vendor u-boot @efectn did long ago (it had a OPTEE problem since we bumped/unified against the latest radxa a few months ago). Vendor u-boot has working UMS, but no NVMe; and works best with vendor kernel and it's NPU/VPU. Will PR separately.

Support for the NanoPi R6C has been added in v2024.10,
so don't use the `generic-rk3588_defconfig` anymore.
Support for the NanoPi R6S has been added in v2024.10,
so don't use the `generic-rk3588_defconfig` anymore.
@rpardini rpardini force-pushed the nanopi-r6-uboot-2024.10-final branch from 4413a1d to c310ddc Compare October 20, 2024 14:54
@ColorfulRhino
Copy link
Collaborator Author

ColorfulRhino commented Oct 20, 2024

Tested on R6C, works, incl NVMe.

Thanks!

I've also re-enabled & fixed the vendor u-boot @efectn did long ago (it had a OPTEE problem since we bumped/unified against the latest radxa a few months ago). Vendor u-boot has working UMS, but no NVMe; and works best with vendor kernel and it's NPU/VPU. Will PR separately.

In my opinion it's best to focus all time and energy on making upstream/mainline U-Boot the best since it will always have the latest features and best longterm support from upstream devs, and in the long run the goal is to be able to drop all vendor stuff. What do you think?

I believe we can make the OTG port work on mainline U-Boot 😄

@igorpecovnik igorpecovnik added Ready to merge Reviewed, tested and ready for merge and removed Needs review Seeking for review labels Oct 22, 2024
@igorpecovnik igorpecovnik merged commit 1e310a3 into main Oct 22, 2024
11 checks passed
@igorpecovnik igorpecovnik deleted the nanopi-r6-uboot-2024.10-final branch October 22, 2024 11:03
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/medium PR with more then 50 and less then 250 lines
Development

Successfully merging this pull request may close these issues.

3 participants