From ed956511982aa12b56085d7a8617fff0aef8cade Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 6 Dec 2012 14:11:19 +0000 Subject: kernel: fix video-core build on 3.6+ git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34533 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/video.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk index 6c5de2ea9..dbf5d889c 100644 --- a/package/kernel/modules/video.mk +++ b/package/kernel/modules/video.mk @@ -77,6 +77,7 @@ define KernelPackage/video-core DEPENDS:=@PCI_SUPPORT||USB_SUPPORT +!TARGET_etrax:kmod-i2c-core KCONFIG:= \ CONFIG_MEDIA_SUPPORT=m \ + CONFIG_MEDIA_CAMERA_SUPPORT=y \ CONFIG_VIDEO_DEV \ CONFIG_VIDEO_V4L1=y \ CONFIG_VIDEO_ALLOW_V4L1=y \ -- cgit v1.2.3 From 6acfcfa4ef67955744e4ff40a59db751304c2f2e Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 10 Dec 2012 18:49:30 +0000 Subject: kernel: include the xfrm_algo module on 3.6+ (fixes #12552) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34611 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/netsupport.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 6089fa5c9..9ddcb1d30 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -233,6 +233,7 @@ $(eval $(call KernelPackage,ipip)) IPSEC-m:= \ key/af_key \ xfrm/xfrm_ipcomp \ + $(if $(CONFIG_LINUX_3_3),,xfrm/xfrm_algo) \ xfrm/xfrm_user \ define KernelPackage/ipsec -- cgit v1.2.3 From 22b527ab0a1dc129659102cdc2ff5c664d113222 Mon Sep 17 00:00:00 2001 From: florian Date: Mon, 10 Dec 2012 21:05:06 +0000 Subject: package/kernel: package kmod-input-matrixkmap This is required by some keyboard drivers in 3.6+ Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34614 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/other.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 607b065e5..ed72f521e 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -297,6 +297,21 @@ endef $(eval $(call KernelPackage,input-polldev)) +define KernelPackage/input-matrixkmap + SUBMENU:=$(OTHER_MENU) + TITLE:=Input matrix devices support + KCONFIG:=CONFIG_INPUT_MATRIXKMAP + DEPENDS:=@LINUX_3_6||@LINUX_3_7 + 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/lp SUBMENU:=$(OTHER_MENU) -- cgit v1.2.3 From da1305b6bcebdcdbf55d79c790ac8bce054e13c8 Mon Sep 17 00:00:00 2001 From: florian Date: Mon, 10 Dec 2012 21:05:15 +0000 Subject: package/kernel: snd-soc-core depends on regmap Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34616 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/sound.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk index 3d12ba650..6f83701df 100644 --- a/package/kernel/modules/sound.mk +++ b/package/kernel/modules/sound.mk @@ -146,6 +146,7 @@ $(eval $(call KernelPackage,sound-cs5535audio)) define KernelPackage/sound-soc-core TITLE:=SoC sound support + DEPENDS:=+kmod-regmap KCONFIG:= \ CONFIG_SND_SOC \ CONFIG_SND_SOC_ALL_CODECS=n -- cgit v1.2.3 From af2b2d3f97efe66e7221f8ba0db99ed010f75d39 Mon Sep 17 00:00:00 2001 From: florian Date: Mon, 10 Dec 2012 21:05:32 +0000 Subject: package/kernel: enable CONFIG_SND_SOC_DMAENGINE_PCM in sound-soc-core This is required for 3.6+ kernels and some sound SoC modules. Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34618 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/sound.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk index 6f83701df..f80fa36c0 100644 --- a/package/kernel/modules/sound.mk +++ b/package/kernel/modules/sound.mk @@ -149,6 +149,7 @@ define KernelPackage/sound-soc-core 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) -- cgit v1.2.3 From 517823cf215ebf222589dc17ecd0e9262df5fee8 Mon Sep 17 00:00:00 2001 From: hauke Date: Thu, 13 Dec 2012 00:09:55 +0000 Subject: kernel: in kernel 3.6.8 and later tg3 depends on hwmon.ko git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34652 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/netdevices.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk index c539ea500..bab3d7094 100644 --- a/package/kernel/modules/netdevices.mk +++ b/package/kernel/modules/netdevices.mk @@ -473,7 +473,7 @@ $(eval $(call KernelPackage,pcnet32)) define KernelPackage/tg3 TITLE:=Broadcom Tigon3 Gigabit Ethernet KCONFIG:=CONFIG_TIGON3 - DEPENDS:=+!TARGET_brcm47xx:kmod-libphy + DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +!LINUX_3_3:kmod-hwmon-core SUBMENU:=$(NETWORK_DEVICES_MENU) FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/tg3.ko AUTOLOAD:=$(call AutoLoad,50,tg3) -- cgit v1.2.3 From 45d141ce0e40570733ef068210251ccea91d91a2 Mon Sep 17 00:00:00 2001 From: blogic Date: Sat, 15 Dec 2012 01:59:29 +0000 Subject: [kernel] add crypto-pcompress git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34685 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/crypto.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index 383f9f318..d8242952b 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -60,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 -- cgit v1.2.3 From 4dea1785f33d67609a68a86b13f28044fc2d774f Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 15 Dec 2012 21:59:56 +0000 Subject: kernel: add a module for ipv6 gre git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34709 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/netsupport.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 9ddcb1d30..7cfd2d731 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -445,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 -- cgit v1.2.3 From 2d521cfa12ceb95cc6e0cf073bbee415835f82d5 Mon Sep 17 00:00:00 2001 From: juhosg Date: Tue, 18 Dec 2012 14:50:43 +0000 Subject: kernel: fix module names for crypto modules in 3.7 Signed-off-by: David Woodhouse Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34751 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/crypto.mk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index d8242952b..2fed357ea 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -335,6 +335,9 @@ $(eval $(call KernelPackage,crypto-sha1)) 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 @@ -359,8 +362,8 @@ define KernelPackage/crypto-misc FILES:= \ $(LINUX_DIR)/crypto/anubis.ko \ $(LINUX_DIR)/crypto/camellia$(camellia_mod_suffix).ko \ - $(LINUX_DIR)/crypto/cast5.ko \ - $(LINUX_DIR)/crypto/cast6.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 \ -- cgit v1.2.3 From aaf21b9d1315b587ed80ea264e98e30c8c82bb2a Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 22 Dec 2012 12:11:09 +0000 Subject: package/kernel: remove obsolete CONFIG_USB_[EO]HCI_RT3883=y symbols Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34844 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/usb.mk | 2 -- 1 file changed, 2 deletions(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 032df46f7..459920326 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -96,7 +96,6 @@ 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_OHCI_HCD_PLATFORM=y FILES:=$(LINUX_DIR)/drivers/usb/host/ohci-hcd.ko @@ -117,7 +116,6 @@ define KernelPackage/usb2 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_HCD_PLATFORM=y -- cgit v1.2.3 From ff2d51e082de896846a4c5d0fb7e7a5799d493d0 Mon Sep 17 00:00:00 2001 From: juhosg Date: Tue, 1 Jan 2013 19:04:17 +0000 Subject: package/kernel: create separate package for the sha256 crypto module Based on a patch from #12711 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34955 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/crypto.mk | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index 2fed357ea..02e3f68b0 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -332,6 +332,17 @@ 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 @@ -351,7 +362,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 \ @@ -366,7 +376,6 @@ define KernelPackage/crypto-misc $(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 \ -- cgit v1.2.3 From d80522f1bdedb56649220cd8ccf89f2e1ae9e104 Mon Sep 17 00:00:00 2001 From: juhosg Date: Tue, 1 Jan 2013 19:04:20 +0000 Subject: package/kernel: select crypto-sha256 for cifs on 3.7+ Based on a patch from #12711 Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34956 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/fs.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk index bb0226b6c..902416368 100644 --- a/package/kernel/modules/fs.mk +++ b/package/kernel/modules/fs.mk @@ -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 -- cgit v1.2.3 From d9f2afc84aa5dd4d3342728ecb447bd16582b4f1 Mon Sep 17 00:00:00 2001 From: blogic Date: Wed, 2 Jan 2013 09:43:07 +0000 Subject: [kernel] fix video modules package generation The folder layout changed between 3.6 and 3.7 Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34960 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/video.mk | 179 ++++++++++++++++++++++------------------ 1 file changed, 97 insertions(+), 82 deletions(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk index dbf5d889c..ae6012aeb 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) @@ -87,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 @@ -104,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 @@ -112,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 @@ -130,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 @@ -146,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 @@ -166,9 +181,9 @@ define KernelPackage/video-pwc 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 @@ -182,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 @@ -201,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 @@ -214,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 @@ -223,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 @@ -238,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 @@ -253,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 @@ -268,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 @@ -283,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 @@ -298,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 @@ -313,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 @@ -328,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 @@ -343,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 @@ -358,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 @@ -373,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 @@ -388,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 @@ -403,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 @@ -418,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 @@ -433,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 @@ -448,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 @@ -463,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 @@ -478,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 @@ -493,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 @@ -508,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 @@ -523,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 @@ -538,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 @@ -553,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 @@ -568,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 @@ -583,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 @@ -598,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 @@ -613,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 @@ -628,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 @@ -643,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 @@ -658,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 @@ -673,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 @@ -688,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 @@ -703,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 -- cgit v1.2.3 From 6b1748edebba2e4f63a8bcc6a86daf9e88de8ce7 Mon Sep 17 00:00:00 2001 From: blogic Date: Wed, 2 Jan 2013 10:29:45 +0000 Subject: [kernel] fix typo in HFS kernel module Signed-off-by: Ian Leonard git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34963 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/fs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk index 902416368..c4561ef7e 100644 --- a/package/kernel/modules/fs.mk +++ b/package/kernel/modules/fs.mk @@ -122,7 +122,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) -- cgit v1.2.3 From edba86d7d2cd642a213ba55212f55036c743a0d6 Mon Sep 17 00:00:00 2001 From: blogic Date: Wed, 2 Jan 2013 11:28:11 +0000 Subject: Remove remaining etrax references git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34968 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/block.mk | 2 +- package/kernel/modules/i2c.mk | 1 - package/kernel/modules/usb.mk | 2 +- package/kernel/modules/video.mk | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index ba2443957..373230b9a 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_etrax + DEPENDS:=@PCI_SUPPORT +kmod-scsi-core KCONFIG:=CONFIG_ATA FILES:=$(LINUX_DIR)/drivers/ata/libata.ko AUTOLOAD:=$(call AutoLoad,21,libata,1) diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk index 49d825077..0a4982010 100644 --- a/package/kernel/modules/i2c.mk +++ b/package/kernel/modules/i2c.mk @@ -27,7 +27,6 @@ I2C_CORE_MODULES:= \ define KernelPackage/i2c-core $(call i2c_defaults,$(I2C_CORE_MODULES),51) TITLE:=I2C support - DEPENDS:=@!TARGET_etrax endef define KernelPackage/i2c-core/description diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 459920326..5947e8817 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 diff --git a/package/kernel/modules/video.mk b/package/kernel/modules/video.mk index ae6012aeb..e652e8a4f 100644 --- a/package/kernel/modules/video.mk +++ b/package/kernel/modules/video.mk @@ -82,7 +82,7 @@ $(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 \ -- cgit v1.2.3 From c12ce7de6ebbab2233dfba606f010f5170ee6505 Mon Sep 17 00:00:00 2001 From: hauke Date: Thu, 3 Jan 2013 02:00:25 +0000 Subject: brcm47xx: build b44 as a module git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34994 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/netdevices.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk index bab3d7094..83d7c5f56 100644 --- a/package/kernel/modules/netdevices.mk +++ b/package/kernel/modules/netdevices.mk @@ -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) -- cgit v1.2.3 From 17afd5a0df9ab533839a2ab114b0062e771c27d5 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 3 Jan 2013 18:04:04 +0000 Subject: add kmod-fs-configfs to replace kernel bloat added by selecting kmod-mmc-over-gpio git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34998 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/fs.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk index c4561ef7e..fc4c75679 100644 --- a/package/kernel/modules/fs.mk +++ b/package/kernel/modules/fs.mk @@ -69,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 -- cgit v1.2.3 From a0acd43cbf34682b18b03d038e2b0a12660a3788 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 3 Jan 2013 18:39:50 +0000 Subject: kernel: move regmap bloat out of the kernel image if it is only being used in modules git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34999 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/other.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index ed72f521e..2374d191a 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -698,12 +698,15 @@ $(eval $(call KernelPackage,acpi-button)) define KernelPackage/regmap SUBMENU:=$(OTHER_MENU) TITLE:=Generic register map support + DEPENDS:=+kmod-lib-lzo KCONFIG:=CONFIG_REGMAP=y \ 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) + FILES:= \ + $(LINUX_DIR)/drivers/base/regmap/regmap.ko \ + $(LINUX_DIR)/drivers/base/regmap/regmap-i2c.ko \ + $(LINUX_DIR)/drivers/base/regmap/regmap-spi.ko + AUTOLOAD:=$(call AutoLoad,10,regmap regmap-i2c regmap-spi) endef define KernelPackage/regmap/description -- cgit v1.2.3 From 6408679755dc3f52868384567d51bd9ae0d63389 Mon Sep 17 00:00:00 2001 From: blogic Date: Sat, 5 Jan 2013 00:20:05 +0000 Subject: [kernel] fix regmap debloat patch git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35015 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/other.mk | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 2374d191a..1c8a3dcfe 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -698,15 +698,16 @@ $(eval $(call KernelPackage,acpi-button)) define KernelPackage/regmap SUBMENU:=$(OTHER_MENU) TITLE:=Generic register map support - DEPENDS:=+kmod-lib-lzo - KCONFIG:=CONFIG_REGMAP=y \ + DEPENDS:=+kmod-lib-lzo +kmod-i2c-core + KCONFIG:=CONFIG_REGMAP \ CONFIG_REGMAP_SPI \ - CONFIG_REGMAP_I2C + CONFIG_REGMAP_I2C \ + CONFIG_SPI=y FILES:= \ - $(LINUX_DIR)/drivers/base/regmap/regmap.ko \ + $(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,10,regmap regmap-i2c regmap-spi) + AUTOLOAD:=$(call AutoLoad,10,regmap-core regmap-i2c regmap-spi) endef define KernelPackage/regmap/description -- cgit v1.2.3 From c79cbf06cc04cdafff50c2a15945207854eb6cc9 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 6 Jan 2013 15:09:43 +0000 Subject: kernel: add a module for the isl1208 rtc git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35022 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/other.mk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 1c8a3dcfe..ddaef8d90 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -539,6 +539,23 @@ 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 -- cgit v1.2.3 From 38cc3e47f517a509152186069c45d20f52e90835 Mon Sep 17 00:00:00 2001 From: hauke Date: Sun, 6 Jan 2013 16:21:29 +0000 Subject: zram: add package to use compressed ram disk for swap The busybox size is increased by 3.2KByte uncompressed on bcm47xx with this commit. This zram-swap automatically creates a zram device, a swap partition on it and make the kernel swap pages to it. Thank you Bastian Bittorf for idea and the script. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35025 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/other.mk | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index ddaef8d90..5d3e00a87 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -747,3 +747,24 @@ define KernelPackage/ikconfig/description 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)) -- cgit v1.2.3 From 9e70c1ddc7b660b9ca4bfac2ab66498e264db942 Mon Sep 17 00:00:00 2001 From: jow Date: Mon, 7 Jan 2013 10:54:56 +0000 Subject: kernel: fix kmod-ipsec load order (#12552) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35032 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/netsupport.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 7cfd2d731..7858f4774 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -231,10 +231,10 @@ $(eval $(call KernelPackage,ipip)) IPSEC-m:= \ - key/af_key \ - xfrm/xfrm_ipcomp \ $(if $(CONFIG_LINUX_3_3),,xfrm/xfrm_algo) \ + xfrm/xfrm_ipcomp \ xfrm/xfrm_user \ + key/af_key \ define KernelPackage/ipsec SUBMENU:=$(NETWORK_SUPPORT_MENU) -- cgit v1.2.3 From c06bcf1ccd80e46f0e162047a716c7dc40dd8324 Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 8 Jan 2013 22:18:23 +0000 Subject: kernel: add more SCTP related configuration symbols These symbols are used by 3.8+ kernels Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35054 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/netsupport.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index 7858f4774..d893c1add 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -836,7 +836,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 -- cgit v1.2.3 From 405727e10bd1bcb72aaf709e47a6d3d30cce3100 Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 8 Jan 2013 22:20:21 +0000 Subject: kernel: adjust orion/kirkwood packages to also build for mvebu target Armada XP/370 boards share these hardware blocks with Orion and Kirkwood SoCs. Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35059 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/crypto.mk | 2 +- package/kernel/modules/i2c.mk | 4 ++-- package/kernel/modules/other.mk | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index 02e3f68b0..221b5a0e4 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -486,7 +486,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/i2c.mk b/package/kernel/modules/i2c.mk index 0a4982010..2ee73bfca 100644 --- a/package/kernel/modules/i2c.mk +++ b/package/kernel/modules/i2c.mk @@ -154,11 +154,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 diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 5d3e00a87..d4983a324 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -479,14 +479,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)) -- cgit v1.2.3 From 57e455fbc88e3ae69b13854549bd3897971f57c8 Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 8 Jan 2013 22:20:25 +0000 Subject: kernel: make kmod-of-i2c available for the mvebu target Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35060 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/i2c.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk index 2ee73bfca..df34bbf83 100644 --- a/package/kernel/modules/i2c.mk +++ b/package/kernel/modules/i2c.mk @@ -107,7 +107,7 @@ OF_I2C_MODULES:=\ 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 \ + DEPENDS:=@TARGET_ppc40x||TARGET_ppc4xx||TARGET_mpc52xx||TARGET_mpc83xx||TARGET_mpc85xx||TARGET_mvebu \ kmod-i2c-core endef @@ -154,7 +154,7 @@ 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||TARGET_mvebu +kmod-i2c-core + DEPENDS:=@TARGET_kirkwood||TARGET_orion||TARGET_mvebu +kmod-i2c-core TARGET_mvebu:kmod-of-i2c endef define KernelPackage/i2c-mv64xxx/description -- cgit v1.2.3 From dde7a4e799f3fce63428d08ef8fbf196c1f34105 Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 8 Jan 2013 22:20:30 +0000 Subject: kernel: add kmod-mvsdio MMC host controller for Marvell targets Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35061 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/other.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index d4983a324..08b3a61a0 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -768,3 +768,19 @@ define KernelPackage/zram/description 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)) -- cgit v1.2.3 From 010a728ebfd5f9c850a9489268f4185ebea04c94 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 12 Jan 2013 13:21:08 +0000 Subject: kernel: make kmod-ledtrig-usbdev depend on usb core support instead of selecting it git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35120 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/leds.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/leds.mk b/package/kernel/modules/leds.mk index 5b9b01704..b2402c956 100644 --- a/package/kernel/modules/leds.mk +++ b/package/kernel/modules/leds.mk @@ -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) -- cgit v1.2.3 From dc131c0a6e13e2d670ed3c9112a88b0cf3f9b7d9 Mon Sep 17 00:00:00 2001 From: jow Date: Mon, 14 Jan 2013 16:12:56 +0000 Subject: netfilter.mk: add addrtype match to iptables-mod-extra (kmod-ipt-extra) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35155 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/netfilter.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk index b739a9c28..69bdba0fc 100644 --- a/package/kernel/modules/netfilter.mk +++ b/package/kernel/modules/netfilter.mk @@ -377,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 -- cgit v1.2.3 From a2cf5a31fb7ca6f0e9fc37762dec4da874c66f22 Mon Sep 17 00:00:00 2001 From: florian Date: Mon, 14 Jan 2013 17:03:45 +0000 Subject: kernel: avoid recursive dependency caused by kmod-i2c-mv64xxx Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35157 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/i2c.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk index df34bbf83..e1adafdb0 100644 --- a/package/kernel/modules/i2c.mk +++ b/package/kernel/modules/i2c.mk @@ -154,7 +154,8 @@ 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||TARGET_mvebu +kmod-i2c-core TARGET_mvebu:kmod-of-i2c + DEPENDS:=@TARGET_kirkwood||TARGET_orion||TARGET_mvebu (TARGET_kirkwood||TARGET_orion):kmod-i2c-core \ + TARGET_mvebu:kmod-of-i2c endef define KernelPackage/i2c-mv64xxx/description -- cgit v1.2.3 From d125ea66b27ec020b90c78382dae6fb42cb2a5d8 Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 14 Jan 2013 17:09:16 +0000 Subject: kernel: make sure that packages are generated for built-in crypto modules to avoid dependency errors with kmod-crypto-core on 3.7 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35158 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/crypto.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index 221b5a0e4..6a3b5a6ba 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -15,7 +15,7 @@ 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)))) define KernelPackage/crypto-core -- cgit v1.2.3 From 6704940b8e5f343f444f3a15bd7ddae79d5d834c Mon Sep 17 00:00:00 2001 From: juhosg Date: Mon, 14 Jan 2013 18:18:03 +0000 Subject: package/kernel: move input modules into a separate submenu Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35161 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/input.mk | 192 ++++++++++++++++++++++++++++++++++++++++ package/kernel/modules/other.mk | 184 +------------------------------------- 2 files changed, 193 insertions(+), 183 deletions(-) create mode 100644 package/kernel/modules/input.mk (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/input.mk b/package/kernel/modules/input.mk new file mode 100644 index 000000000..341125607 --- /dev/null +++ b/package/kernel/modules/input.mk @@ -0,0 +1,192 @@ +# +# 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 + 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:=$(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_6||@LINUX_3_7 + 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/other.mk b/package/kernel/modules/other.mk index 08b3a61a0..28a24a028 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -146,173 +146,6 @@ 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 - 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) -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:=$(OTHER_MENU) - TITLE:=Input matrix devices support - KCONFIG:=CONFIG_INPUT_MATRIXKMAP - DEPENDS:=@LINUX_3_6||@LINUX_3_7 - 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/lp SUBMENU:=$(OTHER_MENU) TITLE:=Parallel port and line printer support @@ -697,21 +530,6 @@ 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 @@ -759,7 +577,7 @@ define KernelPackage/zram CONFIG_ZRAM_DEBUG=n FILES:= \ $(LINUX_DIR)/drivers/staging/zsmalloc/zsmalloc.ko \ - $(LINUX_DIR)/drivers/staging/zram/zram.ko + $(LINUX_DIR)/drivers/staging/zram/zram.ko AUTOLOAD:=$(call AutoLoad,20,zsmalloc zram) endef -- cgit v1.2.3 From 788431808eafa5fdfd98b0166f1e430a12602e1f Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 15 Jan 2013 19:55:26 +0000 Subject: kernel: allow building kmod-rtc-marvell for mvebu target Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35177 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/other.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 28a24a028..486565a11 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -393,7 +393,7 @@ 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) -- cgit v1.2.3 From b027f9c9fe01dfab37bca0c04748232ac9875932 Mon Sep 17 00:00:00 2001 From: nbd Date: Thu, 17 Jan 2013 09:08:09 +0000 Subject: kernel: 8250.ko is called 8250_core.ko on linux 3.7+, fixes package/kernel build error in snapshot builds git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35190 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/other.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 486565a11..a96b6997d 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -520,7 +520,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),_core).ko endef define KernelPackage/serial-8250/description -- cgit v1.2.3 From 288f6b0a2445a33e696a15fe05a97f062a4209be Mon Sep 17 00:00:00 2001 From: hauke Date: Sun, 27 Jan 2013 21:18:52 +0000 Subject: kernel: add packages for pps and ptp, they are needed by tg3 in kernel 3.8 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35336 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/netdevices.mk | 2 +- package/kernel/modules/other.mk | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk index 83d7c5f56..f427df6f0 100644 --- a/package/kernel/modules/netdevices.mk +++ b/package/kernel/modules/netdevices.mk @@ -473,7 +473,7 @@ $(eval $(call KernelPackage,pcnet32)) define KernelPackage/tg3 TITLE:=Broadcom Tigon3 Gigabit Ethernet KCONFIG:=CONFIG_TIGON3 - DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +!LINUX_3_3:kmod-hwmon-core + DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +!LINUX_3_3:kmod-hwmon-core +LINUX_3_8:kmod-ptp SUBMENU:=$(NETWORK_DEVICES_MENU) FILES:=$(LINUX_DIR)/drivers/net/ethernet/broadcom/tg3.ko AUTOLOAD:=$(call AutoLoad,50,tg3) diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index a96b6997d..f63d6705d 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -602,3 +602,37 @@ define KernelPacakge/mvsdio/description 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)) -- cgit v1.2.3 From 0d29c50ef44ba462163dc8f7894c3d2bf0656e6c Mon Sep 17 00:00:00 2001 From: hauke Date: Sun, 27 Jan 2013 21:19:48 +0000 Subject: kernel: add ehci-platform.ko and ehci-pci.ko when build with kernel 3.8 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35337 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/usb.mk | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 5947e8817..e578d12cf 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -112,15 +112,22 @@ $(eval $(call KernelPackage,usb-ohci,1)) define KernelPackage/usb2 TITLE:=Support for USB2 controllers - DEPENDS:=+TARGET_brcm47xx:kmod-usb-brcm47xx + DEPENDS:=+TARGET_brcm47xx:kmod-usb-brcm47xx +(PCI_SUPPORT&&LINUX_3_8):usb2-pci KCONFIG:=CONFIG_USB_EHCI_HCD \ CONFIG_USB_EHCI_ATH79=y \ CONFIG_USB_EHCI_BCM63XX=y \ CONFIG_USB_OCTEON_EHCI=y \ CONFIG_USB_EHCI_FSL=n \ 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 +138,22 @@ endef $(eval $(call KernelPackage,usb2)) +define KernelPackage/usb2-pci + TITLE:=Support for PCI USB2 controllers + DEPENDS:=@PCI_SUPPORT @LINUX_3_8 + KCONFIG:=CONFIG_USB_EHCI_PCI + FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-pci.ko + AUTOLOAD:=$(call AutoLoad,40,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 -- cgit v1.2.3 From aca5de390322f48b9e9677484c2ff9a3c889b19e Mon Sep 17 00:00:00 2001 From: hauke Date: Sun, 27 Jan 2013 21:23:33 +0000 Subject: kernel: activate input-matrixkmap for kernel 3.8 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35338 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/input.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/input.mk b/package/kernel/modules/input.mk index 341125607..d3c1b34e6 100644 --- a/package/kernel/modules/input.mk +++ b/package/kernel/modules/input.mk @@ -163,7 +163,7 @@ define KernelPackage/input-matrixkmap SUBMENU:=$(INPUT_MODULES_MENU) TITLE:=Input matrix devices support KCONFIG:=CONFIG_INPUT_MATRIXKMAP - DEPENDS:=@LINUX_3_6||@LINUX_3_7 + DEPENDS:=@!LINUX_3_3 FILES:=$(LINUX_DIR)/drivers/input/matrix-keymap.ko AUTOLOAD:=$(call AutoLoad,20,matrix-keymap) $(call AddDepends/input) -- cgit v1.2.3 From b6bc55c1a2ba558d8962c4e209dffdcc1d4eaf2b Mon Sep 17 00:00:00 2001 From: hauke Date: Sun, 27 Jan 2013 21:28:26 +0000 Subject: kernel: make usb2-pci depend on usb2 and not the other way around git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35339 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/usb.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index e578d12cf..0a995d0c3 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -112,7 +112,7 @@ $(eval $(call KernelPackage,usb-ohci,1)) define KernelPackage/usb2 TITLE:=Support for USB2 controllers - DEPENDS:=+TARGET_brcm47xx:kmod-usb-brcm47xx +(PCI_SUPPORT&&LINUX_3_8):usb2-pci + DEPENDS:=+TARGET_brcm47xx:kmod-usb-brcm47xx KCONFIG:=CONFIG_USB_EHCI_HCD \ CONFIG_USB_EHCI_ATH79=y \ CONFIG_USB_EHCI_BCM63XX=y \ @@ -140,10 +140,10 @@ $(eval $(call KernelPackage,usb2)) define KernelPackage/usb2-pci TITLE:=Support for PCI USB2 controllers - DEPENDS:=@PCI_SUPPORT @LINUX_3_8 + DEPENDS:=@PCI_SUPPORT @LINUX_3_8 +kmod-usb2 KCONFIG:=CONFIG_USB_EHCI_PCI FILES:=$(LINUX_DIR)/drivers/usb/host/ehci-pci.ko - AUTOLOAD:=$(call AutoLoad,40,ehci-pci,1) + AUTOLOAD:=$(call AutoLoad,42,ehci-pci,1) $(call AddDepends/usb) endef -- cgit v1.2.3 From 47e8343330e5944028e27e9da8a9aa7d58f53223 Mon Sep 17 00:00:00 2001 From: blogic Date: Mon, 28 Jan 2013 18:20:10 +0000 Subject: [kernel] package ncm & qmi wwan Signed-off-by: Cezary Jackiewicz Patchwork: http://patchwork.openwrt.org/patch/3134/ git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35360 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/usb.mk | 46 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 0a995d0c3..be9ed207e 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -169,6 +169,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:= \ @@ -780,6 +796,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 @@ -794,6 +825,21 @@ endef $(eval $(call KernelPackage,usb-net-rndis)) +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 -- cgit v1.2.3 From 8690de897873468b2ecda81613981700ee9749ce Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 2 Feb 2013 15:40:43 +0000 Subject: add nForce Ethernet module Signed-off-by: Zhiqiang Wang git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35461 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/netdevices.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk index f427df6f0..aec4948b9 100644 --- a/package/kernel/modules/netdevices.mk +++ b/package/kernel/modules/netdevices.mk @@ -663,3 +663,18 @@ 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)) -- cgit v1.2.3 From 4aa9f4c715ea46014a95284dfd0a394cd5833684 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 16 Feb 2013 17:13:40 +0000 Subject: package/kernel: add package for the Freescale On-Chip EHCI Controller Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35627 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/usb.mk | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index be9ed207e..fa6763c84 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -110,14 +110,31 @@ 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_OCTEON_EHCI=y \ - CONFIG_USB_EHCI_FSL=n \ CONFIG_USB_EHCI_HCD_PLATFORM=y ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.8.0)),1) FILES:= \ -- cgit v1.2.3 From 93016135afce2a948b7fd2c0a69ffed9f93a828d Mon Sep 17 00:00:00 2001 From: juhosg Date: Wed, 20 Feb 2013 09:41:48 +0000 Subject: package/kernel: remove trailing whitespaces from *.mk files Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35691 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/block.mk | 2 +- package/kernel/modules/fs.mk | 2 +- package/kernel/modules/netdevices.mk | 4 ++-- package/kernel/modules/netfilter.mk | 2 +- package/kernel/modules/sound.mk | 4 ++-- package/kernel/modules/virtual.mk | 2 +- package/kernel/modules/w1.mk | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/block.mk b/package/kernel/modules/block.mk index 373230b9a..1aa47def2 100644 --- a/package/kernel/modules/block.mk +++ b/package/kernel/modules/block.mk @@ -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/fs.mk b/package/kernel/modules/fs.mk index fc4c75679..1b1fdd437 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 diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk index aec4948b9..c55029dd5 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 @@ -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 \ diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk index 69bdba0fc..50180a5f2 100644 --- a/package/kernel/modules/netfilter.mk +++ b/package/kernel/modules/netfilter.mk @@ -553,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/sound.mk b/package/kernel/modules/sound.mk index f80fa36c0..877d31ba0 100644 --- a/package/kernel/modules/sound.mk +++ b/package/kernel/modules/sound.mk @@ -81,7 +81,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 @@ -121,7 +121,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 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 -- cgit v1.2.3 From 3eea13334029d90af095c0c365cda6365ff25e6c Mon Sep 17 00:00:00 2001 From: juhosg Date: Wed, 20 Feb 2013 19:14:15 +0000 Subject: package/kernel: add package for the Freescale Gianfar driver [juhosg: move the fsl-pq-mdio driver into a separate package] Patchwork: http://patchwork.openwrt.org/patch/3345/ Signed-off-by: Wojciech Dubowik Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35705 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/netdevices.mk | 46 ++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk index c55029dd5..07508ff0a 100644 --- a/package/kernel/modules/netdevices.mk +++ b/package/kernel/modules/netdevices.mk @@ -678,3 +678,49 @@ define KernelPackage/forcedeth/description 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)) -- cgit v1.2.3 From 53922c83ba6c72d9a2652f06a2286bec9529d15b Mon Sep 17 00:00:00 2001 From: juhosg Date: Wed, 20 Feb 2013 19:14:20 +0000 Subject: package/kernel: add package for the Gianfar PTP driver PTP for gianfar can be built as a module. Create a package for it. [juhosg: remove the mp85xx specific patch] Patchwork: http://patchwork.openwrt.org/patch/3344/ Signed-off-by: Wojciech Dubowik Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35706 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/other.mk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index f63d6705d..13a0ec4af 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -636,3 +636,20 @@ define KernelPacakge/ptp/description 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)) -- cgit v1.2.3 From bb86821dae2af12899c0439d3a4caa2a6d94dcc1 Mon Sep 17 00:00:00 2001 From: jogo Date: Sat, 23 Feb 2013 11:30:30 +0000 Subject: package/kernel: i2c: don't skip built-in modules Don't skip build-in modules when generating i2c kmod packages, to allow empty packages to be generated for satisfying dependencies. Closes #12259. Signed-off-by: Jonas Gorski git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35755 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/i2c.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk index e1adafdb0..e01f93775 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)) -- cgit v1.2.3 From a5c389fc6a652fee384f5b1eb00f3ab62dab768d Mon Sep 17 00:00:00 2001 From: florian Date: Sun, 17 Mar 2013 19:45:42 +0000 Subject: kernel: load regmap modules after kmod-lib-lzo Otherwise regmap-core will not be able to lookup the lzo exported symbols. Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36069 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/other.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index 13a0ec4af..f9937bee4 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -542,7 +542,7 @@ define KernelPackage/regmap $(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,10,regmap-core regmap-i2c regmap-spi) + AUTOLOAD:=$(call AutoLoad,21,regmap-core regmap-i2c regmap-spi) endef define KernelPackage/regmap/description -- cgit v1.2.3 From dede3f6096350c4048de42cd150f33531f074a03 Mon Sep 17 00:00:00 2001 From: florian Date: Sun, 17 Mar 2013 19:46:00 +0000 Subject: kernel: enable SND_COMPRESS_OFFLOAD for kernels >= 3.3 Most sound SoC driver enable it and rely it on to properly work. Signed-off-by: Florian Fainelli git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36072 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/sound.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/sound.mk b/package/kernel/modules/sound.mk index 877d31ba0..494394603 100644 --- a/package/kernel/modules/sound.mk +++ b/package/kernel/modules/sound.mk @@ -32,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 @@ -50,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) -- cgit v1.2.3 From 06211d702c555dcfdad210497c96ee71a6b31c2f Mon Sep 17 00:00:00 2001 From: hauke Date: Wed, 20 Mar 2013 21:59:24 +0000 Subject: kernel: add some fixes for kernel 3.9 This patch fixes some compile problems with kernel 3.9 and adds some missing linux 3.9 handling into kernel packages. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36098 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/netdevices.mk | 2 +- package/kernel/modules/usb.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/modules/netdevices.mk index 07508ff0a..2c5bd2d6c 100644 --- a/package/kernel/modules/netdevices.mk +++ b/package/kernel/modules/netdevices.mk @@ -473,7 +473,7 @@ $(eval $(call KernelPackage,pcnet32)) define KernelPackage/tg3 TITLE:=Broadcom Tigon3 Gigabit Ethernet KCONFIG:=CONFIG_TIGON3 - DEPENDS:=+!TARGET_brcm47xx:kmod-libphy +!LINUX_3_3:kmod-hwmon-core +LINUX_3_8:kmod-ptp + 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) diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index fa6763c84..66e6e4aa7 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -157,7 +157,7 @@ $(eval $(call KernelPackage,usb2)) define KernelPackage/usb2-pci TITLE:=Support for PCI USB2 controllers - DEPENDS:=@PCI_SUPPORT @LINUX_3_8 +kmod-usb2 + 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) -- cgit v1.2.3 From bd5a1bd36904c74ca794cf21217d16557b21b7f1 Mon Sep 17 00:00:00 2001 From: blogic Date: Wed, 3 Apr 2013 10:00:32 +0000 Subject: [kernel] make OF_I2C build as part of i2c-core Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36179 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/i2c.mk | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk index e01f93775..101466f09 100644 --- a/package/kernel/modules/i2c.mk +++ b/package/kernel/modules/i2c.mk @@ -22,6 +22,7 @@ endef I2C_CORE_MODULES:= \ CONFIG_I2C:drivers/i2c/i2c-core \ + CONFIG_OF_I2C:drivers/of/of_i2c \ CONFIG_I2C_CHARDEV:drivers/i2c/i2c-dev define KernelPackage/i2c-core @@ -100,23 +101,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||TARGET_mvebu \ - 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 -- cgit v1.2.3 From 1e5056402d2eb0a240f6bad540b73621929df84c Mon Sep 17 00:00:00 2001 From: blogic Date: Wed, 3 Apr 2013 10:00:36 +0000 Subject: [kernel] add pcf857x kernel module Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36180 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/other.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index f9937bee4..d1c21572d 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -146,6 +146,21 @@ endef $(eval $(call KernelPackage,gpio-nxp-74hc164)) +define KernelPackage/gpio-pcf857x + SUBMENU:=$(OTHER_MENU) + 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/gpio-pcf857x/description + Kernel module for PCF857x, PCA{85,96}7x, and MAX732[89] I2C GPIO expanders +endef + +$(eval $(call KernelPackage,gpio-pcf857x)) + define KernelPackage/lp SUBMENU:=$(OTHER_MENU) TITLE:=Parallel port and line printer support -- cgit v1.2.3 From e81b1f6003b8ba879511a8364997dd78fb87f5c2 Mon Sep 17 00:00:00 2001 From: blogic Date: Wed, 3 Apr 2013 10:00:40 +0000 Subject: [kernel] add lm92 kernel module Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36181 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/hwmon.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/hwmon.mk b/package/kernel/modules/hwmon.mk index d549336b3..bc1f65281 100644 --- a/package/kernel/modules/hwmon.mk +++ b/package/kernel/modules/hwmon.mk @@ -134,6 +134,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 -- cgit v1.2.3 From eb628a641c8dbcb7857e6aa18b95f7e17267f39b Mon Sep 17 00:00:00 2001 From: blogic Date: Wed, 3 Apr 2013 10:00:44 +0000 Subject: [kernel] Add INA2XX current sensor module. This is a I2C current/voltage/power sensor. Signed-off-by: Tobias Diedrich git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36182 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/hwmon.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/hwmon.mk b/package/kernel/modules/hwmon.mk index bc1f65281..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 -- cgit v1.2.3 From 67960dcb4b53c83bc82a351c767bb28aff2b0b73 Mon Sep 17 00:00:00 2001 From: blogic Date: Wed, 3 Apr 2013 10:00:55 +0000 Subject: [kernel] add cdc-mbim module http://patchwork.openwrt.org/patch/3370/ Signed-off-by: Rusink Rusinkoff git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36184 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/usb.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/usb.mk b/package/kernel/modules/usb.mk index 66e6e4aa7..9548c0294 100644 --- a/package/kernel/modules/usb.mk +++ b/package/kernel/modules/usb.mk @@ -842,6 +842,22 @@ 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 -- cgit v1.2.3 From 7ea2aa00d23955d750999f669c270512e91c0c85 Mon Sep 17 00:00:00 2001 From: blogic Date: Wed, 3 Apr 2013 12:51:12 +0000 Subject: [kernel] fix borken of-i2c dependencies Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36191 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/i2c.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk index 101466f09..485a6569c 100644 --- a/package/kernel/modules/i2c.mk +++ b/package/kernel/modules/i2c.mk @@ -108,7 +108,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 @@ -123,7 +123,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 @@ -138,8 +138,7 @@ 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||TARGET_mvebu (TARGET_kirkwood||TARGET_orion):kmod-i2c-core \ - TARGET_mvebu:kmod-of-i2c + DEPENDS:=@TARGET_kirkwood||TARGET_orion||TARGET_mvebu (TARGET_kirkwood||TARGET_orion):kmod-i2c-core endef define KernelPackage/i2c-mv64xxx/description -- cgit v1.2.3 From 8f8af422138630a2f4ba1d897efd01e9baf5123e Mon Sep 17 00:00:00 2001 From: blogic Date: Wed, 3 Apr 2013 12:58:06 +0000 Subject: [kernel] unbreak i2c-mv64xxx dependencies Signed-off-by: John Crispin git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36192 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/i2c.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk index 485a6569c..5cf929de9 100644 --- a/package/kernel/modules/i2c.mk +++ b/package/kernel/modules/i2c.mk @@ -138,7 +138,7 @@ 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||TARGET_mvebu (TARGET_kirkwood||TARGET_orion):kmod-i2c-core + DEPENDS:=@TARGET_kirkwood||TARGET_orion||TARGET_mvebu +kmod-i2c-core endef define KernelPackage/i2c-mv64xxx/description -- cgit v1.2.3 From fcaf2dfb85e889730ba668ad8e119e14fcc103c9 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 6 Apr 2013 12:41:06 +0000 Subject: kernel: Allow talitos crypto hw module selection Signed-off-by: Helmut Schaa Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36224 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/crypto.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/crypto.mk b/package/kernel/modules/crypto.mk index 6a3b5a6ba..be76f5325 100644 --- a/package/kernel/modules/crypto.mk +++ b/package/kernel/modules/crypto.mk @@ -119,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 -- cgit v1.2.3 From 7bcc3103e70a0065f3f6b350b4eb17553aa1b5b5 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sat, 6 Apr 2013 16:55:25 +0000 Subject: package/kernel: only include i2c-of if CONFIG_OF enabled Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36227 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/i2c.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/i2c.mk b/package/kernel/modules/i2c.mk index 5cf929de9..085570836 100644 --- a/package/kernel/modules/i2c.mk +++ b/package/kernel/modules/i2c.mk @@ -22,9 +22,12 @@ endef I2C_CORE_MODULES:= \ CONFIG_I2C:drivers/i2c/i2c-core \ - CONFIG_OF_I2C:drivers/of/of_i2c \ 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 -- cgit v1.2.3 From f6f4ed7912db2281caaea8593c050d6a365883b9 Mon Sep 17 00:00:00 2001 From: jogo Date: Tue, 23 Apr 2013 09:21:55 +0000 Subject: kernel: add kmod-mcp23s08 package Package up the Microchip MCP23S08 I/O expander driver. Needed on the CalAmp LMU5000 board. Signed-off-by: Adam Porter [jogo@openwrt.org: fix subject] Signed-off-by: Jonas Gorski git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36393 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/other.mk | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index d1c21572d..f282014a3 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 -- cgit v1.2.3 From 141c2b7c413d7f645766c300abe25ca54df47416 Mon Sep 17 00:00:00 2001 From: jow Date: Wed, 24 Apr 2013 09:49:03 +0000 Subject: Add kernel module package for hid-generic driver. Needed to support e.g. keyboards and mice. Signed-off-by: Danny Baumann git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36414 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/input.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/input.mk b/package/kernel/modules/input.mk index d3c1b34e6..89575ae78 100644 --- a/package/kernel/modules/input.mk +++ b/package/kernel/modules/input.mk @@ -22,6 +22,20 @@ 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) -- cgit v1.2.3 From ad3dd3bf5c341de1ee850dd142128245bf5a66c6 Mon Sep 17 00:00:00 2001 From: jow Date: Wed, 24 Apr 2013 09:49:09 +0000 Subject: Enable hidraw support. It's needed for dealing with certain UART-to-USB adapters built into e.g. weather stations, and increases the hid module package only slightly (e.g. on ar71xx: 35k -> 37k). Signed-off-by: Danny Baumann git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36415 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/input.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/input.mk b/package/kernel/modules/input.mk index 89575ae78..db31eb7f9 100644 --- a/package/kernel/modules/input.mk +++ b/package/kernel/modules/input.mk @@ -10,7 +10,7 @@ INPUT_MODULES_MENU:=Input modules define KernelPackage/hid SUBMENU:=$(INPUT_MODULES_MENU) TITLE:=HID Devices - KCONFIG:=CONFIG_HID + KCONFIG:=CONFIG_HID CONFIG_HIDRAW=y FILES:=$(LINUX_DIR)/drivers/hid/hid.ko AUTOLOAD:=$(call AutoLoad,61,hid) $(call AddDepends/input,+kmod-input-evdev) -- cgit v1.2.3 From ebd6480f6bf4ee3cb374a3cf4eacb82a44aa169c Mon Sep 17 00:00:00 2001 From: jow Date: Thu, 2 May 2013 11:25:18 +0000 Subject: kernel: netfilter.mk: Explicitly set the order of autoloaded modules In my machine, the file is created with arptable_filter before arp_tables. This can't happen because the former depends on the latter. So, instead of rely on wildcards (*.ko), set by hand the files to be loaded in the correct order. Signed-off-by: Jonh Wendell git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36512 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/netfilter.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk index 50180a5f2..4e4c85f45 100644 --- a/package/kernel/modules/netfilter.mk +++ b/package/kernel/modules/netfilter.mk @@ -402,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 @@ -410,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 -- cgit v1.2.3 From d86140710b60bd6973237a37107cd6cf677f83e7 Mon Sep 17 00:00:00 2001 From: luka Date: Fri, 3 May 2013 15:16:50 +0000 Subject: [package] kernel: add veth module Signed-off-by: Luka Perkov git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36540 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/netsupport.mk | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk index d893c1add..ff1f79470 100644 --- a/package/kernel/modules/netsupport.mk +++ b/package/kernel/modules/netsupport.mk @@ -476,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 -- cgit v1.2.3 From 3b5a35294b8a6f018bd4a6e935e3fe47cdcf7ca2 Mon Sep 17 00:00:00 2001 From: jogo Date: Thu, 9 May 2013 20:50:10 +0000 Subject: kernel: modules: kmod-fs-isofs depends on kmod-lib-zlib Add missing dependency. Fixes #11624. Signed-off-by: Jonas Gorski git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36593 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/fs.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/fs.mk b/package/kernel/modules/fs.mk index 1b1fdd437..ecdfb6d3a 100644 --- a/package/kernel/modules/fs.mk +++ b/package/kernel/modules/fs.mk @@ -171,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) -- cgit v1.2.3 From 8c9642e945c54e21f0a0522bc76ada78d6017eb8 Mon Sep 17 00:00:00 2001 From: jogo Date: Sun, 19 May 2013 18:36:09 +0000 Subject: kernel: adapt module paths for 3.10-rc1 Signed-off-by: Jonas Gorski git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36662 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/kernel/modules/leds.mk | 10 +++++----- package/kernel/modules/other.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'package/kernel/modules') diff --git a/package/kernel/modules/leds.mk b/package/kernel/modules/leds.mk index b2402c956..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 @@ -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 @@ -157,7 +157,7 @@ define KernelPackage/ledtrig-oneshot TITLE:=LED One-Shot Trigger DEPENDS:=@!LINUX_3_3 KCONFIG:=CONFIG_LEDS_TRIGGER_ONESHOT - FILES:=$(LINUX_DIR)/drivers/leds/ledtrig-oneshot.ko + FILES:=$(LINUX_DIR)/drivers/leds/$(if $(call kernel_patchver_ge,3.10),trigger/)ledtrig-oneshot.ko AUTOLOAD:=$(call AutoLoad,50,ledtrig-oneshot) endef diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk index f282014a3..aa16c142e 100644 --- a/package/kernel/modules/other.mk +++ b/package/kernel/modules/other.mk @@ -551,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$(if $(call kernel_patchver_ge,3.7),_core).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 -- cgit v1.2.3