Merge pull request #7 from Bettehem/Halium_9.0_GSI

Backported BT 4.2

Author: Bettehem

Kconfig

@@ -9,3 +9,4 @@ config SRCARCH
 	option env="SRCARCH"
 
 source "arch/$SRCARCH/Kconfig"
+source "backports/Kconfig"

Makefile

@@ -555,6 +555,7 @@ scripts: scripts_basic include/config/auto.conf include/config/tristate.conf \
 	$(Q)$(MAKE) $(build)=$(@)
 
 # Objects we will link into vmlinux / subdirs we need to visit
+backports-y 	:= backports/
 init-y		:= init/
 drivers-y	:= drivers/ sound/ firmware/
 net-y		:= net/
@@ -905,11 +906,14 @@ core-y		+= kernel/ mm/ fs/ ipc/ security/ crypto/ block/
 
 vmlinux-dirs	:= $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
 		     $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
+		     $(backports-y) $(backports-m) \
 		     $(net-y) $(net-m) $(libs-y) $(libs-m)))
 
 vmlinux-alldirs	:= $(sort $(vmlinux-dirs) $(patsubst %/,%,$(filter %/, \
+		     $(backports-n) $(backports-) \
 		     $(init-) $(core-) $(drivers-) $(net-) $(libs-))))
 
+backports-y    := $(patsubst %/, %/built-in.o, $(backports-y))
 init-y		:= $(patsubst %/, %/built-in.o, $(init-y))
 core-y		:= $(patsubst %/, %/built-in.o, $(core-y))
 drivers-y	:= $(patsubst %/, %/built-in.o, $(drivers-y))
@@ -920,7 +924,7 @@ libs-y		:= $(libs-y1) $(libs-y2)
 
 # Externally visible symbols (used by link-vmlinux.sh)
 export KBUILD_VMLINUX_INIT := $(head-y) $(init-y)
-export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y)
+export KBUILD_VMLINUX_MAIN := $(core-y) $(libs-y) $(drivers-y) $(net-y) $(backports-y)
 export KBUILD_LDS          := arch/$(SRCARCH)/kernel/vmlinux.lds
 export LDFLAGS_vmlinux
 # used by scripts/pacmage/Makefile

arch/arm64/configs/lineageos_oneplus3_defconfig

@@ -509,7 +509,7 @@ CONFIG_COREDUMP=y
 CONFIG_COMPAT=y
 CONFIG_KUSER_HELPERS=y
 CONFIG_SYSVIPC_COMPAT=y
-CONFIG_COMPAT_VDSO=n
+# CONFIG_COMPAT_VDSO is not set
 CONFIG_CROSS_COMPILE_ARM32=""
 
 #
@@ -1026,26 +1026,7 @@ CONFIG_SOCKEV_NLMCAST=y
 # CONFIG_HAMRADIO is not set
 # CONFIG_CAN is not set
 # CONFIG_IRDA is not set
-CONFIG_BT=y
-CONFIG_BT_RFCOMM=y
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=y
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_HIDP=y
-
-#
-# Bluetooth device drivers
-#
-# CONFIG_BT_HCIBTUSB is not set
-# CONFIG_BT_HCIUART is not set
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBFUSB is not set
-CONFIG_BT_HCIVHCI=y
-# CONFIG_BT_MRVL is not set
-CONFIG_MSM_BT_POWER=y
-# CONFIG_BTFM_SLIM is not set
+# CONFIG_BT is not set
 # CONFIG_AF_RXRPC is not set
 CONFIG_FIB_RULES=y
 CONFIG_WIRELESS=y
@@ -1368,8 +1349,6 @@ CONFIG_DM_REQ_CRYPT=y
 CONFIG_DM_UEVENT=y
 # CONFIG_DM_FLAKEY is not set
 CONFIG_DM_VERITY=y
-# CONFIG_DM_VERITY_HASH_PREFETCH_MIN_SIZE_128 is not set
-CONFIG_DM_VERITY_HASH_PREFETCH_MIN_SIZE=1
 CONFIG_DM_VERITY_FEC=y
 # CONFIG_DM_SWITCH is not set
 # CONFIG_DM_LOG_WRITES is not set
@@ -4443,7 +4422,7 @@ CONFIG_CRYPTO_XTS=y
 #
 # Hash modes
 #
-# CONFIG_CRYPTO_CMAC is not set
+CONFIG_CRYPTO_CMAC=y
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_XCBC=y
 # CONFIG_CRYPTO_VMAC is not set
