commit 097c2421d5e1877402148798e70bfc8bc325b9c3
author Amit Pundir <pundiramit@gmail.com> Wed Feb 19 20:12:40 2020 +0530
committer Amit Pundir <amit.pundir@linaro.org> Sun Mar 15 21:32:36 2020 +0530
tree db721996c11f5a6c248c2948384d20209d817871
parent dbb90a92f521252c85844ba55fcbcb408eb7b63b

Add custom kernel image, dtb and modules support

Add option to pick custom kernel prebuilts from
prebuilt-kernel/android-$(CUSTOM) directory. This
helps in testing custom kernels. Default kernel
is still based on android-5.4.

Build with "make TARGET_KERNEL_USE=$(CUSTOM)".
eg. Run "make TARGET_KERNEL_USE=mainline' to pick kernel
    prebuilts from prebuilt-kernel/android-mainline
    directory.

Signed-off-by: Amit Pundir <pundiramit@gmail.com>

aosp_beryllium.mk

diff --git a/aosp_beryllium.mk b/aosp_beryllium.mk
index b56bc69..cddde76 100644
--- a/aosp_beryllium.mk
+++ b/aosp_beryllium.mk
@@ -1,22 +1,34 @@
-DB845C_KERNEL_DIR := device/linaro/dragonboard-kernel/android-5.4
-DB845C_MODS := $(wildcard $(DB845C_KERNEL_DIR)/*.ko)
+ifndef TARGET_KERNEL_USE
+
+KERNEL_MODS := $(wildcard device/linaro/dragonboard-kernel/android-5.4/*.ko)
 
 # Local modules are built from following tree:
 # https://github.com/pundiramit/linux/tree/android-5.4-modules
-LOCAL_KERNEL_DIR := device/xiaomi/beryllium/prebuilt-kernel/android-5.4
-LOCAL_MODS := $(wildcard $(LOCAL_KERNEL_DIR)/*.ko)
+LOCAL_MODS := $(wildcard device/xiaomi/beryllium/prebuilt-kernel/android-5.4/*.ko)
 
 # Skip copying modules broken on android-5.4
 # Use local module copy instead
-DB845C_SKIP_MODS := %/msm.ko
+SKIP_MODS := %/msm.ko
 
 # BT modules go to vendor partition
-DB845C_ONLY_VENDOR := %/btqca.ko %/hci_uart.ko
-BOARD_VENDOR_KERNEL_MODULES := $(filter $(DB845C_ONLY_VENDOR),$(DB845C_MODS))
+ONLY_VENDOR := %/btqca.ko %/hci_uart.ko
+BOARD_VENDOR_KERNEL_MODULES := $(filter $(ONLY_VENDOR),$(KERNEL_MODS))
 
-BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(filter-out $(DB845C_SKIP_MODS) $(DB845C_ONLY_VENDOR),$(DB845C_MODS))
+BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(filter-out $(SKIP_MODS) $(ONLY_VENDOR),$(KERNEL_MODS))
 BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(LOCAL_MODS)
 
+else # ifdef TARGET_KERNEL_USE
+
+KERNEL_MODS := $(wildcard device/xiaomi/beryllium/prebuilt-kernel/android-$(TARGET_KERNEL_USE)/*.ko)
+
+# Following modules go to vendor partition
+ONLY_VENDOR := %/btqca.ko %/hci_uart.ko
+
+BOARD_VENDOR_KERNEL_MODULES := $(filter $(ONLY_VENDOR),$(KERNEL_MODS))
+BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(filter-out $(ONLY_VENDOR),$(KERNEL_MODS))
+
+endif
+
 # Inherit the full_base and device configurations
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, device/xiaomi/beryllium/aosp_beryllium/device.mk)