summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandre Torgue <alexandre.torgue@st.com>2017-09-29 16:51:58 +0200
committerAlexandre Torgue <alexandre.torgue@st.com>2017-10-05 15:18:33 +0200
commit288ef0cd2e80e721113d65259cee51129f50f664 (patch)
tree2ec36836ba148c501dff8b16ab14e4f80fd931ef
parent2bd6bf03f4c1c59381d62c61d03f6cc3fe71f66e (diff)
downloadblackbird-op-linux-288ef0cd2e80e721113d65259cee51129f50f664.tar.gz
blackbird-op-linux-288ef0cd2e80e721113d65259cee51129f50f664.zip
ARM: configs: stm32: Update default configuration for v4.14-rc1
Regenerate the default configuration on top of v4.14-rc1. Signed-off-by: Alexandre Torgue <alexandre.torgue@st.com>
-rw-r--r--arch/arm/configs/stm32_defconfig8
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/configs/stm32_defconfig b/arch/arm/configs/stm32_defconfig
index 90e5c46913a5..3ed3158111b8 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,17 @@ 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_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
@@ -81,8 +79,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
OpenPOWER on IntegriCloud