From 282d85c3f4d4aa3ccf19e0af8259241011417ff3 Mon Sep 17 00:00:00 2001 From: Henrik Brix Andersen Date: Sat, 25 Jan 2020 23:37:36 +0100 Subject: [PATCH] soc: arm: nxp: kinetis: unify CONFIG_WDOG_INIT Kconfig option Move CONFIG_WDOG_INIT for the NXP Kinetis series to the top-level Kinetis Kconfig file and enable it where needed. Signed-off-by: Henrik Brix Andersen --- soc/arm/nxp_kinetis/Kconfig | 9 +++++++++ soc/arm/nxp_kinetis/k2x/Kconfig.soc | 7 ------- soc/arm/nxp_kinetis/k6x/Kconfig.soc | 7 ------- soc/arm/nxp_kinetis/k8x/Kconfig.soc | 8 -------- soc/arm/nxp_kinetis/ke1xf/Kconfig.soc | 8 -------- soc/arm/nxp_kinetis/kl2x/Kconfig.soc | 8 -------- soc/arm/nxp_kinetis/kv5x/Kconfig.soc | 8 -------- soc/arm/nxp_kinetis/kwx/Kconfig.soc | 7 ------- 8 files changed, 9 insertions(+), 53 deletions(-) diff --git a/soc/arm/nxp_kinetis/Kconfig b/soc/arm/nxp_kinetis/Kconfig index 82952a0aec6..8c0c13df74e 100644 --- a/soc/arm/nxp_kinetis/Kconfig +++ b/soc/arm/nxp_kinetis/Kconfig @@ -151,4 +151,13 @@ config KINETIS_FLASH_CONFIG_FDPROT endif # KINETIS_FLASH_CONFIG +config WDOG_INIT + bool + default y + help + This processor enables the watchdog timer with a short + window for configuration upon reset. Therefore, this + requires that the watchdog be configured during reset + handling. + endif # SOC_FAMILY_KINETIS diff --git a/soc/arm/nxp_kinetis/k2x/Kconfig.soc b/soc/arm/nxp_kinetis/k2x/Kconfig.soc index fb277a8b28a..7d5def6b5a9 100644 --- a/soc/arm/nxp_kinetis/k2x/Kconfig.soc +++ b/soc/arm/nxp_kinetis/k2x/Kconfig.soc @@ -70,11 +70,4 @@ config K22_FLASH_CLOCK_DIVIDER This option specifies the divide value for the K64 flash clock from the system clock. -config WDOG_INIT - def_bool y - help - This processor enables the watchdog timer with a short timeout - upon reset. Therefore, this requires that the watchdog be configured - during reset handling. - endif # SOC_SERIES_KINETIS_K2X diff --git a/soc/arm/nxp_kinetis/k6x/Kconfig.soc b/soc/arm/nxp_kinetis/k6x/Kconfig.soc index 7d72fdd2f61..3dad7f2dc57 100644 --- a/soc/arm/nxp_kinetis/k6x/Kconfig.soc +++ b/soc/arm/nxp_kinetis/k6x/Kconfig.soc @@ -97,11 +97,4 @@ config K64_FLASH_CLOCK_DIVIDER This option specifies the divide value for the K64 flash clock from the system clock. -config WDOG_INIT - def_bool y - help - This processor enables the watchdog timer with a short timeout - upon reset. Therefore, this requires that the watchdog be configured - during reset handling. - endif # SOC_SERIES_KINETIS_K6X diff --git a/soc/arm/nxp_kinetis/k8x/Kconfig.soc b/soc/arm/nxp_kinetis/k8x/Kconfig.soc index c83ad2b4122..b7127ad1bd4 100644 --- a/soc/arm/nxp_kinetis/k8x/Kconfig.soc +++ b/soc/arm/nxp_kinetis/k8x/Kconfig.soc @@ -69,12 +69,4 @@ config K8X_FLASH_CLOCK_DIVIDER This option specifies the divide value for the K8x flash clock from the system clock. -config WDOG_INIT - def_bool y - help - This processor enables the watchdog timer with a short - window for configuration upon reset. Therefore, this - requires that the watchdog be configured during reset - handling. - endif # SOC_SERIES_KINETIS_K8X diff --git a/soc/arm/nxp_kinetis/ke1xf/Kconfig.soc b/soc/arm/nxp_kinetis/ke1xf/Kconfig.soc index e365140e50d..8bf8d0cb71d 100644 --- a/soc/arm/nxp_kinetis/ke1xf/Kconfig.soc +++ b/soc/arm/nxp_kinetis/ke1xf/Kconfig.soc @@ -78,14 +78,6 @@ config SOC_PART_NUMBER_KINETIS_KE1XF number selection choice defines the default value for this string. -config WDOG_INIT - def_bool y - help - This processor enables the watchdog timer with a short - window for configuration upon reset. Therefore, this - requires that the watchdog be configured during reset - handling. - config KINETIS_KE1XF_ENABLE_CODE_CACHE bool "Enable the code cache" default y diff --git a/soc/arm/nxp_kinetis/kl2x/Kconfig.soc b/soc/arm/nxp_kinetis/kl2x/Kconfig.soc index 8e38cbb5073..7da61c20180 100644 --- a/soc/arm/nxp_kinetis/kl2x/Kconfig.soc +++ b/soc/arm/nxp_kinetis/kl2x/Kconfig.soc @@ -77,12 +77,4 @@ config SOC_PART_NUMBER_KINETIS_KL2X that you should not set directly. The part number selection choice defines the default value for this string. -config WDOG_INIT - def_bool y - help - This processor enables the watchdog timer with a short - window for configuration upon reset. Therefore, this - requires that the watchdog be configured during reset - handling. - endif # SOC_SERIES_KINETIS_KL2X diff --git a/soc/arm/nxp_kinetis/kv5x/Kconfig.soc b/soc/arm/nxp_kinetis/kv5x/Kconfig.soc index 58f5286d2da..400847a81d1 100644 --- a/soc/arm/nxp_kinetis/kv5x/Kconfig.soc +++ b/soc/arm/nxp_kinetis/kv5x/Kconfig.soc @@ -85,12 +85,4 @@ config KV5X_FLASH_CLOCK_DIVIDER This option specifies the divide value for the KV5X flash clock from the system clock. -config WDOG_INIT - def_bool y - help - This processor enables the watchdog timer with a short - window for configuration upon reset. Therefore, this - requires that the watchdog be configured during reset - handling. - endif # SOC_SERIES_KINETIS_KV5X diff --git a/soc/arm/nxp_kinetis/kwx/Kconfig.soc b/soc/arm/nxp_kinetis/kwx/Kconfig.soc index 35cf3a0a9d1..0eb02d75105 100644 --- a/soc/arm/nxp_kinetis/kwx/Kconfig.soc +++ b/soc/arm/nxp_kinetis/kwx/Kconfig.soc @@ -113,11 +113,4 @@ config KW2XD_FLASH_CLOCK_DIVIDER endif # SOC_MKW24D5 || SOC_MKW22D5 -config WDOG_INIT - def_bool y - help - This processor enables the watchdog timer with a short timeout - upon reset. Therefore, this requires that the watchdog be configured - during reset handling. - endif # SOC_SERIES_KINETIS_KWX