[debug] kernel: try the collabora kernel

schneid-l · Aug 12, 2024 · fd39b5d · fd39b5d
1 parent 85f4362
commit fd39b5d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -16,11 +16,14 @@ TAG ?= $(shell git describe --tag --always --dirty)
 
 KERNEL_TAG ?= 6.10
 KERNEL_SOURCE ?= https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.10.tar.gz
+KERNEL_TAG ?= 6.11-rc1
+KERNEL_SOURCE ?= https://gitlab.collabora.com/hardware-enablement/rockchip-3588/linux/-/archive/rk3588/linux-rk3588.tar.gz
 KERNEL_TAG_SEMVER ?= $(shell echo $(KERNEL_TAG) | sed 's/^\([0-9]*\.[0-9]*\)$$/\1.0/')
 KERNEL_TAINT ?= -$(NAME)
 KERNEL_VERSION ?= $(KERNEL_TAG_SEMVER)$(KERNEL_TAINT)
 KERNEL_OUTPUT_NAME ?= $(NAME)-kernel
 KERNEL_OUTPUT_TAG ?= $(KERNEL_TAG)-$(TAG)
+KERNEL_OUTPUT_TAG ?= $(KERNEL_TAG)-collabora-$(TAG)
 KERNEL_OUTPUT_IMAGE ?= $(REGISTRY_AND_USERNAME)/$(KERNEL_OUTPUT_NAME):$(KERNEL_OUTPUT_TAG)
 
 TALOS_TAG ?= v1.8.0-alpha.1

diff --git a/kernel/config.orangepi5 b/kernel/config.orangepi5
@@ -930,4 +930,5 @@ CONFIG_ATA_NONCQ=y
 CONFIG_SCSI_TIMEOUT=60
 CONFIG_PM_RUNTIME=n
 CONFIG_ATA_DEBUG=y
-CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ROCKCHIP_ERRATUM_3588001=y