From 394a30b4418dca6cba60555d8017c0c7ffad0e70 Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Fri, 25 Aug 2017 12:21:03 -0500 Subject: [PATCH] mcux: nxp_kinetis: Move HAS_RNGA config to ext SoCs outside the Kinetis family can have the RNGA module, so move the HAS_RNGA 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/k6x/Kconfig.soc | 2 +- drivers/random/Kconfig.mcux | 2 +- ext/hal/nxp/mcux/Kconfig | 7 +++++++ 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/arch/arm/soc/nxp_kinetis/Kconfig b/arch/arm/soc/nxp_kinetis/Kconfig index 6a788bf8682a..40190674e460 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_RNGA - bool - default n - help - Set if the random number generator accelerator (RNGA) module is present in the SoC. - config HAS_TRNG bool default n diff --git a/arch/arm/soc/nxp_kinetis/k6x/Kconfig.soc b/arch/arm/soc/nxp_kinetis/k6x/Kconfig.soc index 3cb90a3f4797..df2abd36ec1b 100644 --- a/arch/arm/soc/nxp_kinetis/k6x/Kconfig.soc +++ b/arch/arm/soc/nxp_kinetis/k6x/Kconfig.soc @@ -14,9 +14,9 @@ config SOC_MK64F12 select HAS_MCUX select HAS_MCUX_ADC16 select HAS_MCUX_FTM + select HAS_MCUX_RNGA select HAS_OSC select HAS_MCG - select HAS_RNGA select CPU_HAS_FPU endchoice diff --git a/drivers/random/Kconfig.mcux b/drivers/random/Kconfig.mcux index 1c53968705a3..aaf919d98c3f 100644 --- a/drivers/random/Kconfig.mcux +++ b/drivers/random/Kconfig.mcux @@ -6,7 +6,7 @@ menuconfig RANDOM_MCUX_RNGA bool "MCUX RNGA driver" - depends on RANDOM_GENERATOR && HAS_RNGA + depends on RANDOM_GENERATOR && HAS_MCUX_RNGA default n select RANDOM_HAS_DRIVER help diff --git a/ext/hal/nxp/mcux/Kconfig b/ext/hal/nxp/mcux/Kconfig index 1e8e0f6ca924..36956996bbac 100644 --- a/ext/hal/nxp/mcux/Kconfig +++ b/ext/hal/nxp/mcux/Kconfig @@ -36,4 +36,11 @@ config HAS_MCUX_LPUART help Set if the low power uart (LPUART) module is present in the SoC. +config HAS_MCUX_RNGA + bool + default n + help + Set if the random number generator accelerator (RNGA) module is + present in the SoC. + endif # HAS_MCUX