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

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

Promotion of kernel.lnx.4.4-170410. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
2006987   I48b7f638e3c69bf2c223ecf65d080fb603fc26f8   wil6210: store bss object and use cfg80211_connect_bss()
2026435   Ib5036c70ba46374619cc43f9f7b697e1a444aebf   scripts: Makefile: add support to compile DT overlay blo
2026435   I74b1ed9828ec94093fab40a70c0cd0c155796c94   arm64: add config option to enable DT overlay
2029982   I61cb6a5147b68868d782490885969ceb2feef06c   ARM: dts: msm: Add thermistor support for PM660
2030651   I2a2a03d0a6d441d23ec093ff5de9bef5e9799d24   diag: Fix feature mask mismatch for peripherals
2006987   I4d6ed85f00901b0e286d8b05d016e9cd5e9dd2fb   wil6210: use WMI_DISCONNECT_CMDID upon connect timeout
2026435   I268d2332d5328c3b0050b35c96f91e8ef9e1f6f8   scripts: Makefile: add support to use external DTC
2026435   I008ca00cf9695133ff167ffdee8d8dfb89beb598   AndroidKernel: add support to pass build flags
2006987   I367797e0eeb1e71a28674415121a054daee04cbc   wil6210: correctly report locally generated disconnect i
2006987   I170c953b0f126513b6fec7a7c316d282ed56367e   wil6210: add oob_mode for AP certification
2026435   Iacbfa0fce69d3cb4b6f47a6c857983034633dc19   AndroidKernel: add support to configure DLKM install pat

Change-Id: I8c80cc6239cee2e98debff7a51f1888fdb212220
CRs-Fixed: 2006987, 2029982, 2030651, 2026435
parents ac02542d 96dcaf13

AndroidKernel.mk

+21 −14
Original line number Diff line number Diff line
@@ -6,6 +6,13 @@ ifeq ($(KERNEL_TARGET),) 
INSTALLED_KERNEL_TARGET := $(PRODUCT_OUT)/kernel

endif



TARGET_KERNEL_MAKE_ENV := $(strip $(TARGET_KERNEL_MAKE_ENV))

ifeq ($(TARGET_KERNEL_MAKE_ENV),)

KERNEL_MAKE_ENV :=

else

KERNEL_MAKE_ENV := $(TARGET_KERNEL_MAKE_ENV)

endif



TARGET_KERNEL_ARCH := $(strip $(TARGET_KERNEL_ARCH))

ifeq ($(TARGET_KERNEL_ARCH),)

KERNEL_ARCH := arm
@@ -91,8 +98,8 @@ TARGET_PREBUILT_INT_KERNEL := $(TARGET_PREBUILT_INT_KERNEL)-dtb 
endif



KERNEL_HEADERS_INSTALL := $(KERNEL_OUT)/usr

KERNEL_MODULES_INSTALL := system

KERNEL_MODULES_OUT := $(TARGET_OUT)/lib/modules

KERNEL_MODULES_INSTALL ?= system

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



TARGET_PREBUILT_KERNEL := $(TARGET_PREBUILT_INT_KERNEL)
@@ -124,43 +131,43 @@ $(KERNEL_OUT): 
	mkdir -p $(KERNEL_OUT)



$(KERNEL_CONFIG): $(KERNEL_OUT)

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

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) 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 $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) oldconfig; fi

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



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

	$(hide) echo "Building kernel..."

	$(hide) rm -rf $(KERNEL_OUT)/arch/$(KERNEL_ARCH)/boot/dts

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_CFLAGS)

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_CFLAGS) modules

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) INSTALL_MOD_PATH=$(BUILD_ROOT_LOC)../$(KERNEL_MODULES_INSTALL) INSTALL_MOD_STRIP=1 ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) modules_install

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

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

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) INSTALL_MOD_PATH=$(BUILD_ROOT_LOC)../$(KERNEL_MODULES_INSTALL) INSTALL_MOD_STRIP=1 $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) modules_install

	$(mv-modules)

	$(clean-module-folder)



