From a0c49ef46f7caf5eb02c635d446218201008ecff Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Mon, 22 Jun 2015 12:27:59 +0000 Subject: generic: add linux 4.1 support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Boot tested: http://pastebin.com/L6aAb9xj Signed-off-by: Álvaro Fernández Rojas [jogo: update to 4.1 final add patches added since submission delete patches applied in later rcs restore commit messages in 220-gc-sections and 304-mips_disable_fpu fix 050-backport_netfilter_rtcache to match new API update inlined dma ops with upstream changes add missing config symbols enabled CONFIG_MULTIUSER update kmod defintions for 4.1 ] Signed-off-by: Jonas Gorski SVN-Revision: 46112 --- package/kernel/linux/modules/other.mk | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'package/kernel/linux/modules/other.mk') diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 77a8bff..90adc28 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -13,7 +13,9 @@ WATCHDOG_DIR:=watchdog define KernelPackage/6lowpan SUBMENU:=$(OTHER_MENU) TITLE:=6LoWPAN shared code - KCONFIG:=CONFIG_6LOWPAN + KCONFIG:= \ + CONFIG_6LOWPAN \ + CONFIG_6LOWPAN_NHC=n FILES:=$(LINUX_DIR)/net/6lowpan/6lowpan.ko AUTOLOAD:=$(call AutoProbe,6lowpan) endef @@ -40,14 +42,18 @@ define KernelPackage/bluetooth CONFIG_BLUEZ_HIDP \ CONFIG_BT \ CONFIG_BT_BREDR=y \ + CONFIG_BT_DEBUGFS=n \ CONFIG_BT_L2CAP=y \ CONFIG_BT_LE=y \ CONFIG_BT_SCO=y \ CONFIG_BT_RFCOMM \ CONFIG_BT_BNEP \ CONFIG_BT_HCIBTUSB \ + CONFIG_BT_HCIBTUSB_BCM=n \ CONFIG_BT_HCIUSB \ CONFIG_BT_HCIUART \ + CONFIG_BT_HCIUART_BCM=n \ + CONFIG_BT_HCIUART_INTEL=n \ CONFIG_BT_HCIUART_H4 \ CONFIG_BT_HIDP \ CONFIG_HID_SUPPORT=y @@ -59,6 +65,10 @@ define KernelPackage/bluetooth $(LINUX_DIR)/net/bluetooth/hidp/hidp.ko \ $(LINUX_DIR)/drivers/bluetooth/hci_uart.ko \ $(LINUX_DIR)/drivers/bluetooth/btusb.ko +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,4.1.0)),1) + FILES+= \ + $(LINUX_DIR)/drivers/bluetooth/btintel.ko +endif AUTOLOAD:=$(call AutoProbe,bluetooth rfcomm bnep hidp hci_uart btusb) endef -- cgit v1.1