summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/kernel/linux/modules/crypto.mk1
-rw-r--r--package/kernel/linux/modules/fs.mk50
-rw-r--r--package/kernel/linux/modules/lib.mk15
-rw-r--r--package/kernel/linux/modules/netdevices.mk18
-rw-r--r--package/kernel/linux/modules/netsupport.mk14
-rw-r--r--package/kernel/linux/modules/usb.mk16
-rw-r--r--package/kernel/mac80211/Makefile6
7 files changed, 81 insertions, 39 deletions
diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
index efa69b7..4c2fe68 100644
--- a/package/kernel/linux/modules/crypto.mk
+++ b/package/kernel/linux/modules/crypto.mk
@@ -24,7 +24,6 @@ define KernelPackage/crypto-core
TITLE:=Core CryptoAPI modules
KCONFIG:= \
CONFIG_CRYPTO=y \
- CONFIG_CRYPTO_HW=y \
CONFIG_CRYPTO_BLKCIPHER \
CONFIG_CRYPTO_ALGAPI \
$(foreach mod,$(CRYPTO_MODULES),$(call crypto_confvar,$(mod)))
diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk
index c117415..9e3470b 100644
--- a/package/kernel/linux/modules/fs.mk
+++ b/package/kernel/linux/modules/fs.mk
@@ -292,12 +292,24 @@ define KernelPackage/fs-nfs/description
Kernel module for NFS support
endef
+define KernelPackage/fs-nfs/config
+ if PACKAGE_kmod-fs-nfs
+ config KERNEL_NFS_V4
+ bool "Support NFSv4 in NFS client"
+ depends on PACKAGE_kmod-fs-sunrpc-auth-rpcgss
+ default n
+ help
+ Select this option to support NFSv4 in the NFS server
+ endif
+endef
+
$(eval $(call KernelPackage,fs-nfs))
define KernelPackage/fs-nfs-common
SUBMENU:=$(FS_MENU)
TITLE:=Common NFS filesystem modules
+ DEPENDS:=+kmod-lib-oid-registry
KCONFIG:= \
CONFIG_LOCKD \
CONFIG_SUNRPC
@@ -310,36 +322,40 @@ endef
$(eval $(call KernelPackage,fs-nfs-common))
-define KernelPackage/fs-nfs-common-v4
+define KernelPackage/fs-sunrpc-auth-rpcgss
SUBMENU:=$(FS_MENU)
- TITLE:=Common NFS V4 filesystem modules
- KCONFIG+=\
- CONFIG_SUNRPC_GSS\
- CONFIG_NFS_V4=y\
- CONFIG_NFSD_V4=y
- DEPENDS:= @BROKEN
- FILES+=$(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.ko
- AUTOLOAD=$(call AutoLoad,30,auth_rpcgss)
-endef
-
-define KernelPackage/fs-nfs-common-v4/description
- Kernel modules for NFS V4 & NFSD V4 kernel support
+ TITLE:=GSS authentication for SUN RPC
+ DEPENDS:=+kmod-fs-nfs-common
+ KCONFIG:=CONFIG_SUNRPC_GSS
+ FILES:= \
+ $(LINUX_DIR)/net/sunrpc/auth_gss/auth_rpcgss.ko
+ AUTOLOAD:=$(call AutoLoad,30,auth_rpcgss)
endef
-$(eval $(call KernelPackage,fs-nfs-common-v4))
-
+$(eval $(call KernelPackage,fs-sunrpc-auth-rpcgss))
define KernelPackage/fs-nfsd
SUBMENU:=$(FS_MENU)
TITLE:=NFS kernel server support
- DEPENDS:=+kmod-fs-nfs-common +kmod-fs-exportfs
- KCONFIG:= \
+ DEPENDS:=+kmod-fs-nfs-common +kmod-fs-exportfs +kmod-fs-sunrpc-auth-rpcgss
+ KCONFIG= \
CONFIG_NFSD \
CONFIG_NFSD_FAULT_INJECTION=n
FILES:=$(LINUX_DIR)/fs/nfsd/nfsd.ko
AUTOLOAD:=$(call AutoLoad,40,nfsd)
endef
+define KernelPackage/fs-nfsd/config
+ if PACKAGE_kmod-fs-nfsd
+ config KERNEL_NFSD_V4
+ bool "Support NFSv4 in NFS server"
+ depends on PACKAGE_kmod-fs-sunrpc-auth-rpcgss
+ default n
+ help
+ Select this option to support NFSv4 in the NFS server
+ endif
+endef
+
define KernelPackage/fs-nfsd/description
Kernel module for NFS kernel server support
endef
diff --git a/package/kernel/linux/modules/lib.mk b/package/kernel/linux/modules/lib.mk
index cd919ba..a148da3 100644
--- a/package/kernel/linux/modules/lib.mk
+++ b/package/kernel/linux/modules/lib.mk
@@ -202,3 +202,18 @@ define KernelPackage/lib-cordic/description
endef
$(eval $(call KernelPackage,lib-cordic))
+
+
+define KernelPackage/lib-oid-registry
+ SUBMENU:=$(LIB_MENU)
+ TITLE:=OID-Registry function support
+ KCONFIG:=CONFIG_OID_REGISTRY
+ FILES:=$(LINUX_DIR)/lib/oid_registry.ko
+ AUTOLOAD:=$(call AutoProbe,oid-registry)
+endef
+
+define KernelPackage/lib-oid-registry/description
+ Kernel module for OID-Registry function support
+endef
+
+$(eval $(call KernelPackage,lib-oid-registry))
diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk
index 8dcdd19..959e891 100644
--- a/package/kernel/linux/modules/netdevices.mk
+++ b/package/kernel/linux/modules/netdevices.mk
@@ -129,24 +129,6 @@ endef
$(eval $(call KernelPackage,et131x))
-define KernelPackage/gw16083
- SUBMENU:=$(NETWORK_DEVICES_MENU)
- TITLE:=Gateworks Ventana Ethernet Expansion Mezzanine driver
- URL:=http://www.gateworks.com
- FILES:=$(LINUX_DIR)/drivers/net/phy/gw16083.ko
- KCONFIG:=CONFIG_GATEWORKS_GW16083
- DEPENDS:=@TARGET_imx6 @PCI_SUPPORT +kmod-libphy +kmod-igb
- AUTOLOAD:=$(call AutoLoad,36,gw16083)
-endef
-
-define KernelPackage/gw16083/description
- This package contains the gw16083 kernel module for supporting the Gateworks
- Ventana Ethernet Expansion Mezzanine.
-endef
-
-$(eval $(call KernelPackage,gw16083))
-
-
define KernelPackage/swconfig
SUBMENU:=$(NETWORK_DEVICES_MENU)
TITLE:=switch configuration API
diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
index fc85e22..bffb09c 100644
--- a/package/kernel/linux/modules/netsupport.mk
+++ b/package/kernel/linux/modules/netsupport.mk
@@ -967,3 +967,17 @@ define KernelPackage/rxrpc/description
endef
$(eval $(call KernelPackage,rxrpc))
+
+define KernelPackage/dns-resolver
+ SUBMENU:=$(NETWORK_SUPPORT_MENU)
+ TITLE:=DNS-resolver modules
+ KCONFIG:=CONFIG_DNS_RESOLVER
+ FILES:= \
+ $(LINUX_DIR)/net/dns_resolver/dns_resolver.ko
+endef
+
+define KernelPackage/dns-resolver/description
+ Kernel modules for DNS-RESOLVER support
+endef
+
+$(eval $(call KernelPackage,dns-resolver))
diff --git a/package/kernel/linux/modules/usb.mk b/package/kernel/linux/modules/usb.mk
index 96c899a..d5cf896 100644
--- a/package/kernel/linux/modules/usb.mk
+++ b/package/kernel/linux/modules/usb.mk
@@ -1012,6 +1012,22 @@ endef
$(eval $(call KernelPackage,usb-net-asix))
+define KernelPackage/usb-net-asix-88179
+ TITLE:=Kernel module for USB-to-Ethernet Asix convertors
+ DEPENDS:=+!LINUX_3_3:kmod-libphy
+ KCONFIG:=CONFIG_USB_NET_AX88179_178A
+ FILES:=$(LINUX_DIR)/drivers/$(USBNET_DIR)/ax88179_178a.ko
+ AUTOLOAD:=$(call AutoProbe,ax88179_178a)
+ $(call AddDepends/usb-net)
+endef
+
+define KernelPackage/usb-net-asix-88179/description
+ Kernel module for USB-to-Ethernet Asix convertors
+endef
+
+$(eval $(call KernelPackage,usb-net-asix-88179))
+
+
define KernelPackage/usb-net-hso
TITLE:=Kernel module for Option USB High Speed Mobile Devices
KCONFIG:=CONFIG_USB_HSO
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index 14feeef..b96e782 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -328,7 +328,7 @@ endef
define KernelPackage/rt2800-soc
$(call KernelPackage/rt2x00/Default)
- DEPENDS += @(TARGET_ramips_rt288x||TARGET_ramips_rt305x||TARGET_ramips_rt3883||TARGET_ramips_mt7620n||TARGET_ramips_mt7620a) +kmod-rt2800-mmio +kmod-rt2800-lib
+ DEPENDS += @(TARGET_ramips_rt288x||TARGET_ramips_rt305x||TARGET_ramips_rt3883||TARGET_ramips_mt7620a||TARGET_ramips_mt7620n) +kmod-rt2800-mmio +kmod-rt2800-lib
TITLE += (RT28xx/RT3xxx SoC)
FILES := \
$(PKG_BUILD_DIR)/drivers/net/wireless/rt2x00/rt2x00soc.ko \
@@ -1222,8 +1222,8 @@ config PACKAGE_B43_USE_BCMA
string "Core revisions to include"
depends on B43_FW_SQUASH
default "5,6,7,8,9,10,11,13,15" if TARGET_brcm47xx_legacy
- default "16,28,29,30" if TARGET_brcm47xx_mips74k
- default "5,6,7,8,9,10,11,13,15,16,28,29,30"
+ default "16,28,29" if TARGET_brcm47xx_mips74k
+ default "5,6,7,8,9,10,11,13,15,16,28,29"
help
This is a comma seperated list of core revision numbers.