Skip to content

Commit 98e53cf

Browse files
committed
Merge tag 'mvebu-defconfig64-4.12-2' of git://git.infradead.org/linux-mvebu into next/arm64
mvebu defconfig64 for 4.12 (part 2) Select two new drivers for ARM64 mvebu SoCs: - Xenon SDHCI controller on Armada 37xx and Armada 7K/8K - Safexcel crypto engine on Armada 7K/8K * tag 'mvebu-defconfig64-4.12-2' of git://git.infradead.org/linux-mvebu: arm64: defconfig: enable the Safexcel crypto engine as a module arm64: configs: enable SDHCI driver for Xenon Signed-off-by: Olof Johansson <[email protected]>
2 parents dd726fc + 10ebb57 commit 98e53cf

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

arch/arm64/configs/defconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@ CONFIG_MMC_DW_EXYNOS=y
413413
CONFIG_MMC_DW_K3=y
414414
CONFIG_MMC_DW_ROCKCHIP=y
415415
CONFIG_MMC_SUNXI=y
416+
CONFIG_MMC_SDHCI_XENON=y
416417
CONFIG_MMC_BCM2835=y
417418
CONFIG_NEW_LEDS=y
418419
CONFIG_LEDS_CLASS=y
@@ -537,6 +538,7 @@ CONFIG_MEMTEST=y
537538
CONFIG_SECURITY=y
538539
CONFIG_CRYPTO_ECHAINIV=y
539540
CONFIG_CRYPTO_ANSI_CPRNG=y
541+
CONFIG_CRYPTO_DEV_SAFEXCEL=m
540542
CONFIG_ARM64_CRYPTO=y
541543
CONFIG_CRYPTO_SHA1_ARM64_CE=y
542544
CONFIG_CRYPTO_SHA2_ARM64_CE=y

0 commit comments

Comments
 (0)