Skip to content

Commit ddcd68d

Browse files
committed
rk35xx/rockchip-rk3588: vendor: the unthinkable! add vendor branch for new 6.1-rkr1 BSP vendor kernel, and keep legacy for the 5.10-rkr6 BSP vendor kernel
- pointing to amazingfate's repo, for now
1 parent edd866b commit ddcd68d

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

config/sources/families/rk35xx.conf

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,24 @@ OVERLAY_PREFIX='rk35xx'
1616
case $BRANCH in
1717

1818
legacy)
19-
UBOOT_COMPILER="aarch64-linux-gnu-"
20-
UBOOT_USE_GCC='< 8.0'
2119
BOOTDIR='u-boot-rockchip64'
20+
declare -g KERNEL_MAJOR_MINOR="5.10" # Major and minor versions of this kernel.
21+
declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
2222
KERNELSOURCE='https://github.com/armbian/linux-rockchip.git'
2323
KERNELBRANCH='branch:rk-5.10-rkr6'
24-
declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
25-
declare -g KERNEL_MAJOR_MINOR="5.10" # Major and minor versions of this kernel.
2624
KERNELPATCHDIR='rk35xx-legacy'
2725

2826
;;
2927

28+
vendor)
29+
BOOTDIR='u-boot-rockchip64'
30+
declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
31+
declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
32+
KERNELSOURCE='https://github.com/amazingfate/linux-rockchip.git'
33+
KERNELBRANCH='branch:rk-6.1-rkr1'
34+
KERNELPATCHDIR='rk35xx-vendor-6.1'
35+
;;
36+
3037
esac
3138

3239
prepare_boot_configuration

config/sources/families/rockchip-rk3588.conf

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,26 @@ case $BRANCH in
1818

1919
legacy)
2020
BOOTSCRIPT='boot-rk3588-legacy.cmd:boot.cmd'
21-
UBOOT_COMPILER="aarch64-linux-gnu-"
22-
UBOOT_USE_GCC='< 8.0'
2321
BOOTDIR='u-boot-rockchip64'
24-
KERNELSOURCE='https://github.com/armbian/linux-rockchip.git'
2522
declare -g KERNEL_MAJOR_MINOR="5.10" # Major and minor versions of this kernel.
2623
declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
24+
KERNELSOURCE='https://github.com/armbian/linux-rockchip.git'
2725
KERNELBRANCH='branch:rk-5.10-rkr6'
2826
KERNELPATCHDIR='rk35xx-legacy'
2927
LINUXFAMILY=rk35xx
3028
;;
3129

30+
vendor)
31+
BOOTSCRIPT='boot-rk3588-legacy.cmd:boot.cmd'
32+
BOOTDIR='u-boot-rockchip64'
33+
declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
34+
declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
35+
KERNELSOURCE='https://github.com/amazingfate/linux-rockchip.git'
36+
KERNELBRANCH='branch:rk-6.1-rkr1'
37+
KERNELPATCHDIR='rk35xx-vendor-6.1'
38+
LINUXFAMILY=rk35xx
39+
;;
40+
3241
edge)
3342
LINUXFAMILY=rockchip-rk3588
3443
LINUXCONFIG='linux-rockchip-rk3588-'$BRANCH

0 commit comments

Comments
 (0)