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

bump rockchip64 edge kernel to v6.11 #7278

Merged
merged 1 commit into from
Sep 21, 2024

Conversation

paolosabatino
Copy link
Contributor

@paolosabatino paolosabatino commented Sep 18, 2024

Description

Bump rockchip64 kernel to v6.11

Some notable facts:

  • Tinkerboard Edge device tree has been disabled because this dtsi file does not exist anymore
  • several .remove hooks in various drivers have been fixed due to upstream changed prototype in return type (int -> void)
  • overlay compilation patch reworked for v6.11
  • edge kernel config updated

GitHub issue reference:
Jira reference number AR-2495

How Has This Been Tested?

  • Patch applies and kernel builds
  • Test on a rk3328 board (rock pi-e)
  • Test on a rk3399 board (orangepi 4 lts)
  • Test on rk3308 board (rock pi-s som)
  • Test on a rk356x board
  • Test on a rk3588 board (not applicable, since there is an alternative patchset)

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

@paolosabatino paolosabatino requested a review from a team September 18, 2024 16:05
@github-actions github-actions bot added size/large PR with 250 lines or more Hardware Hardware related like kernel, U-Boot, ... Framework Framework components Patches Patches related to kernel, U-Boot, ... labels Sep 18, 2024
@paolosabatino
Copy link
Contributor Author

Checked on rk3308, rk3328 and rk3399 with success.
I have no rk356x board, so if anyone can give a quick check it would be awesome!

@rpardini
Copy link
Member

rpardini commented Sep 19, 2024

Excellent. I shall cherrypick and try on some 356x asap.

You might want to run ./compile.sh BOARD=rockpro64 BRANCH=edge rewrite-kernel-patches to normalize index stanzas and such.

I've also recently added warnings to the patcher utility about files in dt folder overwriting pre-existing files in the tree; I don't think this happened in the 6.11 timeframe, but we've a few DTs that landed upstream sometime ago and are "forgotten" in the dt folder -- that might cause some confusion down the line.

@paolosabatino
Copy link
Contributor Author

Thanks @rpardini , doing rewrite-kernel-patches still didn't find a place in my kernel bump habit I guess 🙄
I will give it a run ASAP.

For the dt "leftovers", the patch system account for less than a dozen of them; perhaps a round of checks from the board maintainers would be advisable, yet the only board that breaks the compilation is the tinkerboard-edge

@paolosabatino
Copy link
Contributor Author

@rpardini patches rewritten and commit pushed!

@rpardini
Copy link
Member

Cherry picked, built fine, tested on rk3568 (odroidm1) and works fine. Proof: https://paste.next.armbian.com/iyobovurel

@rpardini
Copy link
Member

Note: I've a few unrelated PRs adding DTs to 6.10 which I shall rebase/change to 6.11 when this is merged.

@paolosabatino paolosabatino merged commit 1c79dad into armbian:main Sep 21, 2024
7 checks passed
@paolosabatino paolosabatino deleted the rockchip64-edge-6.11 branch September 21, 2024 12:18
@Tonymac32
Copy link
Member

torvalds/linux@9417909

I'll look at re-enabling the edge R (I have one gathering some dust here)

@paolosabatino
Copy link
Contributor Author

torvalds/linux@9417909

I'll look at re-enabling the edge R (I have one gathering some dust here)

Thanks, actually it should work with the mainlined device tree; the other device tree in the patch directory has been disabled because it is overwriting the mainline one and causing an error during compilation. I don't know what are the differences, but surely there is the need for a revision (or left as-is, since it is a CSC board) and cleanup of the .disabled file

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Framework Framework components Hardware Hardware related like kernel, U-Boot, ... Patches Patches related to kernel, U-Boot, ... size/large PR with 250 lines or more
Development

Successfully merging this pull request may close these issues.

3 participants