From 85f011061a85c75d36634b3211227ceef723041c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrzej=20G=C5=82=C4=85bek?= Date: Mon, 21 Oct 2024 13:11:55 +0200 Subject: [PATCH 1/2] tests: benchmarks: Add support for "jedec,mspi-nor" flash devices MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... so that the tests can be built for nRF54H20 and nRF9280 after they are switched to use the new MSPI driver for EXMIF. Signed-off-by: Andrzej Głąbek --- tests/benchmarks/peripheral_load/src/flash_thread.c | 2 ++ .../power_consumption/flash/src/driver_test.c | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/tests/benchmarks/peripheral_load/src/flash_thread.c b/tests/benchmarks/peripheral_load/src/flash_thread.c index f0e0ae028f3a..2c97b9a3d1e5 100644 --- a/tests/benchmarks/peripheral_load/src/flash_thread.c +++ b/tests/benchmarks/peripheral_load/src/flash_thread.c @@ -13,6 +13,8 @@ LOG_MODULE_REGISTER(flash_thd, LOG_LEVEL_INF); #if DT_HAS_COMPAT_STATUS_OKAY(jedec_spi_nor) #define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(jedec_spi_nor) +#elif DT_HAS_COMPAT_STATUS_OKAY(jedec_mspi_nor) +#define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(jedec_mspi_nor) #elif DT_HAS_COMPAT_STATUS_OKAY(nordic_qspi_nor) #define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(nordic_qspi_nor) #else diff --git a/tests/benchmarks/power_consumption/flash/src/driver_test.c b/tests/benchmarks/power_consumption/flash/src/driver_test.c index 4a37b1921bc6..23f818ca54f8 100644 --- a/tests/benchmarks/power_consumption/flash/src/driver_test.c +++ b/tests/benchmarks/power_consumption/flash/src/driver_test.c @@ -8,11 +8,20 @@ #include #include +#if DT_HAS_COMPAT_STATUS_OKAY(jedec_spi_nor) +#define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(jedec_spi_nor) +#elif DT_HAS_COMPAT_STATUS_OKAY(jedec_mspi_nor) +#define FLASH_NODE DT_COMPAT_GET_ANY_STATUS_OKAY(jedec_mspi_nor) +#else +#error Unsupported flash driver +#define FLASH_NODE DT_INVALID_NODE +#endif + #define TEST_AREA_OFFSET 0xff000 #define EXPECTED_SIZE 512 uint8_t buf[EXPECTED_SIZE]; -static const struct device *flash_dev = DEVICE_DT_GET(DT_INST(0, jedec_spi_nor)); +static const struct device *flash_dev = DEVICE_DT_GET(FLASH_NODE); void thread_definition(void) From 3565fab5fbcaa6d66708eb1d1bf848260778f025 Mon Sep 17 00:00:00 2001 From: Nordic Builder Date: Fri, 18 Oct 2024 10:19:20 +0000 Subject: [PATCH 2/2] manifest: Update sdk-zephyr revision (auto-manifest PR) Automatically created by Github Action Signed-off-by: Nordic Builder --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 01cadbf023bf..495377550ad8 100644 --- a/west.yml +++ b/west.yml @@ -69,7 +69,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 36a1e64bc8414029324cb4e8a4828c13c170f3fc + revision: 9edbdaf1cc6b20e1a070b9ce20bde88a30f5c35c import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above