sunxi: bump `edge` to 6.18 by EvilOlaf · Pull Request #9049 · armbian/build

EvilOlaf · 2025-12-09T17:07:55Z

Description

An hacked together attempt to bump sunxi family to 6.18 in the major spirit somewhere between I-pretend-to-know-what-I-am-doing and I-have-no-idea-what-I-am-doing.

I re-extracted all of megi's patches from their individual branches and sorted them in the same order as megi applied them to their integration branch orange-pi-6.18.
Then I did the same with Jernej's refactored sun4i drm patches
- Removed any sun4i drm patches from megi since they dont play along. Did zero investigation why.

Todo

address all remaining disabled patches manually (PLEASE HELP and push your fixes into this branch)
- ~~patches.armbian/Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch (left untouched until wifi is sorted)~~
- patches.armbian/drv-gpu-drm-sun4i-sun8i_mixer.c-add-h3-mixer1.patch (I assume collides with sun4i-drm patchset??)
- ~~patches.armbian/drv-mfd-axp20x-add-sysfs-interface.patch ???~~
~~fix uwe wifi. Currently it is disabled since it breaks compilation. Re-enable in drivers_network.sh~~ needs testing
~~xradio was fixed by reverting back to the origin of Igor's fork. Either sync fork or adjust wording in the drivers_network.sh~~ leavin' as it is

How Has This Been Tested?

Orangepi Zero build and boot
other sunxi and sunxi64 devices

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

coderabbitai · 2025-12-09T17:08:01Z

Important

Review skipped

Auto reviews are limited based on label configuration.

🏷️ Required labels (at least one) (1)

Needs review

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

✨ Finishing touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Post copyable unit tests in a comment

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

EvilOlaf · 2025-12-09T17:30:36Z

@radoslavv @robertojguerra Would you mind addressing enable-TV-Output-on-OrangePi-Zero-LTE.patch ?

EvilOlaf · 2025-12-09T17:39:52Z

@JohnTheCoolingFan Would you mind checking Fix-ghost-touches-on-tsc2007-tft-screen.patch ? Upstream code has changed and I don't know how to address this.

JohnTheCoolingFan · 2025-12-09T20:33:41Z

@JohnTheCoolingFan Would you mind checking Fix-ghost-touches-on-tsc2007-tft-screen.patch ? Upstream code has changed and I don't know how to address this.

The patch was not fully mainlined, particularly I don't see anything about y direction resistance which is part of Fix-ghost-touches-on-tsc2007-tft-screen.patch. I don't have the tft module to test with, so can't tell if ghost touches still happen now or not.

EvilOlaf · 2025-12-10T04:37:34Z

The patch was not fully mainlined, particularly I don't see anything about y direction resistance which is part of Fix-ghost-touches-on-tsc2007-tft-screen.patch. I don't have the tft module to test with, so can't tell if ghost touches still happen now or not.

https://paste.armbian.com/vuduwugamu

I noticed where u32 rt = 0; is now u64 and I think rest of this hunk also does no longer apply without modification. I don't understand the code's meaning, so I cannot tell if that makes any sense.

…atch

restore overlay prefix on opiz2 this needs to be properly sorted at some point

sunxi and sunxi64 build just fine

igorpecovnik · 2025-12-15T20:07:04Z

can we run a build train on this.

We can run it, if branch is in build repo, not remote. I have open a new branch sunxi-6.18-v3 and merge this there and next nightly build will be from there.

igorpecovnik · 2025-12-16T08:57:40Z

Tested:

Orangepiwin https://paste.armbian.com/iwadavifiv
Orangepizero 2 https://paste.armbian.com/buzanubaxe
Cubietruck https://paste.armbian.com/rufenopibo

igorpecovnik

Seems, ok, tested on few boards. I think we should just move it to CURRENT with next PR.

github-actions · 2025-12-16T09:00:11Z

✅ This PR has been reviewed and approved — all set for merge!

EvilOlaf · 2025-12-16T11:32:05Z

I'd leave it in edge for a month or two to get an idea about breakages. We can deal with shift to current once 6.19 is released.

igorpecovnik · 2025-12-16T12:29:32Z

I'd leave it in edge for a month or two to get an idea about breakages. We can deal with shift to current once 6.19 is released.

OK. At least we can now merge #8831 and drop special linux family for those.

EvilOlaf · 2025-12-16T12:46:31Z

Yes that's the plan

In Linux 6.19, net_device->dev_addr is const unsigned char *. Clang with -Werror,-Wincompatible-pointer-types-discards-qualifiers rejects passing dev_addr to non-const parameters and memcpy into it. Fix by: - Replacing memcpy(dev->dev_addr, ...) with dev_addr_set() - Using local buffer + ether_addr_copy for sprdwl_set_mac_addr call that needs mutable addr (the function modifies it in-place) - Changing u8 *mac pointer to u8 mac[ETH_ALEN] array in cfg80211.c where dev_addr was assigned to a non-const pointer Relates to armbian#9049 Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

In Linux 6.19, net_device->dev_addr is const unsigned char *. Clang with -Werror,-Wincompatible-pointer-types-discards-qualifiers rejects passing dev_addr to non-const parameters and memcpy into it. Fix by: - Replacing memcpy(dev->dev_addr, ...) with dev_addr_set() - Using local buffer + ether_addr_copy for sprdwl_set_mac_addr call that needs mutable addr (the function modifies it in-place) - Changing u8 *mac pointer to u8 mac[ETH_ALEN] array in cfg80211.c where dev_addr was assigned to a non-const pointer Relates to #9049

* sunxi-6.18: make the mess even worse * fixing one of megis patches and add sunxi 32bit to the mess * rewrite against 6.18 * fix media-ov5640-Don-t-powerup-the-sensor-during-driver-probe.patch * fix media-sun6i-csi-implement-vidioc_enum_framesizes.patch * fix misc-modem-power-Power-manager-for-modems.patch * Fix usb-gadget-Fix-dangling-pointer-in-netdev-private-data.patch, include rewrite * fix mmc-sunxi-mmc-Remove-runtime-PM.patch, two hunks no longer apply * re-extract all of megis patches * remove unneeded branch * add note to disabled patch * auto-generated, out of date * drop megous drm patches in favor of Jernej's work. disable broken patches * disable patch which breaks compilation for armhf * disable breaking patch, rewrite everything * remove patches unrelated to sunxi family * fix spi dev compatible patch * fix tsc2007 patch * drop mainlined patch, adjust x96 mate T95 eth sd card hack * remove upstreamed patch * re-enable no longer broken * another rewrite to align stuff properly * adjust various comments in series.conf * recover lost overlays * uew5622: fix compilation against Linux 6.18 * fix Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch * adjust patch subject to make sense * restore fixup creation restore overlay prefix on opiz2 this needs to be properly sorted at some point * bump to 6.18.1 sunxi and sunxi64 build just fine * fix and re-enable drv-mfd-axp20x-add-sysfs-interface.patch * rewrite patches

In Linux 6.19, net_device->dev_addr is const unsigned char *. Clang with -Werror,-Wincompatible-pointer-types-discards-qualifiers rejects passing dev_addr to non-const parameters and memcpy into it. Fix by: - Replacing memcpy(dev->dev_addr, ...) with dev_addr_set() - Using local buffer + ether_addr_copy for sprdwl_set_mac_addr call that needs mutable addr (the function modifies it in-place) - Changing u8 *mac pointer to u8 mac[ETH_ALEN] array in cfg80211.c where dev_addr was assigned to a non-const pointer Relates to armbian#9049

github-actions Bot added size/large PR with 250 lines or more 02 Milestone: First quarter release Needs review Seeking for review Hardware Hardware related like kernel, U-Boot, ... Framework Framework components Patches Patches related to kernel, U-Boot, ... labels Dec 9, 2025

