boards: stm32f1: Clean up driver generic flags

Clean up driver generic flags from boards' _defconfig files

Signed-off-by: Yannis Damigos <giannis.damigos@gmail.com>

arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.series

@@ -12,11 +12,18 @@ source "arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f1*"
 config SOC_SERIES
 	default stm32f1
 
-if WATCHDOG
+if GPIO_STM32
 
-config IWDG_STM32
+config GPIO_STM32_PORTD
+	default y
+
+endif # GPIO_STM32
+
+if I2C && (I2C_1 || I2C_2 || I2C_3)
+
+config  I2C_STM32_V1
 	def_bool y
 
-endif
+endif # I2C
 
 endif # SOC_SERIES_STM32F1X

arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xx

@@ -15,6 +15,13 @@ config NUM_IRQS
 	int
 	default 59
 
+if GPIO_STM32
+
+config GPIO_STM32_PORTE
+	default y
+
+endif # GPIO_STM32
+
 endif # SOC_STM32F103XB || SOC_STM32F103X8
 
 if SOC_STM32F103XE
@@ -27,5 +34,18 @@ config NUM_IRQS
 	int
 	default 68
 
+if GPIO_STM32
+
+config GPIO_STM32_PORTE
+	default y
+
+config GPIO_STM32_PORTF
+	default y
+
+config GPIO_STM32_PORTG
+	default y
+
+endif # GPIO_STM32
+
 endif # SOC_STM32F103XE
 

arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f107xc

@@ -15,4 +15,11 @@ config NUM_IRQS
 	int
 	default 68
 
+if GPIO_STM32
+
+config GPIO_STM32_PORTE
+	default y
+
+endif # GPIO_STM32
+
 endif # SOC_STM32F107XC

boards/arm/nucleo_f103rb/Kconfig.defconfig

@@ -10,4 +10,18 @@ if BOARD_NUCLEO_F103RB
 config BOARD
 	default nucleo_f103rb
 
+if UART_CONSOLE
+
+config UART_STM32_PORT_2
+	default y
+
+endif # UART_CONSOLE
+
+if PWM
+
+config PWM_STM32_1
+	default y
+
+endif # PWM
+
 endif # BOARD_NUCLEO_F103RB

boards/arm/nucleo_f103rb/nucleo_f103rb_defconfig

@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_BOARD_NUCLEO_F103RB=y
-CONFIG_SOC_FAMILY_STM32=y
 CONFIG_SOC_SERIES_STM32F1X=y
 CONFIG_SOC_STM32F103XB=y
 CONFIG_CORTEX_M_SYSTICK=y
@@ -9,23 +8,15 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000
 
 # enable uart driver
 CONFIG_SERIAL=y
-CONFIG_UART_STM32=y
+# enable console
-# enable USART2 - passthrough to STLINK v2 connector
-CONFIG_UART_STM32_PORT_2=y
-# enable console on this port by default
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 
 # enable pinmux
 CONFIG_PINMUX=y
-CONFIG_PINMUX_STM32=y
 
-# enable GPIO ports A, B, C
+# enable GPIO
 CONFIG_GPIO=y
-CONFIG_GPIO_STM32=y
-CONFIG_GPIO_STM32_PORTA=y
-CONFIG_GPIO_STM32_PORTB=y
-CONFIG_GPIO_STM32_PORTC=y
 
 # clock configuration
 CONFIG_CLOCK_CONTROL=y
@@ -45,8 +36,5 @@ CONFIG_CLOCK_STM32_AHB_PRESCALER=1
 CONFIG_CLOCK_STM32_APB1_PRESCALER=2
 CONFIG_CLOCK_STM32_APB2_PRESCALER=1
 
-
 #enable pwm
 CONFIG_PWM=y
-CONFIG_PWM_STM32=y
-CONFIG_PWM_STM32_1=y

boards/arm/olimexino_stm32/Kconfig.board

@@ -6,5 +6,4 @@
 #
 config BOARD_OLIMEXINO_STM32
 	bool "OLIMEXINO-STM32 Development Board"
-	select I2C_2 if I2C
 	depends on SOC_STM32F103XB

boards/arm/olimexino_stm32/Kconfig.defconfig

@@ -10,4 +10,18 @@ if BOARD_OLIMEXINO_STM32
 config BOARD
 	default olimexino_stm32
 
+if UART_CONSOLE
+
+config UART_STM32_PORT_1
+	default y
+
+endif # UART_CONSOLE
+
+if I2C
+
+config I2C_2
+	default y
+
+endif # I2C
+
 endif # BOARD_OLIMEXINO_STM32

boards/arm/olimexino_stm32/olimexino_stm32_defconfig

@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_BOARD_OLIMEXINO_STM32=y
-CONFIG_SOC_FAMILY_STM32=y
 CONFIG_SOC_SERIES_STM32F1X=y
 CONFIG_SOC_STM32F103XB=y
 CONFIG_CORTEX_M_SYSTICK=y
@@ -9,28 +8,19 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000
 
 # enable uart driver
 CONFIG_SERIAL=y
-CONFIG_UART_STM32=y
+
-# enable USART1
+# enable console
-CONFIG_UART_STM32_PORT_1=y
-# enable console on this port by default
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 
 # enable I2C driver
 CONFIG_I2C=y
-CONFIG_I2C_STM32_V1=y
 
 # enable pinmux
 CONFIG_PINMUX=y
-CONFIG_PINMUX_STM32=y
 
