From 59692c195b152b9a74b8d7e38206c592bb1c471b Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sat, 13 Aug 2022 04:25:09 +0300 Subject: [PATCH] felix: Copy touch modules to vendor_kernel_boot Makes touch work in recovery fst2/ftm5 require goog_touch_interface symbols too Co-authored-by: Nicholas Lim Co-authored-by: LuK1337 Change-Id: Iaa5a158af827732b13ab79b60bed2f319ce56391 --- BoardConfigLineage.mk | 6 ++++++ felix/Android.bp | 11 +++++++++++ felix/device-lineage.mk | 4 ++++ felix/init.recovery.touch.rc | 4 ++++ modules.blocklist.vendor_kernel_boot | 3 +++ modules.load.vendor_kernel_boot | 3 +++ 6 files changed, 31 insertions(+) create mode 100644 felix/Android.bp create mode 100644 felix/init.recovery.touch.rc create mode 100644 modules.blocklist.vendor_kernel_boot create mode 100644 modules.load.vendor_kernel_boot diff --git a/BoardConfigLineage.mk b/BoardConfigLineage.mk index eadedb9..4c3a41b 100644 --- a/BoardConfigLineage.mk +++ b/BoardConfigLineage.mk @@ -3,3 +3,9 @@ # SPDX-FileCopyrightText: 2021-2024 The Calyx Institute # SPDX-License-Identifier: Apache-2.0 # + +# Kernel modules +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_BLOCKLIST_FILE := $(DEVICE_PATH)/modules.blocklist.vendor_kernel_boot +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW := $(strip $(shell cat $(DEVICE_PATH)/modules.load.vendor_kernel_boot)) +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD += $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW) +BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES += $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_RAMDISK_KERNEL_MODULES_LOAD_RAW))) diff --git a/felix/Android.bp b/felix/Android.bp new file mode 100644 index 0000000..70f8627 --- /dev/null +++ b/felix/Android.bp @@ -0,0 +1,11 @@ +// +// SPDX-FileCopyrightText: 2024 The LineageOS Project +// SPDX-License-Identifier: Apache-2.0 +// + +prebuilt_etc { + name: "init.recovery.felix.touch.rc", + src: "init.recovery.touch.rc", + sub_dir: "init", + recovery: true, +} diff --git a/felix/device-lineage.mk b/felix/device-lineage.mk index fd82a16..f88f2c0 100644 --- a/felix/device-lineage.mk +++ b/felix/device-lineage.mk @@ -7,3 +7,7 @@ $(call inherit-product, $(DEVICE_PATH)/device-lineage.mk) DEVICE_PACKAGE_OVERLAYS += $(DEVICE_PATH)/$(DEVICE_CODENAME)/overlay-lineage + +# Init +PRODUCT_PACKAGES += \ + init.recovery.felix.touch.rc diff --git a/felix/init.recovery.touch.rc b/felix/init.recovery.touch.rc new file mode 100644 index 0000000..972abab --- /dev/null +++ b/felix/init.recovery.touch.rc @@ -0,0 +1,4 @@ +on init + insmod /lib/modules/goog_touch_interface.ko + insmod /lib/modules/fst2.ko + insmod /lib/modules/ftm5.ko diff --git a/modules.blocklist.vendor_kernel_boot b/modules.blocklist.vendor_kernel_boot new file mode 100644 index 0000000..1a9be18 --- /dev/null +++ b/modules.blocklist.vendor_kernel_boot @@ -0,0 +1,3 @@ +blocklist fst2.ko +blocklist ftm5.ko +blocklist goog_touch_interface.ko diff --git a/modules.load.vendor_kernel_boot b/modules.load.vendor_kernel_boot new file mode 100644 index 0000000..4ecd15b --- /dev/null +++ b/modules.load.vendor_kernel_boot @@ -0,0 +1,3 @@ +extra/fst2.ko +extra/ftm5.ko +extra/goog_touch_interface.ko