Commit dbb2bc91 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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
parents f429ff10 23d2af62

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -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>

arch/arm/configs/multi_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/configs/mvebu_v5_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

arch/arm/configs/mvebu_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE