summaryrefslogtreecommitdiffstats
path: root/package/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'package/kernel')
-rw-r--r--package/kernel/Makefile3
-rw-r--r--package/kernel/modules/001-depends.mk4
-rw-r--r--package/kernel/modules/block.mk4
-rw-r--r--package/kernel/modules/crypto.mk61
-rw-r--r--package/kernel/modules/fs.mk26
-rw-r--r--package/kernel/modules/hwmon.mk29
-rw-r--r--package/kernel/modules/i2c.mk45
-rw-r--r--package/kernel/modules/input.mk206
-rw-r--r--package/kernel/modules/leds.mk27
-rw-r--r--package/kernel/modules/lib.mk2
-rw-r--r--package/kernel/modules/netdevices.mk69
-rw-r--r--package/kernel/modules/netfilter.mk8
-rw-r--r--package/kernel/modules/netsupport.mk47
-rw-r--r--package/kernel/modules/other.mk332
-rw-r--r--package/kernel/modules/sound.mk72
-rw-r--r--package/kernel/modules/usb.mk120
-rw-r--r--package/kernel/modules/video.mk184
-rw-r--r--package/kernel/modules/virtual.mk2
-rw-r--r--package/kernel/modules/w1.mk2
19 files changed, 897 insertions, 346 deletions
diff --git a/package/kernel/Makefile b/package/kernel/Makefile
index 805081739..d44b5a776 100644
--- a/package/kernel/Makefile
+++ b/package/kernel/Makefile
@@ -14,6 +14,9 @@ PKG_FLAGS:=hold
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/packages
SCAN_DEPS=modules/*.mk $(TOPDIR)/target/linux/*/modules.mk
+PKG_LICENSE:=GPLv2
+PKG_LICENSE_FILES:=
+
include $(INCLUDE_DIR)/package.mk
ifeq ($(DUMP),)
-include $(LINUX_DIR)/.config
diff --git a/package/kernel/modules/001-depends.mk b/package/kernel/modules/001-depends.mk
index 6c493018d..e0af73570 100644
--- a/package/kernel/modules/001-depends.mk
+++ b/package/kernel/modules/001-depends.mk
@@ -24,11 +24,11 @@ endef
define SetDepends/rfkill
- DEPENDS:= @(TARGET_ar71xx||TARGET_brcm47xx||TARGET_s3c24xx||TARGET_x86||TARGET_gemini)
+ DEPENDS:= @(TARGET_ar71xx||TARGET_brcm47xx||TARGET_s3c24xx||TARGET_x86||TARGET_gemini||TARGET_cns3xxx||TARGET_ixp4xx)
endef
define AddDepends/rfkill
- DEPENDS+= +(TARGET_ar71xx||TARGET_brcm47xx||TARGET_s3c24xx||TARGET_x86):kmod-rfkill $(1)
+ DEPENDS+= +(TARGET_ar71xx||TARGET_brcm47xx||TARGET_s3c24xx||TARGET_x86||TARGET_cns3xxx||TARGET_ixp4xx):kmod-rfkill $(1)
endef
diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk
index a4288b2a8..1aa47def2 100644
--- a/package/kernel/modules/block.mk
+++ b/package/kernel/modules/block.mk
@@ -25,7 +25,7 @@ $(eval $(call KernelPackage,aoe))
define KernelPackage/ata-core
SUBMENU:=$(BLOCK_MENU)
TITLE:=Serial and Parallel ATA support
- DEPENDS:=@PCI_SUPPORT +kmod-scsi-core @(!TARGET_ubicom32||!TARGET_etrax)
+ DEPENDS:=@PCI_SUPPORT +kmod-scsi-core
KCONFIG:=CONFIG_ATA
FILES:=$(LINUX_DIR)/drivers/ata/libata.ko
AUTOLOAD:=$(call AutoLoad,21,libata,1)
@@ -356,7 +356,7 @@ define KernelPackage/md-raid456/description
async_memcpy.ko
async_pq.ko
async_raid5_recov.ko
- raid6_pq.ko
+ raid6_pq.ko
endef
$(eval $(call KernelPackage,md-raid456))
diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk
index 984ccc1f9..be76f5325 100644
--- a/package/kernel/modules/crypto.mk
+++ b/package/kernel/modules/crypto.mk
@@ -15,11 +15,9 @@ CRYPTOMGR_MODULES = \
BLKCIPHER2=crypto_blkcipher
crypto_confvar=CONFIG_CRYPTO_$(word 1,$(subst =,$(space),$(1)))
-crypto_file=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(LINUX_DIR)/crypto/$(word 2,$(subst =,$(space),$(1))).ko)
+crypto_file=$(LINUX_DIR)/crypto/$(word 2,$(subst =,$(space),$(1))).ko
crypto_name=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(word 2,$(subst =,$(space),$(1))))
-# XXX: added CONFIG_CRYPTO_HMAC to KCONFIG so that CONFIG_CRYPTO_HASH is
-# always set, even if no hash modules are selected
define KernelPackage/crypto-core
SUBMENU:=$(CRYPTO_MENU)
TITLE:=Core CryptoAPI modules
@@ -36,7 +34,7 @@ $(eval $(call KernelPackage,crypto-core))
define AddDepends/crypto
SUBMENU:=$(CRYPTO_MENU)
- DEPENDS+=kmod-crypto-core $(1)
+ DEPENDS+=+kmod-crypto-core $(1)
endef
define KernelPackage/crypto-hash
@@ -62,6 +60,17 @@ define KernelPackage/crypto-manager
endef
$(eval $(call KernelPackage,crypto-manager))
+define KernelPackage/crypto-pcompress
+ TITLE:=CryptoAPI Partial (de)compression operations
+ KCONFIG:= \
+ CONFIG_CRYPTO_PCOMP=y \
+ CONFIG_CRYPTO_PCOMP2
+ FILES:=$(LINUX_DIR)/crypto/pcompress.ko
+ AUTOLOAD:=$(call AutoLoad,09,pcompress)
+ $(call AddDepends/crypto)
+endef
+$(eval $(call KernelPackage,crypto-pcompress))
+
define KernelPackage/crypto-user
TITLE:=CryptoAPI userspace interface
DEPENDS:=+kmod-crypto-hash +kmod-crypto-manager
@@ -110,6 +119,20 @@ define KernelPackage/crypto-iv
endef
$(eval $(call KernelPackage,crypto-iv))
+define KernelPackage/crypto-hw-talitos
+ TITLE:=Freescale integrated security engine (SEC) driver
+ DEPENDS:=+kmod-crypto-aes
+ KCONFIG:= \
+ CONFIG_CRYPTO_DEV_TALITOS
+ FILES:= \
+ $(LINUX_DIR)/drivers/crypto/talitos.ko
+ AUTOLOAD:=$(call AutoLoad,09,talitos)
+ $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-hw-talitos))
+
+
define KernelPackage/crypto-hw-padlock
TITLE:=VIA PadLock ACE with AES/SHA hw crypto module
DEPENDS:=+kmod-crypto-aes
@@ -141,7 +164,6 @@ $(eval $(call KernelPackage,crypto-hw-geode))
define KernelPackage/crypto-hw-hifn-795x
TITLE:=HIFN 795x crypto accelerator
- DEPENDS:=@!TARGET_ubicom32
KCONFIG:= \
CONFIG_HW_RANDOM=y \
CONFIG_CRYPTO_DEV_HIFN_795X \
@@ -192,7 +214,7 @@ define KernelPackage/crypto-arc4
KCONFIG:=CONFIG_CRYPTO_ARC4
FILES:=$(LINUX_DIR)/crypto/arc4.ko
AUTOLOAD:=$(call AutoLoad,09,arc4)
- $(call AddDepends/crypto)
+ $(call AddDepends/crypto,+!LINUX_3_3:kmod-crypto-manager)
endef
$(eval $(call KernelPackage,crypto-arc4))
@@ -324,6 +346,23 @@ endef
$(eval $(call KernelPackage,crypto-sha1))
+define KernelPackage/crypto-sha256
+ TITLE:=SHA224 SHA256 digest CryptoAPI module
+ DEPENDS:=+kmod-crypto-hash
+ KCONFIG:=CONFIG_CRYPTO_SHA256
+ FILES:=$(LINUX_DIR)/crypto/sha256_generic.ko
+ AUTOLOAD:=$(call AutoLoad,09,sha256_generic)
+ $(call AddDepends/crypto)
+endef
+
+$(eval $(call KernelPackage,crypto-sha256))
+
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1)
+camellia_mod_suffix=_generic
+endif
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1)
+cast56_mod_suffix=_generic
+endif
define KernelPackage/crypto-misc
TITLE:=Other CryptoAPI modules
@@ -337,7 +376,6 @@ define KernelPackage/crypto-misc
CONFIG_CRYPTO_FCRYPT \
CONFIG_CRYPTO_KHAZAD \
CONFIG_CRYPTO_SERPENT \
- CONFIG_CRYPTO_SHA256 \
CONFIG_CRYPTO_SHA512 \
CONFIG_CRYPTO_TEA \
CONFIG_CRYPTO_TGR192 \
@@ -347,12 +385,11 @@ define KernelPackage/crypto-misc
CONFIG_CRYPTO_WP512
FILES:= \
$(LINUX_DIR)/crypto/anubis.ko \
- $(LINUX_DIR)/crypto/camellia.ko \
- $(LINUX_DIR)/crypto/cast5.ko \
- $(LINUX_DIR)/crypto/cast6.ko \
+ $(LINUX_DIR)/crypto/camellia$(camellia_mod_suffix).ko \
+ $(LINUX_DIR)/crypto/cast5$(cast56_mod_suffix).ko \
+ $(LINUX_DIR)/crypto/cast6$(cast56_mod_suffix).ko \
$(LINUX_DIR)/crypto/fcrypt.ko \
$(LINUX_DIR)/crypto/khazad.ko \
- $(LINUX_DIR)/crypto/sha256_generic.ko \
$(LINUX_DIR)/crypto/sha512_generic.ko \
$(LINUX_DIR)/crypto/tea.ko \
$(LINUX_DIR)/crypto/tgr192.ko \
@@ -463,7 +500,7 @@ $(eval $(call KernelPackage,crypto-xts))
define KernelPackage/crypto-mv-cesa
TITLE:=Marvell crypto engine
- DEPENDS:=+kmod-crypto-manager +kmod-crypto-aes @TARGET_kirkwood||TARGET_orion
+ DEPENDS:=+kmod-crypto-manager +kmod-crypto-aes @TARGET_kirkwood||TARGET_orion||TARGET_mvebu
KCONFIG:=CONFIG_CRYPTO_DEV_MV_CESA
FILES:=$(LINUX_DIR)/drivers/crypto/mv_cesa.ko
AUTOLOAD:=$(call AutoLoad,09,mv_cesa)
diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk
index 0bc0d5578..ecdfb6d3a 100644
--- a/package/kernel/modules/fs.mk
+++ b/package/kernel/modules/fs.mk
@@ -10,7 +10,7 @@ FS_MENU:=Filesystems
define KernelPackage/fs-autofs4
SUBMENU:=$(FS_MENU)
TITLE:=AUTOFS4 filesystem support
- KCONFIG:=CONFIG_AUTOFS4_FS
+ KCONFIG:=CONFIG_AUTOFS4_FS
FILES:=$(LINUX_DIR)/fs/autofs4/autofs4.ko
AUTOLOAD:=$(call AutoLoad,30,autofs4)
endef
@@ -58,7 +58,8 @@ define KernelPackage/fs-cifs
+kmod-crypto-md5 \
+kmod-crypto-md4 \
+kmod-crypto-des \
- +kmod-crypto-ecb
+ +kmod-crypto-ecb \
+ +!LINUX_3_3&&!LINUX_3_6:kmod-crypto-sha256
endef
define KernelPackage/fs-cifs/description
@@ -68,6 +69,22 @@ endef
$(eval $(call KernelPackage,fs-cifs))
+define KernelPackage/fs-configfs
+ SUBMENU:=$(FS_MENU)
+ TITLE:=Configuration filesystem support
+ KCONFIG:= \
+ CONFIG_CONFIGFS_FS
+ FILES:=$(LINUX_DIR)/fs/configfs/configfs.ko
+ AUTOLOAD:=$(call AutoLoad,30,configfs)
+endef
+
+define KernelPackage/fs-configfs/description
+ Kernel module for configfs support
+endef
+
+$(eval $(call KernelPackage,fs-configfs))
+
+
define KernelPackage/fs-exportfs
SUBMENU:=$(FS_MENU)
TITLE:=exportfs kernel server support
@@ -94,7 +111,7 @@ define KernelPackage/fs-ext4
$(LINUX_DIR)/fs/jbd2/jbd2.ko \
$(LINUX_DIR)/fs/mbcache.ko
AUTOLOAD:=$(call AutoLoad,30,mbcache jbd2 ext4,1)
- $(call AddDepends/crc16)
+ $(call AddDepends/crc16, +!LINUX_3_3:kmod-crypto-hash)
endef
define KernelPackage/fs-ext4/description
@@ -121,7 +138,7 @@ $(eval $(call KernelPackage,fuse))
define KernelPackage/fs-hfs
SUBMENU:=$(FS_MENU)
- TITLE:=HFS+ filesystem support
+ TITLE:=HFS filesystem support
KCONFIG:=CONFIG_HFS_FS
FILES:=$(LINUX_DIR)/fs/hfs/hfs.ko
AUTOLOAD:=$(call AutoLoad,30,hfs)
@@ -154,6 +171,7 @@ $(eval $(call KernelPackage,fs-hfsplus))
define KernelPackage/fs-isofs
SUBMENU:=$(FS_MENU)
TITLE:=ISO9660 filesystem support
+ DEPENDS:=+kmod-lib-zlib
KCONFIG:=CONFIG_ISO9660_FS CONFIG_JOLIET=y CONFIG_ZISOFS=n
FILES:=$(LINUX_DIR)/fs/isofs/isofs.ko
AUTOLOAD:=$(call AutoLoad,30,isofs)
diff --git a/package/kernel/modules/hwmon.mk b/package/kernel/modules/hwmon.mk
index d549336b3..969e8fa3a 100644
--- a/package/kernel/modules/hwmon.mk
+++ b/package/kernel/modules/hwmon.mk
@@ -60,6 +60,21 @@ endef
$(eval $(call KernelPackage,hwmon-adt7475))
+define KernelPackage/hwmon-ina2xx
+ TITLE:=INA2XX monitoring support
+ KCONFIG:=CONFIG_SENSORS_INA2XX
+ FILES:=$(LINUX_DIR)/drivers/hwmon/ina2xx.ko
+ AUTOLOAD:=$(call AutoLoad,60,ina2xx)
+ $(call AddDepends/hwmon,+kmod-i2c-core)
+endef
+
+define KernelPackage/hwmon-ina2xx/description
+ Kernel module for ina2xx dc current monitor chips
+endef
+
+$(eval $(call KernelPackage,hwmon-ina2xx))
+
+
define KernelPackage/hwmon-lm63
TITLE:=LM63/64 monitoring support
KCONFIG:=CONFIG_SENSORS_LM63
@@ -134,6 +149,20 @@ endef
$(eval $(call KernelPackage,hwmon-lm90))
+define KernelPackage/hwmon-lm92
+ TITLE:=LM92 monitoring support
+ KCONFIG:=CONFIG_SENSORS_LM92
+ FILES:=$(LINUX_DIR)/drivers/hwmon/lm92.ko
+ AUTOLOAD:=$(call AutoLoad,60,lm92)
+ $(call AddDepends/hwmon,+kmod-i2c-core)
+endef
+
+define KernelPackage/hwmon-lm92/description
+ Kernel module for LM92 thermal monitor chip
+endef
+
+$(eval $(call KernelPackage,hwmon-lm92))
+
define KernelPackage/hwmon-lm95241
TITLE:=LM95241 monitoring support
KCONFIG:=CONFIG_SENSORS_LM95241
diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk
index d0ebfccfc..085570836 100644
--- a/package/kernel/modules/i2c.mk
+++ b/package/kernel/modules/i2c.mk
@@ -8,7 +8,7 @@
I2C_MENU:=I2C support
ModuleConfVar=$(word 1,$(subst :,$(space),$(1)))
-ModuleFullPath=$(if $(findstring y,$($(call ModuleConfVar,$(1)))),,$(LINUX_DIR)/$(word 2,$(subst :,$(space),$(1))).ko)
+ModuleFullPath=$(LINUX_DIR)/$(word 2,$(subst :,$(space),$(1))).ko
ModuleKconfig=$(foreach mod,$(1),$(call ModuleConfVar,$(mod)))
ModuleFiles=$(foreach mod,$(1),$(call ModuleFullPath,$(mod)))
ModuleAuto=$(call AutoLoad,$(1),$(foreach mod,$(2),$(basename $(notdir $(call ModuleFullPath,$(mod))))),$(3))
@@ -24,10 +24,13 @@ I2C_CORE_MODULES:= \
CONFIG_I2C:drivers/i2c/i2c-core \
CONFIG_I2C_CHARDEV:drivers/i2c/i2c-dev
+ifeq (CONFIG_OF,y)
+ I2C_CORE_MODULES+=CONFIG_OF_I2C:drivers/of/of_i2c
+endif
+
define KernelPackage/i2c-core
$(call i2c_defaults,$(I2C_CORE_MODULES),51)
TITLE:=I2C support
- DEPENDS:=@!TARGET_etrax
endef
define KernelPackage/i2c-core/description
@@ -101,23 +104,6 @@ endef
$(eval $(call KernelPackage,i2c-gpio))
-
-OF_I2C_MODULES:=\
- CONFIG_OF_I2C:drivers/of/of_i2c
-
-define KernelPackage/of-i2c
- $(call i2c_defaults,$(OF_I2C_MODULES),58)
- TITLE:=OpenFirmware I2C accessors
- DEPENDS:=@TARGET_ppc40x||TARGET_ppc4xx||TARGET_mpc52xx||TARGET_mpc83xx||TARGET_mpc85xx \
- kmod-i2c-core
-endef
-
-define KernelPackage/of-i2c/description
- Kernel module for OpenFirmware I2C accessors.
-endef
-
-$(eval $(call KernelPackage,of-i2c))
-
I2C_MPC_MODULES:=\
CONFIG_I2C_MPC:drivers/i2c/busses/i2c-mpc
@@ -125,7 +111,7 @@ define KernelPackage/i2c-mpc
$(call i2c_defaults,$(I2C_MPC_MODULES),59)
TITLE:=MPC I2C accessors
DEPENDS:=@TARGET_mpc52xx||TARGET_mpc83xx||TARGET_mpc85xx \
- +kmod-i2c-core +kmod-of-i2c
+ +kmod-i2c-core
endef
define KernelPackage/i2c-mpc/description
@@ -140,7 +126,7 @@ I2C_IBM_IIC_MODULES:=\
define KernelPackage/i2c-ibm-iic
$(call i2c_defaults,$(OF_I2C_MODULES),59)
TITLE:=IBM PPC 4xx on-chip I2C interface support
- DEPENDS:=@TARGET_ppc40x||TARGET_ppc4xx +kmod-i2c-core +kmod-of-i2c
+ DEPENDS:=@TARGET_ppc40x||TARGET_ppc4xx +kmod-i2c-core
endef
define KernelPackage/i2c-ibm-iic/description
@@ -155,11 +141,11 @@ I2C_MV64XXX_MODULES:=\
define KernelPackage/i2c-mv64xxx
$(call i2c_defaults,$(I2C_MV64XXX_MODULES),59)
TITLE:=Orion Platform I2C interface support
- DEPENDS:=@TARGET_kirkwood||TARGET_orion +kmod-i2c-core
+ DEPENDS:=@TARGET_kirkwood||TARGET_orion||TARGET_mvebu +kmod-i2c-core
endef
define KernelPackage/i2c-mv64xxx/description
- Kernel module for I2C interface on the Kirkwood and Orion
+ Kernel module for I2C interface on the Kirkwood, Orion and Armada XP/370
family processors.
endef
@@ -197,8 +183,13 @@ endef
$(eval $(call KernelPackage,i2c-mux))
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1)
+I2C_MUX_GPIO_MODULES:= \
+ CONFIG_I2C_MUX_GPIO:drivers/i2c/muxes/i2c-mux-gpio
+else
I2C_MUX_GPIO_MODULES:= \
CONFIG_I2C_MUX_GPIO:drivers/i2c/muxes/gpio-i2cmux
+endif
define KernelPackage/i2c-mux-gpio
$(call i2c_defaults,$(I2C_MUX_GPIO_MODULES),51)
@@ -212,8 +203,12 @@ endef
$(eval $(call KernelPackage,i2c-mux-gpio))
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.6.0)),1)
+I2C_MUX_PREFIX:=i2c-mux-
+endif
+
I2C_MUX_PCA954x_MODULES:= \
- CONFIG_I2C_MUX_PCA954x:drivers/i2c/muxes/pca954x
+ CONFIG_I2C_MUX_PCA954x:drivers/i2c/muxes/$(I2C_MUX_PREFIX)pca954x
define KernelPackage/i2c-mux-pca954x
$(call i2c_defaults,$(I2C_MUX_PCA954x_MODULES),51)
@@ -229,7 +224,7 @@ $(eval $(call KernelPackage,i2c-mux-pca954x))
## Support for pca954x seems to be in kernel since 2.6.36
I2C_MUX_PCA9541_MODULES:= \
- CONFIG_I2C_MUX_PCA9541:drivers/i2c/muxes/pca9541
+ CONFIG_I2C_MUX_PCA9541:drivers/i2c/muxes/$(I2C_MUX_PREFIX)pca9541
define KernelPackage/i2c-mux-pca9541
$(call i2c_defaults,$(I2C_MUX_PCA9541_MODULES),51)
diff --git a/package/kernel/modules/input.mk b/package/kernel/modules/input.mk
new file mode 100644
index 000000000..db31eb7f9
--- /dev/null
+++ b/package/kernel/modules/input.mk
@@ -0,0 +1,206 @@
+#
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+INPUT_MODULES_MENU:=Input modules
+
+define KernelPackage/hid
+ SUBMENU:=$(INPUT_MODULES_MENU)
+ TITLE:=HID Devices
+ KCONFIG:=CONFIG_HID CONFIG_HIDRAW=y
+ FILES:=$(LINUX_DIR)/drivers/hid/hid.ko
+ AUTOLOAD:=$(call AutoLoad,61,hid)
+ $(call AddDepends/input,+kmod-input-evdev)
+endef
+
+define KernelPackage/hid/description
+ Kernel modules for HID devices
+endef
+
+$(eval $(call KernelPackage,hid))
+
+define KernelPackage/hid-generic
+ SUBMENU:=$(INPUT_MODULES_MENU)
+ TITLE:=Generic HID device support
+ KCONFIG:=CONFIG_HID_GENERIC
+ FILES:=$(LINUX_DIR)/drivers/hid/hid-generic.ko
+ AUTOLOAD:=$(call AutoLoad,62,hid-generic)
+ $(call AddDepends/hid)
+endef
+
+define KernelPackage/hid/description
+ Kernel modules for generic HID device (e.g. keyboards and mice) support
+endef
+
+$(eval $(call KernelPackage,hid-generic))
+
+define KernelPackage/input-core
+ SUBMENU:=$(INPUT_MODULES_MENU)
+ TITLE:=Input device core
+ KCONFIG:=CONFIG_INPUT
+ FILES:=$(LINUX_DIR)/drivers/input/input-core.ko
+ AUTOLOAD:=$(call AutoLoad,19,input-core)
+endef
+
+define KernelPackage/input-core/description
+ Kernel modules for support of input device
+endef
+
+$(eval $(call KernelPackage,input-core))
+
+
+define KernelPackage/input-evdev
+ SUBMENU:=$(INPUT_MODULES_MENU)
+ TITLE:=Input event device
+ KCONFIG:=CONFIG_INPUT_EVDEV
+ FILES:=$(LINUX_DIR)/drivers/input/evdev.ko
+ AUTOLOAD:=$(call AutoLoad,60,evdev)
+ $(call AddDepends/input)
+endef
+
+define KernelPackage/input-evdev/description
+ Kernel modules for support of input device events
+endef
+
+$(eval $(call KernelPackage,input-evdev))
+
+
+define KernelPackage/input-gpio-buttons
+ SUBMENU:=$(INPUT_MODULES_MENU)
+ TITLE:=Polled GPIO buttons input device
+ DEPENDS:=@GPIO_SUPPORT +kmod-input-polldev
+ KCONFIG:= \
+ CONFIG_INPUT_GPIO_BUTTONS \
+ CONFIG_INPUT_MISC=y
+ FILES:=$(LINUX_DIR)/drivers/input/misc/gpio_buttons.ko
+ AUTOLOAD:=$(call AutoLoad,62,gpio_buttons)
+endef
+
+define KernelPackage/input-gpio-buttons/description
+ Kernel module for support polled GPIO buttons input device
+endef
+
+$(eval $(call KernelPackage,input-gpio-buttons))
+
+
+define KernelPackage/input-gpio-keys
+ SUBMENU:=$(INPUT_MODULES_MENU)
+ TITLE:=GPIO key support
+ DEPENDS:= @GPIO_SUPPORT
+ KCONFIG:= \
+ CONFIG_KEYBOARD_GPIO \
+ CONFIG_INPUT_KEYBOARD=y
+ FILES:=$(LINUX_DIR)/drivers/input/keyboard/gpio_keys.ko
+ AUTOLOAD:=$(call AutoLoad,60,gpio_keys)
+ $(call AddDepends/input)
+endef
+
+define KernelPackage/input-gpio-keys/description
+ This driver implements support for buttons connected
+ to GPIO pins of various CPUs (and some other chips).
+endef
+
+$(eval $(call KernelPackage,input-gpio-keys))
+
+
+define KernelPackage/input-gpio-keys-polled
+ SUBMENU:=$(INPUT_MODULES_MENU)
+ TITLE:=Polled GPIO key support
+ DEPENDS:=@GPIO_SUPPORT +kmod-input-polldev
+ KCONFIG:= \
+ CONFIG_KEYBOARD_GPIO_POLLED \
+ CONFIG_INPUT_KEYBOARD=y
+ FILES:=$(LINUX_DIR)/drivers/input/keyboard/gpio_keys_polled.ko
+ AUTOLOAD:=$(call AutoLoad,62,gpio_keys_polled)
+ $(call AddDepends/input)
+endef
+
+define KernelPackage/input-gpio-keys-polled/description
+ Kernel module for support polled GPIO keys input device
+endef
+
+$(eval $(call KernelPackage,input-gpio-keys-polled))
+
+
+define KernelPackage/input-gpio-encoder
+ SUBMENU:=$(INPUT_MODULES_MENU)
+ TITLE:=GPIO rotay encoder
+ KCONFIG:=CONFIG_INPUT_GPIO_ROTARY_ENCODER
+ FILES:=$(LINUX_DIR)/drivers/input/misc/rotary_encoder.ko
+ AUTOLOAD:=$(call AutoLoad,62,rotary_encoder)
+ $(call AddDepends/input,@GPIO_SUPPORT)
+endef
+
+define KernelPackage/gpio-encoder/description
+ Kernel module to use rotary encoders connected to GPIO pins
+endef
+
+$(eval $(call KernelPackage,input-gpio-encoder))
+
+
+define KernelPackage/input-joydev
+ SUBMENU:=$(INPUT_MODULES_MENU)
+ TITLE:=Joystick device support
+ KCONFIG:=CONFIG_INPUT_JOYDEV
+ FILES:=$(LINUX_DIR)/drivers/input/joydev.ko
+ AUTOLOAD:=$(call AutoLoad,62,joydev)
+ $(call AddDepends/input)
+endef
+
+define KernelPackage/input-joydev/description
+ Kernel module for joystick support
+endef
+
+$(eval $(call KernelPackage,input-joydev))
+
+
+define KernelPackage/input-polldev
+ SUBMENU:=$(INPUT_MODULES_MENU)
+ TITLE:=Polled Input device support
+ KCONFIG:=CONFIG_INPUT_POLLDEV
+ FILES:=$(LINUX_DIR)/drivers/input/input-polldev.ko
+ AUTOLOAD:=$(call AutoLoad,20,input-polldev)
+ $(call AddDepends/input)
+endef
+
+define KernelPackage/input-polldev/description
+ Kernel module for support of polled input devices
+endef
+
+$(eval $(call KernelPackage,input-polldev))
+
+
+define KernelPackage/input-matrixkmap
+ SUBMENU:=$(INPUT_MODULES_MENU)
+ TITLE:=Input matrix devices support
+ KCONFIG:=CONFIG_INPUT_MATRIXKMAP
+ DEPENDS:=@!LINUX_3_3
+ FILES:=$(LINUX_DIR)/drivers/input/matrix-keymap.ko
+ AUTOLOAD:=$(call AutoLoad,20,matrix-keymap)
+ $(call AddDepends/input)
+endef
+
+define KernelPackage/input-matrix/description
+ Kernel module support for input matrix devices
+endef
+
+$(eval $(call KernelPackage,input-matrixkmap))
+
+
+define KernelPackage/acpi-button
+ SUBMENU:=$(INPUT_MODULES_MENU)
+ TITLE:=ACPI Button Support
+ DEPENDS:=@(TARGET_x86_generic||TARGET_x86_kvm_guest||TARGET_x86_xen_domu) +kmod-input-evdev
+ KCONFIG:=CONFIG_ACPI_BUTTON
+ FILES:=$(LINUX_DIR)/drivers/acpi/button.ko
+ AUTOLOAD:=$(call AutoLoad,06,button)
+endef
+
+define KernelPackage/acpi-button/description
+ Kernel module for ACPI Button support
+endef
+
+$(eval $(call KernelPackage,acpi-button))
diff --git a/package/kernel/modules/leds.mk b/package/kernel/modules/leds.mk
index b2970c609..c77c7ed44 100644
--- a/package/kernel/modules/leds.mk
+++ b/package/kernel/modules/leds.mk
@@ -28,7 +28,7 @@ define KernelPackage/ledtrig-heartbeat
SUBMENU:=$(LEDS_MENU)
TITLE:=LED Heartbeat Trigger
KCONFIG:=CONFIG_LEDS_TRIGGER_HEARTBEAT
- FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-heartbeat.ko
+ FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-heartbeat.ko
AUTOLOAD:=$(call AutoLoad,50,ledtrig-heartbeat)
endef
@@ -43,7 +43,7 @@ define KernelPackage/ledtrig-gpio
SUBMENU:=$(LEDS_MENU)
TITLE:=LED GPIO Trigger
KCONFIG:=CONFIG_LEDS_TRIGGER_GPIO
- FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-gpio.ko
+ FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-gpio.ko
AUTOLOAD:=$(call AutoLoad,50,ledtrig-gpio)
endef
@@ -108,7 +108,7 @@ $(eval $(call KernelPackage,ledtrig-netfilter))
define KernelPackage/ledtrig-usbdev
SUBMENU:=$(LEDS_MENU)
TITLE:=LED USB device Trigger
- DEPENDS:=@USB_SUPPORT +kmod-usb-core
+ DEPENDS:=@USB_SUPPORT kmod-usb-core
KCONFIG:=CONFIG_LEDS_TRIGGER_USBDEV
FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-usbdev.ko
AUTOLOAD:=$(call AutoLoad,50,ledtrig-usbdev)
@@ -125,7 +125,7 @@ define KernelPackage/ledtrig-default-on
SUBMENU:=$(LEDS_MENU)
TITLE:=LED Default ON Trigger
KCONFIG:=CONFIG_LEDS_TRIGGER_DEFAULT_ON
- FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-default-on.ko
+ FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-default-on.ko
AUTOLOAD:=$(call AutoLoad,50,ledtrig-default-on)
endef
@@ -140,7 +140,7 @@ define KernelPackage/ledtrig-timer
SUBMENU:=$(LEDS_MENU)
TITLE:=LED Timer Trigger
KCONFIG:=CONFIG_LEDS_TRIGGER_TIMER
- FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-timer.ko
+ FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-timer.ko
AUTOLOAD:=$(call AutoLoad,50,ledtrig-timer)
endef
@@ -150,3 +150,20 @@ define KernelPackage/ledtrig-timer/description
endef
$(eval $(call KernelPackage,ledtrig-timer))
+
+
+define KernelPackage/ledtrig-oneshot
+ SUBMENU:=$(LEDS_MENU)
+ TITLE:=LED One-Shot Trigger
+ DEPENDS:=@!LINUX_3_3
+ KCONFIG:=CONFIG_LEDS_TRIGGER_ONESHOT
+ FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-oneshot.ko
+ AUTOLOAD:=$(call AutoLoad,50,ledtrig-oneshot)
+endef
+
+define KernelPackage/ledtrig-oneshot/description
+ Kernel module that allows LEDs to be triggered by sporadic events in
+ one-shot pulses.
+endef
+
+$(eval $(call KernelPackage,ledtrig-oneshot))
diff --git a/package/kernel/modules/lib.mk b/package/kernel/modules/lib.mk
index 2875fb237..0411e9370 100644
--- a/package/kernel/modules/lib.mk
+++ b/package/kernel/modules/lib.mk
@@ -55,7 +55,6 @@ $(eval $(call KernelPackage,lib-crc7))
define KernelPackage/lib-crc8
SUBMENU:=$(LIB_MENU)
TITLE:=CRC8 support
- DEPENDS:= @!LINUX_2_6_39
KCONFIG:=CONFIG_CRC8
FILES:=$(LINUX_DIR)/lib/crc8.ko
AUTOLOAD:=$(call AutoLoad,20,crc8)
@@ -154,7 +153,6 @@ $(eval $(call KernelPackage,lib-zlib))
define KernelPackage/lib-cordic
SUBMENU:=$(LIB_MENU)
TITLE:=Cordic function support
- DEPENDS:= @!LINUX_2_6_39
KCONFIG:=CONFIG_CORDIC
FILES:=$(LINUX_DIR)/lib/cordic.ko
AUTOLOAD:=$(call AutoLoad,20,cordic)
diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk
index 180be301c..2c5bd2d6c 100644
--- a/package/kernel/modules/netdevices.mk
+++ b/package/kernel/modules/netdevices.mk
@@ -15,7 +15,7 @@ define KernelPackage/sis190
FILES:=$(LINUX_DIR)/drivers/net/ethernet/sis/sis190.ko
AUTOLOAD:=$(call AutoLoad,50,sis190)
endef
-
+
$(eval $(call KernelPackage,sis190))
define KernelPackage/skge
@@ -419,7 +419,7 @@ $(eval $(call KernelPackage,e1000e))
define KernelPackage/b44
TITLE:=Broadcom 44xx driver
KCONFIG:=CONFIG_B44
- DEPENDS:=@PCI_SUPPORT +kmod-ssb
+ DEPENDS:=@PCI_SUPPORT +!TARGET_brcm47xx:kmod-ssb
SUBMENU:=$(NETWORK_DEVICES_MENU)
FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/b44.ko
AUTOLOAD:=$(call AutoLoad,50,b44)
@@ -473,7 +473,7 @@ $(eval $(call KernelPackage,pcnet32))
define KernelPackage/tg3
TITLE:=Broadcom Tigon3 Gigabit Ethernet
KCONFIG:=CONFIG_TIGON3
- DEPENDS:=+!TARGET_brcm47xx:kmod-libphy @!TARGET_ubicom32
+ DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +!LINUX_3_3:kmod-hwmon-core +(LINUX_3_8||LINUX_3_9):kmod-ptp
SUBMENU:=$(NETWORK_DEVICES_MENU)
FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/tg3.ko
AUTOLOAD:=$(call AutoLoad,50,tg3)
@@ -581,7 +581,7 @@ define KernelPackage/tulip
CONFIG_DE4X5 \
CONFIG_WINBOND_840 \
CONFIG_DM9102 \
- CONFIG_ULI526X
+ CONFIG_ULI526X
FILES:= \
$(LINUX_DIR)/drivers/net/ethernet/dec/tulip/tulip.ko \
$(LINUX_DIR)/drivers/net/ethernet/dec/tulip/de2104x.ko \
@@ -663,3 +663,64 @@ define KernelPackage/dm9000/description
endef
$(eval $(call KernelPackage,dm9000))
+
+define KernelPackage/forcedeth
+ SUBMENU:=$(NETWORK_DEVICES_MENU)
+ TITLE:=nForce Ethernet support
+ DEPENDS:=@PCI_SUPPORT
+ KCONFIG:=CONFIG_FORCEDETH
+ FILES:=$(LINUX_DIR)/drivers/net/ethernet/nvidia/forcedeth.ko
+ AUTOLOAD:=$(call AutoLoad,50,forcedeth)
+endef
+
+define KernelPackage/forcedeth/description
+ Kernel driver for Nvidia Ethernet support
+endef
+
+$(eval $(call KernelPackage,forcedeth))
+
+define KernelPackage/of-mdio
+ SUBMENU:=$(NETWORK_DEVICES_MENU)
+ TITLE:=OpenFirmware MDIO support
+ DEPENDS:=+kmod-libphy
+ KCONFIG:=CONFIG_OF_MDIO
+ FILES:=$(LINUX_DIR)/drivers/of/of_mdio.ko
+ AUTOLOAD:=$(call AutoLoad,41,of_mdio)
+endef
+
+define KernelPackage/of-mdio/description
+ Kernel driver for OpenFirmware MDIO support
+endef
+
+$(eval $(call KernelPackage,of-mdio))
+
+define KernelPackage/fsl-pq-mdio
+ SUBMENU:=$(NETWORK_DEVICES_MENU)
+ TITLE:=Freescale PQ MDIO bus support
+ DEPENDS:=@TARGET_mpc85xx +kmod-of-mdio
+ KCONFIG:=CONFIG_FSL_PQ_MDIO
+ FILES:=$(LINUX_DIR)/drivers/net/ethernet/freescale/fsl_pq_mdio.ko
+ AUTOLOAD:=$(call AutoLoad,42,fsl_pq_mdio)
+endef
+
+define KernelPackage/fsl-pq-mdio/description
+ Kernel driver for the Freescale PQ MDIO bus
+endef
+
+$(eval $(call KernelPackage,fsl-pq-mdio))
+
+
+define KernelPackage/gianfar
+ SUBMENU:=$(NETWORK_DEVICES_MENU)
+ TITLE:=Gianfar Ethernet support
+ DEPENDS:=@TARGET_mpc85xx +kmod-fsl-pq-mdio
+ KCONFIG:=CONFIG_GIANFAR
+ FILES:=$(LINUX_DIR)/drivers/net/ethernet/freescale/gianfar_driver.ko
+ AUTOLOAD:=$(call AutoLoad,50,gianfar_driver)
+endef
+
+define KernelPackage/gianfar/description
+ Kernel driver for Freescale Gianfar Ethernet support
+endef
+
+$(eval $(call KernelPackage,gianfar))
diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index ff34664c2..4e4c85f45 100644
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -229,6 +229,7 @@ $(eval $(call KernelPackage,ipt-nathelper-extra))
define KernelPackage/ipt-queue
TITLE:=Module for user-space packet queueing
KCONFIG:=$(KCONFIG_IPT_QUEUE)
+ DEPENDS:=@!LINUX_3_6
FILES:=$(foreach mod,$(IPT_QUEUE-m),$(LINUX_DIR)/net/$(mod).ko)
AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_QUEUE-m)))
$(call AddDepends/ipt)
@@ -376,6 +377,7 @@ endef
define KernelPackage/ipt-extra/description
Other Netfilter (IPv4) kernel modules
Includes:
+ - addrtype
- owner
- physdev (if bridge support was enabled in kernel)
- pkttype
@@ -400,7 +402,7 @@ endef
$(eval $(call KernelPackage,ip6tables))
-
+ARP_MODULES = arp_tables arpt_mangle arptable_filter
define KernelPackage/arptables
SUBMENU:=$(NF_MENU)
TITLE:=ARP firewalling modules
@@ -408,7 +410,7 @@ define KernelPackage/arptables
KCONFIG:=CONFIG_IP_NF_ARPTABLES \
CONFIG_IP_NF_ARPFILTER \
CONFIG_IP_NF_ARP_MANGLE
- AUTOLOAD:=$(call AutoLoad,49,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv4/netfilter/arp*.ko))))
+ AUTOLOAD:=$(call AutoLoad,49,$(ARP_MODULES))
endef
define KernelPackage/arptables/description
@@ -551,7 +553,7 @@ define KernelPackage/nf-conntrack-netlink
endef
define KernelPackage/nf-conntrack-netlink/description
- Kernel modules support for a netlink-based connection tracking
+ Kernel modules support for a netlink-based connection tracking
userspace interface
endef
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index b4e2a425a..ff1f79470 100644
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -231,9 +231,10 @@ $(eval $(call KernelPackage,ipip))
IPSEC-m:= \
- key/af_key \
+ $(if $(CONFIG_LINUX_3_3),,xfrm/xfrm_algo) \
xfrm/xfrm_ipcomp \
xfrm/xfrm_user \
+ key/af_key \
define KernelPackage/ipsec
SUBMENU:=$(NETWORK_SUPPORT_MENU)
@@ -444,6 +445,22 @@ endef
$(eval $(call KernelPackage,gre))
+define KernelPackage/gre6
+ SUBMENU:=$(NETWORK_SUPPORT_MENU)
+ TITLE:=GRE support over IPV6
+ DEPENDS:=+kmod-ipv6 +kmod-ip6-tunnel @!LINUX_3_3 @!LINUX_3_6
+ KCONFIG:=CONFIG_IPV6_GRE
+ FILES:=$(LINUX_DIR)/net/ipv6/ip6_gre.ko
+ AUTOLOAD:=$(call AutoLoad,39,ip6_gre)
+endef
+
+define KernelPackage/gre6/description
+ Generic Routing Encapsulation support over IPv6
+endef
+
+$(eval $(call KernelPackage,gre6))
+
+
define KernelPackage/tun
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=Universal TUN/TAP driver
@@ -459,6 +476,23 @@ endef
$(eval $(call KernelPackage,tun))
+define KernelPackage/veth
+ SUBMENU:=$(NETWORK_SUPPORT_MENU)
+ TITLE:=Virtual ethernet pair device
+ KCONFIG:=CONFIG_VETH
+ FILES:=$(LINUX_DIR)/drivers/net/veth.ko
+ AUTOLOAD:=$(call AutoLoad,30,veth)
+endef
+
+define KernelPackage/veth/description
+ This device is a local ethernet tunnel. Devices are created in pairs.
+ When one end receives the packet it appears on its pair and vice
+ versa.
+endef
+
+$(eval $(call KernelPackage,veth))
+
+
define KernelPackage/ppp
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=PPP modules
@@ -635,6 +669,7 @@ define KernelPackage/sched-core
CONFIG_NET_EMATCH=y \
CONFIG_NET_EMATCH_U32
FILES:=$(SCHED_FILES)
+ AUTOLOAD:=$(call AutoLoad,70, $(SCHED_MODULES_CORE))
endef
define KernelPackage/sched-core/description
@@ -650,6 +685,7 @@ define KernelPackage/sched-connmark
DEPENDS:=+kmod-sched-core +kmod-ipt-core +kmod-ipt-conntrack-extra
KCONFIG:=CONFIG_NET_ACT_CONNMARK
FILES:=$(LINUX_DIR)/net/sched/act_connmark.ko
+ AUTOLOAD:=$(call AutoLoad,71, act_connmark)
endef
$(eval $(call KernelPackage,sched-connmark))
@@ -661,6 +697,7 @@ define KernelPackage/sched-esfq
CONFIG_NET_SCH_ESFQ \
CONFIG_NET_SCH_ESFQ_NFCT=y
FILES:=$(LINUX_DIR)/net/sched/sch_esfq.ko
+ AUTOLOAD:=$(call AutoLoad,72, sch_esfq)
endef
$(eval $(call KernelPackage,sched-esfq))
@@ -686,6 +723,7 @@ define KernelPackage/sched
CONFIG_NET_EMATCH_META \
CONFIG_NET_EMATCH_TEXT
FILES:=$(SCHED_FILES_EXTRA)
+ AUTOLOAD:=$(call AutoLoad,73, $(SCHED_MODULES_EXTRA))
endef
define KernelPackage/sched/description
@@ -815,7 +853,12 @@ define KernelPackage/sctp
CONFIG_SCTP_DBG_OBJCNT=n \
CONFIG_SCTP_HMAC_NONE=n \
CONFIG_SCTP_HMAC_SHA1=n \
- CONFIG_SCTP_HMAC_MD5=y
+ CONFIG_SCTP_HMAC_MD5=y \
+ CONFIG_SCTP_COOKIE_HMAC_SHA1=n \
+ CONFIG_SCTP_COOKIE_HMAC_MD5=y \
+ CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE=n \
+ CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=n \
+ CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
FILES:= $(LINUX_DIR)/net/sctp/sctp.ko
AUTOLOAD:= $(call AutoLoad,32,sctp)
DEPENDS:=+kmod-lib-crc32c +kmod-crypto-md5 +kmod-crypto-hmac
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 57614387a..aa16c142e 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -132,6 +132,22 @@ endef
$(eval $(call KernelPackage,gpio-dev))
+define KernelPackage/gpio-mcp23s08
+ SUBMENU:=$(OTHER_MENU)
+ TITLE:=Microchip MCP23xxx I/O expander
+ DEPENDS:=@GPIO_SUPPORT
+ KCONFIG:=CONFIG_GPIO_MCP23S08
+ FILES:=$(LINUX_DIR)/drivers/gpio/gpio-mcp23s08.ko
+ AUTOLOAD:=$(call AutoLoad,40,gpio-mcp23s08)
+endef
+
+define KernelPackage/gpio-mcp23s08/description
+ Kernel module for Microchip MCP23xxx SPI/I2C I/O expander
+endef
+
+$(eval $(call KernelPackage,gpio-mcp23s08))
+
+
define KernelPackage/gpio-nxp-74hc164
SUBMENU:=$(OTHER_MENU)
TITLE:=NXP 74HC164 GPIO expander support
@@ -146,157 +162,20 @@ endef
$(eval $(call KernelPackage,gpio-nxp-74hc164))
-define KernelPackage/hid
- SUBMENU:=$(OTHER_MENU)
- TITLE:=HID Devices
- KCONFIG:=CONFIG_HID
- FILES:=$(LINUX_DIR)/drivers/hid/hid.ko
- AUTOLOAD:=$(call AutoLoad,61,hid)
- $(call AddDepends/input,+kmod-input-evdev)
-endef
-
-define KernelPackage/hid/description
- Kernel modules for HID devices
-endef
-
-$(eval $(call KernelPackage,hid))
-
-
-define KernelPackage/input-core
- SUBMENU:=$(OTHER_MENU)
- TITLE:=Input device core
- KCONFIG:=CONFIG_INPUT
- FILES:=$(LINUX_DIR)/drivers/input/input-core.ko
- AUTOLOAD:=$(call AutoLoad,19,input-core)
-endef
-
-define KernelPackage/input-core/description
- Kernel modules for support of input device
-endef
-
-$(eval $(call KernelPackage,input-core))
-
-
-define KernelPackage/input-evdev
- SUBMENU:=$(OTHER_MENU)
- TITLE:=Input event device
- KCONFIG:=CONFIG_INPUT_EVDEV
- FILES:=$(LINUX_DIR)/drivers/input/evdev.ko
- AUTOLOAD:=$(call AutoLoad,60,evdev)
- $(call AddDepends/input)
-endef
-
-define KernelPackage/input-evdev/description
- Kernel modules for support of input device events
-endef
-
-$(eval $(call KernelPackage,input-evdev))
-
-
-define KernelPackage/input-gpio-buttons
- SUBMENU:=$(OTHER_MENU)
- TITLE:=Polled GPIO buttons input device
- DEPENDS:=@GPIO_SUPPORT +kmod-input-polldev
- KCONFIG:= \
- CONFIG_INPUT_GPIO_BUTTONS \
- CONFIG_INPUT_MISC=y
- FILES:=$(LINUX_DIR)/drivers/input/misc/gpio_buttons.ko
- AUTOLOAD:=$(call AutoLoad,62,gpio_buttons)
-endef
-
-define KernelPackage/input-gpio-buttons/description
- Kernel module for support polled GPIO buttons input device
-endef
-
-$(eval $(call KernelPackage,input-gpio-buttons))
-
-
-define KernelPackage/input-gpio-keys
- SUBMENU:=$(OTHER_MENU)
- TITLE:=GPIO key support
- DEPENDS:= @GPIO_SUPPORT
- KCONFIG:= \
- CONFIG_KEYBOARD_GPIO \
- CONFIG_INPUT_KEYBOARD=y
- FILES:=$(LINUX_DIR)/drivers/input/keyboard/gpio_keys.ko
- AUTOLOAD:=$(call AutoLoad,60,gpio_keys)
- $(call AddDepends/input)
-endef
-
-define KernelPackage/input-gpio-keys/description
- This driver implements support for buttons connected
- to GPIO pins of various CPUs (and some other chips).
-endef
-
-$(eval $(call KernelPackage,input-gpio-keys))
-
-
-define KernelPackage/input-gpio-keys-polled
- SUBMENU:=$(OTHER_MENU)
- TITLE:=Polled GPIO key support
- DEPENDS:=@GPIO_SUPPORT +kmod-input-polldev
- KCONFIG:= \
- CONFIG_KEYBOARD_GPIO_POLLED \
- CONFIG_INPUT_KEYBOARD=y
- FILES:=$(LINUX_DIR)/drivers/input/keyboard/gpio_keys_polled.ko
- AUTOLOAD:=$(call AutoLoad,62,gpio_keys_polled)
- $(call AddDepends/input)
-endef
-
-define KernelPackage/input-gpio-keys-polled/description
- Kernel module for support polled GPIO keys input device
-endef
-
-$(eval $(call KernelPackage,input-gpio-keys-polled))
-
-
-define KernelPackage/input-gpio-encoder
- SUBMENU:=$(OTHER_MENU)
- TITLE:=GPIO rotay encoder
- KCONFIG:=CONFIG_INPUT_GPIO_ROTARY_ENCODER
- FILES:=$(LINUX_DIR)/drivers/input/misc/rotary_encoder.ko
- AUTOLOAD:=$(call AutoLoad,62,rotary_encoder)
- $(call AddDepends/input,@GPIO_SUPPORT)
-endef
-
-define KernelPackage/gpio-encoder/description
- Kernel module to use rotary encoders connected to GPIO pins
-endef
-
-$(eval $(call KernelPackage,input-gpio-encoder))
-
-
-define KernelPackage/input-joydev
- SUBMENU:=$(OTHER_MENU)
- TITLE:=Joystick device support
- KCONFIG:=CONFIG_INPUT_JOYDEV
- FILES:=$(LINUX_DIR)/drivers/input/joydev.ko
- AUTOLOAD:=$(call AutoLoad,62,joydev)
- $(call AddDepends/input)
-endef
-
-define KernelPackage/input-joydev/description
- Kernel module for joystick support
-endef
-
-$(eval $(call KernelPackage,input-joydev))
-
-
-define KernelPackage/input-polldev
+define KernelPackage/gpio-pcf857x
SUBMENU:=$(OTHER_MENU)
- TITLE:=Polled Input device support
- KCONFIG:=CONFIG_INPUT_POLLDEV
- FILES:=$(LINUX_DIR)/drivers/input/input-polldev.ko
- AUTOLOAD:=$(call AutoLoad,20,input-polldev)
- $(call AddDepends/input)
+ DEPENDS:=@GPIO_SUPPORT +kmod-i2c-core
+ TITLE:=PCX857x, PCA967x and MAX732X I2C GPIO expanders
+ KCONFIG:=CONFIG_GPIO_PCF857X
+ FILES:=$(LINUX_DIR)/drivers/gpio/gpio-pcf857x.ko
+ AUTOLOAD:=$(call AutoLoad,55,gpio-pcf857x)
endef
-define KernelPackage/input-polldev/description
- Kernel module for support of polled input devices
+define KernelPackage/gpio-pcf857x/description
+ Kernel module for PCF857x, PCA{85,96}7x, and MAX732[89] I2C GPIO expanders
endef
-$(eval $(call KernelPackage,input-polldev))
-
+$(eval $(call KernelPackage,gpio-pcf857x))
define KernelPackage/lp
SUBMENU:=$(OTHER_MENU)
@@ -363,7 +242,8 @@ define KernelPackage/rfkill
KCONFIG:= \
CONFIG_RFKILL \
CONFIG_RFKILL_INPUT=y \
- CONFIG_RFKILL_LEDS=y
+ CONFIG_RFKILL_LEDS=y \
+ CONFIG_RFKILL_GPIO=y
FILES:= \
$(LINUX_DIR)/net/rfkill/rfkill.ko
AUTOLOAD:=$(call AutoLoad,20,rfkill)
@@ -463,14 +343,14 @@ $(eval $(call KernelPackage,wdt-omap))
define KernelPackage/wdt-orion
SUBMENU:=$(OTHER_MENU)
TITLE:=Marvell Orion Watchdog timer
- DEPENDS:=@TARGET_orion||@TARGET_kirkwood
+ DEPENDS:=@TARGET_orion||TARGET_kirkwood||TARGET_mvebu
KCONFIG:=CONFIG_ORION_WATCHDOG
FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/orion_wdt.ko
AUTOLOAD:=$(call AutoLoad,50,orion_wdt)
endef
define KernelPackage/wdt-orion/description
- Kernel module for Marvell orion watchdog timer.
+ Kernel module for Marvell Orion, Kirkwood and Armada XP/370 watchdog timer.
endef
$(eval $(call KernelPackage,wdt-orion))
@@ -523,11 +403,28 @@ endef
$(eval $(call KernelPackage,pwm-gpio))
+define KernelPackage/rtc-isl1208
+ SUBMENU:=$(OTHER_MENU)
+ TITLE:=Intersil ISL1208 RTC support
+ $(call AddDepends/rtc)
+ DEPENDS+=+kmod-i2c-core
+ KCONFIG:=CONFIG_RTC_DRV_ISL1208
+ FILES:=$(LINUX_DIR)/drivers/rtc/rtc-isl1208.ko
+ AUTOLOAD:=$(call AutoLoad,60,rtc-isl1208)
+endef
+
+define KernelPackage/rtc-isl1208/description
+ Kernel module for Intersil ISL1208 RTC.
+endef
+
+$(eval $(call KernelPackage,rtc-isl1208))
+
+
define KernelPackage/rtc-marvell
SUBMENU:=$(OTHER_MENU)
TITLE:=Marvell SoC built-in RTC support
$(call AddDepends/rtc)
- DEPENDS+=@TARGET_kirkwood||TARGET_orion
+ DEPENDS+=@TARGET_kirkwood||TARGET_orion||TARGET_mvebu
KCONFIG:=CONFIG_RTC_DRV_MV
FILES:=$(LINUX_DIR)/drivers/rtc/rtc-mv.ko
AUTOLOAD:=$(call AutoLoad,60,rtc-mv)
@@ -612,7 +509,6 @@ $(eval $(call KernelPackage,mtdtests))
define KernelPackage/nand
SUBMENU:=$(OTHER_MENU)
TITLE:=NAND flash support
- DEPENDS:=@!LINUX_2_6_39
KCONFIG:=CONFIG_MTD_NAND \
CONFIG_MTD_NAND_IDS \
CONFIG_MTD_NAND_ECC
@@ -655,7 +551,7 @@ define KernelPackage/serial-8250
CONFIG_SERIAL_8250_SHARE_IRQ=y \
CONFIG_SERIAL_8250_DETECT_IRQ=n \
CONFIG_SERIAL_8250_RSA=n
- FILES:=$(LINUX_DIR)/drivers/tty/serial/8250/8250.ko
+ FILES:=$(LINUX_DIR)/drivers/tty/serial/8250/8250$(if $(call kernel_patchver_ge,3.7),$(if $(call kernel_patchver_le,3.9),_core)).ko
endef
define KernelPackage/serial-8250/description
@@ -665,30 +561,19 @@ endef
$(eval $(call KernelPackage,serial-8250))
-define KernelPackage/acpi-button
- SUBMENU:=$(OTHER_MENU)
- TITLE:=ACPI Button Support
- DEPENDS:=@(TARGET_x86_generic||TARGET_x86_kvm_guest||TARGET_x86_xen_domu) +kmod-input-evdev
- KCONFIG:=CONFIG_ACPI_BUTTON
- FILES:=$(LINUX_DIR)/drivers/acpi/button.ko
- AUTOLOAD:=$(call AutoLoad,06,button)
-endef
-
-define KernelPackage/acpi-button/description
- Kernel module for ACPI Button support
-endef
-
-$(eval $(call KernelPackage,acpi-button))
-
define KernelPackage/regmap
SUBMENU:=$(OTHER_MENU)
TITLE:=Generic register map support
- KCONFIG:=CONFIG_REGMAP=y \
+ DEPENDS:=+kmod-lib-lzo +kmod-i2c-core
+ KCONFIG:=CONFIG_REGMAP \
CONFIG_REGMAP_SPI \
- CONFIG_REGMAP_I2C
- FILES:=$(LINUX_DIR)/drivers/base/regmap/regmap-i2c.ko \
- $(LINUX_DIR)/drivers/base/regmap/regmap-spi.ko
- AUTOLOAD:=$(call AutoLoad,10,regmap-i2c regmap-spi)
+ CONFIG_REGMAP_I2C \
+ CONFIG_SPI=y
+ FILES:= \
+ $(LINUX_DIR)/drivers/base/regmap/regmap-core.ko \
+ $(LINUX_DIR)/drivers/base/regmap/regmap-i2c.ko \
+ $(LINUX_DIR)/drivers/base/regmap/regmap-spi.ko
+ AUTOLOAD:=$(call AutoLoad,21,regmap-core regmap-i2c regmap-spi)
endef
define KernelPackage/regmap/description
@@ -696,3 +581,106 @@ define KernelPackage/regmap/description
endef
$(eval $(call KernelPackage,regmap))
+
+define KernelPackage/ikconfig
+ SUBMENU:=$(OTHER_MENU)
+ TITLE:=Kernel configuration via /proc/config.gz
+ KCONFIG:=CONFIG_IKCONFIG \
+ CONFIG_IKCONFIG_PROC=y
+ FILES:=$(LINUX_DIR)/kernel/configs.ko
+ AUTOLOAD:=$(call AutoLoad,70,configs)
+endef
+
+define KernelPackage/ikconfig/description
+ Kernel configuration via /proc/config.gz
+endef
+
+$(eval $(call KernelPackage,ikconfig))
+
+
+define KernelPackage/zram
+ SUBMENU:=$(OTHER_MENU)
+ TITLE:=ZRAM
+ DEPENDS:=@!LINUX_3_3 +kmod-lib-lzo
+ KCONFIG:= \
+ CONFIG_ZSMALLOC \
+ CONFIG_ZRAM \
+ CONFIG_ZRAM_DEBUG=n
+ FILES:= \
+ $(LINUX_DIR)/drivers/staging/zsmalloc/zsmalloc.ko \
+ $(LINUX_DIR)/drivers/staging/zram/zram.ko
+ AUTOLOAD:=$(call AutoLoad,20,zsmalloc zram)
+endef
+
+define KernelPackage/zram/description
+ Compressed RAM block device support
+endef
+
+$(eval $(call KernelPackage,zram))
+
+
+define KernelPackage/mvsdio
+ SUBMENU:=$(OTHER_MENU)
+ TITLE:=Marvell SDIO support
+ DEPENDS:=@TARGET_orion||TARGET_kirkwood||TARGET_mvebu +kmod-mmc
+ KCONFIG:=CONFIG_MMC_MVSDIO
+ FILES:=$(LINUX_DIR)/drivers/mmc/host/mvsdio.ko
+ AUTOLOAD:=$(call AutoLoad,91,mvsdio)
+endef
+
+define KernelPacakge/mvsdio/description
+ Kernel support for the Marvell SDIO controller
+endef
+
+$(eval $(call KernelPackage,mvsdio))
+
+
+define KernelPackage/pps
+ SUBMENU:=$(OTHER_MENU)
+ TITLE:=PPS support
+ KCONFIG:=CONFIG_PPS
+ FILES:=$(LINUX_DIR)/drivers/pps/pps_core.ko
+ AUTOLOAD:=$(call AutoLoad,20,pps_core)
+endef
+
+define KernelPacakge/pps/description
+ PPS (Pulse Per Second) is a special pulse provided by some GPS
+ antennae. Userland can use it to get a high-precision time
+ reference.
+endef
+
+$(eval $(call KernelPackage,pps))
+
+
+define KernelPackage/ptp
+ SUBMENU:=$(OTHER_MENU)
+ TITLE:=PTP clock support
+ DEPENDS:=+kmod-pps
+ KCONFIG:=CONFIG_PTP_1588_CLOCK
+ FILES:=$(LINUX_DIR)/drivers/ptp/ptp.ko
+ AUTOLOAD:=$(call AutoLoad,25,ptp)
+endef
+
+define KernelPacakge/ptp/description
+ The IEEE 1588 standard defines a method to precisely
+ synchronize distributed clocks over Ethernet networks.
+endef
+
+$(eval $(call KernelPackage,ptp))
+
+
+define KernelPackage/ptp-gianfar
+ SUBMENU:=$(OTHER_MENU)
+ TITLE:=Freescale Gianfar PTP support
+ DEPENDS:=@TARGET_mpc85xx +kmod-gianfar +kmod-ptp
+ KCONFIG:=CONFIG_PTP_1588_CLOCK_GIANFAR
+ FILES:=$(LINUX_DIR)/drivers/net/ethernet/freescale/gianfar_ptp.ko
+ AUTOLOAD:=$(call AutoLoad,51,gianfar_ptp)
+endef
+
+define KernelPacakge/ptp-gianfar/description
+ Kernel module for IEEE 1588 support for Freescale
+ Gianfar Ethernet drivers.
+endef
+
+$(eval $(call KernelPackage,ptp-gianfar))
diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk
index f054d870c..494394603 100644
--- a/package/kernel/modules/sound.mk
+++ b/package/kernel/modules/sound.mk
@@ -7,21 +7,6 @@
SOUND_MENU:=Sound Support
-define KernelPackage/pcspkr
- SUBMENU:=$(SOUND_MENU)
- TITLE:=PC speaker support
- KCONFIG:=CONFIG_INPUT_PCSPKR
- FILES:=$(LINUX_DIR)/drivers/input/misc/pcspkr.ko
- AUTOLOAD:=$(call AutoLoad,50,pcspkr)
-endef
-
-define KernelPackage/pcspkr/description
- This enables sounds (tones) through the pc speaker
-endef
-
-$(eval $(call KernelPackage,pcspkr))
-
-
# allow targets to override the soundcore stuff
SOUNDCORE_LOAD ?= \
soundcore \
@@ -47,6 +32,14 @@ SOUNDCORE_FILES ?= \
$(LINUX_DIR)/sound/core/oss/snd-mixer-oss.ko \
$(LINUX_DIR)/sound/core/oss/snd-pcm-oss.ko
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.3.0)),1)
+SOUNDCORE_LOAD += \
+ snd-compress
+
+SOUNDCORE_FILES += \
+ $(LINUX_DIR)/sound/core/snd-compress.ko
+endif
+
define KernelPackage/sound-core
SUBMENU:=$(SOUND_MENU)
TITLE:=Sound support
@@ -65,7 +58,8 @@ define KernelPackage/sound-core
CONFIG_HOSTAUDIO \
CONFIG_SND_PCM_OSS \
CONFIG_SND_MIXER_OSS \
- CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+ CONFIG_SOUND_OSS_CORE_PRECLAIM=y \
+ CONFIG_SND_COMPRESS_OFFLOAD
FILES:=$(SOUNDCORE_FILES)
AUTOLOAD:=$(call AutoLoad,30,$(SOUNDCORE_LOAD))
$(call AddDepends/input)
@@ -96,7 +90,7 @@ define KernelPackage/ac97
KCONFIG:=CONFIG_SND_AC97_CODEC
FILES:= \
$(LINUX_DIR)/sound/ac97_bus.ko \
- $(LINUX_DIR)/sound/pci/ac97/snd-ac97-codec.ko
+ $(LINUX_DIR)/sound/pci/ac97/snd-ac97-codec.ko
AUTOLOAD:=$(call AutoLoad,35,ac97_bus snd-ac97-codec)
$(call AddDepends/sound)
endef
@@ -136,7 +130,7 @@ endef
define KernelPackage/sound-i8x0/description
support for the integrated AC97 sound device on motherboards
- with Intel/SiS/nVidia/AMD chipsets, or ALi chipsets using
+ with Intel/SiS/nVidia/AMD chipsets, or ALi chipsets using
the M5455 Audio Controller.
endef
@@ -161,8 +155,10 @@ $(eval $(call KernelPackage,sound-cs5535audio))
define KernelPackage/sound-soc-core
TITLE:=SoC sound support
+ DEPENDS:=+kmod-regmap
KCONFIG:= \
CONFIG_SND_SOC \
+ CONFIG_SND_SOC_DMAENGINE_PCM=y \
CONFIG_SND_SOC_ALL_CODECS=n
FILES:=$(LINUX_DIR)/sound/soc/snd-soc-core.ko
AUTOLOAD:=$(call AutoLoad,55, snd-soc-core)
@@ -182,3 +178,43 @@ define KernelPackage/sound-soc-ac97
endef
$(eval $(call KernelPackage,sound-soc-ac97))
+
+
+define KernelPackage/sound-soc-gw_avila
+ TITLE:=Gateworks Avila SoC sound support
+ KCONFIG:= \
+ CONFIG_SND_GW_AVILA_SOC \
+ CONFIG_SND_GW_AVILA_SOC_PCM \
+ CONFIG_SND_GW_AVILA_SOC_HSS
+ FILES:= \
+ $(LINUX_DIR)/sound/soc/codecs/snd-soc-tlv320aic3x.ko \
+ $(LINUX_DIR)/sound/soc/gw-avila/snd-soc-gw-avila.ko \
+ $(LINUX_DIR)/sound/soc/gw-avila/snd-soc-gw-avila-pcm.ko \
+ $(LINUX_DIR)/sound/soc/gw-avila/snd-soc-gw-avila-hss.ko
+ AUTOLOAD:=$(call AutoLoad,65,snd-soc-tlv320aic3x snd-soc-gw-avila snd-soc-gw-avila-pcm snd-soc-gw-avila-hss)
+ DEPENDS:=@TARGET_ixp4xx +kmod-sound-soc-core
+ $(call AddDepends/sound)
+endef
+
+$(eval $(call KernelPackage,sound-soc-gw_avila))
+
+
+define KernelPackage/pcspkr
+ DEPENDS:=@!TARGET_x86
+ TITLE:=PC speaker support
+ KCONFIG:= \
+ CONFIG_INPUT_PCSPKR \
+ CONFIG_SND_PCSP
+ FILES:= \
+ $(LINUX_DIR)/drivers/input/misc/pcspkr.ko \
+ $(LINUX_DIR)/sound/drivers/pcsp/snd-pcsp.ko
+ AUTOLOAD:=$(call AutoLoad,50,pcspkr snd-pcsp)
+ $(call AddDepends/input)
+ $(call AddDepends/sound)
+endef
+
+define KernelPackage/pcspkr/description
+ This enables sounds (tones) through the pc speaker
+endef
+
+$(eval $(call KernelPackage,pcspkr))
diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk
index a54f2aa3f..9548c0294 100644
--- a/package/kernel/modules/usb.mk
+++ b/package/kernel/modules/usb.mk
@@ -32,7 +32,7 @@ $(eval $(call KernelPackage,usb-core))
define AddDepends/usb
SUBMENU:=$(USB_MENU)
- DEPENDS+=+!TARGET_etrax:kmod-usb-core $(1)
+ DEPENDS+=+kmod-usb-core $(1)
endef
@@ -96,8 +96,8 @@ define KernelPackage/usb-ohci
CONFIG_USB_OHCI_HCD \
CONFIG_USB_OHCI_ATH79=y \
CONFIG_USB_OHCI_BCM63XX=y \
- CONFIG_USB_OHCI_RT3883=y \
- CONFIG_USB_OCTEON_OHCI=y
+ CONFIG_USB_OCTEON_OHCI=y \
+ CONFIG_USB_OHCI_HCD_PLATFORM=y
FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko
AUTOLOAD:=$(call AutoLoad,50,ohci-hcd,1)
$(call AddDepends/usb)
@@ -110,17 +110,41 @@ endef
$(eval $(call KernelPackage,usb-ohci,1))
+define KernelPackage/usb2-fsl
+ TITLE:=Support for Freescale USB2 controllers
+ DEPENDS:=TARGET_mpc85xx
+ KCONFIG:=\
+ CONFIG_USB_FSL_MPH_DR_OF \
+ CONFIG_USB_EHCI_FSL=y
+ FILES:=$(LINUX_DIR)/drivers/usb/host/fsl-mph-dr-of.ko
+ AUTOLOAD:=$(call AutoLoad,39,fsl-mph-dr-of,1)
+ $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb2-fsl/description
+ Kernel support for Freescale USB2 (EHCI) controllers
+endef
+
+$(eval $(call KernelPackage,usb2-fsl))
+
+
define KernelPackage/usb2
TITLE:=Support for USB2 controllers
- DEPENDS:=+TARGET_brcm47xx:kmod-usb-brcm47xx
+ DEPENDS:=+TARGET_brcm47xx:kmod-usb-brcm47xx +TARGET_mpc85xx:kmod-usb2-fsl
KCONFIG:=CONFIG_USB_EHCI_HCD \
- CONFIG_USB_EHCI_ATH79=y \
- CONFIG_USB_EHCI_BCM63XX=y \
- CONFIG_USB_EHCI_RT3883=y \
- CONFIG_USB_OCTEON_EHCI=y \
- CONFIG_USB_EHCI_FSL=n
+ CONFIG_USB_EHCI_ATH79=y \
+ CONFIG_USB_EHCI_BCM63XX=y \
+ CONFIG_USB_OCTEON_EHCI=y \
+ CONFIG_USB_EHCI_HCD_PLATFORM=y
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.8.0)),1)
+ FILES:= \
+ $(LINUX_DIR)/drivers/usb/host/ehci-hcd.ko \
+ $(LINUX_DIR)/drivers/usb/host/ehci-platform.ko
+ AUTOLOAD:=$(call AutoLoad,40,ehci-hcd ehci-platform,1)
+else
FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-hcd.ko
AUTOLOAD:=$(call AutoLoad,40,ehci-hcd,1)
+endif
$(call AddDepends/usb)
endef
@@ -131,6 +155,22 @@ endef
$(eval $(call KernelPackage,usb2))
+define KernelPackage/usb2-pci
+ TITLE:=Support for PCI USB2 controllers
+ DEPENDS:=@PCI_SUPPORT @(LINUX_3_8||LINUX_3_9) +kmod-usb2
+ KCONFIG:=CONFIG_USB_EHCI_PCI
+ FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-pci.ko
+ AUTOLOAD:=$(call AutoLoad,42,ehci-pci,1)
+ $(call AddDepends/usb)
+endef
+
+define KernelPackage/usb2-pci/description
+ Kernel support for PCI USB2 (EHCI) controllers
+endef
+
+$(eval $(call KernelPackage,usb2-pci))
+
+
define KernelPackage/usb-acm
TITLE:=Support for modems/isdn controllers
KCONFIG:=CONFIG_USB_ACM
@@ -146,6 +186,22 @@ endef
$(eval $(call KernelPackage,usb-acm))
+define KernelPackage/usb-wdm
+ TITLE:=USB Wireless Device Management
+ KCONFIG:=CONFIG_USB_WDM
+ FILES:=$(LINUX_DIR)/drivers/usb/class/cdc-wdm.ko
+ AUTOLOAD:=$(call AutoLoad,60,cdc-wdm)
+$(call AddDepends/usb)
+$(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-wdm/description
+ USB Wireless Device Management support
+endef
+
+$(eval $(call KernelPackage,usb-wdm))
+
+
define KernelPackage/usb-audio
TITLE:=Support for USB audio devices
KCONFIG:= \
@@ -757,6 +813,21 @@ endef
$(eval $(call KernelPackage,usb-net-cdc-ether))
+define KernelPackage/usb-net-qmi-wwan
+ TITLE:=QMI WWAN driver
+ KCONFIG:=CONFIG_USB_NET_QMI_WWAN
+ FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/qmi_wwan.ko
+ AUTOLOAD:=$(call AutoLoad,61,qmi_wwan)
+ $(call AddDepends/usb-net,+kmod-usb-wdm)
+endef
+
+define KernelPackage/usb-net-qmi-wwan/description
+ QMI WWAN driver for Qualcomm MSM based 3G and LTE modems
+endef
+
+$(eval $(call KernelPackage,usb-net-qmi-wwan))
+
+
define KernelPackage/usb-net-rndis
TITLE:=Support for RNDIS connections
KCONFIG:=CONFIG_USB_NET_RNDIS_HOST
@@ -771,6 +842,37 @@ endef
$(eval $(call KernelPackage,usb-net-rndis))
+define KernelPackage/usb-net-cdc-mbim
+ SUBMENU:=$(USB_MENU)
+ TITLE:=Kernel module for MBIM Devices
+ KCONFIG:=CONFIG_USB_NET_CDC_MBIM
+ FILES:= \
+ $(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_mbim.ko
+ AUTOLOAD:=$(call AutoLoad,61,cdc_mbim)
+ $(call AddDepends/usb-net,+kmod-usb-wdm,+kmod-usb-net-cdc-ncm)
+endef
+
+define KernelPackage/usb-net-cdc-mbim/description
+ Kernel module for Option USB High Speed Mobile Devices
+endef
+
+$(eval $(call KernelPackage,usb-net-cdc-mbim))
+
+define KernelPackage/usb-net-cdc-ncm
+ TITLE:=Support for CDC NCM connections
+ KCONFIG:=CONFIG_USB_NET_CDC_NCM
+ FILES:= $(LINUX_DIR)/drivers/$(USBNET_DIR)/cdc_ncm.ko
+ AUTOLOAD:=$(call AutoLoad,61,cdc_ncm)
+ $(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-net-cdc-ncm/description
+ Kernel support for CDC NCM connections
+endef
+
+$(eval $(call KernelPackage,usb-net-cdc-ncm))
+
+
define KernelPackage/usb-net-sierrawireless
TITLE:=Support for Sierra Wireless devices
KCONFIG:=CONFIG_USB_SIERRA_NET
diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk
index 94ea2616a..e652e8a4f 100644
--- a/package/kernel/modules/video.mk
+++ b/package/kernel/modules/video.mk
@@ -8,6 +8,14 @@
VIDEO_MENU:=Video Support
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.7.0)),1)
+V4L2_DIR=v4l2-core
+V4L2_USB_DIR=usb
+else
+V4L2_DIR=video
+V4L2_USB_DIR=video
+endif
+
define KernelPackage/fb
SUBMENU:=$(VIDEO_MENU)
@@ -74,9 +82,10 @@ $(eval $(call KernelPackage,fb-cfb-imgblt))
define KernelPackage/video-core
SUBMENU:=$(VIDEO_MENU)
TITLE=Video4Linux support
- DEPENDS:=@PCI_SUPPORT||USB_SUPPORT +!TARGET_etrax:kmod-i2c-core
+ DEPENDS:=@PCI_SUPPORT||USB_SUPPORT
KCONFIG:= \
CONFIG_MEDIA_SUPPORT=m \
+ CONFIG_MEDIA_CAMERA_SUPPORT=y \
CONFIG_VIDEO_DEV \
CONFIG_VIDEO_V4L1=y \
CONFIG_VIDEO_ALLOW_V4L1=y \
@@ -86,8 +95,8 @@ define KernelPackage/video-core
CONFIG_V4L_PLATFORM_DRIVERS=y \
CONFIG_V4L_ISA_PARPORT_DRIVERS=y
FILES:= \
- $(LINUX_DIR)/drivers/media/video/v4l2-common.ko \
- $(LINUX_DIR)/drivers/media/video/videodev.ko
+ $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/v4l2-common.ko \
+ $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videodev.ko
AUTOLOAD:=$(call AutoLoad,60, videodev v4l2-common)
endef
@@ -103,6 +112,13 @@ define AddDepends/video
DEPENDS+=kmod-video-core $(1)
endef
+define AddDepends/camera
+ SUBMENU:=$(VIDEO_MENU)
+ KCONFIG+=CONFIG_MEDIA_USB_SUPPORT=y \
+ CONFIG_MEDIA_CAMERA_SUPPORT=y
+ DEPENDS+=kmod-video-core $(1)
+endef
+
define KernelPackage/video-videobuf2
TITLE:=videobuf2 lib
@@ -111,9 +127,9 @@ define KernelPackage/video-videobuf2
CONFIG_VIDEOBUF2_MEMOPS \
CONFIG_VIDEOBUF2_VMALLOC
FILES:= \
- $(LINUX_DIR)/drivers/media/video/videobuf2-core.ko \
- $(LINUX_DIR)/drivers/media/video/videobuf2-memops.ko \
- $(LINUX_DIR)/drivers/media/video/videobuf2-vmalloc.ko
+ $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-core.ko \
+ $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-memops.ko \
+ $(LINUX_DIR)/drivers/media/$(V4L2_DIR)/videobuf2-vmalloc.ko
AUTOLOAD:=$(call AutoLoad,65,videobuf2-core videobuf2-memops videobuf2-vmalloc)
$(call AddDepends/video)
endef
@@ -129,9 +145,9 @@ define KernelPackage/video-cpia2
TITLE:=CPIA2 video driver
DEPENDS:=@USB_SUPPORT +kmod-usb-core
KCONFIG:=CONFIG_VIDEO_CPIA2
- FILES:=$(LINUX_DIR)/drivers/media/video/cpia2/cpia2.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/cpia2/cpia2.ko
AUTOLOAD:=$(call AutoLoad,70,cpia2)
- $(call AddDepends/video)
+ $(call AddDepends/camera)
endef
define KernelPackage/video-cpia2/description
@@ -145,9 +161,9 @@ define KernelPackage/video-sn9c102
TITLE:=SN9C102 Camera Chip support
DEPENDS:=@USB_SUPPORT +kmod-usb-core
KCONFIG:=CONFIG_USB_SN9C102
- FILES:=$(LINUX_DIR)/drivers/media/video/sn9c102/sn9c102.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/sn9c102/sn9c102.ko
AUTOLOAD:=$(call AutoLoad,70,gspca_sn9c20x)
- $(call AddDepends/video)
+ $(call AddDepends/camera)
endef
@@ -161,13 +177,13 @@ $(eval $(call KernelPackage,video-sn9c102))
define KernelPackage/video-pwc
TITLE:=Philips USB webcam support
- DEPENDS:=@USB_SUPPORT +kmod-usb-core +!LINUX_2_6_39:kmod-video-videobuf2
+ DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-video-videobuf2
KCONFIG:= \
CONFIG_USB_PWC \
CONFIG_USB_PWC_DEBUG=n
- FILES:=$(LINUX_DIR)/drivers/media/video/pwc/pwc.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/pwc/pwc.ko
AUTOLOAD:=$(call AutoLoad,70,pwc)
- $(call AddDepends/video)
+ $(call AddDepends/camera)
endef
@@ -181,9 +197,9 @@ define KernelPackage/video-uvc
TITLE:=USB Video Class (UVC) support
DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-video-videobuf2
KCONFIG:= CONFIG_USB_VIDEO_CLASS
- FILES:=$(LINUX_DIR)/drivers/media/video/uvc/uvcvideo.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/uvc/uvcvideo.ko
AUTOLOAD:=$(call AutoLoad,90,uvcvideo)
- $(call AddDepends/video)
+ $(call AddDepends/camera)
$(call AddDepends/input)
endef
@@ -200,9 +216,9 @@ define KernelPackage/video-gspca-core
TITLE:=GSPCA webcam core support framework
DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-input-core
KCONFIG:=CONFIG_USB_GSPCA
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_main.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_main.ko
AUTOLOAD:=$(call AutoLoad,70,gspca_main)
- $(call AddDepends/video)
+ $(call AddDepends/camera)
endef
define KernelPackage/video-gspca-core/description
@@ -213,7 +229,7 @@ endef
$(eval $(call KernelPackage,video-gspca-core))
-define AddDepends/video-gspca
+define AddDepends/camera-gspca
SUBMENU:=$(VIDEO_MENU)
DEPENDS+=kmod-video-gspca-core $(1)
endef
@@ -222,9 +238,9 @@ endef
define KernelPackage/video-gspca-conex
TITLE:=conex webcam support
KCONFIG:=CONFIG_USB_GSPCA_CONEX
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_conex.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_conex.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_conex)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-conex/description
@@ -237,9 +253,9 @@ $(eval $(call KernelPackage,video-gspca-conex))
define KernelPackage/video-gspca-etoms
TITLE:=etoms webcam support
KCONFIG:=CONFIG_USB_GSPCA_ETOMS
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_etoms.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_etoms.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_etoms)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-etoms/description
@@ -252,9 +268,9 @@ $(eval $(call KernelPackage,video-gspca-etoms))
define KernelPackage/video-gspca-finepix
TITLE:=finepix webcam support
KCONFIG:=CONFIG_USB_GSPCA_FINEPIX
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_finepix.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_finepix.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_finepix)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-finepix/description
@@ -267,9 +283,9 @@ $(eval $(call KernelPackage,video-gspca-finepix))
define KernelPackage/video-gspca-mars
TITLE:=mars webcam support
KCONFIG:=CONFIG_USB_GSPCA_MARS
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_mars.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_mars.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_mars)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-mars/description
@@ -282,9 +298,9 @@ $(eval $(call KernelPackage,video-gspca-mars))
define KernelPackage/video-gspca-mr97310a
TITLE:=mr97310a webcam support
KCONFIG:=CONFIG_USB_GSPCA_MR97310A
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_mr97310a.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_mr97310a.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_mr97310a)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-mr97310a/description
@@ -297,9 +313,9 @@ $(eval $(call KernelPackage,video-gspca-mr97310a))
define KernelPackage/video-gspca-ov519
TITLE:=ov519 webcam support
KCONFIG:=CONFIG_USB_GSPCA_OV519
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_ov519.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_ov519.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_ov519)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-ov519/description
@@ -312,9 +328,9 @@ $(eval $(call KernelPackage,video-gspca-ov519))
define KernelPackage/video-gspca-ov534
TITLE:=ov534 webcam support
KCONFIG:=CONFIG_USB_GSPCA_OV534
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_ov534.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_ov534.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_ov534)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-ov534/description
@@ -327,9 +343,9 @@ $(eval $(call KernelPackage,video-gspca-ov534))
define KernelPackage/video-gspca-ov534-9
TITLE:=ov534-9 webcam support
KCONFIG:=CONFIG_USB_GSPCA_OV534_9
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_ov534_9.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_ov534_9.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_ov534_9)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-ov534-9/description
@@ -342,9 +358,9 @@ $(eval $(call KernelPackage,video-gspca-ov534-9))
define KernelPackage/video-gspca-pac207
TITLE:=pac207 webcam support
KCONFIG:=CONFIG_USB_GSPCA_PAC207
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_pac207.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_pac207.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_pac207)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-pac207/description
@@ -357,9 +373,9 @@ $(eval $(call KernelPackage,video-gspca-pac207))
define KernelPackage/video-gspca-pac7311
TITLE:=pac7311 webcam support
KCONFIG:=CONFIG_USB_GSPCA_PAC7311
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_pac7311.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_pac7311.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_pac7311)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-pac7311/description
@@ -372,9 +388,9 @@ $(eval $(call KernelPackage,video-gspca-pac7311))
define KernelPackage/video-gspca-se401
TITLE:=se401 webcam support
KCONFIG:=CONFIG_USB_GSPCA_SE401
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_se401.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_se401.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_se401)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-se401/description
@@ -387,9 +403,9 @@ $(eval $(call KernelPackage,video-gspca-se401))
define KernelPackage/video-gspca-sn9c20x
TITLE:=sn9c20x webcam support
KCONFIG:=CONFIG_USB_GSPCA_SN9C20X
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sn9c20x.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_sn9c20x.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_sn9c20x)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-sn9c20x/description
@@ -402,9 +418,9 @@ $(eval $(call KernelPackage,video-gspca-sn9c20x))
define KernelPackage/video-gspca-sonixb
TITLE:=sonixb webcam support
KCONFIG:=CONFIG_USB_GSPCA_SONIXB
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sonixb.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_sonixb.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_sonixb)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-sonixb/description
@@ -417,9 +433,9 @@ $(eval $(call KernelPackage,video-gspca-sonixb))
define KernelPackage/video-gspca-sonixj
TITLE:=sonixj webcam support
KCONFIG:=CONFIG_USB_GSPCA_SONIXJ
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sonixj.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_sonixj.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_sonixj)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-sonixj/description
@@ -432,9 +448,9 @@ $(eval $(call KernelPackage,video-gspca-sonixj))
define KernelPackage/video-gspca-spca500
TITLE:=spca500 webcam support
KCONFIG:=CONFIG_USB_GSPCA_SPCA500
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca500.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_spca500.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_spca500)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-spca500/description
@@ -447,9 +463,9 @@ $(eval $(call KernelPackage,video-gspca-spca500))
define KernelPackage/video-gspca-spca501
TITLE:=spca501 webcam support
KCONFIG:=CONFIG_USB_GSPCA_SPCA501
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca501.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_spca501.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_spca501)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-spca501/description
@@ -462,9 +478,9 @@ $(eval $(call KernelPackage,video-gspca-spca501))
define KernelPackage/video-gspca-spca505
TITLE:=spca505 webcam support
KCONFIG:=CONFIG_USB_GSPCA_SPCA505
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca505.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_spca505.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_spca505)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-spca505/description
@@ -477,9 +493,9 @@ $(eval $(call KernelPackage,video-gspca-spca505))
define KernelPackage/video-gspca-spca506
TITLE:=spca506 webcam support
KCONFIG:=CONFIG_USB_GSPCA_SPCA506
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca506.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_spca506.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_spca506)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-spca506/description
@@ -492,9 +508,9 @@ $(eval $(call KernelPackage,video-gspca-spca506))
define KernelPackage/video-gspca-spca508
TITLE:=spca508 webcam support
KCONFIG:=CONFIG_USB_GSPCA_SPCA508
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca508.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_spca508.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_spca508)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-spca508/description
@@ -507,9 +523,9 @@ $(eval $(call KernelPackage,video-gspca-spca508))
define KernelPackage/video-gspca-spca561
TITLE:=spca561 webcam support
KCONFIG:=CONFIG_USB_GSPCA_SPCA561
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_spca561.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_spca561.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_spca561)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-spca561/description
@@ -522,9 +538,9 @@ $(eval $(call KernelPackage,video-gspca-spca561))
define KernelPackage/video-gspca-sq905
TITLE:=sq905 webcam support
KCONFIG:=CONFIG_USB_GSPCA_SQ905
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sq905.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_sq905.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_sq905)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-sq905/description
@@ -537,9 +553,9 @@ $(eval $(call KernelPackage,video-gspca-sq905))
define KernelPackage/video-gspca-sq905c
TITLE:=sq905c webcam support
KCONFIG:=CONFIG_USB_GSPCA_SQ905C
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sq905c.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_sq905c.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_sq905c)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-sq905c/description
@@ -552,9 +568,9 @@ $(eval $(call KernelPackage,video-gspca-sq905c))
define KernelPackage/video-gspca-stk014
TITLE:=stk014 webcam support
KCONFIG:=CONFIG_USB_GSPCA_STK014
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_stk014.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_stk014.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_stk014)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-stk014/description
@@ -567,9 +583,9 @@ $(eval $(call KernelPackage,video-gspca-stk014))
define KernelPackage/video-gspca-sunplus
TITLE:=sunplus webcam support
KCONFIG:=CONFIG_USB_GSPCA_SUNPLUS
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_sunplus.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_sunplus.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_sunplus)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-sunplus/description
@@ -582,9 +598,9 @@ $(eval $(call KernelPackage,video-gspca-sunplus))
define KernelPackage/video-gspca-t613
TITLE:=t613 webcam support
KCONFIG:=CONFIG_USB_GSPCA_T613
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_t613.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_t613.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_t613)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-t613/description
@@ -597,9 +613,9 @@ $(eval $(call KernelPackage,video-gspca-t613))
define KernelPackage/video-gspca-tv8532
TITLE:=tv8532 webcam support
KCONFIG:=CONFIG_USB_GSPCA_TV8532
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_tv8532.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_tv8532.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_tv8532)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-tv8532/description
@@ -612,9 +628,9 @@ $(eval $(call KernelPackage,video-gspca-tv8532))
define KernelPackage/video-gspca-vc032x
TITLE:=vc032x webcam support
KCONFIG:=CONFIG_USB_GSPCA_VC032X
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_vc032x.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_vc032x.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_vc032x)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-vc032x/description
@@ -627,9 +643,9 @@ $(eval $(call KernelPackage,video-gspca-vc032x))
define KernelPackage/video-gspca-zc3xx
TITLE:=zc3xx webcam support
KCONFIG:=CONFIG_USB_GSPCA_ZC3XX
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_zc3xx.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_zc3xx.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_zc3xx)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-zc3xx/description
@@ -642,9 +658,9 @@ $(eval $(call KernelPackage,video-gspca-zc3xx))
define KernelPackage/video-gspca-m5602
TITLE:=m5602 webcam support
KCONFIG:=CONFIG_USB_M5602
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/m5602/gspca_m5602.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/m5602/gspca_m5602.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_m5602)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-m5602/description
@@ -657,9 +673,9 @@ $(eval $(call KernelPackage,video-gspca-m5602))
define KernelPackage/video-gspca-stv06xx
TITLE:=stv06xx webcam support
KCONFIG:=CONFIG_USB_STV06XX
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/stv06xx/gspca_stv06xx.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/stv06xx/gspca_stv06xx.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_stv06xx)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-stv06xx/description
@@ -672,9 +688,9 @@ $(eval $(call KernelPackage,video-gspca-stv06xx))
define KernelPackage/video-gspca-gl860
TITLE:=gl860 webcam support
KCONFIG:=CONFIG_USB_GL860
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gl860/gspca_gl860.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gl860/gspca_gl860.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_gl860)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-gl800/description
@@ -687,9 +703,9 @@ $(eval $(call KernelPackage,video-gspca-gl860))
define KernelPackage/video-gspca-jeilinj
TITLE:=jeilinj webcam support
KCONFIG:=CONFIG_USB_GSPCA_JEILINJ
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_jeilinj.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_jeilinj.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_jeilinj)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-jeilinj/description
@@ -702,9 +718,9 @@ $(eval $(call KernelPackage,video-gspca-jeilinj))
define KernelPackage/video-gspca-konica
TITLE:=konica webcam support
KCONFIG:=CONFIG_USB_GSPCA_KONICA
- FILES:=$(LINUX_DIR)/drivers/media/video/gspca/gspca_konica.ko
+ FILES:=$(LINUX_DIR)/drivers/media/$(V4L2_USB_DIR)/gspca/gspca_konica.ko
AUTOLOAD:=$(call AutoLoad,75,gspca_konica)
- $(call AddDepends/video-gspca)
+ $(call AddDepends/camera-gspca)
endef
define KernelPackage/video-gspca-konica/description
diff --git a/package/kernel/modules/virtual.mk b/package/kernel/modules/virtual.mk
index b7313e11d..5f8428be6 100644
--- a/package/kernel/modules/virtual.mk
+++ b/package/kernel/modules/virtual.mk
@@ -105,7 +105,7 @@ define KernelPackage/xen-fbdev
$(LINUX_DIR)/drivers/video/syscopyarea.ko \
$(LINUX_DIR)/drivers/video/sysfillrect.ko \
$(LINUX_DIR)/drivers/video/fb_sys_fops.ko \
- $(LINUX_DIR)/drivers/video/sysimgblt.ko
+ $(LINUX_DIR)/drivers/video/sysimgblt.ko
AUTOLOAD:=$(call AutoLoad,07, \
fb \
syscopyarea \
diff --git a/package/kernel/modules/w1.mk b/package/kernel/modules/w1.mk
index e0e9e576c..909321683 100644
--- a/package/kernel/modules/w1.mk
+++ b/package/kernel/modules/w1.mk
@@ -73,7 +73,7 @@ define KernelPackage/w1-master-ds2490
AUTOLOAD:=$(call AutoLoad,60,ds2490)
$(call AddDepends/w1)
endef
-
+
define KernelPackage/w1-master-ds2490/description
Kernel module for the DS2490 usb 1-wire bus master driver
endef