Skip to content

Commit 34e5ee2

Browse files
zephyr: CMakeLists.txt: add rimage support for the imx95 target
Zephyr PR #97988 attempts to drop all of the SOF dependencies from Zephyr for the imx95 and imx93 EVK boards. Because of this, move the cmake statement setting the RIMAGE_TARGET from Zephyr to SOF. Also, do a manifest update so that the Zephyr-side changes are pulled in. The manifest update and the fix on SOF side need to be performed atomically to avoid breaking bisectability. Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
1 parent cb65c6a commit 34e5ee2

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

west.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ manifest:
4343

4444
- name: zephyr
4545
repo-path: zephyr
46-
revision: e876dee6f2e78788e983385de231eab50e1db543
46+
revision: pull/97988/head
4747
remote: zephyrproject
4848

4949
# Import some projects listed in zephyr/west.yml@revision

zephyr/CMakeLists.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -404,6 +404,22 @@ if (CONFIG_SOC_MIMX9596_M7)
404404
zephyr_linker_sources(DATA_SECTIONS ${sof_top_dir}/src/platform/imx95/linker/data-sections.ld)
405405

406406
set(PLATFORM "imx95")
407+
408+
# no longer done in Zephyr and should be handled by SOF
409+
# See [1], [2], and [3] for more context
410+
#
411+
# [1]: https://github.com/zephyrproject-rtos/zephyr/issues/91061
412+
# [2]: https://github.com/zephyrproject-rtos/zephyr/pull/97946
413+
# [3]: https://github.com/zephyrproject-rtos/zephyr/pull/97988
414+
add_custom_target(zephyr.ri ALL
415+
DEPENDS ${CMAKE_BINARY_DIR}/zephyr/zephyr.ri)
416+
417+
add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/zephyr/zephyr.ri
418+
COMMAND west sign --if-tool-available --tool rimage
419+
--build-dir ${CMAKE_BINARY_DIR} ${WEST_SIGN_OPTS}
420+
DEPENDS ${CMAKE_BINARY_DIR}/zephyr/${KERNEL_ELF_NAME})
421+
422+
board_set_rimage_target(imx95)
407423
endif()
408424

409425
# AMD RMB platforms

0 commit comments

Comments
 (0)