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.

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

rockchip64-edge: bump to 6.14 #7835

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

rockchip64-edge: bump to 6.14 #7835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
41d7846
mainline-kernel.conf.sh: bump 6.14 to rc2
amazingfate Feb 16, 2025
f7c1abd
wireless: fix build with kernel 6.14
amazingfate Feb 16, 2025
0dca9a1
rockchip64-edge: bump to 6.14
amazingfate Feb 16, 2025
93e568c
rockchip64-edge: add hdmi1 disp modes support to rk3588
amazingfate Feb 16, 2025
23ece87
rockchip64-edge: add hdmi1 support to rock5 itx
amazingfate Feb 16, 2025
95f843a
rockchip64-6.14: add patch to fix rk3588 multi hdmi pll clk
amazingfate Feb 24, 2025
4ef5a00
mainline-kernel.conf.sh: bump 6.14 to rc4
amazingfate Feb 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.13"
declare -g KERNEL_MAJOR_MINOR="6.14"
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.14" ]]; then # @TODO: roll over to next MAJOR.MINOR and MAJOR.MINOR-rc1 when it is released
declare -g KERNELBRANCH="tag:v6.14-rc1"
declare -g KERNELBRANCH="tag:v6.14-rc4"
display_alert "mainline-kernel: upstream release candidate" "Using KERNELBRANCH='${KERNELBRANCH}' for KERNEL_MAJOR_MINOR='${KERNEL_MAJOR_MINOR}'" "info"
fi
}
Expand Down
6 changes: 3 additions & 3 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 @@ -41,7 +41,7 @@ driver_rtl8189ES() {
if linux-version compare "${version}" ge 3.14; then

# Attach to specific commit (was "branch:master")
local rtl8189esver='commit:master' # Commit date: Dec 29, 2024 (please update when updating commit ref)
local rtl8189esver='commit:fb77d4b9316805f64893771b520e009215a10bc3' # Commit date: Feb 16, 2025 (please update when updating commit ref)

display_alert "Adding" "Wireless drivers for Realtek 8189ES chipsets ${rtl8189esver}" "info"

Expand Down Expand Up @@ -133,7 +133,7 @@ driver_rtl8192EU() {
if linux-version compare "${version}" ge 3.14; then

# Attach to specific commit (was "branch:realtek-4.4.x")
local rtl8192euver='commit:b9f21a6ff209edc220b2fc4ca610eb54595f218d' # Commit date: Dec 23, 2024 (please update when updating commit ref)
local rtl8192euver='commit:e6721468a4e48cf2199c212fa13c086e3705bcb3' # Commit date: Feb 16, 2025 (please update when updating commit ref)

display_alert "Adding" "Wireless drivers for Realtek 8192EU chipsets ${rtl8192euver}" "info"

Expand Down Expand Up @@ -620,7 +620,7 @@ driver_rtl8723DS() {
if linux-version compare "${version}" ge 5.0; then

# Attach to specific commit (was "branch:master")
local rtl8723dsver='commit:4b8d758f42ce38b75f9a98a083906b0d59d244c3' # Commit date: Dec 23, 2024 (please update when updating commit ref)
local rtl8723dsver='commit:ac64712f6767565bc3560e6ae412b780b07bc84c' # Commit date: Feb 16, 2025 (please update when updating commit ref)

display_alert "Adding" "Wireless drivers for Realtek 8723DS chipsets ${rtl8723dsver}" "info"

Expand Down
Loading
Loading