commit 8d9cf47ea809a3d38269b4899c90d1739424cddc
author Amit Pundir <pundiramit@gmail.com> Wed Mar 18 16:07:00 2020 +0530
committer Amit Pundir <amit.pundir@linaro.org> Tue Mar 31 10:41:46 2020 +0530
tree d7e10054010547378aac431c7d9129209fbcb042
parent 74d51b6234c0cd97d672b32f23f46ae608b91ffc

aosp_beryllium: set TARGET_KERNEL_USE, move msm.ko to vendor.img and other small changes

If TARGET_KERNEL_USE is not set then set it to latest
LTS (5.4) explicitly.

msm.ko(31MB) is too big for ramdisk.img. Move it to
vendor.img instead.

Also rename BOARD_VENDOR_RAMDISK_KERNEL_MODULES to
BOARD_GENERIC_RAMDISK_KERNEL_MODULES to avoid confusion
because we are not supporting vendor boot image at the
moment.

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

aosp_beryllium.mk

diff --git a/aosp_beryllium.mk b/aosp_beryllium.mk
index cddde76..a7b4330 100644
--- a/aosp_beryllium.mk
+++ b/aosp_beryllium.mk
@@ -1,33 +1,16 @@
 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_MODS := $(wildcard device/xiaomi/beryllium/prebuilt-kernel/android-5.4/*.ko)
-
-# Skip copying modules broken on android-5.4
-# Use local module copy instead
-SKIP_MODS := %/msm.ko
-
-# BT 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 $(SKIP_MODS) $(ONLY_VENDOR),$(KERNEL_MODS))
-BOARD_VENDOR_RAMDISK_KERNEL_MODULES += $(LOCAL_MODS)
-
-else # ifdef TARGET_KERNEL_USE
+TARGET_KERNEL_USE := 5.4
+endif
 
 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
+# msm.ko is too big (31M) for ramdisk
+VENDOR_KERN_MODS := %/msm.ko
+BOARD_VENDOR_KERNEL_MODULES := $(filter $(VENDOR_KERN_MODS),$(KERNEL_MODS))
 
-BOARD_VENDOR_KERNEL_MODULES := $(filter $(ONLY_VENDOR),$(KERNEL_MODS))
-BOARD_VENDOR_RAMDISK_KERNEL_MODULES := $(filter-out $(ONLY_VENDOR),$(KERNEL_MODS))
-
-endif
+# All other modules go to ramdisk
+BOARD_GENERIC_RAMDISK_KERNEL_MODULES := $(filter-out $(VENDOR_KERN_MODS),$(KERNEL_MODS))
 
 # Inherit the full_base and device configurations
 $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)

build/tasks/kernel.mk

diff --git a/build/tasks/kernel.mk b/build/tasks/kernel.mk
index 0473f90..9f1b137 100644
--- a/build/tasks/kernel.mk
+++ b/build/tasks/kernel.mk
@@ -1,12 +1,7 @@
 ifneq ($(filter aosp_beryllium, $(TARGET_DEVICE)),)
 
-ifndef TARGET_KERNEL_USE
-IMAGE_GZ := device/linaro/dragonboard-kernel/android-5.4/Image.gz
-DTB := device/xiaomi/beryllium/prebuilt-kernel/android-5.4/sdm845-beryllium.dtb
-else
 IMAGE_GZ := device/xiaomi/beryllium/prebuilt-kernel/android-$(TARGET_KERNEL_USE)/Image.gz
 DTB := device/xiaomi/beryllium/prebuilt-kernel/android-$(TARGET_KERNEL_USE)/sdm845-beryllium.dtb
-endif
 
 $(PRODUCT_OUT)/kernel: $(IMAGE_GZ) $(DTB)
 	cat $(IMAGE_GZ) $(DTB) > $@