fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Upstream

Browse Source
This commit is contained in:
CN_SZTL 2020-04-17 21:04:52 +08:00
commit 25c4523b26
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
10 changed files with 178 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/kernel/hwmon-gsc/Makefile
View File

@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/package.mk
define KernelPackage/hwmon-gsc
SUBMENU:=Hardware Monitoring Support
DEPENDS:=@TARGET_imx6||TARGET_cns3xxx kmod-hwmon-core +kmod-i2c-core
DEPENDS:=@TARGET_imx6||TARGET_cns3xxx +kmod-hwmon-core +kmod-i2c-core
TITLE:=Driver for the Gateworks System Controller
AUTOLOAD:=$(call AutoLoad,60,gsc)
FILES:=$(PKG_BUILD_DIR)/gsc.ko

5
package/kernel/linux/modules/block.mk
View File

@ -38,7 +38,7 @@ $(eval $(call KernelPackage,ata-core))
define AddDepends/ata
SUBMENU:=$(BLOCK_MENU)
DEPENDS+=kmod-ata-core $(1)
DEPENDS+=+kmod-ata-core $(1)
endef
@ -117,14 +117,13 @@ $(eval $(call KernelPackage,ata-nvidia-sata))
define KernelPackage/ata-pdc202xx-old
SUBMENU:=$(BLOCK_MENU)
TITLE:=Older Promise PATA controller support
DEPENDS:=kmod-ata-core
KCONFIG:= \
CONFIG_ATA_SFF=y \
CONFIG_PATA_PDC_OLD
FILES:=$(LINUX_DIR)/drivers/ata/pata_pdc202xx_old.ko
AUTOLOAD:=$(call AutoLoad,41,pata_pdc202xx_old,1)
$(call AddDepends/ata)
endef
define KernelPackage/ata-pdc202xx-old/description

17
package/kernel/linux/modules/can.mk
View File

@ -146,6 +146,23 @@ endef
$(eval $(call KernelPackage,can-gw))
define KernelPackage/can-mcp251x
TITLE:=MCP251x SPI CAN controller
KCONFIG:=\
CONFIG_SPI=y \
CONFIG_CAN_MCP251X
FILES:=$(LINUX_DIR)/drivers/net/can/spi/mcp251x.ko
AUTOLOAD:=$(call AutoProbe,can-mcp251x)
$(call AddDepends/can)
endef
define KernelPackage/can-mcp251x/description
Microchip MCP251x SPI CAN controller
endef
$(eval $(call KernelPackage,can-mcp251x))
define KernelPackage/can-raw
TITLE:=Raw CAN Protcol
KCONFIG:=CONFIG_CAN_RAW

2
package/kernel/linux/modules/crypto.mk
View File

@ -281,7 +281,7 @@ endef
KernelPackage/crypto-ghash/imx6=$(KernelPackage/crypto-ghash/arm-ce)
KernelPackage/crypto-ghash/ipq40xx=$(KernelPackage/crypto-ghash/arm-ce)
KernelPackage/crypto-ghash/mvebu=$(KernelPackage/crypto-ghash/arm-ce)
KernelPackage/crypto-ghash/mvebu/cortexa9=$(KernelPackage/crypto-ghash/arm-ce)
$(eval $(call KernelPackage,crypto-ghash))

48
package/kernel/linux/modules/hwmon.mk
View File

