soc: stm32: STM32F4: Remove useless package digit

erwango · nashif · commit a54de3176ddc · 2019-06-18T08:03:40.000-04:00
Fixes #16733, applied to STM32F4 series. Signed-off-by: Erwan Gouriou <erwan.gouriou@linaro.org>
diff --git a/boards/arm/96b_stm32_sensor_mez/96b_stm32_sensor_mez_defconfig b/boards/arm/96b_stm32_sensor_mez/96b_stm32_sensor_mez_defconfig
@@ -3,7 +3,7 @@
 CONFIG_ARM=y
 CONFIG_BOARD_96B_STM32_SENSOR_MEZ=y
 CONFIG_SOC_SERIES_STM32F4X=y
-CONFIG_SOC_STM32F446XE=y
+CONFIG_SOC_STM32F446XX=y
 CONFIG_CORTEX_M_SYSTICK=y
 
 # 84MHz system clock
diff --git a/boards/arm/96b_stm32_sensor_mez/Kconfig.board b/boards/arm/96b_stm32_sensor_mez/Kconfig.board
@@ -7,4 +7,4 @@
 
 config BOARD_96B_STM32_SENSOR_MEZ
 	bool "96Boards STM32 Sensor Mezzanine Board"
-	depends on SOC_STM32F446XE
+	depends on SOC_STM32F446XX
diff --git a/boards/arm/mikroe_mini_m4_for_stm32/Kconfig.board b/boards/arm/mikroe_mini_m4_for_stm32/Kconfig.board
@@ -6,5 +6,5 @@
 #
 config BOARD_MIKROE_MINI_M4_FOR_STM32
 	bool "Mikroe MINI-M4 for STM32 Board"
-	depends on SOC_STM32F415RG
+	depends on SOC_STM32F415XX
 
diff --git a/boards/arm/mikroe_mini_m4_for_stm32/mikroe_mini_m4_for_stm32_defconfig b/boards/arm/mikroe_mini_m4_for_stm32/mikroe_mini_m4_for_stm32_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_BOARD_MIKROE_MINI_M4_FOR_STM32=y
 CONFIG_SOC_SERIES_STM32F4X=y
-CONFIG_SOC_STM32F415RG=y
+CONFIG_SOC_STM32F415XX=y
 # 168MHz system clock
 CONFIG_CORTEX_M_SYSTICK=y
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=168000000
diff --git a/boards/arm/nucleo_f429zi/Kconfig.board b/boards/arm/nucleo_f429zi/Kconfig.board
@@ -7,4 +7,4 @@
 
 config BOARD_NUCLEO_F429ZI
 	bool "NUCLEO-144 F429ZI Development Board"
-	depends on SOC_STM32F429XI
+	depends on SOC_STM32F429XX
diff --git a/boards/arm/nucleo_f429zi/nucleo_f429zi_defconfig b/boards/arm/nucleo_f429zi/nucleo_f429zi_defconfig
@@ -2,7 +2,7 @@
 
 CONFIG_ARM=y
 CONFIG_SOC_SERIES_STM32F4X=y
-CONFIG_SOC_STM32F429XI=y
+CONFIG_SOC_STM32F429XX=y
 CONFIG_CORTEX_M_SYSTICK=y
 # 168MHz system clock (highest value to get a precise USB clock)
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=168000000
diff --git a/boards/arm/nucleo_f446re/Kconfig.board b/boards/arm/nucleo_f446re/Kconfig.board
@@ -7,4 +7,4 @@
 
 config BOARD_NUCLEO_F446RE
 	bool "Nucleo F446RE Development Board"
-	depends on SOC_STM32F446XE
+	depends on SOC_STM32F446XX
diff --git a/boards/arm/nucleo_f446re/nucleo_f446re_defconfig b/boards/arm/nucleo_f446re/nucleo_f446re_defconfig
@@ -3,7 +3,7 @@
 CONFIG_ARM=y
 CONFIG_BOARD_NUCLEO_F446RE=y
 CONFIG_SOC_SERIES_STM32F4X=y
-CONFIG_SOC_STM32F446XE=y
+CONFIG_SOC_STM32F446XX=y
 CONFIG_CORTEX_M_SYSTICK=y
 # 96MHz system clock (highest value to get a precise USB clock)
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=96000000
diff --git a/boards/arm/stm32f429i_disc1/Kconfig.board b/boards/arm/stm32f429i_disc1/Kconfig.board
@@ -7,4 +7,4 @@
 
 config BOARD_STM32F429I_DISC1
 	bool "STM32F429I-DISC1 Development Board"
