diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-24 22:07:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-24 22:07:34 +0000 |
| commit | b2050366ef885d9b45ff67b3b0f50a835f24adcf (patch) | |
| tree | e287c9865419dbd71c3474eb2455e0436025f992 | |
| parent | e0c74fbdd640865c58ff378ac4c41235e9199248 (diff) | |
| parent | 980aded04fd38edbbe82bd309d1044588ba0c5c9 (diff) | |
| download | build-b2050366ef885d9b45ff67b3b0f50a835f24adcf.tar.gz | |
Merge "Allow specifying load order for 16K kernel modules" into main
| -rw-r--r-- | core/Makefile | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile index d09f54fb7d..e6a5bc0d4f 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1128,10 +1128,15 @@ $(foreach \ BOARD_VENDOR_RAMDISK_FRAGMENT.16K.PREBUILT := $(BUILT_RAMDISK_16K_TARGET) +ifndef BOARD_KERNEL_MODULES_LOAD_16K + BOARD_KERNEL_MODULES_LOAD_16K := $(BOARD_KERNEL_MODULES_16K) +endif + $(BUILT_RAMDISK_16K_TARGET): $(DEPMOD) $(MKBOOTFS) $(EXTRACT_KERNEL) $(COMPRESSION_COMMAND_DEPS) $(BUILT_RAMDISK_16K_TARGET): $(foreach file,$(BOARD_KERNEL_MODULES_16K),$(RAMDISK_16K_STAGING_DIR)/lib/modules/0.0/$(notdir $(file))) $(DEPMOD) -b $(RAMDISK_16K_STAGING_DIR) 0.0 - for MODULE in $(BOARD_KERNEL_MODULES_16K); do \ + rm -f $(RAMDISK_16K_STAGING_DIR)/lib/modules/0.0/modules.load + for MODULE in $(BOARD_KERNEL_MODULES_LOAD_16K); do \ basename $$MODULE >> $(RAMDISK_16K_STAGING_DIR)/lib/modules/0.0/modules.load ; \ done; rm -rf $(TARGET_OUT_RAMDISK_16K)/lib/modules |