diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 22:10:07 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-25 22:10:07 +0300 |
| commit | dbb2bc9118da94ba261278068af300ad3e71efc8 (patch) | |
| tree | 3805cff06108a0591865b4030a5a93bce8d61e59 | |
| parent | f429ff10e691438c66d8f5dab9541d145b47ab60 (diff) | |
| parent | 23d2af622de748bf57d31a4125d06d183c29e908 (diff) | |
| download | linux-dbb2bc9118da94ba261278068af300ad3e71efc8.tar.xz | |
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
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/mvebu_v5_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/mvebu_v7_defconfig | 1 |
4 files changed, 4 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 61a323a6b2cf..d5ea5a7fa9d7 100644 --- 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 edf78515d478..e80662b73254 100644 --- 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 4562006aae68..6051c51ca188 100644 --- 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 dc5797a2efab..bedfa95d8d64 100644 --- 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 |