LINARO: [Config] Enforce CONFIG_BTRFS_FS for all flavours

Buglink: http://bugs/launchpad.net/bugs/715835

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

8 files changed, 20 insertions, 58 deletions

diff --git a/debian.linaro/changelog b/debian.linaro/changelog
index 8fd09bcae6b3..022748f609cb 100644
--- a/debian.linaro/changelog
+++ b/debian.linaro/changelog
@@ -25,6 +25,8 @@ linux-linaro (2.6.37-1003.6) UNRELEASED; urgency=low
   * Enforce CONFIG_PM_DEBUG for all flavours
     - LP: #713075
   * Add s5pv310 flavour
+  * enable and enforce CONFIG_BTRFS_FS for all flavours
+    - LP: #715835
 
  -- John Rigby <john.rigby@linaro.org>  Tue, 08 Feb 2011 19:56:22 -0700
 
diff --git a/debian.linaro/config/armel/config.flavour.linaro-mx51 b/debian.linaro/config/armel/config.flavour.linaro-mx51
index ba6e56fe5249..35442b123232 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-mx51
+++ b/debian.linaro/config/armel/config.flavour.linaro-mx51
@@ -58,13 +58,9 @@ CONFIG_CONNECTOR=y
 # CONFIG_CPU_IDLE is not set
 # CONFIG_CRAMFS is not set
 CONFIG_CRC_T10DIF=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_CAST5 is not set
@@ -81,24 +77,19 @@ CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_GCM is not set
 # CONFIG_CRYPTO_GF128MUL is not set
 # CONFIG_CRYPTO_GHASH is not set
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
 # CONFIG_CRYPTO_HW is not set
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_LRW is not set
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_PCBC is not set
-CONFIG_CRYPTO_PCOMP2=y
 # CONFIG_CRYPTO_RMD128 is not set
 # CONFIG_CRYPTO_RMD160 is not set
 # CONFIG_CRYPTO_RMD256 is not set
 # CONFIG_CRYPTO_RMD320 is not set
-CONFIG_CRYPTO_RNG2=y
 # CONFIG_CRYPTO_SALSA20 is not set
 # CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SEQIV is not set
@@ -110,7 +101,6 @@ CONFIG_CRYPTO_RNG2=y
 # CONFIG_CRYPTO_TGR192 is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_VMAC is not set
-CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_XCBC is not set
 # CONFIG_CRYPTO_XTS is not set
@@ -538,4 +528,3 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
 # CONFIG_X25 is not set
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFS_FS is not set
-CONFIG_ZLIB_DEFLATE=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-omap b/debian.linaro/config/armel/config.flavour.linaro-omap
index 8c712147a3f8..629f88c26d84 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-omap
+++ b/debian.linaro/config/armel/config.flavour.linaro-omap
@@ -67,13 +67,9 @@ CONFIG_CONNECTOR=y
 CONFIG_CPU_IDLE=y
 CONFIG_CRAMFS=m
 CONFIG_CRC_T10DIF=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_ANSI_CPRNG=m
 CONFIG_CRYPTO_ANUBIS=m
 CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_BLOWFISH=m
 CONFIG_CRYPTO_CAMELLIA=m
 CONFIG_CRYPTO_CAST5=m
@@ -90,24 +86,19 @@ CONFIG_CRYPTO_FCRYPT=m
 CONFIG_CRYPTO_GCM=m
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_KHAZAD=m
 CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_LZO=m
 CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_PCOMP2=y
 CONFIG_CRYPTO_RMD128=m
 CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RMD256=m
 CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_SALSA20=m
 CONFIG_CRYPTO_SEED=m
 CONFIG_CRYPTO_SEQIV=m
@@ -119,7 +110,6 @@ CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_VMAC=m
-CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CRYPTO_WP512=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_XTS=m
@@ -638,4 +628,3 @@ CONFIG_WLAN=y
 CONFIG_X25=m
 CONFIG_XFRM_USER=m
 CONFIG_XFS_FS=m
-CONFIG_ZLIB_DEFLATE=m
diff --git a/debian.linaro/config/armel/config.flavour.linaro-s5pv310 b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
index 047b41aa8b79..2d4cb148477a 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-s5pv310
+++ b/debian.linaro/config/armel/config.flavour.linaro-s5pv310
@@ -61,13 +61,9 @@ CONFIG_CONNECTOR=y
 # CONFIG_CPU_IDLE is not set
 # CONFIG_CRAMFS is not set
 CONFIG_CRC_T10DIF=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_CAST5 is not set
