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

firefly-rk3399: move to rockchip64 family #6611

Merged
merged 1 commit into from
May 17, 2024
Merged

Conversation

chainsx
Copy link
Member

@chainsx chainsx commented May 16, 2024

Description

  1. Firefly-RK3399: move to rockchip64 family
  2. The legacy kernel of firefly-rk3399 seems to be unable to work properly, so it will be removed.

AR-2310

How Has This Been Tested?

  • Almost all hardware functions(HDMI, WiFi, BT, GbE, USB...).
  • System startup.

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/large PR with 250 lines or more Hardware Hardware related - kernel, u-boot, patches labels May 16, 2024
@igorpecovnik igorpecovnik added 05 Milestone: Second quarter release Needs review Seeking for review labels May 16, 2024
@ARC-MX
Copy link
Contributor

ARC-MX commented May 16, 2024

why?

@chainsx
Copy link
Member Author

chainsx commented May 16, 2024

why?

The media kernel lacks maintainers for maintenance, and I believe that the number of families should be reduced as much as possible.

@igorpecovnik igorpecovnik added Ready to merge Reviewed, tested and ready for merge and removed Needs review Seeking for review labels May 17, 2024
@igorpecovnik igorpecovnik merged commit aa6ed7c into armbian:main May 17, 2024
12 checks passed
@igorpecovnik igorpecovnik added 08 Milestone: Third quarter release and removed 05 Milestone: Second quarter release labels May 17, 2024
@igorpecovnik
Copy link
Member

igorpecovnik commented May 17, 2024

[🐳|🔨] Failed to parse unidiff for file /armbian/patch/kernel/archive/rockchip64-6.8/board-firefly-rk3399-dts.patch(:1): 'Unexpected hunk found: @@ -27,42 +25,7 @@'

Error: arch/arm64/boot/dts/rockchip/rk3399-firefly.dts:582.6-7 syntax error

@chainsx
Copy link
Member Author

chainsx commented May 18, 2024

[🐳|🔨] Failed to parse unidiff for file /armbian/patch/kernel/archive/rockchip64-6.8/board-firefly-rk3399-dts.patch(:1): 'Unexpected hunk found: @@ -27,42 +25,7 @@'

Error: arch/arm64/boot/dts/rockchip/rk3399-firefly.dts:582.6-7 syntax error

OK, I will fix it.

@rpardini
Copy link
Member

board-firefly-rk3399-dts.patch contains crap (no wonder, considering where it came from) and can't be correctly rewritten

@chainsx
Copy link
Member Author

chainsx commented May 18, 2024

board-firefly-rk3399-dts.patch contains crap (no wonder, considering where it came from) and can't be correctly rewritten

This patch is organized by me based on the patches file of the media family.

@rpardini
Copy link
Member

Didn't mean to offend -- I meant media has carried malformed patch chunks, which get improperly applied, for years -- but sincerely, what is the point of patching mainline to look like a vendor crossover here? let's just go with mainline, and port over specific (small) changes if needed...

@chainsx
Copy link
Member Author

chainsx commented May 18, 2024

Didn't mean to offend -- I meant media has carried malformed patch chunks, which get improperly applied, for years -- but sincerely, what is the point of patching mainline to look like a vendor crossover here? let's just go with mainline, and port over specific (small) changes if needed...

I understand what you mean, but the situation before this was even worse.:
#5896

I also don't know what the situation is. Based on the mainline device tree, the device cannot even boot.

@rpardini
Copy link
Member

I also don't know what the situation is. Based on the mainline device tree, the device cannot even boot.

Oh wow. In this case I'll skip rockchip64/ege from rewrite batch (ref #6455 - which is just patch bureocracy), and let you handle this calmy. In the current state of main, most of the patch gets ignored due the the malformed chunk and its fallout, so in the end it's mostly just mainline and some alias changes.

@chainsx
Copy link
Member Author

chainsx commented May 18, 2024

I also don't know what the situation is. Based on the mainline device tree, the device cannot even boot.

Oh wow. In this case I'll skip rockchip64/ege from rewrite batch (ref #6455 - which is just patch bureocracy), and let you handle this calmy. In the current state of main, most of the patch gets ignored due the the malformed chunk and its fallout, so in the end it's mostly just mainline and some alias changes.

I will handle the issue as soon as possible.

@rpardini
Copy link
Member

Ooops, actually, patching "works", but building fails:

Error: arch/arm64/boot/dts/rockchip/rk3399-firefly.dts:582.6-7 syntax error
FATAL ERROR: Unable to parse input tree

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
08 Milestone: Third quarter release Hardware Hardware related - kernel, u-boot, patches 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.

None yet

4 participants