michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: flash: flash_simulator: Convert to new DT macros

Browse source 
Convert flash_simulator to use new DT macros and remove associated
defines in dts_fixup.h.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2020-04-28 08:34:02 -05:00 • committed by Kumar Gala
commit 50345848b4
4 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
boards/posix/native_posix/dts_fixup.h
View file

@ -4,5 +4,4 @@
* SPDX-License-Identifier: Apache-2.0
*/
#define DT_FLASH_DEV_NAME DT_LABEL(DT_INST(0, zephyr_sim_flash))
#define DT_UART_0_DEV_NAME DT_ZEPHYR_NATIVE_POSIX_UART_UART_LABEL

7
boards/x86/qemu_x86/dts_fixup.h
View file

@ -2,13 +2,6 @@
/* Board level DTS fixup file */
#define DT_FLASH_DEV_NAME DT_ZEPHYR_SIM_FLASH_SIM_FLASH_LABEL
#define DT_FLASH_SIM_BASE_ADDRESS DT_SOC_NV_FLASH_0_BASE_ADDRESS
#define DT_FLASH_SIM_ERASE_BLOCK_SIZE DT_SOC_NV_FLASH_0_ERASE_BLOCK_SIZE
#define DT_FLASH_SIM_SIZE DT_SOC_NV_FLASH_0_SIZE
#define DT_FLASH_SIM_WRITE_BLOCK_SIZE DT_SOC_NV_FLASH_0_WRITE_BLOCK_SIZE
#define DT_FLASH_ERASE_BLOCK_SIZE DT_SOC_NV_FLASH_0_ERASE_BLOCK_SIZE
#define DT_FLASH_WRITE_BLOCK_SIZE DT_SOC_NV_FLASH_0_WRITE_BLOCK_SIZE

21
drivers/flash/flash_simulator.c
View file

@ -4,6 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#define DT_DRV_COMPAT zephyr_sim_flash
#include <device.h>
#include <drivers/flash.h>
#include <init.h>
@ -29,19 +31,18 @@
/* configuration derived from DT */
#ifdef CONFIG_ARCH_POSIX
#define FLASH_SIMULATOR_BASE_OFFSET DT_FLASH_BASE_ADDRESS
#define FLASH_SIMULATOR_ERASE_UNIT DT_FLASH_ERASE_BLOCK_SIZE
#define FLASH_SIMULATOR_PROG_UNIT DT_FLASH_WRITE_BLOCK_SIZE
#define FLASH_SIMULATOR_FLASH_SIZE (DT_FLASH_SIZE * 1024)
#define FLASH_SIMULATOR_DEV_NAME DT_FLASH_DEV_NAME
#define SOC_NV_FLASH_NODE DT_CHILD(DT_DRV_INST(0), flash_0)
#else
#define FLASH_SIMULATOR_BASE_OFFSET DT_FLASH_SIM_BASE_ADDRESS
#define FLASH_SIMULATOR_ERASE_UNIT DT_FLASH_SIM_ERASE_BLOCK_SIZE
#define FLASH_SIMULATOR_PROG_UNIT DT_FLASH_SIM_WRITE_BLOCK_SIZE
#define FLASH_SIMULATOR_FLASH_SIZE DT_FLASH_SIM_SIZE
#define FLASH_SIMULATOR_DEV_NAME "FLASH_SIMULATOR"
#define SOC_NV_FLASH_NODE DT_CHILD(DT_DRV_INST(0), flash_sim_0)
#endif /* CONFIG_ARCH_POSIX */
#define FLASH_SIMULATOR_BASE_OFFSET DT_REG_ADDR(SOC_NV_FLASH_NODE)
#define FLASH_SIMULATOR_ERASE_UNIT DT_PROP(SOC_NV_FLASH_NODE, erase_block_size)
#define FLASH_SIMULATOR_PROG_UNIT DT_PROP(SOC_NV_FLASH_NODE, write_block_size)
#define FLASH_SIMULATOR_FLASH_SIZE DT_REG_SIZE(SOC_NV_FLASH_NODE)
#define FLASH_SIMULATOR_DEV_NAME DT_INST_LABEL(0)
#define FLASH_SIMULATOR_PAGE_COUNT (FLASH_SIMULATOR_FLASH_SIZE / \
FLASH_SIMULATOR_ERASE_UNIT)

13
tests/drivers/flash_simulator/src/main.c
View file

@ -9,10 +9,15 @@
#include <device.h>
/* configuration derived from DT */
#define FLASH_SIMULATOR_BASE_OFFSET DT_FLASH_SIM_BASE_ADDRESS
#define FLASH_SIMULATOR_ERASE_UNIT DT_FLASH_SIM_ERASE_BLOCK_SIZE
#define FLASH_SIMULATOR_PROG_UNIT DT_FLASH_SIM_WRITE_BLOCK_SIZE
#define FLASH_SIMULATOR_FLASH_SIZE DT_FLASH_SIM_SIZE
#ifdef CONFIG_ARCH_POSIX
#define SOC_NV_FLASH_NODE DT_CHILD(DT_INST(0, zephyr_sim_flash), flash_0)
#else
#define SOC_NV_FLASH_NODE DT_CHILD(DT_INST(0, zephyr_sim_flash), flash_sim_0)
#endif /* CONFIG_ARCH_POSIX */
#define FLASH_SIMULATOR_BASE_OFFSET DT_REG_ADDR(SOC_NV_FLASH_NODE)
#define FLASH_SIMULATOR_ERASE_UNIT DT_PROP(SOC_NV_FLASH_NODE, erase_block_size)
#define FLASH_SIMULATOR_PROG_UNIT DT_PROP(SOC_NV_FLASH_NODE, write_block_size)
#define FLASH_SIMULATOR_FLASH_SIZE DT_REG_SIZE(SOC_NV_FLASH_NODE)
/* Offset between pages */
#define TEST_SIM_FLASH_SIZE FLASH_SIMULATOR_FLASH_SIZE