@ -26,7 +26,7 @@ $(eval $(call KernelPackage,hwmon-core))
define AddDepends/hwmon
SUBMENU:=$(HWMON_MENU)
DEPENDS:=kmod-hwmon-core $(1)
DEPENDS:=+kmod-hwmon-core $(1)
endef
define KernelPackage/hwmon-ads1015
@ -77,6 +77,37 @@ endef
$(eval $(call KernelPackage,hwmon-adt7475))
define KernelPackage/hwmon-dme1737
TITLE:=SMSC DME1737 and compatible monitoring support
KCONFIG:=CONFIG_SENSORS_DME1737
FILES:= \
$(LINUX_DIR)/drivers/hwmon/dme1737.ko
AUTOLOAD:=$(call AutoProbe,dme1737)
$(call AddDepends/hwmon,+kmod-i2c-core +kmod-hwmon-vid)
endef
define KernelPackage/hwmon-dme1737/description
SMSC DME1737, SCH3112, SCH3114, SCH3116, SCH5027 monitoring support
endef
$(eval $(call KernelPackage,hwmon-dme1737))
define KernelPackage/hwmon-drivetemp
TITLE:=Hard disk drives with temperature sensor
KCONFIG:=CONFIG_SENSORS_DRIVETEMP
FILES:=$(LINUX_DIR)/drivers/hwmon/drivetemp.ko
AUTOLOAD:=$(call AutoLoad,60,drivetemp)
$(call AddDepends/hwmon,+kmod-ata-core +kmod-scsi-core)
endef
define KernelPackage/hwmon-drivetemp/description
Kernel module for Hard disk drives with temperature sensor
endef
$(eval $(call KernelPackage,hwmon-drivetemp))
define KernelPackage/hwmon-gpiofan
TITLE:=Generic GPIO FAN support
KCONFIG:=CONFIG_SENSORS_GPIO_FAN
@ -92,6 +123,21 @@ endef
$(eval $(call KernelPackage,hwmon-gpiofan))
define KernelPackage/hwmon-f71882fg
TITLE:=F71882FG compatible monitoring support
KCONFIG:=CONFIG_SENSORS_F71882FG
FILES:=$(LINUX_DIR)/drivers/hwmon/f71882fg.ko
AUTOLOAD:=$(call AutoProbe,f71882fg)
$(call AddDepends/hwmon,@TARGET_x86)
endef
define KernelPackage/hwmon-f71882fg/description
Kernel module for hardware monitoring via many Fintek Super-IO chips.
endef
$(eval $(call KernelPackage,hwmon-f71882fg))
define KernelPackage/hwmon-ina209
TITLE:=INA209 monitoring support
KCONFIG:=CONFIG_SENSORS_INA209

24
package/kernel/linux/modules/i2c.mk
View File

@ -42,7 +42,7 @@ I2C_ALGOBIT_MODULES:= \
define KernelPackage/i2c-algo-bit
$(call i2c_defaults,$(I2C_ALGOBIT_MODULES),55)
TITLE:=I2C bit-banging interfaces
DEPENDS:=kmod-i2c-core
DEPENDS:=+kmod-i2c-core
endef
define KernelPackage/i2c-algo-bit/description
@ -58,7 +58,7 @@ I2C_ALGOPCA_MODULES:= \
define KernelPackage/i2c-algo-pca
$(call i2c_defaults,$(I2C_ALGOPCA_MODULES),55)
TITLE:=I2C PCA 9564 interfaces
DEPENDS:=kmod-i2c-core
DEPENDS:=+kmod-i2c-core
endef
define KernelPackage/i2c-algo-pca/description
@ -74,7 +74,7 @@ I2C_ALGOPCF_MODULES:= \
define KernelPackage/i2c-algo-pcf
$(call i2c_defaults,$(I2C_ALGOPCF_MODULES),55)
TITLE:=I2C PCF 8584 interfaces
DEPENDS:=kmod-i2c-core
DEPENDS:=+kmod-i2c-core
endef
define KernelPackage/i2c-algo-pcf/description
@ -107,7 +107,7 @@ I2C_I801_MODULES:= \
define KernelPackage/i2c-i801
$(call i2c_defaults,$(I2C_I801_MODULES),59)
TITLE:=Intel I801 and compatible I2C interfaces
DEPENDS:=@PCI_SUPPORT @TARGET_x86 kmod-i2c-core +kmod-i2c-smbus
DEPENDS:=@PCI_SUPPORT @TARGET_x86 +kmod-i2c-core +kmod-i2c-smbus
endef
define KernelPackage/i2c-i801/description
@ -132,7 +132,7 @@ I2C_MUX_MODULES:= \
define KernelPackage/i2c-mux
$(call i2c_defaults,$(I2C_MUX_MODULES),51)
TITLE:=I2C bus multiplexing support
DEPENDS:=kmod-i2c-core
DEPENDS:=+kmod-i2c-core
endef
define KernelPackage/i2c-mux/description
@ -147,7 +147,7 @@ I2C_MUX_GPIO_MODULES:= \
define KernelPackage/i2c-mux-gpio
$(call i2c_defaults,$(I2C_MUX_GPIO_MODULES),51)
TITLE:=GPIO-based I2C mux/switches
DEPENDS:=kmod-i2c-mux
DEPENDS:=+kmod-i2c-mux
endef
define KernelPackage/i2c-mux-gpio/description
@ -163,7 +163,7 @@ I2C_MUX_PCA9541_MODULES:= \
define KernelPackage/i2c-mux-pca9541
$(call i2c_defaults,$(I2C_MUX_PCA9541_MODULES),51)
TITLE:=Philips PCA9541 I2C mux/switches
DEPENDS:=kmod-i2c-mux
DEPENDS:=+kmod-i2c-mux
endef
define KernelPackage/i2c-mux-pca9541/description
@ -178,7 +178,7 @@ I2C_MUX_PCA954x_MODULES:= \
define KernelPackage/i2c-mux-pca954x
$(call i2c_defaults,$(I2C_MUX_PCA954x_MODULES),51)
TITLE:=Philips PCA954x I2C mux/switches
DEPENDS:=kmod-i2c-mux
DEPENDS:=+kmod-i2c-mux
endef
define KernelPackage/i2c-mux-pca954x/description
@ -194,7 +194,7 @@ I2C_PIIX4_MODULES:= \
define KernelPackage/i2c-piix4
$(call i2c_defaults,$(I2C_PIIX4_MODULES),59)
TITLE:=Intel PIIX4 and compatible I2C interfaces
DEPENDS:=@PCI_SUPPORT @TARGET_x86 kmod-i2c-core
DEPENDS:=@PCI_SUPPORT @TARGET_x86 +kmod-i2c-core
endef
define KernelPackage/i2c-piix4/description
@ -216,7 +216,7 @@ I2C_PXA_MODULES:= \
define KernelPackage/i2c-pxa
$(call i2c_defaults,$(I2C_PXA_MODULES),50)
TITLE:=Intel PXA I2C bus driver
DEPENDS:=kmod-i2c-core
DEPENDS:=+kmod-i2c-core
endef
define KernelPackage/i2c-pxa/description
@ -232,7 +232,7 @@ I2C_SMBUS_MODULES:= \
define KernelPackage/i2c-smbus
$(call i2c_defaults,$(I2C_SMBUS_MODULES),58)
TITLE:=SMBus-specific protocols helper
DEPENDS:=kmod-i2c-core
DEPENDS:=+kmod-i2c-core
endef
define KernelPackage/i2c-smbus/description
@ -249,7 +249,7 @@ I2C_TINY_USB_MODULES:= \
define KernelPackage/i2c-tiny-usb
$(call i2c_defaults,$(I2C_TINY_USB_MODULES),59)
TITLE:=I2C Tiny USB adaptor
DEPENDS:=@USB_SUPPORT kmod-i2c-core +kmod-usb-core
DEPENDS:=@USB_SUPPORT +kmod-i2c-core +kmod-usb-core
endef
define KernelPackage/i2c-tiny-usb/description

