LINARO: Disable CONFIG_ROOT_NFS for mx51

The resulting larger kernel from having ROOT_NFS on
will not boot reliably with current hwpack.

Signed-off-by: John Rigby <john.rigby@linaro.org>

6 files changed, 24 insertions, 6 deletions

diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index 6f4da3d1673..2b6ce4c25b8 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -229,6 +229,7 @@ CONFIG_KEYS=y
 CONFIG_LEDS_LP5521=m
 CONFIG_LEDS_LP5523=m
 # CONFIG_LEGACY_PTYS is not set
+CONFIG_LOCKD=m
 # CONFIG_LOGIG940_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
 # CONFIG_LOGITECH_FF is not set
@@ -299,6 +300,8 @@ CONFIG_NEON=y
 # CONFIG_NET_POLL_CONTROLLER is not set
 # CONFIG_NET_SCHED is not set
 # CONFIG_NFSD is not set
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_FS=m
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
 # CONFIG_NFTL is not set
@@ -377,7 +380,7 @@ CONFIG_RELAY=y
 # CONFIG_RFD_FTL is not set
 # CONFIG_RFKILL is not set
 # CONFIG_ROMFS_FS is not set
-CONFIG_RPCSEC_GSS_KRB5=y
+CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_RTC_DRV_BQ4802 is not set
 # CONFIG_RTC_DRV_CMOS is not set
 # CONFIG_RTC_DRV_DS1286 is not set
@@ -439,6 +442,8 @@ CONFIG_SSB=m
 # CONFIG_STAGING is not set
 # CONFIG_STANDALONE is not set
 CONFIG_STE10XP=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
 # CONFIG_SWP_EMULATE is not set
 # CONFIG_SYSCTL_SYSCALL_CHECK is not set
 # CONFIG_SYSV_FS is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index bec7d796de6..651b65174fe 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -249,6 +249,7 @@ CONFIG_LBDAF=y
 CONFIG_LEDS_REGULATOR=m
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=0
+CONFIG_LOCKD=y
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGITECH_FF=y
@@ -328,6 +329,8 @@ CONFIG_NET_PKTGEN=m
 CONFIG_NET_POLL_CONTROLLER=y
 CONFIG_NET_SCHED=y
 CONFIG_NFSD=m
+CONFIG_NFS_ACL_SUPPORT=y
+CONFIG_NFS_FS=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
 CONFIG_NFTL=m
@@ -500,6 +503,8 @@ CONFIG_SSFDC=m
 CONFIG_STAGING=y
 CONFIG_STANDALONE=y
 CONFIG_STE10XP=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
 # CONFIG_SWP_EMULATE is not set
 CONFIG_SYSCTL_SYSCALL_CHECK=y
 CONFIG_SYSV_FS=m
diff --git a/debian.linaro/config/armel/config.flavour.linaro-s5pv310 b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
index 1053c528710..08ecda8cb92 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-s5pv310
+++ b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
@@ -235,6 +235,7 @@ CONFIG_LEDS_LP5521=m
 CONFIG_LEDS_LP5523=m
 # CONFIG_LEDS_REGULATOR is not set
 # CONFIG_LEGACY_PTYS is not set
+CONFIG_LOCKD=y
 # CONFIG_LOGIG940_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
 # CONFIG_LOGITECH_FF is not set
@@ -305,6 +306,8 @@ CONFIG_NEON=y
 # CONFIG_NET_POLL_CONTROLLER is not set
 # CONFIG_NET_SCHED is not set
 # CONFIG_NFSD is not set
+CONFIG_NFS_ACL_SUPPORT=y
+CONFIG_NFS_FS=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
 # CONFIG_NFTL is not set
@@ -466,6 +469,8 @@ CONFIG_SND_TIMER=y
 # CONFIG_STAGING is not set
 CONFIG_STANDALONE=y
 # CONFIG_STE10XP is not set
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
 CONFIG_SWP_EMULATE=y
 CONFIG_SYSCTL_SYSCALL_CHECK=y
 # CONFIG_SYSV_FS is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-u8500 b/debian.linaro/config/armel/config.flavour.linaro-u8500
