1 From 704b53d89697a2542dfa6d23224f49c0d5350abb Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
3 Date: Fri, 26 Jun 2015 14:16:15 +0200
4 Subject: [PATCH 103/121] configs: Incorporate v4.1 dependency changes
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 Commit 78e9b7de78bb53e8bc7f4c4a60ebacb250c0c190 added a
10 dependency on TI_ST instead of selecting it, disabling:
14 Commit 652ccae5cc4e1305fb0a4619947f9ee89d8c7f5a added a
15 depency on ARM_CRYPTO, disabling:
16 CONFIG_CRYPTO_SHA*_ARM*=m
17 CONFIG_CRYPTO_AES_ARM*=m
19 Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
21 arch/arm/configs/bcm2709_defconfig | 10 ++++++----
22 arch/arm/configs/bcm2835_defconfig | 8 +++++---
23 arch/arm/configs/bcmrpi_defconfig | 8 +++++---
24 3 files changed, 16 insertions(+), 10 deletions(-)
26 --- a/arch/arm/configs/bcm2709_defconfig
27 +++ b/arch/arm/configs/bcm2709_defconfig
28 @@ -401,6 +401,7 @@ CONFIG_BLK_DEV_RAM=y
29 CONFIG_CDROM_PKTCDVD=m
34 # CONFIG_SCSI_PROC_FS is not set
36 @@ -1100,6 +1101,7 @@ CONFIG_OCFS2_FS=m
38 CONFIG_BTRFS_FS_POSIX_ACL=y
44 @@ -1129,7 +1131,6 @@ CONFIG_SQUASHFS=m
45 CONFIG_SQUASHFS_XATTR=y
52 @@ -1205,14 +1206,15 @@ CONFIG_CRYPTO_CBC=y
56 -CONFIG_CRYPTO_SHA1_ARM_NEON=m
57 -CONFIG_CRYPTO_SHA512_ARM_NEON=m
58 CONFIG_CRYPTO_TGR192=m
60 -CONFIG_CRYPTO_AES_ARM_BS=m
63 # CONFIG_CRYPTO_ANSI_CPRNG is not set
64 # CONFIG_CRYPTO_HW is not set
66 +CONFIG_CRYPTO_SHA1_ARM_NEON=m
67 +CONFIG_CRYPTO_SHA512_ARM_NEON=m
68 +CONFIG_CRYPTO_AES_ARM_BS=m
71 --- a/arch/arm/configs/bcm2835_defconfig
72 +++ b/arch/arm/configs/bcm2835_defconfig
73 @@ -402,6 +402,7 @@ CONFIG_BLK_DEV_RAM=y
74 CONFIG_CDROM_PKTCDVD=m
79 # CONFIG_SCSI_PROC_FS is not set
81 @@ -1091,6 +1092,7 @@ CONFIG_OCFS2_FS=m
83 CONFIG_BTRFS_FS_POSIX_ACL=y
89 @@ -1120,7 +1122,6 @@ CONFIG_SQUASHFS=m
90 CONFIG_SQUASHFS_XATTR=y
97 @@ -1208,15 +1209,16 @@ CONFIG_CRYPTO_CBC=y
101 -CONFIG_CRYPTO_SHA1_ARM=m
102 CONFIG_CRYPTO_SHA512=m
103 CONFIG_CRYPTO_TGR192=m
104 CONFIG_CRYPTO_WP512=m
105 -CONFIG_CRYPTO_AES_ARM=m
106 CONFIG_CRYPTO_CAST5=m
108 # CONFIG_CRYPTO_ANSI_CPRNG is not set
109 # CONFIG_CRYPTO_HW is not set
111 +CONFIG_CRYPTO_SHA1_ARM=m
112 +CONFIG_CRYPTO_AES_ARM=m
115 # CONFIG_XZ_DEC_ARM is not set
116 --- a/arch/arm/configs/bcmrpi_defconfig
117 +++ b/arch/arm/configs/bcmrpi_defconfig
118 @@ -394,6 +394,7 @@ CONFIG_BLK_DEV_RAM=y
119 CONFIG_CDROM_PKTCDVD=m
120 CONFIG_ATA_OVER_ETH=m
124 # CONFIG_SCSI_PROC_FS is not set
126 @@ -1093,6 +1094,7 @@ CONFIG_OCFS2_FS=m
128 CONFIG_BTRFS_FS_POSIX_ACL=y
134 @@ -1122,7 +1124,6 @@ CONFIG_SQUASHFS=m
135 CONFIG_SQUASHFS_XATTR=y
136 CONFIG_SQUASHFS_LZO=y
142 @@ -1200,14 +1201,15 @@ CONFIG_CRYPTO_CBC=y
146 -CONFIG_CRYPTO_SHA1_ARM=m
147 CONFIG_CRYPTO_SHA512=m
148 CONFIG_CRYPTO_TGR192=m
149 CONFIG_CRYPTO_WP512=m
150 -CONFIG_CRYPTO_AES_ARM=m
151 CONFIG_CRYPTO_CAST5=m
153 # CONFIG_CRYPTO_ANSI_CPRNG is not set
154 # CONFIG_CRYPTO_HW is not set
156 +CONFIG_CRYPTO_SHA1_ARM=m
157 +CONFIG_CRYPTO_AES_ARM=m