EvilOlaf commented Dec 9, 2025

View reviewed changes

Comment thread lib/functions/compilation/patch/drivers_network.sh Outdated

EvilOlaf commented Dec 9, 2025

View reviewed changes

Comment thread lib/functions/compilation/patch/drivers_network.sh Outdated

This comment was marked as outdated.

Sign in to view

EvilOlaf mentioned this pull request Dec 11, 2025

[Bug]: sun50i-*-fixup.scr lost in 6.16 edge kernel #8828

Closed

2 tasks

EvilOlaf marked this pull request as ready for review December 11, 2025 05:26

EvilOlaf requested review from AGM1968, JohnTheCoolingFan, PanderMusubi, TheSnowfield, Tonymac32, chraac, igorpecovnik, janprunk, krachlatte, leggewie, pyavitz, schwar3kat, sgjava and teknoid as code owners December 11, 2025 05:26

EvilOlaf and others added 12 commits December 15, 2025 21:00

remove upstreamed patch

b1bffe4

re-enable no longer broken

fc3d341

another rewrite to align stuff properly

616096e

adjust various comments in series.conf

9f844e6

recover lost overlays

b4f2506

uew5622: fix compilation against Linux 6.18

086d25e

fix Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.p…

6da2d7c

…atch

adjust patch subject to make sense

ee586e6

restore fixup creation

b60372c

restore overlay prefix on opiz2 this needs to be properly sorted at some point

bump to 6.18.1

8ae0354

sunxi and sunxi64 build just fine

fix and re-enable drv-mfd-axp20x-add-sysfs-interface.patch

8595a4e

rewrite patches

a3dd752

igorpecovnik force-pushed the sunxi-6.18-v2 branch from 2fba863 to a3dd752 Compare December 15, 2025 20:00

igorpecovnik approved these changes Dec 16, 2025

View reviewed changes

github-actions Bot added the Ready to merge Reviewed, tested and ready for merge label Dec 16, 2025

github-actions Bot removed the Needs review Seeking for review label Dec 16, 2025

coderabbitai Bot mentioned this pull request Dec 16, 2025

Split cb1-overlay.patch into separate patches for overlays and Makefile changes #9088

Closed

EvilOlaf merged commit 3d46ef8 into armbian:main Dec 16, 2025
13 checks passed

EvilOlaf deleted the sunxi-6.18-v2 branch December 16, 2025 12:46

iav mentioned this pull request Jan 30, 2026

uwe5622: fix compilation with clang on Linux 6.19 #9314

Merged

7 tasks

Uh oh!

Conversation

EvilOlaf commented Dec 9, 2025 • edited by igorpecovnik Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Todo

How Has This Been Tested?

Checklist:

Uh oh!

coderabbitai Bot commented Dec 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

Uh oh!

Uh oh!

EvilOlaf commented Dec 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

EvilOlaf commented Dec 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

JohnTheCoolingFan commented Dec 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

EvilOlaf commented Dec 10, 2025

Uh oh!

This comment was marked as outdated.

igorpecovnik commented Dec 15, 2025

Uh oh!

igorpecovnik commented Dec 16, 2025

Uh oh!

igorpecovnik left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions Bot commented Dec 16, 2025

Uh oh!

EvilOlaf commented Dec 16, 2025

Uh oh!

Uh oh!

igorpecovnik commented Dec 16, 2025

Uh oh!

EvilOlaf commented Dec 16, 2025

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

3 participants

EvilOlaf commented Dec 9, 2025 •

edited by igorpecovnik

Loading

coderabbitai Bot commented Dec 9, 2025 •

edited

Loading

EvilOlaf commented Dec 9, 2025 •

edited

Loading

EvilOlaf commented Dec 9, 2025 •

edited

Loading

JohnTheCoolingFan commented Dec 9, 2025 •

edited

Loading