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: NanoPC T6 & LTS - Bump uboot from 2024.07 to 2024.10 mainline #7393

Merged
merged 5 commits into from
Oct 21, 2024

Conversation

SuperKali
Copy link
Member

@SuperKali SuperKali commented Oct 21, 2024

Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

  • Bump uboot from 2024.07 to 2024.10 mainline
  • Replaced edge patch with v7 that enable power-supply on USB3.0 and add fan control through pwm.

Jira reference number AR-2517

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Please also note any relevant details for your test configuration.

  • ./compile.sh BOARD=nanopct6-lts 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

- Replaced edge patch with v7 that enable power-supply on USB3.0 and add fan control through pwm.

Signed-off-by: SuperKali <hello@superkali.me>
@github-actions github-actions bot added size/large PR with 250 lines or more Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... labels Oct 21, 2024
@SuperKali SuperKali changed the title Board: NanoPC T6 & LTS - Bump uboot from 2024.07 to 2024.10 mainline Board: NanoPC T6 & LTS - Bump uboot from 2024.04 to 2024.10 mainline Oct 21, 2024
@SuperKali SuperKali changed the title Board: NanoPC T6 & LTS - Bump uboot from 2024.04 to 2024.10 mainline Board: NanoPC T6 & LTS - Bump uboot from 2024.07 to 2024.10 mainline Oct 21, 2024
@SuperKali SuperKali added 11 Milestone: Fourth quarter release Needs review Seeking for review labels Oct 21, 2024
@ColorfulRhino
Copy link
Collaborator

Here is a quick description on how to import patches from the kernel mailing list, but you can also apply this when downloading single commits e.g. from GitHub: #7078 (comment)

@ColorfulRhino
Copy link
Collaborator

To explain more:

When updating the kernel, e.g. from 6.12 to 6.13, the build script can detect patches that are now part of the upstream. But this only works if the patches are the same than the upstream ones. When you have one big patch that you did yourself, it can not detect this and instead just refuses to patch (build error). Worst case the maintainer will get rid of the whole patch file since he doesn't want to spend the time and effort to check which parts can go and which to leave.

@github-actions github-actions bot added size/medium PR with more then 50 and less then 250 lines and removed size/large PR with 250 lines or more labels Oct 21, 2024
Copy link
Member Author

@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.

@ColorfulRhino it's correct now?

@ColorfulRhino
Copy link
Collaborator

@ColorfulRhino it's correct now?

The result is now correct, thanks!
Best practice would be to have two commits for this PR instead of the going back and forth:

  1. board: nanopc-t6: Bump U-Boot from 2024.07 to 2024.10 mainline
  2. board: nanopc-t6: Add USB3 power-supply and pwm fan

You could force-push that, but i'm not gonna make you go through it again and just squash the commits instead :) Next time!

@ColorfulRhino
Copy link
Collaborator

ColorfulRhino commented Oct 21, 2024

@SuperKali Just out of interest, which fan do you use for your NanoPC T6?

@ColorfulRhino ColorfulRhino added Ready to merge Reviewed, tested and ready for merge and removed Needs review Seeking for review labels Oct 21, 2024
@ColorfulRhino ColorfulRhino merged commit 435d9e2 into armbian:main Oct 21, 2024
1 check passed
@SuperKali
Copy link
Member Author

@SuperKali Just out of interest, which fan do you use for your NanoPC T6?

I don't have a fan atm, but this code works on other board i own, i read the schem and i checked that pins are correctly:
image
image

@SuperKali SuperKali deleted the nanopct6-next branch October 21, 2024 14:11
@ColorfulRhino
Copy link
Collaborator

Alright. And see, thanks to it now being just one separate patch, it could be easily included in the 6.12 PR ;)

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.

2 participants