From 959ea1a1727a86b299545b3219da8379e72c4615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szprejda?= Date: Mon, 4 Mar 2024 17:51:33 +0100 Subject: [PATCH] resc: cmake: robot: Rename Renode variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename Renode variable used to store the .elf file path from `bin` to `elf` for consistency. Signed-off-by: Michał Szprejda --- boards/ite/it8xxx2_evb/support/it8xxx2_evb.resc | 2 +- boards/microchip/m2gl025_miv/support/m2gl025_miv.resc | 2 +- boards/microchip/mpfs_icicle/support/mpfs250t.resc | 2 +- boards/renode/riscv32_virtual/support/riscv32_virtual.resc | 2 +- boards/sifive/hifive1/support/hifive1.resc | 2 +- boards/sifive/hifive_unleashed/support/hifive_unleashed.resc | 2 +- boards/sifive/hifive_unmatched/support/hifive_unmatched.resc | 2 +- cmake/emu/renode.cmake | 2 +- tests/robot/common.robot | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/boards/ite/it8xxx2_evb/support/it8xxx2_evb.resc b/boards/ite/it8xxx2_evb/support/it8xxx2_evb.resc index 987fed77bac..5ef1ae4e5bb 100644 --- a/boards/ite/it8xxx2_evb/support/it8xxx2_evb.resc +++ b/boards/ite/it8xxx2_evb/support/it8xxx2_evb.resc @@ -12,6 +12,6 @@ cpu PerformanceInMips 80 macro reset """ - sysbus LoadELF $bin + sysbus LoadELF $elf """ runMacro $reset diff --git a/boards/microchip/m2gl025_miv/support/m2gl025_miv.resc b/boards/microchip/m2gl025_miv/support/m2gl025_miv.resc index 2227e89bff2..d45eb5e7855 100644 --- a/boards/microchip/m2gl025_miv/support/m2gl025_miv.resc +++ b/boards/microchip/m2gl025_miv/support/m2gl025_miv.resc @@ -12,6 +12,6 @@ cpu PerformanceInMips 4 macro reset """ - sysbus LoadELF $bin + sysbus LoadELF $elf """ runMacro $reset diff --git a/boards/microchip/mpfs_icicle/support/mpfs250t.resc b/boards/microchip/mpfs_icicle/support/mpfs250t.resc index 8892b2839de..29005c8f198 100644 --- a/boards/microchip/mpfs_icicle/support/mpfs250t.resc +++ b/boards/microchip/mpfs_icicle/support/mpfs250t.resc @@ -12,6 +12,6 @@ e51 PerformanceInMips 80 macro reset """ - sysbus LoadELF $bin + sysbus LoadELF $elf """ runMacro $reset diff --git a/boards/renode/riscv32_virtual/support/riscv32_virtual.resc b/boards/renode/riscv32_virtual/support/riscv32_virtual.resc index 87e327287b6..dedbc699078 100644 --- a/boards/renode/riscv32_virtual/support/riscv32_virtual.resc +++ b/boards/renode/riscv32_virtual/support/riscv32_virtual.resc @@ -12,6 +12,6 @@ cpu PerformanceInMips 4 macro reset """ - sysbus LoadELF $bin + sysbus LoadELF $elf """ runMacro $reset diff --git a/boards/sifive/hifive1/support/hifive1.resc b/boards/sifive/hifive1/support/hifive1.resc index e9aaa1be62d..bbe5f26c8ad 100644 --- a/boards/sifive/hifive1/support/hifive1.resc +++ b/boards/sifive/hifive1/support/hifive1.resc @@ -23,6 +23,6 @@ showAnalyzer uart0 macro reset """ - sysbus LoadELF $bin + sysbus LoadELF $elf """ runMacro $reset diff --git a/boards/sifive/hifive_unleashed/support/hifive_unleashed.resc b/boards/sifive/hifive_unleashed/support/hifive_unleashed.resc index a46d377d7c2..4d06081c5c9 100644 --- a/boards/sifive/hifive_unleashed/support/hifive_unleashed.resc +++ b/boards/sifive/hifive_unleashed/support/hifive_unleashed.resc @@ -20,6 +20,6 @@ showAnalyzer uart0 macro reset """ - sysbus LoadELF $bin + sysbus LoadELF $elf """ runMacro $reset diff --git a/boards/sifive/hifive_unmatched/support/hifive_unmatched.resc b/boards/sifive/hifive_unmatched/support/hifive_unmatched.resc index 535bb06c69c..4d18a9b86dd 100644 --- a/boards/sifive/hifive_unmatched/support/hifive_unmatched.resc +++ b/boards/sifive/hifive_unmatched/support/hifive_unmatched.resc @@ -20,6 +20,6 @@ showAnalyzer uart0 macro reset """ - sysbus LoadELF $bin + sysbus LoadELF $elf """ runMacro $reset diff --git a/cmake/emu/renode.cmake b/cmake/emu/renode.cmake index 4deebd848c9..fa99da0f8fd 100644 --- a/cmake/emu/renode.cmake +++ b/cmake/emu/renode.cmake @@ -22,7 +22,7 @@ add_custom_target(run_renode COMMAND ${RENODE} ${RENODE_FLAGS} - -e '$$bin=@${PROJECT_BINARY_DIR}/${KERNEL_ELF_NAME}\; include @${RENODE_SCRIPT}\; ${RENODE_OVERLAY} s' + -e '$$elf=@${PROJECT_BINARY_DIR}/${KERNEL_ELF_NAME}\; include @${RENODE_SCRIPT}\; ${RENODE_OVERLAY} s' WORKING_DIRECTORY ${APPLICATION_BINARY_DIR} DEPENDS ${logical_target_for_zephyr_elf} USES_TERMINAL diff --git a/tests/robot/common.robot b/tests/robot/common.robot index 55c52d915c5..2bebe955797 100644 --- a/tests/robot/common.robot +++ b/tests/robot/common.robot @@ -2,6 +2,6 @@ *** Keywords *** Prepare Machine - Execute Command $bin = ${ELF} + Execute Command $elf = ${ELF} Execute Command include ${RESC} Create Terminal Tester ${UART}