From be9a0b35ee5c73d1e253daeb0a0ce71b70d883aa Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sat, 30 Sep 2017 07:57:59 -0400 Subject: [PATCH] arm: atmel: define soc family in correct Kconfig Signed-off-by: Anas Nashif --- arch/arm/soc/atmel_sam/Kconfig | 14 +++++++++++++- arch/arm/soc/atmel_sam/Kconfig.defconfig | 12 +----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/arch/arm/soc/atmel_sam/Kconfig b/arch/arm/soc/atmel_sam/Kconfig index 1988dd2005a..db8c340cb06 100644 --- a/arch/arm/soc/atmel_sam/Kconfig +++ b/arch/arm/soc/atmel_sam/Kconfig @@ -2,7 +2,19 @@ # # Copyright (c) 2016 Piotr Mienkowski # SPDX-License-Identifier: Apache-2.0 -# + +config SOC_FAMILY_SAM + bool + # omit prompt to signify a "hidden" option + default n + +if SOC_FAMILY_SAM + +config SOC_FAMILY + string + default atmel_sam + +endif #SOC_FAMILY_SAM # Select SoC Part No. and configuration options source "arch/arm/soc/atmel_sam/*/Kconfig.soc" diff --git a/arch/arm/soc/atmel_sam/Kconfig.defconfig b/arch/arm/soc/atmel_sam/Kconfig.defconfig index bdddffc4387..0c28ed6890d 100644 --- a/arch/arm/soc/atmel_sam/Kconfig.defconfig +++ b/arch/arm/soc/atmel_sam/Kconfig.defconfig @@ -4,20 +4,10 @@ # SPDX-License-Identifier: Apache-2.0 # -config SOC_FAMILY_SAM - bool - # omit prompt to signify a "hidden" option - default n - if SOC_FAMILY_SAM -config SOC_FAMILY - string - default atmel_sam - config WATCHDOG def_bool y -endif #SOC_FAMILY_SAM - +endif source "arch/arm/soc/atmel_sam/*/Kconfig.defconfig.series"