bancha: load firmware symbols so mpact catches tohost writes
Change-Id: Iba5b37d76715bba107c5d1340cf69d10a0dda63d
diff --git a/bancha.resc b/bancha.resc
index 53da385..31b3d13 100644
--- a/bancha.resc
+++ b/bancha.resc
@@ -61,7 +61,8 @@
# Load the boot rom into the 32k rom at 0x8000 (useVirtualAddress = false, allowLoadsOnlyToMemory = false)
# Unlike the OT boot rom where cpu0 starts at the reset vecitor (@0x8080)
# the PC is initialized to the ELF entry point.
-sysbus LoadELF @out/cheriot/bancha/boot_rom.elf false false cpu0
+$boot_elf ?= @out/cheriot/bancha/boot_rom.elf
+sysbus LoadELF $boot_elf false false cpu0
# Override cli_port to enable the command line interface on the specified port.
$cli_port?= 0
@@ -72,11 +73,11 @@
$tar ?= @out/cheriot/bancha/release/ext_flash.tar
$spi_flash_load_address ?= 0x44000000
$sc_bin ?= @out/cheriot/bancha/release/tmp/cheriot-firmware.bin
+$cheriot_elf ?= @out/cheriot/bancha/release/tmp/cheriot-firmware.elf
# NB: cannot load from eflash so do not populate
#$eflash_address ?= 0x20000000
#sysbus LoadBinary $sc_bin $eflash_address
sysbus LoadBinary $tar $spi_flash_load_address
-#sysbus LoadSymbolsFrom $cheriot_elf
# If we have a I2S peripheral, setup an audio file that we can use
# for sampling data. Note that the format for these files is raw
@@ -106,9 +107,10 @@
cpu0 IsHalted true
cpu2 IsHalted true
+cpu0 SymbolFile $boot_elf
+# NB: in particular this exposes tohost so mpact catches termination
+cpu0 SymbolFile $cheriot_elf
# Enable for instruction & memory profiling. Data are written to
# $ROOTDIR/cache/renode/mpact_cheriot_renode* (to be fixed).
-cpu0 SymbolFile @out/cheriot/bancha/boot_rom.elf
-#cpu0 SymbolFile $cheriot_elf
#cpu0 InstProfile true
#cpu0 MemProfile true
diff --git a/cheriot.resc b/cheriot.resc
index 789330e..17bcc10 100644
--- a/cheriot.resc
+++ b/cheriot.resc
@@ -50,4 +50,5 @@
# Load the ELF file (useVirtualAddress = false, allowLoadsOnlyToMemory = false)
sysbus LoadELF $cheriot_elf false false
+# NB: in particular this exposes tohost so mpact catches termination
sysbus.cpu1 SymbolFile $cheriot_elf
