Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16075eab authored by Aaron Kling's avatar Aaron Kling Committed by Jan Altensen
Browse files

kernel: Use correct recovery modules.load variable 

Originally, BOARD_RECOVERY_RAMDISK_KERNEL_MODULES_LOAD was used, but
BOARD_RECOVERY_KERNEL_MODULES_LOAD is what build/make uses. Use the
proper variable by default and if it's not set, use the old variable.

Change-Id: I3522e4782ae56f67e49b234236fbb86c8ec65b92
parent ae2f5b65

build/tasks/kernel.mk

+3 −1
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ VARIANT_DEFCONFIG := $(TARGET_KERNEL_VARIANT_CONFIG) 
SELINUX_DEFCONFIG := $(TARGET_KERNEL_SELINUX_CONFIG)

# dtb generation - optional

TARGET_MERGE_DTBS_WILDCARD ?= *

# recovery modules.load fallback - optional

BOARD_RECOVERY_KERNEL_MODULES_LOAD ?= $(BOARD_RECOVERY_RAMDISK_KERNEL_MODULES_LOAD)



## Internal variables

DTC := $(HOST_OUT_EXECUTABLES)/dtc
@@ -551,7 +553,7 @@ $(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_CONFIG) $(DEPMOD) $(DTC) $(KERNEL_MODULE 
					if [ -n "$$p" ]; then echo $$p; else echo "ERROR: $$m from RECOVERY_KERNEL_MODULES was not found" 1>&2 && exit 1; fi; \

				done); \

				[ $$? -ne 0 ] && exit 1; \

				($(call build-image-kernel-modules-lineage,$$recovery_modules,$(KERNEL_RECOVERY_MODULES_OUT),,$(KERNEL_RECOVERY_DEPMOD_STAGING_DIR),$(BOARD_RECOVERY_RAMDISK_KERNEL_MODULES_LOAD),,,)) || exit "$$?"; \

				($(call build-image-kernel-modules-lineage,$$recovery_modules,$(KERNEL_RECOVERY_MODULES_OUT),,$(KERNEL_RECOVERY_DEPMOD_STAGING_DIR),$(BOARD_RECOVERY_KERNEL_MODULES_LOAD),,,)) || exit "$$?"; \

			) \

		fi