File tree Expand file tree Collapse file tree 1 file changed +13
-7
lines changed
Expand file tree Collapse file tree 1 file changed +13
-7
lines changed Original file line number Diff line number Diff line change @@ -462,30 +462,36 @@ else()
462462 add_custom_target (run_meu DEPENDS run_rimage)
463463endif ()
464464
465+ if (NOT DEFINED FIRMWARE_NAME)
466+ set (fw_output_name "${fw_name} " )
467+ else ()
468+ set (fw_output_name "${FIRMWARE_NAME} " )
469+ endif ()
470+
465471if (MEU_NO_SIGN)
466472 # copy rimage output that can be used to sign firmware
467473 add_custom_target (
468474 bin ALL
469- COMMAND ${CMAKE_COMMAND} -E copy sof-${fw_name} .ri.uns ${PROJECT_BINARY_DIR} /sof-${fw_name } .ri.uns
470- COMMAND ${CMAKE_COMMAND} -E copy sof-${fw_name} .ri.met ${PROJECT_BINARY_DIR} /sof-${fw_name } .ri.met
471- COMMAND ${CMAKE_COMMAND} -E copy sof-${fw_name} .ldc ${PROJECT_BINARY_DIR} /sof-${fw_name } .ldc
475+ COMMAND ${CMAKE_COMMAND} -E copy sof-${fw_name} .ri.uns ${PROJECT_BINARY_DIR} /sof-${fw_output_name } .ri.uns
476+ COMMAND ${CMAKE_COMMAND} -E copy sof-${fw_name} .ri.met ${PROJECT_BINARY_DIR} /sof-${fw_output_name } .ri.met
477+ COMMAND ${CMAKE_COMMAND} -E copy sof-${fw_name} .ldc ${PROJECT_BINARY_DIR} /sof-${fw_output_name } .ldc
472478 DEPENDS run_meu bin_extras
473479 VERBATIM
474480 USES_TERMINAL
475481 )
476482else ()
477483 add_custom_target (
478484 bin ALL
479- COMMAND ${CMAKE_COMMAND} -E copy sof-${fw_name} .ri ${PROJECT_BINARY_DIR} /sof-${fw_name } .ri
480- COMMAND ${CMAKE_COMMAND} -E copy sof-${fw_name} .ldc ${PROJECT_BINARY_DIR} /sof-${fw_name } .ldc
485+ COMMAND ${CMAKE_COMMAND} -E copy sof-${fw_name} .ri ${PROJECT_BINARY_DIR} /sof-${fw_output_name } .ri
486+ COMMAND ${CMAKE_COMMAND} -E copy sof-${fw_name} .ldc ${PROJECT_BINARY_DIR} /sof-${fw_output_name } .ldc
481487 DEPENDS run_meu bin_extras
482488 VERBATIM
483489 USES_TERMINAL
484490 )
485491endif ()
486492
487493install (
488- FILES ${PROJECT_BINARY_DIR} /sof-${fw_name } .ri
489- ${PROJECT_BINARY_DIR} /sof-${fw_name } .ldc
494+ FILES ${PROJECT_BINARY_DIR} /sof-${fw_output_name } .ri
495+ ${PROJECT_BINARY_DIR} /sof-${fw_output_name } .ldc
490496 DESTINATION bin
491497)
You can’t perform that action at this time.
0 commit comments