From 39f7adc41d0496c74c762b9ce905722720de68e4 Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Wed, 2 Nov 2016 12:10:13 +0100 Subject: [PATCH] stm32f4: 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 stm32f401re following define is used: *STM32F401xE Which means: *Same SW could be used on STM32F401RE and STM32F401CE: same CONFIG_SOC could be used *Different SW should be used on STMF401RE and STM32F401RC: different CONFIG_SOC should be used This change focuses on stm32f4xx series. Change-Id: I56ff4d1815d09747cf722385532eb2dcbdf37b44 Signed-off-by: Erwan Gouriou --- ....defconfig.stm32f401re => Kconfig.defconfig.stm32f401xe} | 6 +++--- arch/arm/soc/st_stm32/stm32f4/Kconfig.soc | 4 ++-- boards/arm/96b_carbon/96b_carbon_defconfig | 2 +- boards/arm/96b_carbon/Kconfig.board | 2 +- boards/arm/nucleo_f401re/Kconfig.board | 2 +- boards/arm/nucleo_f401re/nucleo_f401re_defconfig | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename arch/arm/soc/st_stm32/stm32f4/{Kconfig.defconfig.stm32f401re => Kconfig.defconfig.stm32f401xe} (92%) diff --git a/arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.stm32f401re b/arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.stm32f401xe similarity index 92% rename from arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.stm32f401re rename to arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.stm32f401xe index 024f1eb060d..e204600b761 100644 --- a/arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.stm32f401re +++ b/arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.stm32f401xe @@ -15,11 +15,11 @@ # limitations under the License. # -if SOC_STM32F401RE +if SOC_STM32F401XE config SOC string - default stm32f401re + default stm32f401xe config SRAM_SIZE default 96 @@ -31,4 +31,4 @@ config NUM_IRQS int default 85 -endif # SOC_STM32F401RE +endif # SOC_STM32F401XE diff --git a/arch/arm/soc/st_stm32/stm32f4/Kconfig.soc b/arch/arm/soc/st_stm32/stm32f4/Kconfig.soc index e002c748491..3947e3a45b0 100644 --- a/arch/arm/soc/st_stm32/stm32f4/Kconfig.soc +++ b/arch/arm/soc/st_stm32/stm32f4/Kconfig.soc @@ -19,7 +19,7 @@ choice prompt "STM32F4x MCU Selection" depends on SOC_SERIES_STM32F4X -config SOC_STM32F401RE - bool "STM32F401RE" +config SOC_STM32F401XE + bool "STM32F401XE" endchoice diff --git a/boards/arm/96b_carbon/96b_carbon_defconfig b/boards/arm/96b_carbon/96b_carbon_defconfig index 412e7818e7b..72f345bbc1f 100644 --- a/boards/arm/96b_carbon/96b_carbon_defconfig +++ b/boards/arm/96b_carbon/96b_carbon_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_BOARD_96B_CARBON=y CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F401RE=y +CONFIG_SOC_STM32F401XE=y # 84MHz system clock CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=84000000 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000 diff --git a/boards/arm/96b_carbon/Kconfig.board b/boards/arm/96b_carbon/Kconfig.board index 3d81e14627c..4c09c0e72fa 100644 --- a/boards/arm/96b_carbon/Kconfig.board +++ b/boards/arm/96b_carbon/Kconfig.board @@ -17,4 +17,4 @@ config BOARD_96B_CARBON bool "96Boards Carbon (STM32F401)" - depends on SOC_STM32F401RE + depends on SOC_STM32F401XE diff --git a/boards/arm/nucleo_f401re/Kconfig.board b/boards/arm/nucleo_f401re/Kconfig.board index fe1ad3e07ba..c4c4c66cbea 100644 --- a/boards/arm/nucleo_f401re/Kconfig.board +++ b/boards/arm/nucleo_f401re/Kconfig.board @@ -17,4 +17,4 @@ config BOARD_NUCLEO_F401RE bool "NUCLEO-64 F401RE Development Board" - depends on SOC_STM32F401RE + depends on SOC_STM32F401XE diff --git a/boards/arm/nucleo_f401re/nucleo_f401re_defconfig b/boards/arm/nucleo_f401re/nucleo_f401re_defconfig index 0153e46fbc6..879c630418f 100644 --- a/boards/arm/nucleo_f401re/nucleo_f401re_defconfig +++ b/boards/arm/nucleo_f401re/nucleo_f401re_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y CONFIG_BOARD_NUCLEO_F401RE=y CONFIG_SOC_SERIES_STM32F4X=y -CONFIG_SOC_STM32F401RE=y +CONFIG_SOC_STM32F401XE=y # 84MHz system clock CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=84000000 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000