-# enable GPIO ports A, B, C, D
+# enable GPIO
 CONFIG_GPIO=y
-CONFIG_GPIO_STM32=y
-CONFIG_GPIO_STM32_PORTA=y
-CONFIG_GPIO_STM32_PORTB=y
-CONFIG_GPIO_STM32_PORTC=y
-CONFIG_GPIO_STM32_PORTD=y
 
 # clock configuration
 CONFIG_CLOCK_CONTROL=y

boards/arm/stm3210c_eval/Kconfig.defconfig

@@ -10,4 +10,11 @@ if BOARD_STM3210C_EVAL
 config BOARD
 	default stm3210c_eval
 
+if UART_CONSOLE
+
+config UART_STM32_PORT_2
+	default y
+
+endif # UART_CONSOLE
+
 endif # BOARD_STM3210C_EVAL

boards/arm/stm3210c_eval/stm3210c_eval_defconfig

@@ -1,15 +1,9 @@
 # Zephyr Kernel Configuration
 CONFIG_ARM=y
-CONFIG_ARCH="arm"
-CONFIG_SOC_SERIES="stm32f1"
-CONFIG_SOC_FAMILY="st_stm32"
-CONFIG_BOARD="stm3210c_eval"
 CONFIG_SOC_SERIES_STM32F1X=y
 
 # Platform Configuration
-CONFIG_SOC_FAMILY_STM32=y
 CONFIG_SOC_STM32F107XC=y
-CONFIG_SOC_STM32F10X_CONNECTIVITY_LINE_DEVICE=y
 CONFIG_BOARD_STM3210C_EVAL=y
 
 # General Kernel Options
@@ -19,25 +13,16 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000
 
 # Serial Drivers
 CONFIG_SERIAL=y
-CONFIG_SERIAL_HAS_DRIVER=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
-CONFIG_UART_STM32=y
+# enable console
-# enable USART2 - passthrough to STLINK v2 connector
-CONFIG_UART_STM32_PORT_2=y
-# enable console on this port by default
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 
 # Pinmux Driver
 CONFIG_PINMUX=y
-CONFIG_PINMUX_STM32=y
 
 # GPIO Controller
 CONFIG_GPIO=y
-CONFIG_GPIO_STM32=y
-CONFIG_GPIO_STM32_PORTA=y
-CONFIG_GPIO_STM32_PORTB=y
-CONFIG_GPIO_STM32_PORTC=y
 
 # RCC configuration
 CONFIG_CLOCK_CONTROL=y

boards/arm/stm32_min_dev/Kconfig.defconfig

@@ -10,4 +10,11 @@ if BOARD_STM32_MIN_DEV
 config BOARD
 	default stm32_min_dev
 
+if UART_CONSOLE
+
+config UART_STM32_PORT_1
+	default y
+
+endif # UART_CONSOLE
+
 endif # BOARD_STM32_MIN_DEV

boards/arm/stm32_min_dev/stm32_min_dev_defconfig

@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_BOARD_STM32_MIN_DEV=y
-CONFIG_SOC_FAMILY_STM32=y
 CONFIG_SOC_SERIES_STM32F1X=y
 CONFIG_SOC_STM32F103X8=y
 CONFIG_CORTEX_M_SYSTICK=y
@@ -10,26 +9,16 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000
 
 # enable uart driver
 CONFIG_SERIAL=y
-CONFIG_UART_STM32=y
 
-# enable USART1
+# enable console
-CONFIG_UART_STM32_PORT_1=y
-
-# enable console on this port by default
 CONFIG_CONSOLE=y
 CONFIG_UART_CONSOLE=y
 
 # enable pinmux
 CONFIG_PINMUX=y
-CONFIG_PINMUX_STM32=y
 
-# enable GPIO ports A, B
+# enable GPIO
 CONFIG_GPIO=y
-CONFIG_GPIO_STM32=y
-CONFIG_GPIO_STM32_PORTA=y
-CONFIG_GPIO_STM32_PORTB=y
-CONFIG_GPIO_STM32_PORTC=n
-CONFIG_GPIO_STM32_PORTD=n
 
 # clock configuration
 CONFIG_CLOCK_CONTROL=y

boards/arm/stm32_mini_a15/Kconfig.defconfig

@@ -13,4 +13,11 @@ config BOARD
 config BOARD_DEPRECATED
 	default "1.11"
 
+if UART_CONSOLE
+
+config UART_STM32_PORT_1
+	default y
+
+endif # UART_CONSOLE
+
 endif # BOARD_STM32_MINI_A15

boards/arm/stm32_mini_a15/stm32_mini_a15_defconfig

@@ -1,6 +1,5 @@
 CONFIG_ARM=y
 CONFIG_BOARD_STM32_MINI_A15=y
-CONFIG_SOC_FAMILY_STM32=y
 CONFIG_SOC_SERIES_STM32F1X=y
 CONFIG_SOC_STM32F103XE=y
 CONFIG_CORTEX_M_SYSTICK=y
@@ -9,17 +8,12 @@ CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000
 
 # enable uart driver
 CONFIG_SERIAL=y
-CONFIG_UART_STM32=y
-CONFIG_UART_STM32_PORT_1=y
 
 # enable pinmux
 CONFIG_PINMUX=y
-CONFIG_PINMUX_STM32=y
 
 # enable GPIOs
 CONFIG_GPIO=y
-CONFIG_GPIO_STM32=y
-CONFIG_GPIO_STM32_PORTB=y
 
 # clock configuration
 CONFIG_CLOCK_CONTROL=y