Skip to content

Commit 6f6287b

Browse files
committed
Merge tag 'at91-defconfig-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/defconfig
AT91 defconfig #1 for 5.17: - Sama7: addition of QSPI SPI-NOR and the QSPI controller for this product - Addition of the crypto algorithms that are fallbacks for HW engines * tag 'at91-defconfig-5.17' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: configs: at91: Enable crypto software implementations ARM: configs: at91: sama7: Enable SPI NOR and QSPI controller Link: https://lore.kernel.org/r/20211217165850.29694-1-nicolas.ferre@microchip.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 9ca65b6 + e1137bc commit 6f6287b

3 files changed

Lines changed: 19 additions & 3 deletions

File tree

arch/arm/configs/at91_dt_defconfig

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,14 @@ CONFIG_NLS_CODEPAGE_437=y
216216
CONFIG_NLS_CODEPAGE_850=y
217217
CONFIG_NLS_ISO8859_1=y
218218
CONFIG_NLS_UTF8=y
219-
CONFIG_CRYPTO_ECB=y
219+
CONFIG_CRYPTO_CBC=y
220+
CONFIG_CRYPTO_CFB=y
221+
CONFIG_CRYPTO_OFB=y
222+
CONFIG_CRYPTO_XTS=y
223+
CONFIG_CRYPTO_HMAC=y
224+
CONFIG_CRYPTO_SHA1=y
225+
CONFIG_CRYPTO_SHA512=y
226+
CONFIG_CRYPTO_DES=y
220227
CONFIG_CRYPTO_USER_API_HASH=m
221228
CONFIG_CRYPTO_USER_API_SKCIPHER=m
222229
CONFIG_CRYPTO_DEV_ATMEL_AES=y

arch/arm/configs/sama5_defconfig

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,14 @@ CONFIG_NLS_CODEPAGE_437=y
232232
CONFIG_NLS_CODEPAGE_850=y
233233
CONFIG_NLS_ISO8859_1=y
234234
CONFIG_NLS_UTF8=y
235+
CONFIG_CRYPTO_CBC=y
236+
CONFIG_CRYPTO_CFB=y
237+
CONFIG_CRYPTO_OFB=y
238+
CONFIG_CRYPTO_XTS=y
239+
CONFIG_CRYPTO_HMAC=y
240+
CONFIG_CRYPTO_SHA1=y
241+
CONFIG_CRYPTO_SHA512=y
242+
CONFIG_CRYPTO_DES=y
235243
CONFIG_CRYPTO_USER_API_HASH=m
236244
CONFIG_CRYPTO_USER_API_SKCIPHER=m
237245
CONFIG_CRYPTO_DEV_ATMEL_AES=y

arch/arm/configs/sama7_defconfig

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ CONFIG_MODULES=y
3333
CONFIG_MODULE_FORCE_LOAD=y
3434
CONFIG_MODULE_UNLOAD=y
3535
CONFIG_MODULE_FORCE_UNLOAD=y
36-
# CONFIG_BLK_DEV_BSG is not set
3736
CONFIG_PARTITION_ADVANCED=y
3837
# CONFIG_EFI_PARTITION is not set
3938
# CONFIG_COREDUMP is not set
@@ -83,13 +82,15 @@ CONFIG_DEVTMPFS_MOUNT=y
8382
CONFIG_MTD=y
8483
CONFIG_MTD_TESTS=m
8584
CONFIG_MTD_CMDLINE_PARTS=y
85+
CONFIG_MTD_SPI_NOR=y
8686
CONFIG_BLK_DEV_LOOP=y
8787
CONFIG_BLK_DEV_RAM=y
8888
CONFIG_BLK_DEV_RAM_COUNT=1
8989
CONFIG_BLK_DEV_RAM_SIZE=8192
9090
CONFIG_EEPROM_AT24=y
9191
CONFIG_SCSI=y
9292
CONFIG_BLK_DEV_SD=y
93+
# CONFIG_BLK_DEV_BSG is not set
9394
CONFIG_NETDEVICES=y
9495
CONFIG_MACB=y
9596
CONFIG_MICREL_PHY=y
@@ -104,8 +105,8 @@ CONFIG_I2C=y
104105
CONFIG_I2C_CHARDEV=y
105106
CONFIG_I2C_AT91=y
106107
CONFIG_SPI=y
107-
CONFIG_SPI_MEM=y
108108
CONFIG_SPI_ATMEL=y
109+
CONFIG_SPI_ATMEL_QUADSPI=y
109110
CONFIG_SPI_GPIO=y
110111
CONFIG_PINCTRL_AT91=y
111112
CONFIG_PINCTRL_AT91PIO4=y

0 commit comments

Comments
 (0)