qiurui
/
armbian-build
mirror of https://github.com/armbian/build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Switch rkr4.1 to rkr5

This commit is contained in:
Mecid Urganci 2025-01-28 12:46:04 +01:00 committed by Igor
parent cba2963b12
commit 0cc738e3c2
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/boards/mixtile-edge2.csc
View File

@ -40,7 +40,7 @@ function post_family_config_branch_vendor__kernel_and_uboot_rk35xx_mixtile_edge2
# Copypasta from rockchip-rk3588.conf family file -- we _really_ gotta find a better way! # Copypasta from rockchip-rk3588.conf family file -- we _really_ gotta find a better way!
declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel. declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
declare -g KERNELSOURCE='https://github.com/armbian/linux-rockchip.git' declare -g KERNELSOURCE='https://github.com/armbian/linux-rockchip.git'
declare -g KERNELBRANCH='branch:rk-6.1-rkr4.1' declare -g KERNELBRANCH='branch:rk-6.1-rkr5'
declare -g KERNELPATCHDIR='rk35xx-vendor-6.1' declare -g KERNELPATCHDIR='rk35xx-vendor-6.1'
declare -g LINUXFAMILY=rk35xx declare -g LINUXFAMILY=rk35xx
declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes

2
config/sources/families/rk35xx.conf
View File

@ -37,7 +37,7 @@ case $BRANCH in
declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel. declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
KERNELSOURCE='https://github.com/armbian/linux-rockchip.git' KERNELSOURCE='https://github.com/armbian/linux-rockchip.git'
KERNELBRANCH='branch:rk-6.1-rkr4.1' KERNELBRANCH='branch:rk-6.1-rkr5'
KERNELPATCHDIR='rk35xx-vendor-6.1' KERNELPATCHDIR='rk35xx-vendor-6.1'
;; ;;
esac esac

2
config/sources/families/rockchip-rk3588.conf
View File

@ -34,7 +34,7 @@ case $BRANCH in
declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel. declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
KERNELSOURCE='https://github.com/armbian/linux-rockchip.git' KERNELSOURCE='https://github.com/armbian/linux-rockchip.git'
KERNELBRANCH='branch:rk-6.1-rkr4.1' KERNELBRANCH='branch:rk-6.1-rkr5'
KERNELPATCHDIR='rk35xx-vendor-6.1' KERNELPATCHDIR='rk35xx-vendor-6.1'
LINUXFAMILY=rk35xx LINUXFAMILY=rk35xx
;; ;;

4
patch/kernel/rk35xx-vendor-6.1/0000.patching_config.yaml
View File

@ -4,8 +4,8 @@ config:
name: rk35xx-6.1 name: rk35xx-6.1
kind: kernel kind: kernel
type: vendor # or: vendor type: vendor # or: vendor
branch: rk-6.1-rkr4.1 branch: rk-6.1-rkr5
last-known-good-tag: v6.1.84 last-known-good-tag: v6.1.99
# .dts files in these directories will be copied as-is to the build tree; later ones overwrite earlier ones. # .dts files in these directories will be copied as-is to the build tree; later ones overwrite earlier ones.
# This is meant to provide a way to "add a board DTS" without having to null-patch them in. # This is meant to provide a way to "add a board DTS" without having to null-patch them in.