From df5a2af34b4c66d3fbf96f7a509b44923c597da9 Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Thu, 3 Nov 2016 09:29:04 +0100 Subject: [PATCH] stm32f1: Adapt CONFIG_SOC to STM32Cube values STM32Cube uses SoC defines made to reflect HW heterogeneity that should be taken into account by SW. Aim of this commit is to adapt values used by Zephyr to the same diversity. This will help create new SoC values only when justified by a real hardware difference that should be taken into account by software. For instance, for SoC stm32f103rb following define is used: *STM32F103xB Which means: *Same SW could be used on STM32F103RB and STM32F103VB: same CONFIG_SOC could be used *Different SW should be used on STMF103RB and STM32F103R4: different CONFIG_SOC should be used This change focuses on stm32f1xx series. Change-Id: I5ecfaa52952d04421b27b5e74fb71b4fc108b662 Signed-off-by: Erwan Gouriou --- ...efconfig.stm32f103rb => Kconfig.defconfig.stm32f103xb} | 6 +++--- ...efconfig.stm32f103ve => Kconfig.defconfig.stm32f103xe} | 6 +++--- arch/arm/soc/st_stm32/stm32f1/Kconfig.soc | 8 ++++---- boards/arm/nucleo_f103rb/Kconfig.board | 2 +- boards/arm/nucleo_f103rb/nucleo_f103rb_defconfig | 2 +- boards/arm/olimexino_stm32/Kconfig.board | 2 +- boards/arm/olimexino_stm32/olimexino_stm32_defconfig | 2 +- boards/arm/stm32_mini_a15/Kconfig.board | 2 +- boards/arm/stm32_mini_a15/stm32_mini_a15_defconfig | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) rename arch/arm/soc/st_stm32/stm32f1/{Kconfig.defconfig.stm32f103rb => Kconfig.defconfig.stm32f103xb} (92%) rename arch/arm/soc/st_stm32/stm32f1/{Kconfig.defconfig.stm32f103ve => Kconfig.defconfig.stm32f103xe} (92%) diff --git a/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103rb b/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xb similarity index 92% rename from arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103rb rename to arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xb index b5b955e3535..32c6ebe1412 100644 --- a/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103rb +++ b/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xb @@ -15,11 +15,11 @@ # limitations under the License. # -if SOC_STM32F103RB +if SOC_STM32F103XB config SOC string - default stm32f103rb + default stm32f103xb config SRAM_SIZE default 20 @@ -30,5 +30,5 @@ config NUM_IRQS int default 59 -endif # SOC_STM32F103RB +endif # SOC_STM32F103XB diff --git a/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103ve b/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xe similarity index 92% rename from arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103ve rename to arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xe index 32133f10006..41fccecc4b0 100644 --- a/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103ve +++ b/arch/arm/soc/st_stm32/stm32f1/Kconfig.defconfig.stm32f103xe @@ -15,11 +15,11 @@ # limitations under the License. # -if SOC_STM32F103VE +if SOC_STM32F103XE config SOC string - default stm32f103ve + default stm32f103xe config SRAM_SIZE default 64 @@ -31,5 +31,5 @@ config NUM_IRQS int default 68 -endif # SOC_STM32F103VE +endif # SOC_STM32F103XE diff --git a/arch/arm/soc/st_stm32/stm32f1/Kconfig.soc b/arch/arm/soc/st_stm32/stm32f1/Kconfig.soc index 66c87454fbd..07ead7a7332 100644 --- a/arch/arm/soc/st_stm32/stm32f1/Kconfig.soc +++ b/arch/arm/soc/st_stm32/stm32f1/Kconfig.soc @@ -19,10 +19,10 @@ choice prompt "STM32F1x MCU Selection" depends on SOC_SERIES_STM32F1X -config SOC_STM32F103VE - bool "STM32F103VE" +config SOC_STM32F103XE + bool "STM32F103XE" -config SOC_STM32F103RB - bool "STM32F103RB" +config SOC_STM32F103XB + bool "STM32F103XB" endchoice diff --git a/boards/arm/nucleo_f103rb/Kconfig.board b/boards/arm/nucleo_f103rb/Kconfig.board index 498dd061d29..638719a7d80 100644 --- a/boards/arm/nucleo_f103rb/Kconfig.board +++ b/boards/arm/nucleo_f103rb/Kconfig.board @@ -17,4 +17,4 @@ config BOARD_NUCLEO_F103RB bool "NUCLEO-64 F103RB Development Board" - depends on SOC_STM32F103RB + depends on SOC_STM32F103XB diff --git a/boards/arm/nucleo_f103rb/nucleo_f103rb_defconfig b/boards/arm/nucleo_f103rb/nucleo_f103rb_defconfig index 90cdd144d33..d29215532bd 100644 --- a/boards/arm/nucleo_f103rb/nucleo_f103rb_defconfig +++ b/boards/arm/nucleo_f103rb/nucleo_f103rb_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_BOARD_NUCLEO_F103RB=y CONFIG_SOC_FAMILY_STM32=y CONFIG_SOC_SERIES_STM32F1X=y -CONFIG_SOC_STM32F103RB=y +CONFIG_SOC_STM32F103XB=y CONFIG_CORTEX_M_SYSTICK=y # 72MHz system clock CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000 diff --git a/boards/arm/olimexino_stm32/Kconfig.board b/boards/arm/olimexino_stm32/Kconfig.board index 0eab6f0bc28..5b109cd7bd9 100644 --- a/boards/arm/olimexino_stm32/Kconfig.board +++ b/boards/arm/olimexino_stm32/Kconfig.board @@ -16,4 +16,4 @@ # config BOARD_OLIMEXINO_STM32 bool "OLIMEXINO-STM32 Development Board" - depends on SOC_STM32F103RB + depends on SOC_STM32F103XB diff --git a/boards/arm/olimexino_stm32/olimexino_stm32_defconfig b/boards/arm/olimexino_stm32/olimexino_stm32_defconfig index 014a226cab3..1ea4db3c3db 100644 --- a/boards/arm/olimexino_stm32/olimexino_stm32_defconfig +++ b/boards/arm/olimexino_stm32/olimexino_stm32_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_BOARD_OLIMEXINO_STM32=y CONFIG_SOC_FAMILY_STM32=y CONFIG_SOC_SERIES_STM32F1X=y -CONFIG_SOC_STM32F103RB=y +CONFIG_SOC_STM32F103XB=y CONFIG_CORTEX_M_SYSTICK=y # 72MHz system clock CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000 diff --git a/boards/arm/stm32_mini_a15/Kconfig.board b/boards/arm/stm32_mini_a15/Kconfig.board index 7287c16d04d..abbac593c5f 100644 --- a/boards/arm/stm32_mini_a15/Kconfig.board +++ b/boards/arm/stm32_mini_a15/Kconfig.board @@ -17,4 +17,4 @@ config BOARD_STM32_MINI_A15 bool "STM32 MINI A15 Development Board" - depends on SOC_STM32F103VE + depends on SOC_STM32F103XE diff --git a/boards/arm/stm32_mini_a15/stm32_mini_a15_defconfig b/boards/arm/stm32_mini_a15/stm32_mini_a15_defconfig index 7ac3e706184..d8fd1fed033 100644 --- a/boards/arm/stm32_mini_a15/stm32_mini_a15_defconfig +++ b/boards/arm/stm32_mini_a15/stm32_mini_a15_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_BOARD_STM32_MINI_A15=y CONFIG_SOC_FAMILY_STM32=y CONFIG_SOC_SERIES_STM32F1X=y -CONFIG_SOC_STM32F103VE=y +CONFIG_SOC_STM32F103XE=y CONFIG_CORTEX_M_SYSTICK=y # 72MHz system clock CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=72000000