From 5a1a290db47885e56c0269809eb4f8962a49bf1e Mon Sep 17 00:00:00 2001 From: Shirayuki39 Date: Thu, 18 Jul 2024 01:38:07 +0800 Subject: [PATCH] LG8n: BoardConfig: fixups and change paths for modules Signed-off-by: Shirayuki39 --- BoardConfig.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index b1a1b0d..4f56590 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -14,7 +14,7 @@ TARGET_ARCH_VARIANT := armv8-2a-dotprod TARGET_CPU_ABI := arm64-v8a TARGET_CPU_ABI2 := TARGET_CPU_VARIANT := generic -TARGET_CPU_VARIANT_RUNTIME := cortex-a76 +TARGET_CPU_VARIANT_RUNTIME := cortex-a55 TARGET_2ND_ARCH := arm TARGET_2ND_ARCH_VARIANT := armv8-2a @@ -71,19 +71,19 @@ PRODUCT_COPY_FILES += \ $(LOCAL_KERNEL):kernel # Kernel modules -BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_PATH)/modules.load.vendor_ramdisk)) -BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(addprefix $(KERNEL_PATH)/modules/, $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD)) +BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_PATH)/ramdisk/modules.load)) +BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(addprefix $(KERNEL_PATH)/ramdisk/, $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES_LOAD)) # Also add recovery modules to vendor ramdisk -BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_PATH)/modules.load.recovery)) -RECOVERY_MODULES := $(addprefix $(KERNEL_PATH)/modules/, $(BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD)) +BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_PATH)/ramdisk/modules.load.recovery)) +RECOVERY_MODULES := $(addprefix $(KERNEL_PATH)/ramdisk/, $(BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD)) # Prevent duplicated entries (to solve duplicated build rules problem) BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(sort $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES) $(RECOVERY_MODULES)) # Vendor modules (installed to vendor_dlkm) -BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_PATH)/modules.load)) -BOARD_VENDOR_KERNEL_MODULES := $(wildcard $(KERNEL_PATH)/modules/*.ko) +BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_PATH)/vendor_dlkm/modules.load)) +BOARD_VENDOR_KERNEL_MODULES := $(wildcard $(KERNEL_PATH)/vendor_dlkm/*.ko) # Partitions BOARD_FLASH_BLOCK_SIZE := 262144 # BOARD_KERNEL_PAGESIZE * 64