@@ -84,24 +80,19 @@ CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_GCM is not set
 # CONFIG_CRYPTO_GF128MUL is not set
 # CONFIG_CRYPTO_GHASH is not set
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
 # CONFIG_CRYPTO_HW is not set
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_LRW is not set
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_PCBC is not set
-CONFIG_CRYPTO_PCOMP2=y
 # CONFIG_CRYPTO_RMD128 is not set
 # CONFIG_CRYPTO_RMD160 is not set
 # CONFIG_CRYPTO_RMD256 is not set
 # CONFIG_CRYPTO_RMD320 is not set
-CONFIG_CRYPTO_RNG2=y
 # CONFIG_CRYPTO_SALSA20 is not set
 # CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SEQIV is not set
@@ -113,7 +104,6 @@ CONFIG_CRYPTO_RNG2=y
 # CONFIG_CRYPTO_TGR192 is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_VMAC is not set
-CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_XCBC is not set
 # CONFIG_CRYPTO_XTS is not set
@@ -583,4 +573,3 @@ CONFIG_WLAN=y
 # CONFIG_X25 is not set
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFS_FS is not set
-CONFIG_ZLIB_DEFLATE=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-u8500 b/debian.linaro/config/armel/config.flavour.linaro-u8500
index 87f5709e1527..0b78f1e52892 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-u8500
+++ b/debian.linaro/config/armel/config.flavour.linaro-u8500
@@ -63,13 +63,9 @@ CONFIG_CONNECTOR=y
 # CONFIG_CPU_IDLE is not set
 # CONFIG_CRAMFS is not set
 CONFIG_CRC_T10DIF=y
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_ALGAPI2=y
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_BLKCIPHER2=y
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_CAST5 is not set
@@ -86,24 +82,19 @@ CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_GCM is not set
 # CONFIG_CRYPTO_GF128MUL is not set
 # CONFIG_CRYPTO_GHASH is not set
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_HASH2=y
 # CONFIG_CRYPTO_HW is not set
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_LRW is not set
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=y
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_PCBC is not set
-CONFIG_CRYPTO_PCOMP2=y
 # CONFIG_CRYPTO_RMD128 is not set
 # CONFIG_CRYPTO_RMD160 is not set
 # CONFIG_CRYPTO_RMD256 is not set
 # CONFIG_CRYPTO_RMD320 is not set
-CONFIG_CRYPTO_RNG2=y
 # CONFIG_CRYPTO_SALSA20 is not set
 # CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SEQIV is not set
@@ -115,7 +106,6 @@ CONFIG_CRYPTO_RNG2=y
 # CONFIG_CRYPTO_TGR192 is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_VMAC is not set
-CONFIG_CRYPTO_WORKQUEUE=y
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_XCBC is not set
 # CONFIG_CRYPTO_XTS is not set
@@ -607,4 +597,3 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
 # CONFIG_X25 is not set
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFS_FS is not set
-CONFIG_ZLIB_DEFLATE=y
diff --git a/debian.linaro/config/armel/config.flavour.linaro-vexpress b/debian.linaro/config/armel/config.flavour.linaro-vexpress
index 9571326216d4..1fe24ddd0a34 100644
--- a/debian.linaro/config/armel/config.flavour.linaro-vexpress
+++ b/debian.linaro/config/armel/config.flavour.linaro-vexpress
@@ -61,13 +61,9 @@ CONFIG_CMDLINE="root=/dev/nfs nfsroot=10.1.69.3:/work/nfsroot ip=dhcp console=tt
 # CONFIG_CPU_IDLE is not set
 CONFIG_CRAMFS=y
 CONFIG_CRC_T10DIF=m
-CONFIG_CRYPTO_AEAD2=m
-CONFIG_CRYPTO_ALGAPI=m
-CONFIG_CRYPTO_ALGAPI2=m
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
 # CONFIG_CRYPTO_ANUBIS is not set
 CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_BLKCIPHER2=m
 # CONFIG_CRYPTO_BLOWFISH is not set
 # CONFIG_CRYPTO_CAMELLIA is not set
 # CONFIG_CRYPTO_CAST5 is not set
@@ -84,24 +80,19 @@ CONFIG_CRYPTO_ECB=m
 # CONFIG_CRYPTO_GCM is not set
 # CONFIG_CRYPTO_GF128MUL is not set
 # CONFIG_CRYPTO_GHASH is not set
-CONFIG_CRYPTO_HASH=m
-CONFIG_CRYPTO_HASH2=m
 # CONFIG_CRYPTO_HW is not set
 # CONFIG_CRYPTO_KHAZAD is not set
 # CONFIG_CRYPTO_LRW is not set
 # CONFIG_CRYPTO_LZO is not set
 CONFIG_CRYPTO_MANAGER=m
