rockchip-rk3588 collabora: new branch (by @lanefu)

- `bsdextrautils` for kernel 6.4 (only if collabora branch)
- kernel 6.4 major, but skip rtw88 driver patching
This commit is contained in:
Lane Jennison 2023-03-21 13:08:37 +00:00 committed by Igor
parent 1c7f2248d5
commit ad97c1b7ee
4 changed files with 8308 additions and 2 deletions

View File

@ -3,7 +3,7 @@ BOARD_NAME="Rock 5B"
BOARDFAMILY="rockchip-rk3588"
BOARD_MAINTAINER="amazingfate linhz0hz"
BOOTCONFIG="rock-5b-rk3588_defconfig"
KERNEL_TARGET="legacy,edge,midstream"
KERNEL_TARGET="legacy,edge,midstream,collabora"
FULL_DESKTOP="yes"
BOOT_LOGO="desktop"
BOOT_FDT_FILE="rockchip/rk3588-rock-5b.dtb"

File diff suppressed because it is too large Load Diff

View File

@ -50,10 +50,27 @@ case $BRANCH in
KERNEL_DRIVERS_SKIP+=(driver_rtw88) # This is a 6.2-rcX kernel, while the rtw88 driver patching expects 6.2.0+
;;
collabora)
# Collabora's rk3588, where the action is these days
SKIP_BOOTSPLASH="yes"
LINUXFAMILY=rockchip-rk3588
LINUXCONFIG='linux-rockchip-rk3588-'$BRANCH
KERNEL_MAJOR_MINOR="6.4" # Major and minor versions of this kernel.
KERNELPATCHDIR='rockchip-rk3588-collabora' # Empty/nonexisting, so zero patches, hopefully
KERNELSOURCE='https://gitlab.collabora.com/hardware-enablement/rockchip-3588/linux.git'
KERNELBRANCH='branch:rk3588'
KERNEL_DRIVERS_SKIP+=(driver_rtw88) # This is a custom kernel, while the rtw88 driver patching expects pure mainline
;;
esac
prepare_boot_configuration
function add_host_dependencies__collabora_kernel() {
[[ "${BRANCH}" != "collabora" ]] && return 0
display_alert "Extra deps for collabora kernels" "bsdextrautils" "debug"
export EXTRA_BUILD_DEPS="${EXTRA_BUILD_DEPS} bsdextrautils" # @TODO: convert to array later
}
family_tweaks_bsp() {
:
}

View File

@ -113,7 +113,7 @@ function memoized_git_ref_to_info() {
esac
;;
"https://gitlab.com/"* | "https://source.denx.de/"*)
"https://gitlab.com/"* | "https://source.denx.de/"* | "https://gitlab.collabora.com/"*)
# GitLab is more complex than GitHub, there can be more levels.
# This code is incomplete... but it works for now.
# Example: input: https://gitlab.com/rk3588_linux/rk/kernel.git