From d286f54a211a20c2710219f77938abcf5dc7b579 Mon Sep 17 00:00:00 2001 From: Woomymy Date: Thu, 2 Mar 2023 20:40:16 +0100 Subject: [PATCH] X6833B: Fix recovery kernel modules instalation * BOARD_VENDOR_RAMDISK_RECOVERY_KERNEL_MODULES_LOAD should contain the list of modules loaded with the recovery, but the modules should be installed using BOARD_VENDOR_RAMDISK_KERNEL_MODULES Signed-off-by: Woomymy Change-Id: I72768f8325017e0f5b969a7eb03ccccbf4b7eae0 Signed-off-by: dodyirawan85 <40514988+dodyirawan85@users.noreply.github.com> --- BoardConfig.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index bc91691..397522c 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -61,8 +61,15 @@ PRODUCT_COPY_FILES += \ 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_RECOVERY_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_PATH)/modules.load.recovery)) -BOARD_RECOVERY_KERNEL_MODULES := $(addprefix $(KERNEL_PATH)/modules/, $(BOARD_RECOVERY_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)) + +# Prevent duplicated entries (to solve duplicated build rules problem) +BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(sort $(BOARD_VENDOR_RAMDISK_KERNEL_MODULES) $(RECOVERY_MODULES)) + +BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_PATH)/modules.load)) +BOARD_VENDOR_KERNEL_MODULES := $(addprefix $(KERNEL_PATH)/modules/, $(BOARD_VENDOR_KERNEL_MODULES_LOAD)) # Partitions BOARD_FLASH_BLOCK_SIZE := 262144 # BOARD_KERNEL_PAGESIZE * 64