From 50cb5a6bd337a7be8c220726a879e669f1e3b367 Mon Sep 17 00:00:00 2001 From: Bogdan Davidoaia Date: Mon, 27 Feb 2017 16:45:08 +0200 Subject: [PATCH] random: mcux: rename random_mcux to random_mcux_rnga MCUX contains more than one type of random number generator, so refrect this in config and file names. Change-Id: Iba4482a1ae41f35d471686f8b159c113147c4df8 Signed-off-by: Bogdan Davidoaia --- .../nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 | 2 +- drivers/random/Kconfig.mcux | 4 +-- drivers/random/Makefile | 2 +- .../{random_mcux.c => random_mcux_rnga.c} | 26 +++++++++---------- ext/hal/nxp/mcux/drivers/Makefile | 2 +- 5 files changed, 18 insertions(+), 18 deletions(-) rename drivers/random/{random_mcux.c => random_mcux_rnga.c} (68%) diff --git a/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 b/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 index 6dfe0535327..7978ff40c8e 100644 --- a/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 +++ b/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 @@ -62,7 +62,7 @@ endif # NET_L2_ETHERNET if RANDOM_GENERATOR -config RANDOM_MCUX +config RANDOM_MCUX_RNGA def_bool y endif # RANDOM_GENERATOR diff --git a/drivers/random/Kconfig.mcux b/drivers/random/Kconfig.mcux index eb991a8d08f..307c5b17969 100644 --- a/drivers/random/Kconfig.mcux +++ b/drivers/random/Kconfig.mcux @@ -4,8 +4,8 @@ # # SPDX-License-Identifier: Apache-2.0 -menuconfig RANDOM_MCUX - bool "MCUX Random driver" +menuconfig RANDOM_MCUX_RNGA + bool "MCUX RNGA driver" depends on RANDOM_GENERATOR && HAS_RNGA default n select RANDOM_HAS_DRIVER diff --git a/drivers/random/Makefile b/drivers/random/Makefile index 59bec46358a..9b42ce680f8 100644 --- a/drivers/random/Makefile +++ b/drivers/random/Makefile @@ -1,3 +1,3 @@ -obj-$(CONFIG_RANDOM_MCUX) += random_mcux.o +obj-$(CONFIG_RANDOM_MCUX_RNGA) += random_mcux_rnga.o obj-$(CONFIG_TIMER_RANDOM_GENERATOR) = rand32_timer.o obj-$(CONFIG_X86_TSC_RANDOM_GENERATOR) += rand32_timestamp.o diff --git a/drivers/random/random_mcux.c b/drivers/random/random_mcux_rnga.c similarity index 68% rename from drivers/random/random_mcux.c rename to drivers/random/random_mcux_rnga.c index 8d86c8764b3..eea52471c32 100644 --- a/drivers/random/random_mcux.c +++ b/drivers/random/random_mcux_rnga.c @@ -11,7 +11,7 @@ #include "fsl_rnga.h" -static uint8_t random_mcux_get_uint8(void) +static uint8_t random_mcux_rnga_get_uint8(void) { uint32_t random; uint8_t output = 0; @@ -36,32 +36,32 @@ static uint8_t random_mcux_get_uint8(void) return output; } -static int random_mcux_get_entropy(struct device *dev, uint8_t *buffer, - uint16_t length) +static int random_mcux_rnga_get_entropy(struct device *dev, uint8_t *buffer, + uint16_t length) { int i; ARG_UNUSED(dev); for (i = 0; i < length; i++) { - buffer[i] = random_mcux_get_uint8(); + buffer[i] = random_mcux_rnga_get_uint8(); } return 0; } -static const struct random_driver_api random_mcux_api_funcs = { - .get_entropy = random_mcux_get_entropy +static const struct random_driver_api random_mcux_rnga_api_funcs = { + .get_entropy = random_mcux_rnga_get_entropy }; -static int random_mcux_init(struct device *); +static int random_mcux_rnga_init(struct device *); -DEVICE_AND_API_INIT(random_mcux, CONFIG_RANDOM_NAME, - random_mcux_init, NULL, NULL, +DEVICE_AND_API_INIT(random_mcux_rnga, CONFIG_RANDOM_NAME, + random_mcux_rnga_init, NULL, NULL, PRE_KERNEL_2, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, - &random_mcux_api_funcs); + &random_mcux_rnga_api_funcs); -static int random_mcux_init(struct device *dev) +static int random_mcux_rnga_init(struct device *dev) { uint32_t seed = k_cycle_get_32(); @@ -85,8 +85,8 @@ uint32_t sys_rand32_get(void) uint32_t output; int r; - r = random_mcux_get_entropy(DEVICE_GET(random_mcux), - (uint8_t *) &output, sizeof(output)); + r = random_mcux_rnga_get_entropy(DEVICE_GET(random_mcux_rnga), + (uint8_t *) &output, sizeof(output)); __ASSERT_NO_MSG(!r); return output; diff --git a/ext/hal/nxp/mcux/drivers/Makefile b/ext/hal/nxp/mcux/drivers/Makefile index 8a911f9012b..36a908cf274 100644 --- a/ext/hal/nxp/mcux/drivers/Makefile +++ b/ext/hal/nxp/mcux/drivers/Makefile @@ -6,7 +6,7 @@ obj-$(CONFIG_ETH_MCUX) += fsl_enet.o obj-$(CONFIG_I2C_MCUX) += fsl_i2c.o -obj-$(CONFIG_RANDOM_MCUX) += fsl_rnga.o +obj-$(CONFIG_RANDOM_MCUX_RNGA) += fsl_rnga.o obj-$(CONFIG_SOC_FLASH_MCUX) += fsl_flash.o obj-$(CONFIG_SPI_MCUX) += fsl_dspi.o obj-$(CONFIG_UART_MCUX) += fsl_uart.o