summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2010-02-11 16:26:58 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2010-02-11 16:26:58 +0100
commitc113ffbfb2c9b71980d0b84456ea8df2209da6c1 (patch)
tree52b0607927d7e1ee33d7317d5b49b7c1fd7d3ce1
parent7fab693c5c07f094a50f3686ad1fae6353f1161b (diff)
disable rpc/nfs4 for nfsroot target, fix allmodconfig
-rw-r--r--target/Config.in1
-rw-r--r--target/linux/config/Config.in.crypto5
-rw-r--r--target/linux/config/Config.in.fsnet3
3 files changed, 9 insertions, 0 deletions
diff --git a/target/Config.in b/target/Config.in
index cb097cc5d..54024e752 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -733,6 +733,7 @@ config ADK_TARGET_ROOTFS_NFSROOT
ADK_LINUX_MIPS_WAG54G || \
ADK_LINUX_MIPS_AG241 || \
ADK_LINUX_MIPS64_LEMOTE
+ select ADK_KERNEL_SUNRPC
select ADK_KERNEL_NFS_FS
select ADK_KERNEL_NFS_V3
select ADK_KERNEL_ROOT_NFS
diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto
index 7d78a594e..ef0be06a3 100644
--- a/target/linux/config/Config.in.crypto
+++ b/target/linux/config/Config.in.crypto
@@ -15,6 +15,10 @@ config ADK_KERNEL_OCF_CRYPTODEV
boolean
default n
+config ADK_KERNEL_CRYPTO_MANAGER
+ tristate
+ default n
+
config ADK_KERNEL_OCF_OCF
boolean
default n
@@ -125,6 +129,7 @@ config ADK_KPACKAGE_KMOD_CRYPTO_MANAGER
prompt "kmod-crypto-manager.................. Crypto algorithm manager"
tristate
default n
+ depends on !ADK_KERNEL_CRYPTO_MANAGER
select ADK_KPACKAGE_KMOD_CRYPTO_HASH
select ADK_KPACKAGE_KMOD_CRYPTO_ALGAPI
select ADK_KPACKAGE_KMOD_CRYPTO_AEAD
diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet
index 1db9d72b6..432415dd1 100644
--- a/target/linux/config/Config.in.fsnet
+++ b/target/linux/config/Config.in.fsnet
@@ -97,6 +97,7 @@ config ADK_KPACKAGE_KMOD_NFSD
select ADK_KERNEL_NFSD_V3
select ADK_KPACKAGE_KMOD_SUNRPC
select ADK_KPACKAGE_KMOD_LOCKD
+ depends on !ADK_TARGET_ROOTFS_NFSROOT
help
If you want your Linux box to act as an NFS *server*, so that other
computers on your local network which support NFS can access certain
@@ -120,6 +121,7 @@ config ADK_KPACKAGE_KMOD_NFSD
config ADK_KERNEL_NFSD_V4
prompt "Enable NFSv4 and RPC Kerberos"
boolean
+ depends on !ADK_TARGET_ROOTFS_NFSROOT
depends on ADK_KPACKAGE_KMOD_NFSD
select ADK_KPACKAGE_KMOD_SUNRPC_GSS
select ADK_KPACKAGE_KMOD_RPCSEC_GSS_KRB5
@@ -134,6 +136,7 @@ config ADK_KPACKAGE_KMOD_LOCKD
config ADK_KPACKAGE_KMOD_SUNRPC
tristate
+ depends on !ADK_KERNEL_SUNRPC
default n
config ADK_KPACKAGE_KMOD_SUNRPC_GSS