48
package/kernel/linux/modules/netdevices.mk
View File

@ -192,6 +192,23 @@ endef
$(eval $(call KernelPackage,phy-broadcom))
define KernelPackage/phy-bcm84881
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Broadcom BCM84881 PHY driver
KCONFIG:=CONFIG_BCM84881_PHY
DEPENDS:=+kmod-libphy
FILES:=$(LINUX_DIR)/drivers/net/phy/bcm84881.ko
AUTOLOAD:=$(call AutoLoad,18,bcm84881,1)
endef
define KernelPackage/phy-bcm84881/description
Supports the Broadcom 84881 PHY.
endef
$(eval $(call KernelPackage,phy-bcm84881))
define KernelPackage/phy-realtek
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Realtek Ethernet PHY driver
@ -223,6 +240,36 @@ endef
$(eval $(call KernelPackage,swconfig))
define KernelPackage/switch-bcm53xx
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Broadcom bcm53xx switch support
DEPENDS:=+kmod-swconfig
KCONFIG:=CONFIG_SWCONFIG_B53
FILES:=$(LINUX_DIR)/drivers/net/phy/b53/b53_common.ko
AUTOLOAD:=$(call AutoLoad,42,b53_common)
endef
define KernelPackage/switch-bcm53xx/description
Broadcom bcm53xx switch support
endef
$(eval $(call KernelPackage,switch-bcm53xx))
define KernelPackage/switch-bcm53xx-mdio
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Broadcom bcm53xx switch MDIO support
DEPENDS:=+kmod-switch-bcm53xx
KCONFIG:=CONFIG_SWCONFIG_B53_PHY_DRIVER
FILES:=$(LINUX_DIR)/drivers/net/phy/b53/b53_mdio.ko
AUTOLOAD:=$(call AutoLoad,42,b53_mdio)
endef
define KernelPackage/switch-bcm53xx-mdio/description
Broadcom bcm53xx switch MDIO support
endef
$(eval $(call KernelPackage,switch-bcm53xx-mdio))
define KernelPackage/switch-mvsw61xx
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=Marvell 88E61xx switch support
@ -912,6 +959,7 @@ define KernelPackage/ifb
CONFIG_NET_CLS=y
FILES:=$(LINUX_DIR)/drivers/net/ifb.ko
AUTOLOAD:=$(call AutoLoad,34,ifb)
MODPARAMS.ifb:=numifbs=0
endef
define KernelPackage/ifb/description