@@ -4602,6 +4581,56 @@ CONFIG_ARCH_HAS_SG_CHAIN=y
 CONFIG_QMI_ENCDEC=y
 # CONFIG_QMI_ENCDEC_DEBUG is not set
 # CONFIG_STRICT_MEMORY_RWX is not set
+CONFIG_BACKPORT_INTEGRATE=y
+CONFIG_BACKPORT_DIR="backports/"
+CONFIG_BACKPORT_VERSION="v4.2.6-1-0-g90118c7"
+CONFIG_BACKPORT_KERNEL_VERSION="v4.2.6-0-g1c02865"
+CONFIG_BACKPORT_KERNEL_NAME="Linux"
+CONFIG_BACKPORT_LINUX=y
+CONFIG_BACKPORT_KERNEL_3_19=y
+CONFIG_BACKPORT_KERNEL_4_0=y
+CONFIG_BACKPORT_KERNEL_4_1=y
+CONFIG_BACKPORT_KERNEL_4_2=y
+CONFIG_BACKPORT_BPAUTO_BUILD_CORDIC=m
+CONFIG_BACKPORT_BPAUTO_BUILD_AVERAGE=y
+CONFIG_BACKPORT_BPAUTO_USERSEL_BUILD_ALL=y
+CONFIG_BACKPORT_BT=y
+CONFIG_BACKPORT_BT_BREDR=y
+CONFIG_BACKPORT_BT_RFCOMM=y
+CONFIG_BACKPORT_BT_RFCOMM_TTY=y
+CONFIG_BACKPORT_BT_BNEP=y
+CONFIG_BACKPORT_BT_BNEP_MC_FILTER=y
+CONFIG_BACKPORT_BT_BNEP_PROTO_FILTER=y
+CONFIG_BACKPORT_BT_HIDP=y
+CONFIG_BACKPORT_BT_LE=y
+# CONFIG_BACKPORT_BT_SELFTEST is not set
+CONFIG_BACKPORT_BT_DEBUGFS=y
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BACKPORT_BT_INTEL=y
+CONFIG_BACKPORT_BT_BCM=y
+CONFIG_BACKPORT_BT_RTL=y
+CONFIG_BACKPORT_BT_HCIBTUSB=y
+CONFIG_BACKPORT_BT_HCIBTUSB_BCM=y
+CONFIG_BACKPORT_BT_HCIBTUSB_RTL=y
+CONFIG_BACKPORT_BT_HCIUART=y
+CONFIG_BACKPORT_BT_HCIUART_H4=y
+CONFIG_BACKPORT_BT_HCIUART_BCSP=y
+CONFIG_BACKPORT_BT_HCIUART_ATH3K=y
+CONFIG_BACKPORT_BT_HCIUART_LL=y
+CONFIG_BACKPORT_BT_HCIUART_3WIRE=y
+CONFIG_BACKPORT_BT_HCIUART_INTEL=y
+CONFIG_BACKPORT_BT_HCIUART_BCM=y
+CONFIG_BACKPORT_BT_HCIBCM203X=y
+CONFIG_BACKPORT_BT_HCIBPA10X=y
+CONFIG_BACKPORT_BT_HCIBFUSB=y
+CONFIG_BACKPORT_BT_HCIVHCI=y
+CONFIG_BACKPORT_BT_MRVL=y
+CONFIG_BACKPORT_BT_ATH3K=y
+CONFIG_BACKPORT_MSM_BT_POWER=y
+# CONFIG_BACKPORT_BT_BCM4359 is not set
 CONFIG_CGROUP_MEM_RES_CTLR=y
 CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
 CONFIG_CGROUP_MEM_RES_CTLR_KMEM=y
@@ -4618,7 +4647,13 @@ CONFIG_SQUASHFS_FILE_DIRECT=y
 # CONFIG_USB_CONFIGFS_QCRNDIS is not set
 # CONFIG_USB_CONFIGFS_RMNET_BAM is not set
 # CONFIG_USB_CONFIGFS_F_GSI is not set
+# CONFIG_BT_HCIBTUSB is not set
 # CONFIG_BT_HCIBTSDIO is not set
+# CONFIG_BT_HCIUART is not set
+# CONFIG_BT_HCIBCM203X is not set
+# CONFIG_BT_HCIBPA10X is not set
+# CONFIG_BT_HCIBFUSB is not set
+# CONFIG_BT_MRVL is not set
 # CONFIG_ARM_UNWIND is not set
 # CONFIG_CIFS_UPCALL is not set
 # CONFIG_CIFS_DFS_UPCALL is not set