-CONFIG_CRYPTO_MANAGER2=m
 # CONFIG_CRYPTO_MD4 is not set
 CONFIG_CRYPTO_MD5=m
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_PCBC is not set
-CONFIG_CRYPTO_PCOMP2=m
 # CONFIG_CRYPTO_RMD128 is not set
 # CONFIG_CRYPTO_RMD160 is not set
 # CONFIG_CRYPTO_RMD256 is not set
 # CONFIG_CRYPTO_RMD320 is not set
-CONFIG_CRYPTO_RNG2=m
 # CONFIG_CRYPTO_SALSA20 is not set
 # CONFIG_CRYPTO_SEED is not set
 # CONFIG_CRYPTO_SEQIV is not set
@@ -113,7 +104,6 @@ CONFIG_CRYPTO_RNG2=m
 # CONFIG_CRYPTO_TGR192 is not set
 # CONFIG_CRYPTO_TWOFISH is not set
 # CONFIG_CRYPTO_VMAC is not set
-CONFIG_CRYPTO_WORKQUEUE=m
 # CONFIG_CRYPTO_WP512 is not set
 # CONFIG_CRYPTO_XCBC is not set
 # CONFIG_CRYPTO_XTS is not set
@@ -562,4 +552,3 @@ CONFIG_WLAN=y
 # CONFIG_X25 is not set
 # CONFIG_XFRM_USER is not set
 # CONFIG_XFS_FS is not set
-CONFIG_ZLIB_DEFLATE=y
diff --git a/debian.linaro/config/config.common.ubuntu b/debian.linaro/config/config.common.ubuntu
index 04312f75162d..babdb03d1844 100644
--- a/debian.linaro/config/config.common.ubuntu
+++ b/debian.linaro/config/config.common.ubuntu
@@ -298,7 +298,7 @@ CONFIG_BRIDGE_NF_EBTABLES=m
 CONFIG_BROKEN_ON_SMP=y
 CONFIG_BSD_DISKLABEL=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS=y
 CONFIG_BTRFS_FS_POSIX_ACL=y
 CONFIG_BT_ATH3K=m
 CONFIG_BT_BNEP=m
@@ -438,20 +438,30 @@ CONFIG_CRC_ITU_T=m
 CONFIG_CROSS_COMPILE=""
 CONFIG_CRYPTO=y
 CONFIG_CRYPTO_AEAD=m
+CONFIG_CRYPTO_AEAD2=y
 CONFIG_CRYPTO_AES=m
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
 CONFIG_CRYPTO_ARC4=m
 CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_CRC32C=m
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_CRC32C=y
 # CONFIG_CRYPTO_DEV_OMAP_AES is not set
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
 CONFIG_CRYPTO_HMAC=m
+CONFIG_CRYPTO_MANAGER2=y
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_PCOMP=m
+CONFIG_CRYPTO_PCOMP2=y
 # CONFIG_CRYPTO_PCRYPT is not set
 CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_SHA1=m
 CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_WORKQUEUE=y
 CONFIG_CUSE=m
 CONFIG_DAB=y
 # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
@@ -1334,7 +1344,7 @@ CONFIG_LIB80211_CRYPT_CCMP=m
 CONFIG_LIB80211_CRYPT_TKIP=m
 CONFIG_LIB80211_CRYPT_WEP=m
 # CONFIG_LIB80211_DEBUG is not set
-CONFIG_LIBCRC32C=m
+CONFIG_LIBCRC32C=y
 CONFIG_LIBERTAS=m
 # CONFIG_LIBERTAS_DEBUG is not set
 # CONFIG_LIBERTAS_MESH is not set
@@ -2997,6 +3007,7 @@ CONFIG_ZD1211RW=m
 # CONFIG_ZD1211RW_DEBUG is not set
 CONFIG_ZEROPLUS_FF=y
 CONFIG_ZISOFS=y
+CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DMA_FLAG=0
 # CONFIG_ZRAM is not set
diff --git a/debian.linaro/config/enforce b/debian.linaro/config/enforce
index cc1b5b12770d..7775d618ad1f 100644
--- a/debian.linaro/config/enforce
+++ b/debian.linaro/config/enforce
@@ -78,3 +78,7 @@ value CONFIG_PRINTK_TIME y
 
 # CONFIG_PM is broken on s5pv310 so don't enforce CONFIG_PM_DEBUG for the moment
 value CONFIG_ARCH_S5PV310 y | value CONFIG_PM_DEBUG y
+
+# LINARO kernels should be able to boot with a BTRFS rootfs without an initrd
+value CONFIG_BTRFS_FS y
+value CONFIG_LIBCRC32C y