target/linux/brcm2708/patches-4.1/0103-configs-Incorporate-v4.1-dependency-changes.patch

   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
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Commit 78e9b7de78bb53e8bc7f4c4a60ebacb250c0c190 added a
  10 dependency on TI_ST instead of selecting it, disabling:
  11 CONFIG_BT_WILINK=m
  12 CONFIG_RADIO_WL128X=m
  13
  14 Commit 652ccae5cc4e1305fb0a4619947f9ee89d8c7f5a added a
  15 depency on ARM_CRYPTO, disabling:
  16 CONFIG_CRYPTO_SHA*_ARM*=m
  17 CONFIG_CRYPTO_AES_ARM*=m
  18
  19 Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  20 ---
  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(-)
  25
  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
  30  CONFIG_ATA_OVER_ETH=m
  31  CONFIG_EEPROM_AT24=m
  32 +CONFIG_TI_ST=m
  33  CONFIG_SCSI=y
  34  # CONFIG_SCSI_PROC_FS is not set
  35  CONFIG_BLK_DEV_SD=y
  36 @@ -1100,6 +1101,7 @@ CONFIG_OCFS2_FS=m
  37  CONFIG_BTRFS_FS=m
  38  CONFIG_BTRFS_FS_POSIX_ACL=y
  39  CONFIG_NILFS2_FS=m
  40 +CONFIG_F2FS_FS=y
  41  CONFIG_FANOTIFY=y
  42  CONFIG_QFMT_V1=m
  43  CONFIG_QFMT_V2=m
  44 @@ -1129,7 +1131,6 @@ CONFIG_SQUASHFS=m
  45  CONFIG_SQUASHFS_XATTR=y
  46  CONFIG_SQUASHFS_LZO=y
  47  CONFIG_SQUASHFS_XZ=y
  48 -CONFIG_F2FS_FS=y
  49  CONFIG_NFS_FS=y
  50  CONFIG_NFS_V3_ACL=y
  51  CONFIG_NFS_V4=y
  52 @@ -1205,14 +1206,15 @@ CONFIG_CRYPTO_CBC=y
  53  CONFIG_CRYPTO_CTS=m
  54  CONFIG_CRYPTO_XTS=m
  55  CONFIG_CRYPTO_XCBC=m
  56 -CONFIG_CRYPTO_SHA1_ARM_NEON=m
  57 -CONFIG_CRYPTO_SHA512_ARM_NEON=m
  58  CONFIG_CRYPTO_TGR192=m
  59  CONFIG_CRYPTO_WP512=m
  60 -CONFIG_CRYPTO_AES_ARM_BS=m
  61  CONFIG_CRYPTO_CAST5=m
  62  CONFIG_CRYPTO_DES=y
  63  # CONFIG_CRYPTO_ANSI_CPRNG is not set
  64  # CONFIG_CRYPTO_HW is not set
  65 +CONFIG_ARM_CRYPTO=y
  66 +CONFIG_CRYPTO_SHA1_ARM_NEON=m
  67 +CONFIG_CRYPTO_SHA512_ARM_NEON=m
  68 +CONFIG_CRYPTO_AES_ARM_BS=m
  69  CONFIG_CRC_ITU_T=y
  70  CONFIG_LIBCRC32C=y
  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
  75  CONFIG_ATA_OVER_ETH=m
  76  CONFIG_EEPROM_AT24=m
  77 +CONFIG_TI_ST=m
  78  CONFIG_SCSI=y
  79  # CONFIG_SCSI_PROC_FS is not set
  80  CONFIG_BLK_DEV_SD=y
  81 @@ -1091,6 +1092,7 @@ CONFIG_OCFS2_FS=m
  82  CONFIG_BTRFS_FS=m
  83  CONFIG_BTRFS_FS_POSIX_ACL=y
  84  CONFIG_NILFS2_FS=m
  85 +CONFIG_F2FS_FS=y
  86  CONFIG_FANOTIFY=y
  87  CONFIG_QFMT_V1=m
  88  CONFIG_QFMT_V2=m
  89 @@ -1120,7 +1122,6 @@ CONFIG_SQUASHFS=m
  90  CONFIG_SQUASHFS_XATTR=y
  91  CONFIG_SQUASHFS_LZO=y
  92  CONFIG_SQUASHFS_XZ=y
  93 -CONFIG_F2FS_FS=y
  94  CONFIG_NFS_FS=y
  95  CONFIG_NFS_V3_ACL=y
  96  CONFIG_NFS_V4=y
  97 @@ -1208,15 +1209,16 @@ CONFIG_CRYPTO_CBC=y
  98  CONFIG_CRYPTO_CTS=m
  99  CONFIG_CRYPTO_XTS=m
 100  CONFIG_CRYPTO_XCBC=m
 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
 107  CONFIG_CRYPTO_DES=y
 108  # CONFIG_CRYPTO_ANSI_CPRNG is not set
 109  # CONFIG_CRYPTO_HW is not set
 110 +CONFIG_ARM_CRYPTO=y
 111 +CONFIG_CRYPTO_SHA1_ARM=m
 112 +CONFIG_CRYPTO_AES_ARM=m
 113  CONFIG_CRC_ITU_T=y
 114  CONFIG_LIBCRC32C=y
 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
 121  CONFIG_EEPROM_AT24=m
 122 +CONFIG_TI_ST=m
 123  CONFIG_SCSI=y
 124  # CONFIG_SCSI_PROC_FS is not set
 125  CONFIG_BLK_DEV_SD=y
 126 @@ -1093,6 +1094,7 @@ CONFIG_OCFS2_FS=m
 127  CONFIG_BTRFS_FS=m
 128  CONFIG_BTRFS_FS_POSIX_ACL=y
 129  CONFIG_NILFS2_FS=m
 130 +CONFIG_F2FS_FS=y
 131  CONFIG_FANOTIFY=y
 132  CONFIG_QFMT_V1=m
 133  CONFIG_QFMT_V2=m
 134 @@ -1122,7 +1124,6 @@ CONFIG_SQUASHFS=m
 135  CONFIG_SQUASHFS_XATTR=y
 136  CONFIG_SQUASHFS_LZO=y
 137  CONFIG_SQUASHFS_XZ=y
 138 -CONFIG_F2FS_FS=y
 139  CONFIG_NFS_FS=y
 140  CONFIG_NFS_V3_ACL=y
 141  CONFIG_NFS_V4=y
 142 @@ -1200,14 +1201,15 @@ CONFIG_CRYPTO_CBC=y
 143  CONFIG_CRYPTO_CTS=m
 144  CONFIG_CRYPTO_XTS=m
 145  CONFIG_CRYPTO_XCBC=m
 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
 152  CONFIG_CRYPTO_DES=y
 153  # CONFIG_CRYPTO_ANSI_CPRNG is not set
 154  # CONFIG_CRYPTO_HW is not set
 155 +CONFIG_ARM_CRYPTO=y
 156 +CONFIG_CRYPTO_SHA1_ARM=m
 157 +CONFIG_CRYPTO_AES_ARM=m
 158  CONFIG_CRC_ITU_T=y
 159  CONFIG_LIBCRC32C=y