28
package/kernel/linux/modules/netsupport.mk
View File

@ -127,6 +127,7 @@ endef
$(eval $(call KernelPackage,geneve))
define KernelPackage/nsh
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Network Service Header (NSH) protocol
@ -746,7 +747,7 @@ $(eval $(call KernelPackage,mppe))
SCHED_MODULES = $(patsubst $(LINUX_DIR)/net/sched/%.ko,%,$(wildcard $(LINUX_DIR)/net/sched/*.ko))
SCHED_MODULES_CORE = sch_ingress sch_fq_codel sch_hfsc sch_htb sch_tbf cls_basic cls_fw cls_route cls_flow cls_tcindex cls_u32 em_u32 act_mirred act_skbedit cls_matchall
SCHED_MODULES_FILTER = $(SCHED_MODULES_CORE) act_connmark act_ctinfo sch_netem sch_mqprio em_ipset cls_bpf cls_flower act_bpf act_vlan
SCHED_MODULES_FILTER = $(SCHED_MODULES_CORE) act_connmark act_ctinfo sch_cake sch_netem sch_mqprio em_ipset cls_bpf cls_flower act_bpf act_vlan
SCHED_MODULES_EXTRA = $(filter-out $(SCHED_MODULES_FILTER),$(SCHED_MODULES))
SCHED_FILES = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(filter $(SCHED_MODULES_CORE),$(SCHED_MODULES)))
SCHED_FILES_EXTRA = $(patsubst %,$(LINUX_DIR)/net/sched/%.ko,$(SCHED_MODULES_EXTRA))
@ -785,6 +786,21 @@ endef
$(eval $(call KernelPackage,sched-core))
define KernelPackage/sched-cake
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Cake fq_codel/blue derived shaper
DEPENDS:=@!(LINUX_4_9||LINUX_4_14) +kmod-sched-core
KCONFIG:=CONFIG_NET_SCH_CAKE
FILES:=$(LINUX_DIR)/net/sched/sch_cake.ko
AUTOLOAD:=$(call AutoProbe,sch_cake)
endef
define KernelPackage/sched-cake/description
Common Applications Kept Enhanced fq_codel/blue derived shaper
endef
$(eval $(call KernelPackage,sched-cake))
define KernelPackage/sched-flower
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Flower traffic classifier
@ -852,16 +868,6 @@ define KernelPackage/sched-ctinfo
endef
$(eval $(call KernelPackage,sched-ctinfo))
define KernelPackage/sched-police
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Traffic shaper police support
DEPENDS:=+kmod-sched-core
KCONFIG:=CONFIG_NET_ACT_POLICE
FILES:=$(LINUX_DIR)/net/sched/act_police.ko
AUTOLOAD:=$(call AutoLoad,71, act_police)
endef
$(eval $(call KernelPackage,sched-police))
define KernelPackage/sched-ipset
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Traffic shaper ipset support

45
package/kernel/linux/modules/other.mk
View File

@ -142,9 +142,10 @@ $(eval $(call KernelPackage,dma-buf))
define KernelPackage/nvmem
SUBMENU:=$(OTHER_MENU)
TITLE:=Non Volatile Memory support
DEPENDS:=@!LINUX_5_4
KCONFIG:=CONFIG_NVMEM
HIDDEN:=1
FILES:=$(LINUX_DIR)/drivers/nvmem/nvmem_core.ko@ge4.9
FILES:=$(LINUX_DIR)/drivers/nvmem/nvmem_core.ko
endef
define KernelPackage/nvmem/description
@ -172,7 +173,7 @@ define KernelPackage/eeprom-at24
SUBMENU:=$(OTHER_MENU)
TITLE:=EEPROM AT24 support
KCONFIG:=CONFIG_EEPROM_AT24
DEPENDS:=+kmod-i2c-core +kmod-nvmem +!LINUX_4_14:kmod-regmap-i2c
DEPENDS:=+kmod-i2c-core +!LINUX_5_4:kmod-nvmem +!LINUX_4_14:kmod-regmap-i2c
FILES:=$(LINUX_DIR)/drivers/misc/eeprom/at24.ko
AUTOLOAD:=$(call AutoProbe,at24)
endef
@ -188,7 +189,7 @@ define KernelPackage/eeprom-at25
SUBMENU:=$(OTHER_MENU)
TITLE:=EEPROM AT25 support
KCONFIG:=CONFIG_EEPROM_AT25
DEPENDS:=+kmod-nvmem
DEPENDS:=+!LINUX_5_4:kmod-nvmem
FILES:=$(LINUX_DIR)/drivers/misc/eeprom/at25.ko
AUTOLOAD:=$(call AutoProbe,at25)
endef
@ -216,6 +217,22 @@ endef
$(eval $(call KernelPackage,gpio-dev))
define KernelPackage/gpio-f7188x
SUBMENU:=$(OTHER_MENU)
TITLE:=Fintek F718xx/F818xx GPIO Support
DEPENDS:=@GPIO_SUPPORT @TARGET_x86
KCONFIG:=CONFIG_GPIO_F7188X
FILES:=$(LINUX_DIR)/drivers/gpio/gpio-f7188x.ko
AUTOLOAD:=$(call AutoProbe,gpio-f7188x)
endef
define KernelPackage/gpio-f7188x/description
Kernel module for the GPIOs found on many Fintek Super-IO chips.
endef
$(eval $(call KernelPackage,gpio-f7188x))
define KernelPackage/gpio-mcp23s08
SUBMENU:=$(OTHER_MENU)
TITLE:=Microchip MCP23xxx I/O expander
@ -735,8 +752,9 @@ define KernelPackage/serial-8250
CONFIG_SERIAL_8250_RSA=n
FILES:= \
$(LINUX_DIR)/drivers/tty/serial/8250/8250.ko \
$(LINUX_DIR)/drivers/tty/serial/8250/8250_base.ko@ge4.4 \
$(if $(CONFIG_PCI),$(LINUX_DIR)/drivers/tty/serial/8250/8250_pci.ko@ge4.4)
$(LINUX_DIR)/drivers/tty/serial/8250/8250_base.ko \
$(if $(CONFIG_PCI),$(LINUX_DIR)/drivers/tty/serial/8250/8250_pci.ko) \
$(if $(CONFIG_GPIOLIB),$(LINUX_DIR)/drivers/tty/serial/serial_mctrl_gpio.ko@ge5.3)
AUTOLOAD:=$(call AutoProbe,8250 8250_base 8250_pci)
endef
@ -1233,16 +1251,17 @@ endef
$(eval $(call KernelPackage,it87-wdt))
define KernelPackage/pinctrl-sx150x
define KernelPackage/f71808e-wdt
SUBMENU:=$(OTHER_MENU)
TITLE:=Semtech SX150x-series I2C GPIO expanders
DEPENDS:= +kmod-i2c-core @!LINUX_4_9
KCONFIG:=CONFIG_PINCTRL_SX150X=y
AUTOLOAD:=$(call AutoLoad,40,pinctrl-sx150x)
TITLE:=Fintek F718xx/F818xx Watchdog Timer
DEPENDS:=@TARGET_x86
KCONFIG:=CONFIG_F71808E_WDT
FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/f71808e_wdt.ko
AUTOLOAD:=$(call AutoProbe,f71808e-wdt,1)
endef
define KernelPackage/pinctrl-sx150x/description
This driver adds support for Semtech SX150x-series I2C GPIO expanders.
define KernelPackage/f71808e-wdt/description
Kernel module for the watchdog timer found on many Fintek Super-IO chips.
endef
$(eval $(call KernelPackage,pinctrl-sx150x))
$(eval $(call KernelPackage,f71808e-wdt))

2
package/kernel/linux/modules/video.mk
View File

@ -151,7 +151,7 @@ define KernelPackage/fb-sys-fops
DEPENDS:=+kmod-fb
KCONFIG:=CONFIG_FB_SYS_FOPS
FILES:=$(LINUX_DIR)/drivers/video/fbdev/core/fb_sys_fops.ko
AUTOLOAD:=$(call AutoLoad,07,fbsysfops)
AUTOLOAD:=$(call AutoLoad,07,fb_sys_fops)
endef
define KernelPackage/fb-sys-fops/description