From 714acbb889996ad1a940850e87049a0823f728de Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Sat, 8 Dec 2018 09:23:44 +0800 Subject: [PATCH] kernel modules: fix usb mount for upstream --- package/kernel/linux/modules/crypto.mk | 2 +- package/kernel/linux/modules/hwmon.mk | 14 +++++++++++ package/kernel/linux/modules/iio.mk | 28 +++++++++++++++++++++- package/kernel/linux/modules/netfilter.mk | 4 ++-- package/kernel/linux/modules/netsupport.mk | 27 ++++++++++++++++++--- package/kernel/linux/modules/other.mk | 16 ++----------- package/kernel/linux/modules/usb.mk | 26 ++++++++++++++++++++ 7 files changed, 96 insertions(+), 21 deletions(-) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 235e6dada..34546edf4 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -180,7 +180,7 @@ $(eval $(call KernelPackage,crypto-ecb)) define KernelPackage/crypto-ecdh TITLE:=ECDH algorithm - DEPENDS:=@!(LINUX_3_18||LINUX_4_4) +kmod-crypto-kpp + DEPENDS:=@!LINUX_3_18 +kmod-crypto-kpp KCONFIG:= CONFIG_CRYPTO_ECDH FILES:= \ $(LINUX_DIR)/crypto/ecdh_generic.ko diff --git a/package/kernel/linux/modules/hwmon.mk b/package/kernel/linux/modules/hwmon.mk index 5cd849b86..00bb18501 100644 --- a/package/kernel/linux/modules/hwmon.mk +++ b/package/kernel/linux/modules/hwmon.mk @@ -29,6 +29,20 @@ define AddDepends/hwmon DEPENDS:=kmod-hwmon-core $(1) endef +define KernelPackage/hwmon-ads1015 + TITLE:=Texas Instruments ADS1015 + KCONFIG:= CONFIG_SENSORS_ADS1015 + FILES:= $(LINUX_DIR)/drivers/hwmon/ads1015.ko + AUTOLOAD:=$(call AutoLoad,60,ads1015) + $(call AddDepends/hwmon,+kmod-i2c-core) +endef + +define KernelPackage/hwmon-ads1015/description + Kernel module for Texas Instruments ADS1015 Analog-to-Digital converter +endef + +$(eval $(call KernelPackage,hwmon-ads1015)) + define KernelPackage/hwmon-adt7410 TITLE:=ADT7410 monitoring support KCONFIG:= \ diff --git a/package/kernel/linux/modules/iio.mk b/package/kernel/linux/modules/iio.mk index b7eb04851..a2ce821e7 100644 --- a/package/kernel/linux/modules/iio.mk +++ b/package/kernel/linux/modules/iio.mk @@ -52,6 +52,32 @@ endef $(eval $(call KernelPackage,iio-ad799x)) +define KernelPackage/iio-bh1750 + SUBMENU:=$(IIO_MENU) + DEPENDS:=+kmod-i2c-core +kmod-iio-core + TITLE:=ROHM BH1750 ambient light sensor + KCONFIG:= CONFIG_BH1750 + FILES:=$(LINUX_DIR)/drivers/iio/light/bh1750.ko + AUTOLOAD:=$(call AutoLoad,56,bh1750) +endef +define KernelPackage/iio-bh1750/description + ROHM BH1750 ambient light sensor (i2c bus) +endef +$(eval $(call KernelPackage,iio-bh1750)) + +define KernelPackage/iio-am2315 + SUBMENU:=$(IIO_MENU) + DEPENDS:=+kmod-i2c-core +kmod-iio-core + TITLE:=Asong AM2315 humidity/temperature sensor + KCONFIG:= CONFIG_AM2315 + FILES:=$(LINUX_DIR)/drivers/iio/humidity/am2315.ko + AUTOLOAD:=$(call AutoLoad,56,am2315) +endef +define KernelPackage/iio-am2315/description + Aosong AM2315 humidity/temperature sensor (I2C bus) +endef +$(eval $(call KernelPackage,iio-am2315)) + define KernelPackage/iio-mxs-lradc SUBMENU:=$(IIO_MENU) DEPENDS:=@TARGET_mxs +kmod-iio-core @@ -89,7 +115,7 @@ $(eval $(call KernelPackage,iio-dht11)) define KernelPackage/iio-bmp280 SUBMENU:=$(IIO_MENU) TITLE:=BMP180/BMP280/BME280 pressure/temperatur sensor - DEPENDS:=@(LINUX_4_9||LINUX_4_14) +kmod-iio-core +kmod-regmap + DEPENDS:=@!LINUX_3_18 +kmod-iio-core +kmod-regmap KCONFIG:=CONFIG_BMP280 FILES:=$(LINUX_DIR)/drivers/iio/pressure/bmp280.ko endef diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk index 109d1fd37..63a535eee 100644 --- a/package/kernel/linux/modules/netfilter.mk +++ b/package/kernel/linux/modules/netfilter.mk @@ -152,7 +152,7 @@ define KernelPackage/nf-flow CONFIG_NETFILTER_INGRESS=y \ CONFIG_NF_FLOW_TABLE \ CONFIG_NF_FLOW_TABLE_HW - DEPENDS:=+kmod-nf-conntrack @!LINUX_3_18 @!LINUX_4_4 @!LINUX_4_9 + DEPENDS:=+kmod-nf-conntrack @!LINUX_3_18 @!LINUX_4_9 FILES:= \ $(LINUX_DIR)/net/netfilter/nf_flow_table.ko \ $(LINUX_DIR)/net/netfilter/nf_flow_table_hw.ko @@ -539,7 +539,7 @@ define KernelPackage/nf-nathelper-extra KCONFIG:=$(KCONFIG_NF_NATHELPER_EXTRA) FILES:=$(foreach mod,$(NF_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_NATHELPER_EXTRA-m))) - DEPENDS:=+kmod-nf-nat +kmod-lib-textsearch + DEPENDS:=+kmod-nf-nat +kmod-lib-textsearch +kmod-ipt-raw endef define KernelPackage/nf-nathelper-extra/description diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index 77f1faa81..8da6f43e6 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -457,6 +457,27 @@ endef $(eval $(call KernelPackage,fou)) +define KernelPackage/fou6 + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=FOU and GUE decapsulation over IPv6 + DEPENDS:= @IPV6 \ + +kmod-fou \ + +kmod-ip6-tunnel + KCONFIG:= \ + CONFIG_IPV6_FOU \ + CONFIG_IPV6_FOU_TUNNEL + FILES:=$(LINUX_DIR)/net/ipv6/fou6.ko + AUTOLOAD:=$(call AutoProbe,fou6) +endef + +define KernelPackage/fou6/description + Kernel module for FOU (Foo over UDP) and GUE (Generic UDP Encapsulation) tunnelling over IPv6. + Requires Kernel 3.18 or newer. +endef + +$(eval $(call KernelPackage,fou6)) + + define KernelPackage/ip6-tunnel SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IP-in-IPv6 tunnelling @@ -780,7 +801,7 @@ $(eval $(call KernelPackage,sched)) define KernelPackage/tcp-bbr SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=BBR TCP congestion control - DEPENDS:=@!LINUX_3_18 @!LINUX_4_1 @!LINUX_4_4 +LINUX_4_9:kmod-sched + DEPENDS:=@!LINUX_3_18 +LINUX_4_9:kmod-sched KCONFIG:= \ CONFIG_TCP_CONG_ADVANCED=y \ CONFIG_TCP_CONG_BBR=m @@ -996,7 +1017,7 @@ $(eval $(call KernelPackage,rxrpc)) define KernelPackage/mpls SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=MPLS support - DEPENDS:=@!(LINUX_3_18||LINUX_4_1) + DEPENDS:=@!LINUX_3_18 KCONFIG:= \ CONFIG_MPLS=y \ CONFIG_LWTUNNEL=y \ @@ -1073,7 +1094,7 @@ $(eval $(call KernelPackage,mdio)) define KernelPackage/macsec SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=IEEE 802.1AE MAC-level encryption (MAC) - DEPENDS:=+kmod-crypto-gcm @!LINUX_3_18 @!LINUX_4_1 @!LINUX_4_4 + DEPENDS:=+kmod-crypto-gcm @!LINUX_3_18 KCONFIG:=CONFIG_MACSEC FILES:=$(LINUX_DIR)/drivers/net/macsec.ko AUTOLOAD:=$(call AutoLoad,13,macsec) diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 7df93d3a0..326945939 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -32,32 +32,20 @@ define KernelPackage/bluetooth TITLE:=Bluetooth support DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +kmod-crypto-ecb +kmod-lib-crc16 +kmod-hid +!LINUX_3_18:kmod-crypto-cmac +!LINUX_3_18:kmod-regmap +LINUX_4_14:kmod-crypto-ecdh KCONFIG:= \ - CONFIG_BLUEZ \ - CONFIG_BLUEZ_L2CAP \ - CONFIG_BLUEZ_SCO \ - CONFIG_BLUEZ_RFCOMM \ - CONFIG_BLUEZ_BNEP \ - CONFIG_BLUEZ_HCIUART \ - CONFIG_BLUEZ_HCIUSB \ - 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_HCIUART_NOKIA=n \ - CONFIG_BT_HIDP \ - CONFIG_HID_SUPPORT=y + CONFIG_BT_HIDP $(call AddDepends/rfkill) FILES:= \ $(LINUX_DIR)/net/bluetooth/bluetooth.ko \ @@ -988,7 +976,7 @@ $(eval $(call KernelPackage,echo)) define KernelPackage/bmp085 SUBMENU:=$(OTHER_MENU) TITLE:=BMP085/BMP18x pressure sensor - DEPENDS:= +kmod-regmap @!LINUX_3_18 @!LINUX_4_1 + DEPENDS:= +kmod-regmap @!LINUX_3_18 KCONFIG:= CONFIG_BMP085 FILES:= $(LINUX_DIR)/drivers/misc/bmp085.ko endef diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk index 8a4915712..748e7ede8 100644 --- a/package/kernel/linux/modules/usb.mk +++ b/package/kernel/linux/modules/usb.mk @@ -318,6 +318,17 @@ define KernelPackage/usb-bcma endef $(eval $(call KernelPackage,usb-bcma)) +define KernelPackage/usb-fotg210 + TITLE:=Support for FOTG210 USB host controllers + DEPENDS:=@USB_SUPPORT @TARGET_gemini + KCONFIG:=CONFIG_USB_FOTG210_HCD + FILES:= \ + $(if $(CONFIG_USB_FOTG210_HCD),$(LINUX_DIR)/drivers/usb/host/fotg210-hcd.ko) + AUTOLOAD:=$(call AutoLoad,50,fotg210-hcd,1) + $(call AddDepends/usb) +endef +$(eval $(call KernelPackage,usb-fotg210)) + define KernelPackage/usb-ssb TITLE:=Support for SSB USB controllers DEPENDS:=@USB_SUPPORT @TARGET_brcm47xx @@ -727,6 +738,21 @@ endef $(eval $(call KernelPackage,usb-serial-mos7720)) +define KernelPackage/usb-serial-mos7840 + TITLE:=Support for Moschip MOS7840 devices + KCONFIG:=CONFIG_USB_SERIAL_MOS7840 + FILES:=$(LINUX_DIR)/drivers/usb/serial/mos7840.ko + AUTOLOAD:=$(call AutoProbe,mos7840) + $(call AddDepends/usb-serial) +endef + +define KernelPackage/usb-serial-mos7840/description + Kernel support for Moschip MOS7840 USB-to-Serial converters +endef + +$(eval $(call KernelPackage,usb-serial-mos7840)) + + define KernelPackage/usb-serial-pl2303 TITLE:=Support for Prolific PL2303 devices KCONFIG:=CONFIG_USB_SERIAL_PL2303