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

Commit f996c367 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "AndroidKernel: Compile VM kernel in addition to base defconfig"

parents fc6f97b7 368def78

AndroidKernel.mk

+53 −4
Original line number Diff line number Diff line
@@ -6,6 +6,8 @@ ifeq ($(KERNEL_TARGET),) 
INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel

endif



INSTALLED_KERNEL_VM_TARGET := $(PRODUCT_OUT)/kernel_vm



TARGET_KERNEL_MAKE_ENV := $(strip $(TARGET_KERNEL_MAKE_ENV))

ifeq ($(TARGET_KERNEL_MAKE_ENV),)

KERNEL_MAKE_ENV :=
@@ -64,12 +66,16 @@ ifeq ($(TARGET_KERNEL),$(current_dir)) 
    KERNEL_OUT := $(TARGET_OUT_INTERMEDIATES)/kernel/$(TARGET_KERNEL)

    KERNEL_SYMLINK := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ

    KERNEL_USR := $(KERNEL_SYMLINK)/usr

    KERNEL_VM_OUT := $(TARGET_OUT_INTERMEDIATES)/kernel_vm/$(TARGET_KERNEL)

    KERNEL_VM_SYMLINK := $(TARGET_OUT_INTERMEDIATES)/KERNEL_VM_OBJ

    KERNEL_VM_USR := $(KERNEL_VM_SYMLINK)/usr

else

    # Legacy style, kernel source directly under kernel

    KERNEL_LEGACY_DIR := true

    BUILD_ROOT_LOC := ../

    TARGET_KERNEL_SOURCE := kernel

    KERNEL_OUT := $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ

    KERNEL_VM_OUT := $(TARGET_OUT_INTERMEDIATES)/KERNEL_VM_OBJ

endif



KERNEL_CONFIG := $(KERNEL_OUT)/.config
@@ -80,26 +86,32 @@ else 


ifeq ($(TARGET_USES_UNCOMPRESSED_KERNEL),true)

$(info Using uncompressed kernel)

TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/Image

TARGET_PREBUILT_INT_KERNEL_ := arch/$(KERNEL_ARCH)/boot/Image

else

ifeq ($(KERNEL_ARCH),arm64)

TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/Image.gz

TARGET_PREBUILT_INT_KERNEL_ := arch/$(KERNEL_ARCH)/boot/Image.gz

else

TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/zImage

TARGET_PREBUILT_INT_KERNEL_ := arch/$(KERNEL_ARCH)/boot/zImage

endif

endif



ifeq ($(TARGET_KERNEL_APPEND_DTB), true)

$(info Using appended DTB)

TARGET_PREBUILT_INT_KERNEL := $(TARGET_PREBUILT_INT_KERNEL)-dtb

TARGET_PREBUILT_INT_KERNEL_ := $(TARGET_PREBUILT_INT_KERNEL_)-dtb

endif



KERNEL_HEADERS_INSTALL := $(KERNEL_OUT)/usr

KERNEL_MODULES_INSTALL ?= system

KERNEL_MODULES_OUT ?= $(PRODUCT_OUT)/$(KERNEL_MODULES_INSTALL)/lib/modules



TARGET_PREBUILT_INT_KERNEL := $(KERNEL_OUT)/$(TARGET_PREBUILT_INT_KERNEL_)

TARGET_PREBUILT_KERNEL := $(TARGET_PREBUILT_INT_KERNEL)



KERNEL_VM_CONFIG := $(KERNEL_VM_OUT)/.config

KERNEL_VM_HEADERS_INSTALL := $(KERNEL_VM_OUT)/usr

TARGET_PREBUILT_INT_KERNEL_VM := $(KERNEL_VM_OUT)/$(TARGET_PREBUILT_INT_KERNEL_)

TARGET_PREBUILT_KERNEL_VM := $(TARGET_PREBUILT_INT_KERNEL_VM)



define mv-modules

mdpath=`find $(KERNEL_MODULES_OUT) -type f -name modules.dep`;\

if [ "$$mdpath" != "" ];then\
@@ -116,12 +128,49 @@ mpath=`dirname $$mdpath`; rm -rf $$mpath;\ 
fi

endef



$(TARGET_PREBUILT_INT_KERNEL_VM): ;



ifneq ($(KERNEL_LEGACY_DIR),true)

$(KERNEL_USR): $(KERNEL_HEADERS_INSTALL)

	rm -rf $(KERNEL_SYMLINK)

	ln -s kernel/$(TARGET_KERNEL) $(KERNEL_SYMLINK)



$(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_USR)



ifneq ($(KERNEL_VM_DEFCONFIG),)

$(KERNEL_VM_USR): $(KERNEL_VM_HEADERS_INSTALL)

	rm -rf $(KERNEL_VM_SYMLINK);

	ln -s kernel_vm/$(TARGET_KERNEL) $(KERNEL_VM_SYMLINK);



$(TARGET_PREBUILT_INT_KERNEL_VM): $(KERNEL_VM_USR)

endif

endif



ifneq ($(KERNEL_VM_DEFCONFIG),)

$(KERNEL_VM_OUT):

	mkdir -p $(KERNEL_VM_OUT);



$(KERNEL_VM_CONFIG): $(KERNEL_VM_OUT)

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_VM_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_VM_DEFCONFIG);

	if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \

		echo "Overriding kernel config with '$(KERNEL_CONFIG_OVERRIDE)'"; \

		echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_VM_OUT)/.config; \

		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_VM_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) oldconfig; fi;



$(TARGET_PREBUILT_INT_KERNEL_VM): $(KERNEL_VM_OUT) $(KERNEL_VM_HEADERS_INSTALL)

	echo "Building vm kernel...";

	rm -rf $(KERNEL_VM_OUT)/arch/$(KERNEL_ARCH)/boot/dts;

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_VM_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_CFLAGS);



$(KERNEL_VM_HEADERS_INSTALL): $(KERNEL_VM_OUT)

	rm -f $(BUILD_ROOT_LOC)$(KERNEL_VM_CONFIG);

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_VM_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_HEADER_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_VM_DEFCONFIG);

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_VM_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_HEADER_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) headers_install;

	if [ -d "$(KERNEL_VM_HEADERS_INSTALL)/include/bringup_headers" ]; then \

		cp -Rf  $(KERNEL_VM_HEADERS_INSTALL)/include/bringup_headers/* $(KERNEL_VM_HEADERS_INSTALL)/include/ ; fi ;

	if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \

		echo $(KERNEL_CONFIG_OVERRIDE) >> $(KERNEL_VM_OUT)/.config; \

		$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_VM_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) oldconfig; fi;

endif



$(KERNEL_OUT):