Skip to content

rk35xx/rockchip-rk3588: vendor: switch to armbian/linux-rockchip#rk-6.1-rkr1 #6385

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 2 commits into from
Mar 10, 2024
Merged

rk35xx/rockchip-rk3588: vendor: switch to armbian/linux-rockchip#rk-6.1-rkr1 #6385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a439ca
rk35xx/rockchip-rk3588: vendor: switch to `armbian/linux-rockchip#rk-…
rpardini Mar 10, 2024
35ca4c4
khadas-edge2: remove `vendor` branch, we've no kedge2 DT/patches for …
rpardini Mar 10, 2024
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/boards/khadas-edge2.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ declare -g BOARD_NAME="Khadas Edge2"
declare -g BOARDFAMILY="rockchip-rk3588"
declare -g BOARD_MAINTAINER="igorpecovnik"
declare -g BOOT_SOC="rk3588" # Just to avoid errors in rockchip64_commmon
declare -g KERNEL_TARGET="legacy,vendor,edge"
declare -g KERNEL_TARGET="legacy,edge" # @TODO: khadas-edge2 doesn't have ',vendor' yet
declare -g IMAGE_PARTITION_TABLE="gpt"
declare -g BOOT_FDT_FILE="rockchip/rk3588s-khadas-edge2.dtb" # Specific to this board

Expand Down
2 changes: 1 addition & 1 deletion config/sources/families/rk35xx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ case $BRANCH in
BOOTDIR='u-boot-rockchip64'
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
KERNELSOURCE='https://github.com/amazingfate/linux-rockchip.git'
KERNELSOURCE='https://github.com/armbian/linux-rockchip.git'
KERNELBRANCH='branch:rk-6.1-rkr1'
KERNELPATCHDIR='rk35xx-vendor-6.1'
;;
Expand Down
2 changes: 1 addition & 1 deletion config/sources/families/rockchip-rk3588.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ case $BRANCH in
BOOTDIR='u-boot-rockchip64'
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
KERNELSOURCE='https://github.com/amazingfate/linux-rockchip.git'
KERNELSOURCE='https://github.com/armbian/linux-rockchip.git'
KERNELBRANCH='branch:rk-6.1-rkr1'
KERNELPATCHDIR='rk35xx-vendor-6.1'
LINUXFAMILY=rk35xx
Expand Down