$(KERNEL_HEADERS_INSTALL): $(KERNEL_OUT)

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

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

			$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_HEADER_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_HEADER_DEFCONFIG); \

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

			$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) $(KERNEL_MAKE_ENV) ARCH=$(KERNEL_HEADER_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) $(KERNEL_HEADER_DEFCONFIG); \

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

	$(hide) if [ "$(KERNEL_HEADER_DEFCONFIG)" != "$(KERNEL_DEFCONFIG)" ]; then \

			echo "Used a different defconfig for header generation"; \

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

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

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

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

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

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

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

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



kerneltags: $(KERNEL_OUT) $(KERNEL_CONFIG)

	$(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) tags

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



kernelconfig: $(KERNEL_OUT) $(KERNEL_CONFIG)

	env KCONFIG_NOTIMESTAMP=true \

	     $(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) menuconfig

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

	env KCONFIG_NOTIMESTAMP=true \

	     $(MAKE) -C $(TARGET_KERNEL_SOURCE) O=$(BUILD_ROOT_LOC)$(KERNEL_OUT) ARCH=$(KERNEL_ARCH) CROSS_COMPILE=$(KERNEL_CROSS_COMPILE) savedefconfig

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

	cp $(KERNEL_OUT)/defconfig $(TARGET_KERNEL_SOURCE)/arch/$(KERNEL_ARCH)/configs/$(KERNEL_DEFCONFIG)



endif

arch/arm/boot/dts/qcom/msm-pm660.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -287,6 +287,18 @@ 
				qcom,vadc-thermal-node;

			};



			chan@4f {

				label = "pa_therm0";

				reg = <0x4f>;

				qcom,decimation = <2>;

				qcom,pre-div-channel-scaling = <0>;

				qcom,calibration-type = "ratiometric";

				qcom,scale-function = <2>;

				qcom,hw-settle-time = <2>;

				qcom,fast-avg-setup = <0>;

				qcom,vadc-thermal-node;

			};



			chan@1d {

				label = "drax_temp";

				reg = <0x1d>;

arch/arm64/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -1030,6 +1030,11 @@ config BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES 
	  Space separated list of names of dtbs to append when

	  building a concatenated Image.gz-dtb.



config BUILD_ARM64_DT_OVERLAY

	bool "enable DT overlay compilation support"

	depends on OF

	help

	  This option enables support for DT overlay compilation.

endmenu



menu "Userspace binary formats"

arch/arm64/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -92,6 +92,10 @@ endif 


KBUILD_DTBS	:= dtbs



ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

export DTC_FLAGS := -@

endif



all:	$(KBUILD_IMAGE) $(KBUILD_DTBS)



boot := arch/arm64/boot

drivers/char/diag/diag_masks.c

+7 −2
Original line number Diff line number Diff line
@@ -456,8 +456,13 @@ static void diag_send_feature_mask_update(uint8_t peripheral) 
		DIAG_SET_FEATURE_MASK(F_DIAG_REQ_RSP_SUPPORT);

	if (driver->supports_apps_hdlc_encoding)

		DIAG_SET_FEATURE_MASK(F_DIAG_APPS_HDLC_ENCODE);

	if (driver->supports_apps_header_untagging)

	if (driver->supports_apps_header_untagging) {

		if (peripheral == PERIPHERAL_MODEM) {

			DIAG_SET_FEATURE_MASK(F_DIAG_PKT_HEADER_UNTAG);

			driver->peripheral_untag[peripheral] =

				ENABLE_PKT_HEADER_UNTAGGING;

		}

	}

	DIAG_SET_FEATURE_MASK(F_DIAG_MASK_CENTRALIZATION);

	if (driver->supports_sockets)

		DIAG_SET_FEATURE_MASK(F_DIAG_SOCKETS_ENABLED);