michaelh/zephyr
1
0
Fork 0
Code Releases Activity

boards: intel: ish: Improve Simics support

Browse source 
Improve Simics support for `boards/intel/ish/intel_ish_5_8_0`
for better integration with the simulator.

Signed-off-by: Dmitrii Golovanov <dmitrii.golovanov@intel.com>
This commit is contained in:
Dmitrii Golovanov 2023-05-24 10:55:34 +02:00 • committed by Benjamin Cabé
commit c3cb5bd376
4 changed files with 38 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
boards/common/simics.board.cmake
View file

@ -1,5 +1,7 @@
# Copyright (c) 2023 Intel Corporation
# Copyright (c) 2023-2024 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
set(SUPPORTED_EMU_PLATFORMS simics)
board_finalize_emu_args(simics)

5
boards/intel/ish/board.cmake
View file

@ -1,9 +1,8 @@
# Copyright (c) 2023-2024 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
set(SUPPORTED_EMU_PLATFORMS simics)
if(CONFIG_BOARD_INTEL_ISH_5_8_0)
board_emu_args(simics "project=$ENV{SIMICS_PROJECT}")
board_emu_args(simics "zephyr_elf=${APPLICATION_BINARY_DIR}/zephyr/${KERNEL_ELF_NAME}")
board_emu_args(simics "zephyr_start_address=${CONFIG_SRAM_BASE_ADDRESS}")
include(${ZEPHYR_BASE}/boards/common/simics.board.cmake)

1
boards/intel/ish/intel_ish_5_8_0.yaml
View file

@ -11,6 +11,7 @@ simulation:
supported:
- serial
testing:
timeout_multiplier: 2
ignore_tags:
- net
- bluetooth

52
cmake/emu/simics.cmake
View file

@ -1,30 +1,42 @@
# Copyright (c) 2023 Intel Corporation
# Copyright (c) 2023-2024 Intel Corporation
#
# SPDX-License-Identifier: Apache-2.0
find_program(
SIMICS
NAMES simics
NO_DEFAULT_PATH
PATHS ENV SIMICS_PROJECT
# Search exactly for the project's autogenerated 'trampoline' script.
)
zephyr_get(SIMICS_SCRIPT_PATH SYSBUILD GLOBAL)
if(SIMICS_SCRIPT_PATH)
set(SIMICS_SCRIPT ${SIMICS_SCRIPT_PATH})
if(SIMICS STREQUAL SIMICS-NOTFOUND)
message(WARNING "Simics simulator environment is not found at SIMICS_PROJECT:'${SIMICS_PROJECT}'")
else()
set(SIMICS_SCRIPT ${BOARD_DIR}/support/${BOARD}.simics)
message(STATUS "Found Simics: ${SIMICS}")
zephyr_get(SIMICS_SCRIPT_PATH SYSBUILD GLOBAL)
if(SIMICS_SCRIPT_PATH)
set(SIMICS_SCRIPT ${SIMICS_SCRIPT_PATH})
else()
set(SIMICS_SCRIPT ${BOARD_DIR}/support/${BOARD}.simics)
endif()
get_property(SIMICS_ARGS GLOBAL PROPERTY "BOARD_EMU_ARGS_simics")
add_custom_target(run_simics
COMMAND
${SIMICS}
-no-gui
--no-win
--batch-mode
${SIMICS_SCRIPT}
${SIMICS_ARGS}
$ENV{SIMICS_EXTRA_ARGS}
-e run
WORKING_DIRECTORY ${APPLICATION_BINARY_DIR}
DEPENDS ${logical_target_for_zephyr_elf}
USES_TERMINAL
)
endif()
get_property(SIMICS_ARGS GLOBAL PROPERTY "BOARD_EMU_ARGS_simics")
add_custom_target(run_simics
COMMAND
${SIMICS}
-no-gui
-no-win
${SIMICS_SCRIPT}
${SIMICS_ARGS}
-e run
WORKING_DIRECTORY ${APPLICATION_BINARY_DIR}
DEPENDS ${logical_target_for_zephyr_elf}
USES_TERMINAL
)