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

Commit d5a749d6 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 117a496b on remote branch 

Change-Id: I0e515e4d4804e1aab87d3c6ac0b995d75a606efe
parents 5b5cbe5b 117a496b

AndroidKernel.mk

+17 −3
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ ifneq ($(TARGET_KERNEL_APPEND_DTB), true) 
$(info Using DTB Image)

INSTALLED_DTBIMAGE_TARGET := $(PRODUCT_OUT)/dtb.img

endif

MAKE_ARGS := $(strip $(TARGET_KERNEL_MAKE_ARGS))

KERNEL_DISABLE_DEBUGFS := $(TARGET_KERNEL_DISABLE_DEBUGFS)



TARGET_KERNEL_MAKE_ENV := $(strip $(TARGET_KERNEL_MAKE_ENV))

ifeq ($(TARGET_KERNEL_MAKE_ENV),)
@@ -138,6 +140,7 @@ $(info Using appended DTB) 
TARGET_PREBUILT_INT_KERNEL := $(TARGET_PREBUILT_INT_KERNEL)-dtb

endif



KERNEL_DEBUGFS := $(KERNEL_OUT)/tmp

KERNEL_HEADERS_INSTALL := $(KERNEL_OUT)/usr

KERNEL_MODULES_INSTALL ?= system

KERNEL_MODULES_OUT ?= $(PRODUCT_OUT)/$(KERNEL_MODULES_INSTALL)/lib/modules
@@ -162,6 +165,9 @@ mpath=`dirname $$mdpath`; rm -rf $$mpath;\ 
fi

endef



$(KERNEL_OUT): $(KERNEL_DEBUGFS)

	mkdir -p $(KERNEL_OUT)



ifneq ($(KERNEL_LEGACY_DIR),true)

$(KERNEL_USR): $(KERNEL_HEADERS_INSTALL)

	rm -rf $(KERNEL_SYMLINK)
@@ -170,9 +176,6 @@ $(KERNEL_USR): $(KERNEL_HEADERS_INSTALL) 
$(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_USR)

endif



$(KERNEL_OUT):

	mkdir -p $(KERNEL_OUT)



$(KERNEL_CONFIG): $(KERNEL_OUT)

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(real_cc) $(KERNEL_DEFCONFIG)

	$(hide) if [ ! -z "$(KERNEL_CONFIG_OVERRIDE)" ]; then \
@@ -206,6 +209,17 @@ $(TARGET_PREBUILT_INT_KERNEL): $(KERNEL_OUT) $(KERNEL_HEADERS_INSTALL) 
	$(clean-module-folder)

endif



$(KERNEL_DEBUGFS):

	KERNEL_DIR=$(TARGET_KERNEL_SOURCE) \

	DEFCONFIG=$(KERNEL_DEFCONFIG) \

	OUT_DIR=$(KERNEL_OUT) \

	ARCH=$(KERNEL_ARCH) \

	CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) \

	DISABLE_DEBUGFS=$(KERNEL_DISABLE_DEBUGFS) \

	$(TARGET_KERNEL_SOURCE)/disable_dbgfs.sh \

	$(real_cc) \

	$(TARGET_KERNEL_MAKE_ARGS)



$(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT)

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

			rm -f $(BUILD_ROOT_LOC)$(KERNEL_CONFIG) && \

arch/arm/configs/vendor/sa515m-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ CONFIG_BRIDGE=y 
CONFIG_VLAN_8021Q=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_PRIO=y

CONFIG_NET_SWITCHDEV=y

CONFIG_QRTR=y

CONFIG_QRTR_NODE_ID=2

CONFIG_QRTR_SMD=y

arch/arm/configs/vendor/sa515m_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -166,6 +166,7 @@ CONFIG_BRIDGE=y 
CONFIG_VLAN_8021Q=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_PRIO=y

CONFIG_NET_SWITCHDEV=y

CONFIG_QRTR=y

CONFIG_QRTR_NODE_ID=2

CONFIG_QRTR_SMD=y

arch/arm/configs/vendor/sdm429-bg-perf_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -297,7 +297,6 @@ CONFIG_USB_USBNET=y 
CONFIG_WIL6210=m

CONFIG_WCNSS_MEM_PRE_ALLOC=y

CONFIG_CLD_LL_CORE=y

CONFIG_CNSS_GENL=y

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set

arch/arm/configs/vendor/sdm429-bg_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -303,7 +303,6 @@ CONFIG_USB_RTL8152=y 
CONFIG_USB_USBNET=y

CONFIG_WCNSS_MEM_PRE_ALLOC=y

CONFIG_CLD_LL_CORE=y

CONFIG_CNSS_GENL=y

CONFIG_INPUT_EVDEV=y

CONFIG_KEYBOARD_GPIO=y

# CONFIG_INPUT_MOUSE is not set