From e17adf377bfe77099cba2652882adc6c54138136 Mon Sep 17 00:00:00 2001 From: Maureen Helm Date: Mon, 2 Jan 2017 14:31:32 -0600 Subject: [PATCH] flash: Rename ksdk to mcux Renames the ksdk soc flash driver to mcux. Change-Id: I835e36f25d8bc3e3aa6286718452528174378907 Signed-off-by: Maureen Helm --- .../nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 | 2 +- drivers/flash/Kconfig | 16 +++++----- drivers/flash/Makefile | 2 +- .../{soc_flash_ksdk.c => soc_flash_mcux.c} | 30 +++++++++---------- ext/hal/nxp/mcux/drivers/Makefile | 2 +- 5 files changed, 26 insertions(+), 26 deletions(-) rename drivers/flash/{soc_flash_ksdk.c => soc_flash_mcux.c} (74%) diff --git a/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 b/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 index 0a2e542b137..6fab281f17d 100644 --- a/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 +++ b/arch/arm/soc/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 @@ -79,7 +79,7 @@ endif # RANDOM_GENERATOR if FLASH -config SOC_FLASH_KSDK +config SOC_FLASH_MCUX def_bool y endif # FLASH diff --git a/drivers/flash/Kconfig b/drivers/flash/Kconfig index ef00c45d4b8..c0d5b38f736 100644 --- a/drivers/flash/Kconfig +++ b/drivers/flash/Kconfig @@ -132,21 +132,21 @@ config SOC_FLASH_NRF5_DEV_NAME help Specify the device name for the flash driver. -config SOC_FLASH_KSDK - bool "KSDK flash shim driver" - depends on FLASH && HAS_KSDK +config SOC_FLASH_MCUX + bool "MCUX flash shim driver" + depends on FLASH && HAS_MCUX default n help - Enables the KSDK flash shim driver. + Enables the MCUX flash shim driver. WARNING: This driver will disable the system interrupts for the duration of the flash erase/write operations. This will have an impact on the overall system performance - whether this is acceptable or not will depend on the use case. -config SOC_FLASH_KSDK_DEV_NAME - string "KSDK flash device name" - depends on SOC_FLASH_KSDK - default "KSDK_FLASH" +config SOC_FLASH_MCUX_DEV_NAME + string "MCUX flash device name" + depends on SOC_FLASH_MCUX + default "MCUX_FLASH" help Specify the device name for the flash driver. diff --git a/drivers/flash/Makefile b/drivers/flash/Makefile index f5123c56586..370932a4342 100644 --- a/drivers/flash/Makefile +++ b/drivers/flash/Makefile @@ -1,4 +1,4 @@ obj-$(CONFIG_SPI_FLASH_W25QXXDV) += spi_flash_w25qxxdv.o obj-$(CONFIG_SOC_FLASH_QMSI) += soc_flash_qmsi.o obj-$(CONFIG_SOC_FLASH_NRF5) += soc_flash_nrf5.o -obj-$(CONFIG_SOC_FLASH_KSDK) += soc_flash_ksdk.o +obj-$(CONFIG_SOC_FLASH_MCUX) += soc_flash_mcux.o diff --git a/drivers/flash/soc_flash_ksdk.c b/drivers/flash/soc_flash_mcux.c similarity index 74% rename from drivers/flash/soc_flash_ksdk.c rename to drivers/flash/soc_flash_mcux.c index 07e1d526e04..68c6305d520 100644 --- a/drivers/flash/soc_flash_ksdk.c +++ b/drivers/flash/soc_flash_mcux.c @@ -32,14 +32,14 @@ struct flash_priv { /* * Interrupt vectors could be executed from flash hence the need for locking. - * The underlying KDSK driver takes care of copying the functions to SRAM. + * The underlying MCUX driver takes care of copying the functions to SRAM. * * For more information, see the application note below on Read-While-Write * http://cache.freescale.com/files/32bit/doc/app_note/AN4695.pdf * */ -static int flash_ksdk_erase(struct device *dev, off_t offset, size_t len) +static int flash_mcux_erase(struct device *dev, off_t offset, size_t len) { struct flash_priv *priv = dev->driver_data; uint32_t addr; @@ -55,14 +55,14 @@ static int flash_ksdk_erase(struct device *dev, off_t offset, size_t len) return (rc == kStatus_Success) ? 0 : -EINVAL; } -static int flash_ksdk_read(struct device *dev, off_t offset, +static int flash_mcux_read(struct device *dev, off_t offset, void *data, size_t len) { struct flash_priv *priv = dev->driver_data; uint32_t addr; /* - * The KSDK supports different flash chips whose valid ranges are + * The MCUX supports different flash chips whose valid ranges are * hidden below the API: until the API export these ranges, we can not * do any generic validation */ @@ -73,7 +73,7 @@ static int flash_ksdk_read(struct device *dev, off_t offset, return 0; } -static int flash_ksdk_write(struct device *dev, off_t offset, +static int flash_mcux_write(struct device *dev, off_t offset, const void *data, size_t len) { struct flash_priv *priv = dev->driver_data; @@ -90,21 +90,21 @@ static int flash_ksdk_write(struct device *dev, off_t offset, return (rc == kStatus_Success) ? 0 : -EINVAL; } -static int flash_ksdk_write_protection(struct device *dev, bool enable) +static int flash_mcux_write_protection(struct device *dev, bool enable) { return -EIO; } static struct flash_priv flash_data; -static const struct flash_driver_api flash_ksdk_api = { - .write_protection = flash_ksdk_write_protection, - .erase = flash_ksdk_erase, - .write = flash_ksdk_write, - .read = flash_ksdk_read, +static const struct flash_driver_api flash_mcux_api = { + .write_protection = flash_mcux_write_protection, + .erase = flash_mcux_erase, + .write = flash_mcux_write, + .read = flash_mcux_read, }; -static int flash_ksdk_init(struct device *dev) +static int flash_mcux_init(struct device *dev) { struct flash_priv *priv = dev->driver_data; status_t rc; @@ -114,7 +114,7 @@ static int flash_ksdk_init(struct device *dev) return (rc == kStatus_Success) ? 0 : -EIO; } -DEVICE_AND_API_INIT(flash_ksdk, CONFIG_SOC_FLASH_KSDK_DEV_NAME, - flash_ksdk_init, &flash_data, NULL, POST_KERNEL, - CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &flash_ksdk_api); +DEVICE_AND_API_INIT(flash_mcux, CONFIG_SOC_FLASH_MCUX_DEV_NAME, + flash_mcux_init, &flash_data, NULL, POST_KERNEL, + CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &flash_mcux_api); diff --git a/ext/hal/nxp/mcux/drivers/Makefile b/ext/hal/nxp/mcux/drivers/Makefile index 4ddd29872bd..d63cb5e6e25 100644 --- a/ext/hal/nxp/mcux/drivers/Makefile +++ b/ext/hal/nxp/mcux/drivers/Makefile @@ -17,5 +17,5 @@ obj-$(CONFIG_ETH_MCUX) += fsl_enet.o obj-$(CONFIG_I2C_MCUX) += fsl_i2c.o obj-$(CONFIG_RANDOM_MCUX) += fsl_rnga.o -obj-$(CONFIG_SOC_FLASH_KSDK) += fsl_flash.o +obj-$(CONFIG_SOC_FLASH_MCUX) += fsl_flash.o