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

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

Merge "AndroidKernel.mk: Use binder-32 for kernel 64/userspace 32"

parents 8989a736 5cf4129b

AndroidKernel.mk

+15 −0
Original line number Diff line number Diff line
@@ -26,6 +26,13 @@ ifeq ($(KERNEL_HEADER_DEFCONFIG),) 
KERNEL_HEADER_DEFCONFIG := $(KERNEL_DEFCONFIG)

endif



# Force 32-bit binder IPC for 64bit kernel with 32bit userspace

ifeq ($(KERNEL_ARCH),arm64)

ifeq ($(TARGET_ARCH),arm)

KERNEL_CONFIG_OVERRIDE := CONFIG_ANDROID_BINDER_IPC_32BIT=y

endif

endif



TARGET_KERNEL_CROSS_COMPILE_PREFIX := $(strip $(TARGET_KERNEL_CROSS_COMPILE_PREFIX))

ifeq ($(TARGET_KERNEL_CROSS_COMPILE_PREFIX),)

KERNEL_CROSS_COMPILE := arm-eabi-
@@ -77,6 +84,10 @@ $(KERNEL_OUT): 


$(KERNEL_CONFIG): $(KERNEL_OUT)

	$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_DEFCONFIG)

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

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

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

			$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) oldconfig; fi



$(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_OUT) $(KERNEL_HEADERS_INSTALL)

	$(hide) rm -rf $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts
@@ -92,6 +103,10 @@ $(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT) 
	$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=$(KERNEL_HEADER_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) headers_install

	$(hide) rm -f ../$(KERNEL_CONFIG)

	$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_DEFCONFIG)

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

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

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

			$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) oldconfig; fi



kerneltags: $(KERNEL_OUT) $(KERNEL_CONFIG)

	$(MAKE) -C kernel O=../$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) tags