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 32bit and rk322x families consolidation #6092

Merged

Conversation

paolosabatino
Copy link
Contributor

@paolosabatino paolosabatino commented Dec 25, 2023

Description

Big pull request that consolidates rockchip 32bit and rk322x families together, for less painful kernel patch adaption during maintance cycles.

Jira reference number AR-1988

Despite this is the minor nightmarish part of the rockchip patches archive, consolidation could and has been done.

In particular, this PR do:

  • merge patches from rockchip and rk322x families for current and edge kernels, moving everything into rockchipfamily
  • migrate edge kernel rockchip-6.6 into patch series, rename all patches with more understandable names with alphabetical prefixes in place of numeric ones (sunxi inspired)
  • implement new style dt and overlay directories for edge and current kernels to leverage the build system automatic makefile handling
  • rework kernel configs for both edge and current: some things have been added, some removed, but will require some fine tuning that will be subject of another PR probably
  • adjust patches for tinkerboard to remove some cruft and overclocking, cleaning up dmesg also
  • fix rk322x dmc to avoid lockup on rk3288
  • remove non-LTS rk322x archives from patch directory; remaining rk322x kernel archives can be removed in the future as well, since they are kept only for historical purposes and not in use anymore; also removes rk322x legacy, current and edge symlinks
  • remove non-LTS rockchip archives from patch directory (acutally the only removed leftover was rockchip-6.5)
  • remove legacy kernel target for rk322x-box
  • add gen-series.sh script in tools directory (it is a naive tool to create patch series from scratch when you don't want to rebase everything, script is fully commented and usage help provided also)

How Has This Been Tested?

  • Debian Bookworm image built and tested for rk322x-box
  • Debian Bookworm image built and tested for tinkerboard
  • Ubuntu Jammy image built and tested for rk322x-box
  • Ubuntu Jammy image built and tested for tinkerboard
  • Several edge 6.6 and current 6.1 kernel compilations
  • Cores, gpu, hdmi, hdmi audio, ethernet, wifi, hardware decoding, usb tested on tinkerboard current 6.1
  • Cores, gpu, hdmi, hdmi audio, ethernet, wifi, hardware decoding, usb tested on tinkerboard edge 6.6
  • Cores, gpu, hdmi, hdmi audio, ethernet, wifi, hardware decoding, usb tested on rk322x-box current 6.1
  • Cores, gpu, hdmi, hdmi audio, ethernet, wifi, hardware decoding, usb tested on rk322x-box edge 6.6

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

 * merge patches from rockchip and rk322x families for current and edge
   kernels
 * adjust patches for tinkerboard to remove some cruft and overclocking
 * rework kernel configs
 * fix rk322x dmc to avoid lockup on rk3288
 * migrate rockchip-6.6 into patch series, rename all patches with
   more understandable names
 * add gen-series.sh script in tools directory (it is a naive tool to
   create patch series when you don't want to rebase everything)
@paolosabatino paolosabatino requested a review from a team December 25, 2023 21:37
@github-actions github-actions bot added Hardware Hardware related like kernel, U-Boot, ... Framework Framework components labels Dec 25, 2023
@paolosabatino
Copy link
Contributor Author

I have left documentation and Any dependent changes have been merged and published in downstream modules checkboxes unchecked because I'm just not sure:

  • if there is any documentation that involved rk322x that should be changed (but I guess there isn't any)
  • if there is the need to change in the automatic image building machinery, but I guess not, since the rk322x-box board configuration has been just changed from rk322x to rockchip family and that should suffice to avoid building rk322x kernels

rpardini
rpardini previously approved these changes Dec 26, 2023
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.

What a labor of love @paolosabatino - merge it!

@github-actions github-actions bot added the size/large PR with 250 lines or more label Dec 26, 2023
@paolosabatino
Copy link
Contributor Author

Thanks @rpardini!
Could you also accept again the PR? I accidentally pushed another commit to fix some kernel configs and made the previous acceptation stale, sorry!

@rpardini
Copy link
Member

There you go

@paolosabatino paolosabatino merged commit a1d98a4 into armbian:main Dec 26, 2023
6 of 7 checks passed
@paolosabatino paolosabatino deleted the rk322x-rockchip-family-consolidation2 branch December 26, 2023 15:45
ColorfulRhino added a commit to ColorfulRhino/build that referenced this pull request Jun 29, 2024
The rk322x board family was intergated into the rockchip family in theis PR: armbian#6092

The kernel patch folder are not in use anymore.
ColorfulRhino added a commit to ColorfulRhino/build that referenced this pull request Jun 29, 2024
…n't exist anymore

BOARDFAMILY `rk322x` was integrated into the `rockchip` BOARDFAMILY in armbian#6092
ColorfulRhino added a commit to ColorfulRhino/build that referenced this pull request Jun 29, 2024
…n't exist anymore

BOARDFAMILY `rk322x` was integrated into the `rockchip` BOARDFAMILY in armbian#6092
ColorfulRhino added a commit to ColorfulRhino/build that referenced this pull request Jun 29, 2024
…timizations

BOARDFAMILY `rk322x` was integrated into the `rockchip` BOARDFAMILY in armbian#6092
This integration made the hardware optimization for rk322x not apply anymore.

Also remove a rk322x optimization for an old 4.4 kernel
ColorfulRhino added a commit that referenced this pull request Jun 30, 2024
The rk322x board family was intergated into the rockchip family in theis PR: #6092

The kernel patch folder are not in use anymore.
ColorfulRhino added a commit that referenced this pull request Jun 30, 2024
…timizations

BOARDFAMILY `rk322x` was integrated into the `rockchip` BOARDFAMILY in #6092
This integration made the hardware optimization for rk322x not apply anymore.

Also remove a rk322x optimization for an old 4.4 kernel
Dangku pushed a commit to Dangku/armbian-build that referenced this pull request Jul 3, 2024
The rk322x board family was intergated into the rockchip family in theis PR: armbian/build#6092

The kernel patch folder are not in use anymore.
Dangku pushed a commit to Dangku/armbian-build that referenced this pull request Jul 3, 2024
…timizations

BOARDFAMILY `rk322x` was integrated into the `rockchip` BOARDFAMILY in armbian/build#6092
This integration made the hardware optimization for rk322x not apply anymore.

Also remove a rk322x optimization for an old 4.4 kernel
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, ... size/large PR with 250 lines or more
Development

Successfully merging this pull request may close these issues.

2 participants