tests: storage: flash_map: adding qemu platform
Added QEMU platform to the Flash Map test and defined partitions for
QEMU dts.
Signed-off-by: Kamil Piszczek <Kamil.Piszczek@nordicsemi.no>
diff --git a/boards/x86/qemu_x86/qemu_x86.dts b/boards/x86/qemu_x86/qemu_x86.dts
index 60e56ac..489ab40 100644
--- a/boards/x86/qemu_x86/qemu_x86.dts
+++ b/boards/x86/qemu_x86/qemu_x86.dts
@@ -26,12 +26,13 @@
chosen {
zephyr,sram = &sram0;
- zephyr,flash = &flash0;
+ zephyr,flash = &flash_sim0;
zephyr,console = &uart0;
zephyr,shell-uart = &uart0;
zephyr,bt-uart = &uart1;
zephyr,uart-pipe = &uart1;
zephyr,bt-mon-uart = &uart1;
+ zephyr,code-partition = &slot0_partition;
};
soc {
@@ -56,3 +57,30 @@
status = "ok";
current-speed = <115200>;
};
+
+&flash_sim0 {
+ /*
+ * For more information, see:
+ * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
+ */
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ /* Storage partition will be used by FCB/NFFS/NVS if enabled. */
+ storage_partition: partition@1000 {
+ label = "storage";
+ reg = <0x00001000 0x00010000>;
+ };
+
+ slot0_partition: partition@11000 {
+ label = "image-0";
+ reg = <0x00011000 0x00010000>;
+ };
+ slot1_partition: partition@21000 {
+ label = "image-1";
+ reg = <0x00021000 0x00010000>;
+ };
+ };
+};
diff --git a/dts/common/sim-flash.dtsi b/dts/common/sim-flash.dtsi
index 9713386..6056545 100644
--- a/dts/common/sim-flash.dtsi
+++ b/dts/common/sim-flash.dtsi
@@ -9,9 +9,19 @@
*/
/ {
- sim_flash: sim-flash {
+ sim_flash {
compatible = "sim-flash";
-
label = "FLASH_SIMULATOR";
+
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ flash_sim0: flash_sim@0 {
+ compatible = "soc-nv-flash";
+ reg = <0x00000000 DT_FLASH_SIZE>;
+
+ erase-block-size = <1024>;
+ write-block-size = <4>;
+ };
};
};
diff --git a/tests/subsys/fs/multi-fs/CMakeLists.txt b/tests/subsys/fs/multi-fs/CMakeLists.txt
index 9f59fca..f3fede3 100644
--- a/tests/subsys/fs/multi-fs/CMakeLists.txt
+++ b/tests/subsys/fs/multi-fs/CMakeLists.txt
@@ -6,8 +6,6 @@
zephyr_compile_definitions(
-DTEST_FLASH_OFFSET=0
- -DDT_FLASH_AREA_STORAGE_OFFSET=0
- -DDT_FLASH_AREA_STORAGE_SIZE=1048576
)
FILE(GLOB app_sources src/*.c)
diff --git a/tests/subsys/fs/multi-fs/qemu_x86.overlay b/tests/subsys/fs/multi-fs/qemu_x86.overlay
new file mode 100644
index 0000000..95d978c
--- /dev/null
+++ b/tests/subsys/fs/multi-fs/qemu_x86.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2019 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&flash_sim0 {
+ /*
+ * For more information, see:
+ * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
+ */
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ storage_partition: partition@0 {
+ label = "storage";
+ reg = <0x00000000 0x100000>;
+ };
+ };
+};
diff --git a/tests/subsys/fs/nffs_fs_api/basic/CMakeLists.txt b/tests/subsys/fs/nffs_fs_api/basic/CMakeLists.txt
index d2b14fb..180db1a 100644
--- a/tests/subsys/fs/nffs_fs_api/basic/CMakeLists.txt
+++ b/tests/subsys/fs/nffs_fs_api/basic/CMakeLists.txt
@@ -11,8 +11,6 @@
if(BOARD STREQUAL qemu_x86)
zephyr_compile_definitions(
-DTEST_FLASH_OFFSET=0
- -DDT_FLASH_AREA_STORAGE_OFFSET=0
- -DDT_FLASH_AREA_STORAGE_SIZE=1048576
)
elseif(BOARD STREQUAL nrf52840_pca10056)
zephyr_compile_definitions(
diff --git a/tests/subsys/fs/nffs_fs_api/basic/qemu_x86.overlay b/tests/subsys/fs/nffs_fs_api/basic/qemu_x86.overlay
new file mode 100644
index 0000000..95d978c
--- /dev/null
+++ b/tests/subsys/fs/nffs_fs_api/basic/qemu_x86.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2019 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&flash_sim0 {
+ /*
+ * For more information, see:
+ * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
+ */
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ storage_partition: partition@0 {
+ label = "storage";
+ reg = <0x00000000 0x100000>;
+ };
+ };
+};
diff --git a/tests/subsys/fs/nffs_fs_api/cache/CMakeLists.txt b/tests/subsys/fs/nffs_fs_api/cache/CMakeLists.txt
index 71904d8..f704ca7 100644
--- a/tests/subsys/fs/nffs_fs_api/cache/CMakeLists.txt
+++ b/tests/subsys/fs/nffs_fs_api/cache/CMakeLists.txt
@@ -11,8 +11,6 @@
if(BOARD STREQUAL qemu_x86)
zephyr_compile_definitions(
-DTEST_FLASH_OFFSET=0
- -DDT_FLASH_AREA_STORAGE_OFFSET=0
- -DDT_FLASH_AREA_STORAGE_SIZE=1048576
)
elseif(BOARD STREQUAL nrf52840_pca10056)
zephyr_compile_definitions(
diff --git a/tests/subsys/fs/nffs_fs_api/cache/qemu_x86.overlay b/tests/subsys/fs/nffs_fs_api/cache/qemu_x86.overlay
new file mode 100644
index 0000000..95d978c
--- /dev/null
+++ b/tests/subsys/fs/nffs_fs_api/cache/qemu_x86.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2019 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&flash_sim0 {
+ /*
+ * For more information, see:
+ * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
+ */
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ storage_partition: partition@0 {
+ label = "storage";
+ reg = <0x00000000 0x100000>;
+ };
+ };
+};
diff --git a/tests/subsys/fs/nffs_fs_api/large/CMakeLists.txt b/tests/subsys/fs/nffs_fs_api/large/CMakeLists.txt
index 0e8ac76..dd9c16b 100644
--- a/tests/subsys/fs/nffs_fs_api/large/CMakeLists.txt
+++ b/tests/subsys/fs/nffs_fs_api/large/CMakeLists.txt
@@ -11,8 +11,6 @@
if(BOARD STREQUAL qemu_x86)
zephyr_compile_definitions(
-DTEST_FLASH_OFFSET=0
- -DDT_FLASH_AREA_STORAGE_OFFSET=0
- -DDT_FLASH_AREA_STORAGE_SIZE=1048576
)
elseif(BOARD STREQUAL nrf52840_pca10056)
zephyr_compile_definitions(
diff --git a/tests/subsys/fs/nffs_fs_api/large/qemu_x86.overlay b/tests/subsys/fs/nffs_fs_api/large/qemu_x86.overlay
new file mode 100644
index 0000000..95d978c
--- /dev/null
+++ b/tests/subsys/fs/nffs_fs_api/large/qemu_x86.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2019 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&flash_sim0 {
+ /*
+ * For more information, see:
+ * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
+ */
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ storage_partition: partition@0 {
+ label = "storage";
+ reg = <0x00000000 0x100000>;
+ };
+ };
+};
diff --git a/tests/subsys/fs/nffs_fs_api/performance/CMakeLists.txt b/tests/subsys/fs/nffs_fs_api/performance/CMakeLists.txt
index 24cea96..c8bc107 100644
--- a/tests/subsys/fs/nffs_fs_api/performance/CMakeLists.txt
+++ b/tests/subsys/fs/nffs_fs_api/performance/CMakeLists.txt
@@ -11,8 +11,6 @@
if(BOARD STREQUAL qemu_x86)
zephyr_compile_definitions(
-DTEST_FLASH_OFFSET=0
- -DDT_FLASH_AREA_STORAGE_OFFSET=0
- -DDT_FLASH_AREA_STORAGE_SIZE=1048576
)
elseif(BOARD STREQUAL nrf52840_pca10056)
zephyr_compile_definitions(
diff --git a/tests/subsys/fs/nffs_fs_api/performance/qemu_x86.overlay b/tests/subsys/fs/nffs_fs_api/performance/qemu_x86.overlay
new file mode 100644
index 0000000..95d978c
--- /dev/null
+++ b/tests/subsys/fs/nffs_fs_api/performance/qemu_x86.overlay
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2019 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/delete-node/ &storage_partition;
+
+&flash_sim0 {
+ /*
+ * For more information, see:
+ * http://docs.zephyrproject.org/latest/guides/dts/index.html#flash-partitions
+ */
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
+
+ storage_partition: partition@0 {
+ label = "storage";
+ reg = <0x00000000 0x100000>;
+ };
+ };
+};
diff --git a/tests/subsys/storage/flash_map/prj.conf b/tests/subsys/storage/flash_map/prj.conf
index beb399c..734d2d0 100644
--- a/tests/subsys/storage/flash_map/prj.conf
+++ b/tests/subsys/storage/flash_map/prj.conf
@@ -2,4 +2,3 @@
CONFIG_FLASH=y
CONFIG_FLASH_PAGE_LAYOUT=y
CONFIG_FLASH_MAP=y
-CONFIG_MPU_ALLOW_FLASH_WRITE=y
diff --git a/tests/subsys/storage/flash_map/testcase.yaml b/tests/subsys/storage/flash_map/testcase.yaml
index 0f5ad56b..b4eb300 100644
--- a/tests/subsys/storage/flash_map/testcase.yaml
+++ b/tests/subsys/storage/flash_map/testcase.yaml
@@ -1,5 +1,5 @@
tests:
storage.flash_map:
platform_whitelist: nrf52840_pca10056 nrf52_pca10040 nrf51_pca10028
- frdm_k64f hexiwear_k64
+ frdm_k64f hexiwear_k64 qemu_x86
tags: flash_map
