From 1ded7d7b3301cdb1a4ab1d0b25566f5e1d59febb Mon Sep 17 00:00:00 2001 From: Erwan Gouriou Date: Fri, 8 Sep 2017 11:29:19 +0200 Subject: [PATCH] arch: arm: stm32: factorize stm32f417xy socs defconfig files stm32f417xe and stm32f417xg have been introduced with 2 different defconfig files. Since same code is declared in both files, mutualize declarations in a single file. Signed-off-by: Erwan Gouriou --- .../stm32f4/Kconfig.defconfig.stm32f417xg | 18 ------------------ ...m32f417xe => Kconfig.defconfig.stm32f417xx} | 7 +++---- 2 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.stm32f417xg rename arch/arm/soc/st_stm32/stm32f4/{Kconfig.defconfig.stm32f417xe => Kconfig.defconfig.stm32f417xx} (54%) diff --git a/arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.stm32f417xg b/arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.stm32f417xg deleted file mode 100644 index ba4cc844052..00000000000 --- a/arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.stm32f417xg +++ /dev/null @@ -1,18 +0,0 @@ -# Kconfig - ST STM32F417XG MCU configuration options -# -# Copyright (c) 2016 Linaro Limited. -# -# SPDX-License-Identifier: Apache-2.0 -# - -if SOC_STM32F417XG - -config SOC - string - default stm32f417xx - -config NUM_IRQS - int - default 82 - -endif # SOC_STM32F417XG diff --git a/arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.stm32f417xe b/arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.stm32f417xx similarity index 54% rename from arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.stm32f417xe rename to arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.stm32f417xx index e3182f8ad3e..8a4bab1517c 100644 --- a/arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.stm32f417xe +++ b/arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.stm32f417xx @@ -1,11 +1,11 @@ -# Kconfig - ST STM32F417XE MCU configuration options +# Kconfig - ST STM32F417XX MCU configuration options # # Copyright (c) 2016 Linaro Limited. # # SPDX-License-Identifier: Apache-2.0 # -if SOC_STM32F417XE +if SOC_STM32F417XE || SOC_STM32F417XG config SOC string @@ -15,5 +15,4 @@ config NUM_IRQS int default 82 -endif # SOC_STM32F417XE - +endif # SOC_STM32F417XE || SOC_STM32F417XG