From 91d7cf5d058b85694e022168833bc29dceea4a6b Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Thu, 8 Feb 2024 00:10:00 +0200
Subject: [PATCH] gs201: Squashed revert of inline kernel build

Revert "gs201: Add kernel dependency"

This reverts commit 21e31e937aa6c15a8ffe503002c02b8fdd63a6eb.

Revert "Build kernel with clang r450784e"

This reverts commit f51894328490e3687a94c21599814abc2ab8207d.

Revert "gs201: Inline kernel building"

This reverts commit af5951eef5331235f3420bcb3f3dfca02c3bc36f.

Change-Id: I780cedbab50ba946633b220f6f3818be47097831
---
 BoardConfig-common.mk         | 33 +++++++++++++++++++++++++++++++++
 BoardConfigLineage.mk         | 11 -----------
 device.mk                     |  3 +++
 lineage.dependencies          |  4 ----
 vendor_dlkm.modules.blocklist | 13 -------------
 5 files changed, 36 insertions(+), 28 deletions(-)
 delete mode 100644 vendor_dlkm.modules.blocklist

diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 2170f4bb..21880510 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -58,7 +58,12 @@ BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs
 
 TARGET_NO_BOOTLOADER := true
 TARGET_NO_RADIOIMAGE := true
+BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot.img)
+ifneq (,$(BOARD_PREBUILT_BOOTIMAGE))
+TARGET_NO_KERNEL := true
+else
 TARGET_NO_KERNEL := false
+endif
 BOARD_USES_GENERIC_KERNEL_IMAGE := true
 BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT := true
 BOARD_MOVE_GSI_AVB_KEYS_TO_VENDOR_BOOT := true
@@ -289,6 +294,8 @@ BOARD_USES_SCALER_M2M1SHOT := true
 # Device Tree
 BOARD_USES_DT := true
 BOARD_INCLUDE_DTB_IN_BOOTIMG := true
+BOARD_PREBUILT_DTBIMAGE_DIR := $(TARGET_KERNEL_DIR)
+BOARD_PREBUILT_DTBOIMAGE := $(BOARD_PREBUILT_DTBIMAGE_DIR)/dtbo.img
 
 # PLATFORM LOG
 TARGET_USES_LOGD := true
@@ -370,6 +377,32 @@ BOARD_VENDOR_KERNEL_BOOTIMAGE_PARTITION_SIZE := 0x04000000
 # Vendor ramdisk image for kernel development
 BOARD_BUILD_VENDOR_RAMDISK_IMAGE := true
 
+KERNEL_MODULE_DIR := $(TARGET_KERNEL_DIR)
+KERNEL_MODULES := $(wildcard $(KERNEL_MODULE_DIR)/*.ko)
+
+BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.blocklist
+
+# Prebuilt kernel modules that are *not* listed in vendor_kernel_boot.modules.load
+BOARD_PREBUILT_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES = fips140/fips140.ko
+BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_EXTRA = $(foreach k,$(BOARD_PREBUILT_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES),$(if $(wildcard $(KERNEL_MODULE_DIR)/$(k)), $(k)))
+KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_EXTRA))
+
+# Kernel modules that are listed in vendor_kernel_boot.modules.load
+BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_FILE := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_kernel_boot.modules.load))
+ifndef BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_FILE
+$(error vendor_kernel_boot.modules.load not found or empty)
+endif
+BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD := $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_EXTRA)
+BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD += $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_FILE)
+BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_EXTRA))
+BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_FILE)))
+
+BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/vendor_dlkm.modules.load))
+ifndef BOARD_VENDOR_KERNEL_MODULES_LOAD
+$(error vendor_dlkm.modules.load not found or empty)
+endif
+BOARD_VENDOR_KERNEL_MODULES := $(KERNEL_MODULES)
+
 # Using BUILD_COPY_HEADERS
 BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true
 
diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk
index c0ca7a8a..342ef7cc 100644
--- a/BoardConfigLineage.mk
+++ b/BoardConfigLineage.mk
@@ -6,17 +6,6 @@
 
 BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true
 
-# Kernel
-BOARD_KERNEL_IMAGE_NAME := Image.lz4
-TARGET_KERNEL_CLANG_VERSION := r450784e
-TARGET_KERNEL_CONFIG ?= cloudripper_gki_defconfig
-TARGET_KERNEL_SOURCE := kernel/google/gs201/private/gs-google
-TARGET_NEEDS_DTBOIMAGE := true
-
-# Kernel modules
-BOARD_VENDOR_KERNEL_MODULES_BLOCKLIST_FILE := device/google/gs201/vendor_dlkm.modules.blocklist
-TARGET_KERNEL_EXT_MODULE_ROOT := kernel/google/gs201/private/google-modules
-
 # Lineage Health
 TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_DEADLINE := true
 TARGET_HEALTH_CHARGING_CONTROL_SUPPORTS_TOGGLE := false
diff --git a/device.mk b/device.mk
index 92a17b78..f1f8ef60 100644
--- a/device.mk
+++ b/device.mk
@@ -74,6 +74,8 @@ PRODUCT_SOONG_NAMESPACES += \
 	vendor/google_nos/test/system-test-harness \
 	vendor/google/camera
 
+LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
+
 # OEM Unlock reporting
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 	ro.oem_unlock_supported=1
@@ -317,6 +319,7 @@ PRODUCT_ENFORCE_PRODUCT_PARTITION_INTERFACE := true
 
 # Init files
 PRODUCT_COPY_FILES += \
+	$(LOCAL_KERNEL):kernel \
 	device/google/gs201/conf/init.gs201.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.usb.rc \
 	device/google/gs201/conf/ueventd.gs201.rc:$(TARGET_COPY_OUT_VENDOR)/etc/ueventd.rc
 
diff --git a/lineage.dependencies b/lineage.dependencies
index 587f3c62..9f791014 100644
--- a/lineage.dependencies
+++ b/lineage.dependencies
@@ -2,9 +2,5 @@
   {
     "repository": "android_device_google_gs101",
     "target_path": "device/google/gs101"
-  },
-  {
-    "repository": "android_kernel_google_gs201",
-    "target_path": "kernel/google/gs201/private/gs-google"
   }
 ]
diff --git a/vendor_dlkm.modules.blocklist b/vendor_dlkm.modules.blocklist
deleted file mode 100644
index 18e13d06..00000000
--- a/vendor_dlkm.modules.blocklist
+++ /dev/null
@@ -1,13 +0,0 @@
-blocklist bcmdhd4389
-blocklist synadhd
-blocklist focal_touch
-blocklist fst2
-blocklist ftm5
-blocklist goodix_brl_touch
-blocklist nvt_touch
-blocklist sec_touch
-blocklist syna_touch
-blocklist uwb_desense.ko
-blocklist uwb-hal.ko
-blocklist uwbcore.ko
-blocklist cs40l26_i2c