Evolution-X-Tensor/device_google_gs201
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gs201: support splitting modules between system/vendor_dlkm

Browse source 
Currently, all gs201 targets have a system_dlkm image but their
modules are stored on the vendor_dlkm partition. In order to
support the staging kernel, modules have to be split across the
system/vendor_dlkm images.

This fix enables targets to define modules on the system_dlkm image.
If so, the system/vendor_dlkm split will be honored. Otherwise, all
modules will remain stored on the vendor_dlkm image.

Test:
- Build and flash aosp_panther, no errors.
- Build and flash a target defining BOARD_SYSTEM_KERNEL_MODULES, ensure
  modules are correctly split across the two dlkm partitions.

Bug: 285177263
Change-Id: I80131d97073ce666a9228a47c2fff94b76139a64
Signed-off-by: Samuel Gosselin <sgosselin@google.com>
This commit is contained in:
Samuel Gosselin 2023-06-01 03:16:58 +00:00
parent b29e534e86
commit 1382fe78e0
1 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
BoardConfig-common.mk
View file

@ -411,7 +411,15 @@ BOARD_VENDOR_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/ven
ifndef BOARD_VENDOR_KERNEL_MODULES_LOAD
$(error vendor_dlkm.modules.load not found or empty)
endif
# staging kernels might have modules split between system/vendor_dlkm. If
# the target defined modules on the system_dlkm image, honor the split.
# Otherwise, assume all modules are stored on the vendor_dlkm image.
ifneq ($(BOARD_SYSTEM_KERNEL_MODULES),)
BOARD_VENDOR_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_VENDOR_KERNEL_MODULES_LOAD)))
else
BOARD_VENDOR_KERNEL_MODULES := $(KERNEL_MODULES)
endif
# Using BUILD_COPY_HEADERS
BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true