Merge tag 'mvebu-defconfig-4.7-1' of git://git.infradead.org/linux-mvebu into next...

Merge "mvebu defconfig for 4.7 (part 1)" from Gregory CLEMENT

- Use the new cryto engine(mv_cesa) in the mvebu and multi-arm
  defcongig files
- Attach mvebu_*_defconfig to the mvebu maintainers

* tag 'mvebu-defconfig-4.7-1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu_v5_defconfig: Switching to the new Marvell's cryptographic engine driver
  ARM: multi_v7_defconfig: Enabling the new Marvell's cryptographic engine driver
  MAINTAINERS: attach arch/arm/configs/mvebu_*_defconfig to relevant maintainers
  ARM: mvebu_v7_defconfig: Enabling the new Marvell's cryptographic engine driver

diff --git a/MAINTAINERS b/MAINTAINERS
index 61a323a6b2cfe7348c63f49eadcd858100dc8a03..d5ea5a7fa9d7cb6a8b88d9f85478c898f1a5d261 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1322,7 +1322,7 @@ F:        drivers/rtc/rtc-armada38x.c
 F:     arch/arm/boot/dts/armada*
 F:     arch/arm/boot/dts/kirkwood*
 F:     arch/arm64/boot/dts/marvell/armada*
-
+F:     arch/arm/configs/mvebu_*_defconfig
 
 ARM/Marvell Berlin SoC support
 M:     Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>

diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index edf78515d478cb56bac63b9c12514ea3c4e66fd0..e80662b732548f92206774ae726fa8ce850d8bae 100644 (file)
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -843,6 +843,7 @@ CONFIG_CPUFREQ_DT=y
 CONFIG_KEYSTONE_IRQ=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_ST=y
+CONFIG_CRYPTO_DEV_MARVELL_CESA=m
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
 CONFIG_CRYPTO_DEV_ROCKCHIP=m
 CONFIG_ARM_CRYPTO=y

diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig
index 4562006aae68afc067aa96394499086d62726dfa..6051c51ca1883899c037ca23982cc4d9c1b50bcf 100644 (file)
--- a/arch/arm/configs/mvebu_v5_defconfig
+++ b/arch/arm/configs/mvebu_v5_defconfig
@@ -208,8 +208,8 @@ CONFIG_DEBUG_KERNEL=y
 # CONFIG_DEBUG_PREEMPT is not set
 # CONFIG_FTRACE is not set
 CONFIG_DEBUG_USER=y
+CONFIG_CRYPTO_DEV_MARVELL_CESA=y
 CONFIG_CRYPTO_CBC=m
 CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_DEV_MV_CESA=y
 CONFIG_CRC_CCITT=y
 CONFIG_LIBCRC32C=y

diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig
index dc5797a2efab52f5ad701291ce68fda9ebc55996..bedfa95d8d64f3fc0e9d242b1b8726ef932d66e3 100644 (file)
--- a/arch/arm/configs/mvebu_v7_defconfig
+++ b/arch/arm/configs/mvebu_v7_defconfig
@@ -155,3 +155,4 @@ CONFIG_MAGIC_SYSRQ=y
 CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_USER=y
+CONFIG_CRYPTO_DEV_MARVELL_CESA=y