Skip to content

Commit bc5ae59

Browse files
EvilOlafyury-deltsov
authored andcommitted
sunxi: bump edge to 6.18 (armbian#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
1 parent e075715 commit bc5ae59

570 files changed

Lines changed: 18206 additions & 8247 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

config/boards/orangepizero2.csc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ BOARDFAMILY="sun50iw9"
55
BOARD_MAINTAINER="AGM1968 krachlatte"
66
BOOTCONFIG="orangepi_zero2_defconfig"
77
BOOT_LOGO="desktop"
8+
OVERLAY_PREFIX="sun50i-h616"
89
KERNEL_TARGET="current,edge"
910
KERNEL_TEST_TARGET="current"
1011
FORCE_BOOTSCRIPT_UPDATE="yes"

config/sources/families/include/sunxi64_common.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ case $BRANCH in
3535
;;
3636

3737
edge)
38-
declare -g KERNEL_MAJOR_MINOR="6.16" # Major and minor versions of this kernel.
39-
declare -g KERNELBRANCH="tag:v6.16.8"
38+
declare -g KERNEL_MAJOR_MINOR="6.18" # Major and minor versions of this kernel.
39+
declare -g KERNELBRANCH="tag:v6.18.1"
4040
;;
4141
dev)
4242
declare -g KERNEL_MAJOR_MINOR="6.14" # Major and minor versions of this kernel.

config/sources/families/include/sunxi_common.inc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ case $BRANCH in
3636
;;
3737

3838
edge)
39-
declare -g KERNEL_MAJOR_MINOR="6.16" # Major and minor versions of this kernel.
40-
declare -g KERNELBRANCH="tag:v6.16.8"
39+
declare -g KERNEL_MAJOR_MINOR="6.18" # Major and minor versions of this kernel.
40+
declare -g KERNELBRANCH="tag:v6.18.1"
4141
;;
4242
esac
4343

lib/functions/compilation/patch/drivers_network.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,11 @@ driver_xradio_xr819() {
236236
if linux-version compare "${version}" ge 4.19 && [[ "$LINUXFAMILY" == sun* ]]; then
237237

238238
# Attach to specific commit (is branch:master)
239-
local xradio_xr819_ver="commit:684a91a3692a964c5886dcf4369874cc7c19c0a4" # Commit date: Aug 7, 2025 (please update when updating commit ref)
239+
local xradio_xr819_ver="commit:43992a7e7ed95ff815cf6d8ba81cef1085e50ab9" # Commit date: Oct 11, 2025 (please update when updating commit ref)
240240

241241
display_alert "Adding" "Wireless drivers for Xradio XR819 chipsets" "info"
242242

243-
fetch_from_repo "$GITHUB_SOURCE/igorpecovnik/xradio" "xradio" "${xradio_xr819_ver}" "yes" # Forked from https://github.com/fifteenhex/xradio
243+
fetch_from_repo "$GITHUB_SOURCE/fifteenhex/xradio" "xradio" "${xradio_xr819_ver}" "yes"
244244
cd "$kerneldir" || exit
245245
rm -rf "$kerneldir/drivers/net/wireless/xradio"
246246
mkdir -p "$kerneldir/drivers/net/wireless/xradio/"
@@ -565,7 +565,11 @@ driver_uwe5622() {
565565

566566
if linux-version compare "${version}" ge 6.17; then
567567
process_patch_file "${SRC}/patch/misc/wireless-uwe5622/uwe5622-v6.17.patch" "applying"
568-
fi
568+
fi
569+
570+
if linux-version compare "${version}" ge 6.18; then
571+
process_patch_file "${SRC}/patch/misc/wireless-uwe5622/uwe5622-v6.18.patch" "applying"
572+
fi
569573

570574
fi
571575
}

patch/kernel/archive/sunxi-6.16/patches.armbian/arm64-dts-sun50i-h616-x96-mate-add-hdmi.patch

Lines changed: 0 additions & 64 deletions
This file was deleted.

patch/kernel/archive/sunxi-6.16/patches.drm/drm-sun4i-Report-page-flip-after-vsync-is-complete-not-in-the-m.patch

Lines changed: 0 additions & 111 deletions
This file was deleted.

0 commit comments

Comments
 (0)