From dbad99ec924075928e070ab44b9d0c45e632ed39 Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Mon, 17 Jun 2019 12:11:12 +0200 Subject: [PATCH] soc: stm32: STM32L4: Remove useless package digit Fixes #16733, applied to STM32L4 series. Signed-off-by: Erwan Gouriou --- boards/arm/disco_l475_iot1/Kconfig.board | 2 +- .../disco_l475_iot1/disco_l475_iot1_defconfig | 2 +- boards/arm/nucleo_l432kc/Kconfig.board | 2 +- .../arm/nucleo_l432kc/nucleo_l432kc_defconfig | 2 +- boards/arm/nucleo_l476rg/Kconfig.board | 2 +- .../arm/nucleo_l476rg/nucleo_l476rg_defconfig | 2 +- boards/arm/nucleo_l496zg/Kconfig.board | 2 +- .../arm/nucleo_l496zg/nucleo_l496zg_defconfig | 2 +- boards/arm/nucleo_l4r5zi/Kconfig.board | 2 +- .../arm/nucleo_l4r5zi/nucleo_l4r5zi_defconfig | 2 +- boards/arm/stm32l476g_disco/Kconfig.board | 2 +- .../stm32l476g_disco_defconfig | 2 +- boards/arm/stm32l496g_disco/Kconfig.board | 2 +- .../stm32l496g_disco_defconfig | 2 +- samples/basic/blink_led/src/main.c | 2 +- samples/basic/fade_led/src/main.c | 2 +- .../stm32l4/Kconfig.defconfig.stm32l432xx | 4 +-- .../stm32l4/Kconfig.defconfig.stm32l433xx | 4 +-- .../stm32l4/Kconfig.defconfig.stm32l452xx | 4 +-- ...32l475xg => Kconfig.defconfig.stm32l475xx} | 4 +-- .../stm32l4/Kconfig.defconfig.stm32l476xx | 4 +-- .../stm32l4/Kconfig.defconfig.stm32l496xx | 4 +-- .../stm32l4/Kconfig.defconfig.stm32l4r5xx | 4 +-- soc/arm/st_stm32/stm32l4/Kconfig.soc | 28 +++++++++---------- 24 files changed, 44 insertions(+), 44 deletions(-) rename soc/arm/st_stm32/stm32l4/{Kconfig.defconfig.stm32l475xg => Kconfig.defconfig.stm32l475xx} (89%) diff --git a/boards/arm/disco_l475_iot1/Kconfig.board b/boards/arm/disco_l475_iot1/Kconfig.board index 0d9f243e035..8b575250da6 100644 --- a/boards/arm/disco_l475_iot1/Kconfig.board +++ b/boards/arm/disco_l475_iot1/Kconfig.board @@ -7,4 +7,4 @@ config BOARD_DISCO_L475_IOT1 bool "Discovery IoT L475 Development Board" - depends on SOC_STM32L475XG + depends on SOC_STM32L475XX diff --git a/boards/arm/disco_l475_iot1/disco_l475_iot1_defconfig b/boards/arm/disco_l475_iot1/disco_l475_iot1_defconfig index f09ebf47416..c51404249da 100644 --- a/boards/arm/disco_l475_iot1/disco_l475_iot1_defconfig +++ b/boards/arm/disco_l475_iot1/disco_l475_iot1_defconfig @@ -3,7 +3,7 @@ CONFIG_ARM=y CONFIG_BOARD_DISCO_L475_IOT1=y CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L475XG=y +CONFIG_SOC_STM32L475XX=y CONFIG_CORTEX_M_SYSTICK=y CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000 diff --git a/boards/arm/nucleo_l432kc/Kconfig.board b/boards/arm/nucleo_l432kc/Kconfig.board index 7c31dadefbe..5d3573d9f5c 100644 --- a/boards/arm/nucleo_l432kc/Kconfig.board +++ b/boards/arm/nucleo_l432kc/Kconfig.board @@ -8,4 +8,4 @@ config BOARD_NUCLEO_L432KC bool "Nucleo L432KC Development Board" - depends on SOC_STM32L432XC + depends on SOC_STM32L432XX diff --git a/boards/arm/nucleo_l432kc/nucleo_l432kc_defconfig b/boards/arm/nucleo_l432kc/nucleo_l432kc_defconfig index 2d97514338b..88f672d507d 100644 --- a/boards/arm/nucleo_l432kc/nucleo_l432kc_defconfig +++ b/boards/arm/nucleo_l432kc/nucleo_l432kc_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L432XC=y +CONFIG_SOC_STM32L432XX=y CONFIG_CORTEX_M_SYSTICK=y # 80MHz system clock CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=80000000 diff --git a/boards/arm/nucleo_l476rg/Kconfig.board b/boards/arm/nucleo_l476rg/Kconfig.board index 91771332dbf..27db7c33b55 100644 --- a/boards/arm/nucleo_l476rg/Kconfig.board +++ b/boards/arm/nucleo_l476rg/Kconfig.board @@ -8,4 +8,4 @@ config BOARD_NUCLEO_L476RG bool "Nucleo L476RG Development Board" - depends on SOC_STM32L476XG + depends on SOC_STM32L476XX diff --git a/boards/arm/nucleo_l476rg/nucleo_l476rg_defconfig b/boards/arm/nucleo_l476rg/nucleo_l476rg_defconfig index 5ce259e8f5d..35f0a721318 100644 --- a/boards/arm/nucleo_l476rg/nucleo_l476rg_defconfig +++ b/boards/arm/nucleo_l476rg/nucleo_l476rg_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L476XG=y +CONFIG_SOC_STM32L476XX=y CONFIG_CORTEX_M_SYSTICK=y # 80MHz system clock CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=80000000 diff --git a/boards/arm/nucleo_l496zg/Kconfig.board b/boards/arm/nucleo_l496zg/Kconfig.board index dca38747931..3aa99ca5920 100644 --- a/boards/arm/nucleo_l496zg/Kconfig.board +++ b/boards/arm/nucleo_l496zg/Kconfig.board @@ -7,4 +7,4 @@ config BOARD_NUCLEO_L496ZG bool "Nucleo L496ZG Development Board" - depends on SOC_STM32L496XG + depends on SOC_STM32L496XX diff --git a/boards/arm/nucleo_l496zg/nucleo_l496zg_defconfig b/boards/arm/nucleo_l496zg/nucleo_l496zg_defconfig index 019638170ab..65de6420137 100644 --- a/boards/arm/nucleo_l496zg/nucleo_l496zg_defconfig +++ b/boards/arm/nucleo_l496zg/nucleo_l496zg_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L496XG=y +CONFIG_SOC_STM32L496XX=y CONFIG_CORTEX_M_SYSTICK=y # 80MHz system clock CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=80000000 diff --git a/boards/arm/nucleo_l4r5zi/Kconfig.board b/boards/arm/nucleo_l4r5zi/Kconfig.board index 427c76e3390..439f0561d36 100644 --- a/boards/arm/nucleo_l4r5zi/Kconfig.board +++ b/boards/arm/nucleo_l4r5zi/Kconfig.board @@ -7,4 +7,4 @@ config BOARD_NUCLEO_L4R5ZI bool "Nucleo L4R5ZI Development Board" - depends on SOC_STM32L4R5XI + depends on SOC_STM32L4R5XX diff --git a/boards/arm/nucleo_l4r5zi/nucleo_l4r5zi_defconfig b/boards/arm/nucleo_l4r5zi/nucleo_l4r5zi_defconfig index bd7d598476c..3bdb26c4e49 100644 --- a/boards/arm/nucleo_l4r5zi/nucleo_l4r5zi_defconfig +++ b/boards/arm/nucleo_l4r5zi/nucleo_l4r5zi_defconfig @@ -2,7 +2,7 @@ CONFIG_ARM=y CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L4R5XI=y +CONFIG_SOC_STM32L4R5XX=y CONFIG_BOARD_NUCLEO_L4R5ZI=y CONFIG_CORTEX_M_SYSTICK=y diff --git a/boards/arm/stm32l476g_disco/Kconfig.board b/boards/arm/stm32l476g_disco/Kconfig.board index a90c14e35e5..243f9b9b117 100644 --- a/boards/arm/stm32l476g_disco/Kconfig.board +++ b/boards/arm/stm32l476g_disco/Kconfig.board @@ -7,4 +7,4 @@ config BOARD_STM32L476G_DISCO bool "STM32L476G Discovery Development Board" - depends on SOC_STM32L476XG + depends on SOC_STM32L476XX diff --git a/boards/arm/stm32l476g_disco/stm32l476g_disco_defconfig b/boards/arm/stm32l476g_disco/stm32l476g_disco_defconfig index 9559ef955fb..ccb3b053294 100644 --- a/boards/arm/stm32l476g_disco/stm32l476g_disco_defconfig +++ b/boards/arm/stm32l476g_disco/stm32l476g_disco_defconfig @@ -3,7 +3,7 @@ CONFIG_ARM=y CONFIG_BOARD_STM32L476G_DISCO=y CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L476XG=y +CONFIG_SOC_STM32L476XX=y CONFIG_CORTEX_M_SYSTICK=y # 80MHz system clock CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=80000000 diff --git a/boards/arm/stm32l496g_disco/Kconfig.board b/boards/arm/stm32l496g_disco/Kconfig.board index 0538d444ab3..aae58030a8e 100644 --- a/boards/arm/stm32l496g_disco/Kconfig.board +++ b/boards/arm/stm32l496g_disco/Kconfig.board @@ -8,4 +8,4 @@ config BOARD_STM32L496G_DISCO bool "STM32L496G Discovery Development Board" - depends on SOC_STM32L496XG + depends on SOC_STM32L496XX diff --git a/boards/arm/stm32l496g_disco/stm32l496g_disco_defconfig b/boards/arm/stm32l496g_disco/stm32l496g_disco_defconfig index 27cbbef7325..40e4679694e 100644 --- a/boards/arm/stm32l496g_disco/stm32l496g_disco_defconfig +++ b/boards/arm/stm32l496g_disco/stm32l496g_disco_defconfig @@ -3,7 +3,7 @@ CONFIG_ARM=y CONFIG_BOARD_STM32L496G_DISCO=y CONFIG_SOC_SERIES_STM32L4X=y -CONFIG_SOC_STM32L496XG=y +CONFIG_SOC_STM32L496XX=y CONFIG_CORTEX_M_SYSTICK=y # 80MHz system clock CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC=80000000 diff --git a/samples/basic/blink_led/src/main.c b/samples/basic/blink_led/src/main.c index 80b7110b876..823bc6cc23b 100644 --- a/samples/basic/blink_led/src/main.c +++ b/samples/basic/blink_led/src/main.c @@ -16,7 +16,7 @@ #include #if defined(CONFIG_SOC_STM32F401XE) || defined(CONFIG_SOC_STM32F412ZG) || \ - defined(CONFIG_SOC_STM32F413XX) || defined(CONFIG_SOC_STM32L476XG) || \ + defined(CONFIG_SOC_STM32F413XX) || defined(CONFIG_SOC_STM32L476XX) || \ defined(CONFIG_SOC_STM32F407XG) || defined(CONFIG_SOC_STM32F302X8) #define PWM_DRIVER DT_PWM_STM32_2_DEV_NAME #define PWM_CHANNEL 1 diff --git a/samples/basic/fade_led/src/main.c b/samples/basic/fade_led/src/main.c index e64ddd311a8..d82a6075632 100644 --- a/samples/basic/fade_led/src/main.c +++ b/samples/basic/fade_led/src/main.c @@ -15,7 +15,7 @@ #include #include -#if defined(CONFIG_SOC_STM32F401XE) || defined(CONFIG_SOC_STM32L476XG) +#if defined(CONFIG_SOC_STM32F401XE) || defined(CONFIG_SOC_STM32L476XX) #define PWM_DRIVER DT_PWM_STM32_2_DEV_NAME #define PWM_CHANNEL 1 #elif CONFIG_SOC_STM32F103XB diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l432xx b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l432xx index eb92a51563f..1ea0902cea5 100644 --- a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l432xx +++ b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l432xx @@ -6,7 +6,7 @@ # SPDX-License-Identifier: Apache-2.0 # -if SOC_STM32L432XC +if SOC_STM32L432XX config SOC string @@ -23,4 +23,4 @@ config GPIO_STM32_PORTH endif # GPIO_STM32 -endif # SOC_STM32L432XC +endif # SOC_STM32L432XX diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l433xx b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l433xx index f260fdc393b..7440a1b6e2f 100644 --- a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l433xx +++ b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l433xx @@ -5,7 +5,7 @@ # SPDX-License-Identifier: Apache-2.0 # -if SOC_STM32L433XC +if SOC_STM32L433XX config SOC string @@ -25,4 +25,4 @@ config GPIO_STM32_PORTE endif # GPIO_STM32 -endif # SOC_STM32L433XC +endif # SOC_STM32L433XX diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l452xx b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l452xx index 0e2dac784f4..609b25c6a26 100644 --- a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l452xx +++ b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l452xx @@ -5,7 +5,7 @@ # SPDX-License-Identifier: Apache-2.0 # -if SOC_STM32L452XC +if SOC_STM32L452XX config SOC string @@ -25,4 +25,4 @@ config GPIO_STM32_PORTE endif # GPIO_STM32 -endif # SOC_STM32L452XC +endif # SOC_STM32L452XX diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l475xg b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l475xx similarity index 89% rename from soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l475xg rename to soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l475xx index 04178855390..863d5cf99be 100644 --- a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l475xg +++ b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l475xx @@ -5,7 +5,7 @@ # SPDX-License-Identifier: Apache-2.0 # -if SOC_STM32L475XG +if SOC_STM32L475XX config SOC string @@ -31,4 +31,4 @@ config GPIO_STM32_PORTG endif # GPIO_STM32 -endif # SOC_STM32L475XG +endif # SOC_STM32L475XX diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l476xx b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l476xx index 61c5158a8d4..a7860fb8fca 100644 --- a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l476xx +++ b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l476xx @@ -6,7 +6,7 @@ # SPDX-License-Identifier: Apache-2.0 # -if SOC_STM32L476XG +if SOC_STM32L476XX config SOC string @@ -32,4 +32,4 @@ config GPIO_STM32_PORTG endif # GPIO_STM32 -endif # SOC_STM32L476XG +endif # SOC_STM32L476XX diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l496xx b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l496xx index 5facf302b6b..aaf402a4f93 100644 --- a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l496xx +++ b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l496xx @@ -6,7 +6,7 @@ # SPDX-License-Identifier: Apache-2.0 # -if SOC_STM32L496XG +if SOC_STM32L496XX config SOC string @@ -35,4 +35,4 @@ config GPIO_STM32_PORTI endif # GPIO_STM32 -endif # SOC_STM32L496XG +endif # SOC_STM32L496XX diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4r5xx b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4r5xx index cd2e8043a8a..a9084819d3b 100644 --- a/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4r5xx +++ b/soc/arm/st_stm32/stm32l4/Kconfig.defconfig.stm32l4r5xx @@ -5,7 +5,7 @@ # SPDX-License-Identifier: Apache-2.0 # -if SOC_STM32L4R5XI +if SOC_STM32L4R5XX config SOC string @@ -31,4 +31,4 @@ config GPIO_STM32_PORTG endif # GPIO_STM32 -endif # SOC_STM32L4R5XI +endif # SOC_STM32L4R5XX diff --git a/soc/arm/st_stm32/stm32l4/Kconfig.soc b/soc/arm/st_stm32/stm32l4/Kconfig.soc index 0c431486499..b4d3348fd12 100644 --- a/soc/arm/st_stm32/stm32l4/Kconfig.soc +++ b/soc/arm/st_stm32/stm32l4/Kconfig.soc @@ -10,26 +10,26 @@ choice prompt "STM32L4x MCU Selection" depends on SOC_SERIES_STM32L4X -config SOC_STM32L476XG - bool "STM32L476XG" +config SOC_STM32L476XX + bool "STM32L476X" -config SOC_STM32L496XG - bool "STM32L496XG" +config SOC_STM32L496XX + bool "STM32L496XX" -config SOC_STM32L432XC - bool "STM32L432XC" +config SOC_STM32L432XX + bool "STM32L432XX" -config SOC_STM32L433XC - bool "STM32L433XC" +config SOC_STM32L433XX + bool "STM32L433XX" -config SOC_STM32L452XC - bool "STM32L452XC" +config SOC_STM32L452XX + bool "STM32L452XX" -config SOC_STM32L475XG - bool "STM32L475XG" +config SOC_STM32L475XX + bool "STM32L475XX" -config SOC_STM32L4R5XI - bool "STM32L4R5XI" +config SOC_STM32L4R5XX + bool "STM32L4R5XX" config SOC_STM32L471XX bool "STM32L471XX"