From a359ade66df40b187a528582553e13713e8da83c Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@gmail.com>
Date: Sat, 21 Jun 2025 10:45:41 +0300
Subject: [PATCH] bluejay: Switch to our own kernel

Change-Id: Iaec4d3704b2b44cd809f24d922f6965312da71e5
---
 device-bluejay.mk       | 14 +++-----------
 init.insmod.bluejay.cfg | 19 -------------------
 lineage.dependencies    |  4 ++++
 3 files changed, 7 insertions(+), 30 deletions(-)
 delete mode 100644 init.insmod.bluejay.cfg

diff --git a/device-bluejay.mk b/device-bluejay.mk
index 9cf30bf..c3d3ba3 100644
--- a/device-bluejay.mk
+++ b/device-bluejay.mk
@@ -15,9 +15,9 @@
 #
 
 TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_BLUEJAY_VERSION)
-# Keeps flexibility for kasan and ufs builds
-TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_BLUEJAY_DIR)
-TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_BLUEJAY_DIR)/kernel-headers
+TARGET_KERNEL_DEVICE := bluejay
+TARGET_KERNEL_DIR := device/google/$(TARGET_KERNEL_DEVICE)-kernels/$(TARGET_LINUX_KERNEL_VERSION)
+TARGET_KERNEL_PLATFORM_SOURCE := google/gs-$(TARGET_LINUX_KERNEL_VERSION)
 
 DEVICE_PACKAGE_OVERLAYS += device/google/bluejay/bluejay/overlay
 
@@ -41,14 +41,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	device/google/gs101/conf/init.recovery.device.rc:$(TARGET_COPY_OUT_RECOVERY)/root/init.recovery.bluejay.rc
 
-# insmod files. Kernel 5.10 prebuilts don't provide these yet, so provide our
-# own copy if they're not in the prebuilts.
-# TODO(b/369686096): drop this when 5.10 is gone.
-ifeq ($(wildcard $(TARGET_KERNEL_DIR)/init.insmod.*.cfg),)
-PRODUCT_COPY_FILES += \
-	device/google/bluejay/init.insmod.bluejay.cfg:$(TARGET_COPY_OUT_VENDOR_DLKM)/etc/init.insmod.bluejay.cfg
-endif
-
 # Thermal Config
 PRODUCT_COPY_FILES += \
 	device/google/bluejay/thermal_info_config_bluejay.json:$(TARGET_COPY_OUT_VENDOR)/etc/thermal_info_config.json \
diff --git a/init.insmod.bluejay.cfg b/init.insmod.bluejay.cfg
deleted file mode 100644
index 26297a5..0000000
--- a/init.insmod.bluejay.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-##########################################################
-#           init.insmod.bluejay.cfg                      #
-# This file contains bluejay specific kernel modules to  #
-# load at init time by init.insmod.sh script             #
-##########################################################
-
-# Load device specific kernel modules
-# Modules here will be loaded *after* all common modules
-modprobe|bcmdhd4389.ko
-modprobe|snd-soc-cs35l41-i2c.ko
-modprobe|cs40l26-i2c.ko
-modprobe|ftm5.ko
-modprobe|sec_touch.ko
-modprobe|snd-soc-cs40l26.ko
-
-# All device specific modules loaded
-setprop|vendor.device.modules.ready
-setprop|vendor.all.modules.ready
-setprop|vendor.all.devices.ready
diff --git a/lineage.dependencies b/lineage.dependencies
index 9f79101..265bcea 100644
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -2,5 +2,9 @@
   {
     "repository": "android_device_google_gs101",
     "target_path": "device/google/gs101"
+  },
+  {
+    "repository": "android_device_google_bluejay-kernels",
+    "target_path": "device/google/bluejay-kernels"
   }
 ]