Skip to content

rockchip64: bump edge to 6.16-rc3 #8328

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Jun 24, 2025
Merged

rockchip64: bump edge to 6.16-rc3 #8328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd26401
Fix wifi drivers on kernel v6.16
amazingfate Jun 19, 2025
a14f191
initial commit
EvilOlaf Jun 24, 2025
ba556e4
fix header
EvilOlaf Jun 24, 2025
edc5958
remove ssv6051 driver
EvilOlaf Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/sources/families/include/rockchip64_common.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ case $BRANCH in
;;

edge)
declare -g KERNEL_MAJOR_MINOR="6.15"
declare -g KERNEL_MAJOR_MINOR="6.16"
declare -g LINUXFAMILY=rockchip64
declare -g LINUXCONFIG='linux-rockchip64-'$BRANCH
;;
Expand Down
2 changes: 1 addition & 1 deletion config/sources/mainline-kernel.conf.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
function mainline_kernel_decide_version__upstream_release_candidate_number() {
[[ -n "${KERNELBRANCH}" ]] && return 0 # if already set, don't touch it; that way other hooks can run in any order
if [[ "${KERNEL_MAJOR_MINOR}" == "6.16" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released
declare -g KERNELBRANCH="tag:v6.16-rc1"
declare -g KERNELBRANCH="tag:v6.16-rc3"
display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info"
fi
}
Expand Down
13 changes: 13 additions & 0 deletions lib/functions/compilation/patch/drivers_network.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ driver_rtl8189ES() {

# fix compilation for kernels >= 5.4.251
process_patch_file "${SRC}/patch/misc/wireless-rtl8189es-Fix-building-on-5.4.251-kernel.patch" "applying"

# fix compilation for kernels >= 6.16
process_patch_file "${SRC}/patch/misc/wireless-rtl8189es-Fix-v6.16.patch" "applying"
fi
}

Expand Down Expand Up @@ -165,6 +168,9 @@ driver_rtl8192EU() {

# fix compilation for kernels >= 5.4.251
process_patch_file "${SRC}/patch/misc/wireless-rtl8192eu-Fix-building-on-5.4.251-kernel.patch" "applying"

# fix compilation for kernels >= 6.16
process_patch_file "${SRC}/patch/misc/wireless-rtl8192eu-Fix-v6.16.patch" "applying"
fi
}

Expand Down Expand Up @@ -533,6 +539,10 @@ driver_uwe5622() {
process_patch_file "${SRC}/patch/misc/wireless-uwe5622/uwe5622-v6.15-timer-api-changes.patch" "applying"
fi
fi

if linux-version compare "${version}" ge 6.15; then
process_patch_file "${SRC}/patch/misc/wireless-uwe5622/uwe5622-v6.16.patch" "applying"
fi
fi
}

Expand Down Expand Up @@ -667,6 +677,9 @@ driver_rtl8723DS() {

# fix compilation for kernels >= 5.4
process_patch_file "${SRC}/patch/misc/wireless-rtl8723ds-Fix-VFS-import.patch" "applying"

# fix compilation for kernels >= 6.16
process_patch_file "${SRC}/patch/misc/wireless-rtl8723ds-Fix-v6.16.patch" "applying"
fi
}

Expand Down
28 changes: 0 additions & 28 deletions ...kernel/archive/rockchip64-6.15/general-clk-rockchip-rk3568-Add-PLL-rate-for-33.3MHz.patch
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions patch/kernel/archive/rockchip64-6.15/general-rockchip-overlays.patch
View file
Open in desktop

This file was deleted.

Loading