index 32b08788d37..2653e8d4185 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-u8500
+++ b/debian.linaro/config/armel/config.flavour.linaro-u8500
@@ -240,6 +240,7 @@ CONFIG_LEDS_LP5521=y
 CONFIG_LEDS_LP5523=m
 # CONFIG_LEDS_REGULATOR is not set
 # CONFIG_LEGACY_PTYS is not set
+CONFIG_LOCKD=y
 # CONFIG_LOGIG940_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
 # CONFIG_LOGITECH_FF is not set
@@ -312,6 +313,8 @@ CONFIG_NEON=y
 # CONFIG_NET_POLL_CONTROLLER is not set
 # CONFIG_NET_SCHED is not set
 # CONFIG_NFSD is not set
+CONFIG_NFS_ACL_SUPPORT=y
+CONFIG_NFS_FS=y
 CONFIG_NFS_V3_ACL=y
 CONFIG_NFS_V4=y
 # CONFIG_NFTL is not set
@@ -482,6 +485,8 @@ CONFIG_SSB=m
 CONFIG_STAGING=y
 # CONFIG_STANDALONE is not set
 CONFIG_STE10XP=y
+CONFIG_SUNRPC=y
+CONFIG_SUNRPC_GSS=y
 # CONFIG_SWP_EMULATE is not set
 # CONFIG_SYSCTL_SYSCALL_CHECK is not set
 # CONFIG_SYSV_FS is not set
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index 02309e13ef6..5a575e2a0d1 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -235,6 +235,7 @@ CONFIG_JFFS2_FS=y
 CONFIG_LBDAF=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=16
+CONFIG_LOCKD=y
 # CONFIG_LOGIG940_FF is not set
 # CONFIG_LOGIRUMBLEPAD2_FF is not set
 # CONFIG_LOGITECH_FF is not set
@@ -311,6 +312,7 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y
 # CONFIG_NET_POLL_CONTROLLER is not set
 # CONFIG_NET_SCHED is not set
 # CONFIG_NFSD is not set
+CONFIG_NFS_FS=y
 # CONFIG_NFS_V3_ACL is not set
 # CONFIG_NFS_V4 is not set
 # CONFIG_NFTL is not set
@@ -457,6 +459,7 @@ CONFIG_SSB=m
 # CONFIG_STAGING is not set
 CONFIG_STANDALONE=y
 # CONFIG_STE10XP is not set
+CONFIG_SUNRPC=y
 CONFIG_SWP_EMULATE=y
 # CONFIG_SYSCTL_SYSCALL_CHECK is not set
 # CONFIG_SYSV_FS is not set
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 456b628c01a..ef6a4d48059 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -1435,7 +1435,6 @@ CONFIG_LLC2=m
 CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_LOCAL_TIMERS=y
-CONFIG_LOCKD=y
 CONFIG_LOCKDEP_SUPPORT=y
 CONFIG_LOCKD_V4=y
 # CONFIG_LOCKUP_DETECTOR is not set
@@ -1836,9 +1835,7 @@ CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
 CONFIG_NFSD_V3_ACL=y
 CONFIG_NFSD_V4=y
-CONFIG_NFS_ACL_SUPPORT=y
 CONFIG_NFS_COMMON=y
-CONFIG_NFS_FS=y
 CONFIG_NFS_USE_KERNEL_DNS=y
 # CONFIG_NFS_USE_LEGACY_DNS is not set
 # CONFIG_NFS_USE_NEW_IDMAPPER is not set
@@ -2559,8 +2556,6 @@ CONFIG_STP=m
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_STRIP_ASM_SYMS is not set
 CONFIG_ST_BT=m
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
 CONFIG_SUN_PARTITION=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y