-	depends on SOC_STM32F429XI
+	depends on SOC_STM32F429XX
diff --git a/boards/arm/stm32f429i_disc1/stm32f429i_disc1_defconfig b/boards/arm/stm32f429i_disc1/stm32f429i_disc1_defconfig
@@ -3,7 +3,7 @@
 CONFIG_ARM=y
 CONFIG_BOARD_STM32F429I_DISC1=y
 CONFIG_SOC_SERIES_STM32F4X=y
-CONFIG_SOC_STM32F429XI=y
+CONFIG_SOC_STM32F429XX=y
 CONFIG_CORTEX_M_SYSTICK=y
 # 168MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=168000000
diff --git a/boards/arm/stm32f469i_disco/Kconfig.board b/boards/arm/stm32f469i_disco/Kconfig.board
@@ -7,4 +7,4 @@
 
 config BOARD_STM32F469I_DISCO
 	bool "STM32F469I-DISCO Development Board"
-	depends on SOC_STM32F469XI
+	depends on SOC_STM32F469XX
diff --git a/boards/arm/stm32f469i_disco/stm32f469i_disco_defconfig b/boards/arm/stm32f469i_disco/stm32f469i_disco_defconfig
@@ -3,7 +3,7 @@
 CONFIG_ARM=y
 CONFIG_BOARD_STM32F469I_DISCO=y
 CONFIG_SOC_SERIES_STM32F4X=y
-CONFIG_SOC_STM32F469XI=y
+CONFIG_SOC_STM32F469XX=y
 CONFIG_CORTEX_M_SYSTICK=y
 # 180MHz system clock
 CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=180000000
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f415xx b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f415xx
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-if SOC_STM32F415RG
+if SOC_STM32F415XX
 
 config SOC
 	string
@@ -15,4 +15,4 @@ config NUM_IRQS
 	int
 	default 82
 
-endif # SOC_STM32F415RG
+endif # SOC_STM32F415XX
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f417xx b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f417xx
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-if SOC_STM32F417XE || SOC_STM32F417XG
+if SOC_STM32F417XX
 
 config SOC
 	string
@@ -35,4 +35,4 @@ config ENTROPY_STM32_RNG
 
 endif # ENTROPY_GENERATOR
 
-endif # SOC_STM32F417XE || SOC_STM32F417XG
+endif # SOC_STM32F417XX
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f429xx b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f429xx
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-if SOC_STM32F429XI
+if SOC_STM32F429XX
 
 config SOC
 	string
@@ -41,4 +41,4 @@ config ENTROPY_STM32_RNG
 
 endif # ENTROPY_GENERATOR
 
-endif # SOC_STM32F429XI
+endif # SOC_STM32F429XX
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f446xx b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f446xx
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-if SOC_STM32F446XE
+if SOC_STM32F446XX
 
 config SOC
 	string
@@ -25,4 +25,4 @@ config GPIO_STM32_PORTH
 
 endif # GPIO_STM32
 
-endif # SOC_STM32F446XE
+endif # SOC_STM32F446XX
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f469xx b/soc/arm/st_stm32/stm32f4/Kconfig.defconfig.stm32f469xx
@@ -5,7 +5,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-if SOC_STM32F469XI
+if SOC_STM32F469XX
 
 config SOC
 	string
@@ -41,4 +41,4 @@ config ENTROPY_STM32_RNG
 
 endif # ENTROPY_GENERATOR
 
-endif # SOC_STM32F469XI
+endif # SOC_STM32F469XX
diff --git a/soc/arm/st_stm32/stm32f4/Kconfig.soc b/soc/arm/st_stm32/stm32f4/Kconfig.soc
@@ -30,22 +30,19 @@ config SOC_STM32F412ZG
 config SOC_STM32F413XX
 	bool "STM32F413XX"
 
-config SOC_STM32F415RG
-	bool "STM32F415RG"
+config SOC_STM32F415XX
+	bool "STM32F415XX"
 
-config SOC_STM32F417XE
-	bool "STM32F417XE"
+config SOC_STM32F417XX
+	bool "STM32F417XX"
 
-config SOC_STM32F417XG
-	bool "STM32F417XG"
-
-config SOC_STM32F429XI
+config SOC_STM32F429XX
 	bool "STM32F429XI"
 
-config SOC_STM32F446XE
-	bool "STM32F446XE"
+config SOC_STM32F446XX
+	bool "STM32F446XX"
 
-config SOC_STM32F469XI
-	bool "STM32F469XI"
+config SOC_STM32F469XX
+	bool "STM32F469XX"
 
 endchoice

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@`
`6`	`6`	`#`
`7`	`7`	`config BOARD_MIKROE_MINI_M4_FOR_STM32`
`8`	`8`	`bool "Mikroe MINI-M4 for STM32 Board"`
`9`		`- depends on SOC_STM32F415RG`
	`9`	`+ depends on SOC_STM32F415XX`
`10`	`10`