From b0d93fb0426911d0329f861f22c59f1c72cff815 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner <digit@android.com> Date: Wed, 31 Mar 2010 11:33:29 -0700 Subject: [PATCH] ARM: goldfish: Add encrypted SD Card support. Signed-off-by: David 'Digit' Turner <digit@android.com> --- arch/arm/configs/goldfish_armv7_defconfig | 10 ++++++++-- arch/arm/configs/goldfish_defconfig | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/arch/arm/configs/goldfish_armv7_defconfig b/arch/arm/configs/goldfish_armv7_defconfig index 6a2667bdd8f7..ec8b592036d8 100644 --- a/arch/arm/configs/goldfish_armv7_defconfig +++ b/arch/arm/configs/goldfish_armv7_defconfig @@ -512,7 +512,7 @@ CONFIG_HAVE_IDE=y # CONFIG_SCSI_DMA is not set # CONFIG_SCSI_NETLINK is not set # CONFIG_ATA is not set -# CONFIG_MD is not set +CONFIG_MD=y CONFIG_NETDEVICES=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set @@ -540,6 +540,11 @@ CONFIG_SMC91X=y CONFIG_NETDEV_1000=y CONFIG_NETDEV_10000=y +CONFIG_BLK_DEV_DM=y +CONFIG_DM_DEBUG=y +CONFIG_DM_CRYPT=y +CONFIG_DM_UEVENT=y + # # Wireless LAN # @@ -1145,7 +1150,8 @@ CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_SEED is not set # CONFIG_CRYPTO_SERPENT is not set # CONFIG_CRYPTO_TEA is not set -# CONFIG_CRYPTO_TWOFISH is not set +CONFIG_CRYPTO_TWOFISH=y +CONFIG_CRYPTO_TWOFISH_COMMON=y # # Compression diff --git a/arch/arm/configs/goldfish_defconfig b/arch/arm/configs/goldfish_defconfig index 47fcbac55aaa..927ce17ea420 100644 --- a/arch/arm/configs/goldfish_defconfig +++ b/arch/arm/configs/goldfish_defconfig @@ -509,7 +509,7 @@ CONFIG_HAVE_IDE=y # CONFIG_SCSI_DMA is not set # CONFIG_SCSI_NETLINK is not set # CONFIG_ATA is not set -# CONFIG_MD is not set +CONFIG_MD=y CONFIG_NETDEVICES=y # CONFIG_DUMMY is not set # CONFIG_BONDING is not set @@ -537,6 +537,11 @@ CONFIG_SMC91X=y CONFIG_NETDEV_1000=y CONFIG_NETDEV_10000=y +CONFIG_BLK_DEV_DM=y +CONFIG_DM_DEBUG=y +CONFIG_DM_CRYPT=y +CONFIG_DM_UEVENT=y + # # Wireless LAN # @@ -1142,7 +1147,8 @@ CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_SEED is not set # CONFIG_CRYPTO_SERPENT is not set # CONFIG_CRYPTO_TEA is not set -# CONFIG_CRYPTO_TWOFISH is not set +CONFIG_CRYPTO_TWOFISH=y +CONFIG_CRYPTO_TWOFISH_COMMON=y # # Compression -- GitLab