diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-19 22:55:28 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-19 22:55:28 +0200 |
| commit | e4191c53ae4627fe5bf32fd77abaa527f49b628b (patch) | |
| tree | 4e52bd2182779e5feb5fcc3b53d6638ca61584b8 /arch/arm/configs | |
| parent | ARM: defconfig: select the right SX150X driver (diff) | |
| parent | ARM: configs: stm32: Add MDMA support in STM32 defconfig (diff) | |
| download | linux-e4191c53ae4627fe5bf32fd77abaa527f49b628b.tar.xz linux-e4191c53ae4627fe5bf32fd77abaa527f49b628b.zip | |
Merge tag 'stm32-defconfig-for-v4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32 into next/soc
Pull "STM32 defconfig updates for v4.15, round 1" from Alexandre Torgue:
Highlights:
----------
-Regenerate default configuration
-Add DMAMUX support
-Add I2C F7 support
-Add MDMA support
* tag 'stm32-defconfig-for-v4.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32:
ARM: configs: stm32: Add MDMA support in STM32 defconfig
ARM: configs: stm32: Add I2C F7 support in STM32 defconfig
ARM: configs: stm32: Add DMAMUX support in STM32 defconfig
ARM: configs: stm32: Update default configuration for v4.14-rc1
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/stm32_defconfig | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/configs/stm32_defconfig b/arch/arm/configs/stm32_defconfig index 90e5c46913a5..bb358ffde7d2 100644 --- a/arch/arm/configs/stm32_defconfig +++ b/arch/arm/configs/stm32_defconfig @@ -18,7 +18,6 @@ CONFIG_EMBEDDED=y # CONFIG_IOSCHED_DEADLINE is not set # CONFIG_IOSCHED_CFQ is not set # CONFIG_MMU is not set -CONFIG_ARM_SINGLE_ARMV7M=y CONFIG_ARCH_STM32=y CONFIG_CPU_V7M_NUM_IRQ=240 CONFIG_SET_MEM_PARAM=y @@ -44,18 +43,18 @@ CONFIG_KEYBOARD_GPIO=y # CONFIG_UNIX98_PTYS is not set # CONFIG_LEGACY_PTYS is not set CONFIG_SERIAL_NONSTANDARD=y -# CONFIG_DEVKMEM is not set CONFIG_SERIAL_STM32=y CONFIG_SERIAL_STM32_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_I2C=y CONFIG_I2C_CHARDEV=y CONFIG_I2C_STM32F4=y +CONFIG_I2C_STM32F7=y +CONFIG_GPIO_STMPE=y # CONFIG_HWMON is not set CONFIG_WATCHDOG=y -CONFIG_REGULATOR=y -CONFIG_GPIO_STMPE=y CONFIG_MFD_STMPE=y +CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y # CONFIG_USB_SUPPORT is not set CONFIG_NEW_LEDS=y @@ -67,6 +66,8 @@ CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_STM32=y CONFIG_DMADEVICES=y CONFIG_STM32_DMA=y +CONFIG_STM32_DMAMUX=y +CONFIG_STM32_MDMA=y CONFIG_IIO=y CONFIG_STM32_ADC_CORE=y CONFIG_STM32_ADC=y @@ -81,8 +82,6 @@ CONFIG_DEBUG_INFO=y CONFIG_MAGIC_SYSRQ=y # CONFIG_SCHED_DEBUG is not set # CONFIG_DEBUG_BUGVERBOSE is not set -# CONFIG_FTRACE is not set CONFIG_CRYPTO=y -CONFIG_CRYPTO_DEV_STM32=y CONFIG_CRC_ITU_T=y CONFIG_CRC7=y |