From f0d50979e82982f1c8261c136b9748ae3d372be7 Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Fri, 25 Aug 2017 12:27:25 -0500 Subject: [PATCH] mcux: nxp_kinetis: Move HAS_TRNG config to ext SoCs outside the Kinetis family can have the TRNG module, so move the HAS_TRNG config from arch/arm/soc/nxp_kinetis to ext/hal/nxp/mcux Signed-off-by: Maureen Helm --- arch/arm/soc/nxp_kinetis/Kconfig | 6 ------ arch/arm/soc/nxp_kinetis/kwx/Kconfig.soc | 4 ++-- drivers/random/Kconfig.mcux | 2 +- ext/hal/nxp/mcux/Kconfig | 7 +++++++ 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/arch/arm/soc/nxp_kinetis/Kconfig b/arch/arm/soc/nxp_kinetis/Kconfig index 40190674e46..cd2af7ef072 100644 --- a/arch/arm/soc/nxp_kinetis/Kconfig +++ b/arch/arm/soc/nxp_kinetis/Kconfig @@ -40,12 +40,6 @@ config HAS_MCG help Set if the multipurpose clock generator (MCG) module is present in the SoC. -config HAS_TRNG - bool - default n - help - Set if the true random number generator (TRNG) module is present in the SoC. - config HAS_SYSMPU bool "Enable MPU" depends on CPU_HAS_MPU diff --git a/arch/arm/soc/nxp_kinetis/kwx/Kconfig.soc b/arch/arm/soc/nxp_kinetis/kwx/Kconfig.soc index b332cf66f30..123b5a8390c 100644 --- a/arch/arm/soc/nxp_kinetis/kwx/Kconfig.soc +++ b/arch/arm/soc/nxp_kinetis/kwx/Kconfig.soc @@ -15,9 +15,9 @@ config SOC_MKW40Z4 select HAS_MCUX select HAS_MCUX_ADC16 select HAS_MCUX_LPUART + select HAS_MCUX_TRNG select HAS_OSC select HAS_MCG - select HAS_TRNG select HAS_SEGGER_RTT config SOC_MKW41Z4 @@ -26,9 +26,9 @@ config SOC_MKW41Z4 select HAS_MCUX select HAS_MCUX_ADC16 select HAS_MCUX_LPUART + select HAS_MCUX_TRNG select HAS_OSC select HAS_MCG - select HAS_TRNG endchoice diff --git a/drivers/random/Kconfig.mcux b/drivers/random/Kconfig.mcux index aaf919d98c3..1082852b2dc 100644 --- a/drivers/random/Kconfig.mcux +++ b/drivers/random/Kconfig.mcux @@ -15,7 +15,7 @@ menuconfig RANDOM_MCUX_RNGA menuconfig RANDOM_MCUX_TRNG bool "MCUX TRNG driver" - depends on RANDOM_GENERATOR && HAS_TRNG + depends on RANDOM_GENERATOR && HAS_MCUX_TRNG default n select RANDOM_HAS_DRIVER help diff --git a/ext/hal/nxp/mcux/Kconfig b/ext/hal/nxp/mcux/Kconfig index 36956996bba..b884f8092a6 100644 --- a/ext/hal/nxp/mcux/Kconfig +++ b/ext/hal/nxp/mcux/Kconfig @@ -43,4 +43,11 @@ config HAS_MCUX_RNGA Set if the random number generator accelerator (RNGA) module is present in the SoC. +config HAS_MCUX_TRNG + bool + default n + help + Set if the true random number generator (TRNG) module is present in + the SoC. + endif # HAS_MCUX