From 735143fada086487577915861a15ed4822caa9db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= Date: Fri, 26 Jun 2015 14:16:15 +0200 Subject: [PATCH 103/203] configs: Incorporate v4.1 dependency changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 78e9b7de78bb53e8bc7f4c4a60ebacb250c0c190 added a dependency on TI_ST instead of selecting it, disabling: CONFIG_BT_WILINK=m CONFIG_RADIO_WL128X=m Commit 652ccae5cc4e1305fb0a4619947f9ee89d8c7f5a added a depency on ARM_CRYPTO, disabling: CONFIG_CRYPTO_SHA*_ARM*=m CONFIG_CRYPTO_AES_ARM*=m Signed-off-by: Noralf Trønnes --- arch/arm/configs/bcm2709_defconfig | 10 ++++++---- arch/arm/configs/bcm2835_defconfig | 8 +++++--- arch/arm/configs/bcmrpi_defconfig | 8 +++++--- 3 files changed, 16 insertions(+), 10 deletions(-) --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -401,6 +401,7 @@ CONFIG_BLK_DEV_RAM=y CONFIG_CDROM_PKTCDVD=m CONFIG_ATA_OVER_ETH=m CONFIG_EEPROM_AT24=m +CONFIG_TI_ST=m CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y @@ -1100,6 +1101,7 @@ CONFIG_OCFS2_FS=m CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_NILFS2_FS=m +CONFIG_F2FS_FS=y CONFIG_FANOTIFY=y CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m @@ -1129,7 +1131,6 @@ CONFIG_SQUASHFS=m CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XZ=y -CONFIG_F2FS_FS=y CONFIG_NFS_FS=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y @@ -1205,14 +1206,15 @@ CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_XTS=m CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_SHA1_ARM_NEON=m -CONFIG_CRYPTO_SHA512_ARM_NEON=m CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_AES_ARM_BS=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_HW is not set +CONFIG_ARM_CRYPTO=y +CONFIG_CRYPTO_SHA1_ARM_NEON=m +CONFIG_CRYPTO_SHA512_ARM_NEON=m +CONFIG_CRYPTO_AES_ARM_BS=m CONFIG_CRC_ITU_T=y CONFIG_LIBCRC32C=y --- a/arch/arm/configs/bcm2835_defconfig +++ b/arch/arm/configs/bcm2835_defconfig @@ -402,6 +402,7 @@ CONFIG_BLK_DEV_RAM=y CONFIG_CDROM_PKTCDVD=m CONFIG_ATA_OVER_ETH=m CONFIG_EEPROM_AT24=m +CONFIG_TI_ST=m CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y @@ -1091,6 +1092,7 @@ CONFIG_OCFS2_FS=m CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_NILFS2_FS=m +CONFIG_F2FS_FS=y CONFIG_FANOTIFY=y CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m @@ -1120,7 +1122,6 @@ CONFIG_SQUASHFS=m CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XZ=y -CONFIG_F2FS_FS=y CONFIG_NFS_FS=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y @@ -1208,15 +1209,16 @@ CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_XTS=m CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_SHA1_ARM=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_AES_ARM=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_HW is not set +CONFIG_ARM_CRYPTO=y +CONFIG_CRYPTO_SHA1_ARM=m +CONFIG_CRYPTO_AES_ARM=m CONFIG_CRC_ITU_T=y CONFIG_LIBCRC32C=y # CONFIG_XZ_DEC_ARM is not set --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -394,6 +394,7 @@ CONFIG_BLK_DEV_RAM=y CONFIG_CDROM_PKTCDVD=m CONFIG_ATA_OVER_ETH=m CONFIG_EEPROM_AT24=m +CONFIG_TI_ST=m CONFIG_SCSI=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y @@ -1093,6 +1094,7 @@ CONFIG_OCFS2_FS=m CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y CONFIG_NILFS2_FS=m +CONFIG_F2FS_FS=y CONFIG_FANOTIFY=y CONFIG_QFMT_V1=m CONFIG_QFMT_V2=m @@ -1122,7 +1124,6 @@ CONFIG_SQUASHFS=m CONFIG_SQUASHFS_XATTR=y CONFIG_SQUASHFS_LZO=y CONFIG_SQUASHFS_XZ=y -CONFIG_F2FS_FS=y CONFIG_NFS_FS=y CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=y @@ -1200,14 +1201,15 @@ CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_XTS=m CONFIG_CRYPTO_XCBC=m -CONFIG_CRYPTO_SHA1_ARM=m CONFIG_CRYPTO_SHA512=m CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m -CONFIG_CRYPTO_AES_ARM=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_ANSI_CPRNG is not set # CONFIG_CRYPTO_HW is not set +CONFIG_ARM_CRYPTO=y +CONFIG_CRYPTO_SHA1_ARM=m +CONFIG_CRYPTO_AES_ARM=m CONFIG_CRC_ITU_T=y CONFIG_LIBCRC32C=y