commit a76d1b9f45f421329d2263a478eda4a16bd0d2a6
author Sam Leffler <sleffler@google.com> Thu May 23 09:03:48 2024 -0700
committer Sam Leffler <sleffler@google.com> Thu May 23 17:03:38 2024 +0000
tree e6a044aa278de4c4851036078ba178ad7dd79a06
parent f003ce7ab2ae0e9666ef900f404a1f972f5db1b0

sencha: track renode script changes to use $cheriot_elf

Bypass-Presubmit-Reason: no sencha CI tests

Change-Id: Iac0c3e505158045ee0f16cd32ef977b48c974613

platforms/sencha/setup.sh

diff --git a/platforms/sencha/setup.sh b/platforms/sencha/setup.sh
index 74bb612..d8cecba 100644
--- a/platforms/sencha/setup.sh
+++ b/platforms/sencha/setup.sh
@@ -98,7 +98,7 @@
     # Run the ELF firmware with renode
     local elf_file="$(realpath $1)"
 
-    (cd "${ROOTDIR}" && renode -e "\$bin=@${elf_file}; \
+    (cd "${ROOTDIR}" && renode -e "\$cheriot_elf=@${elf_file}; \
         i @sim/config/cheriot.resc; start" \
         --disable-xwt --console)
 }

platforms/sencha/sim.mk

diff --git a/platforms/sencha/sim.mk b/platforms/sencha/sim.mk
index 539ad53..bfabeb5 100644
--- a/platforms/sencha/sim.mk
+++ b/platforms/sencha/sim.mk
@@ -75,7 +75,7 @@
     \$$repl_file = @${SENCHA_REPL}; \
     \$$tar = @$(EXT_FLASH_RELEASE); \
     \$$sc_bin =@$(TMP_RELEASE)/matcha-tock-bundle.bin; \
-    \$$kernel = @$(TMP_RELEASE)/kernel; \
+    \$$cheriot_elf = @$(TMP_RELEASE)/kernel; \
     $(PORT_PRESTART_CMDS) i @${SENCHA_RESC_RELEASE}; \
         $(RENODE_PRESTART_CMDS) start"
 
@@ -87,7 +87,7 @@
     \$$repl_file = @${SENCHA_REPL}; \
     \$$tar = @$(EXT_FLASH_RELEASE); \
     \$$sc_bin =@$(TMP_RELEASE)/matcha-tock-bundle.bin; \
-    \$$kernel = @$(TMP_RELEASE)/kernel; \
+    \$$cheriot_elf = @$(TMP_RELEASE)/kernel; \
     \$$cli_port = 4567; \
     \$$wait_for_cli = true; \
     $(PORT_PRESTART_CMDS) i @${SENCHA_RESC_RELEASE}; \
@@ -103,7 +103,7 @@
     \$$repl_file = @${SENCHA_REPL}; \
     \$$tar = @$(EXT_FLASH_DEBUG); \
     \$$sc_bin =@$(TMP_DEBUG)/matcha-tock-bundle.bin; \
-    \$$kernel = @$(TMP_DEBUG)/kernel; \
+    \$$cheriot_elf = @$(TMP_DEBUG)/kernel; \
     $(PORT_PRESTART_CMDS) i @${SENCHA_RESC_DEBUG}; \
         $(RENODE_PRESTART_CMDS); start"
 
@@ -118,7 +118,7 @@
     \$$repl_file = @${SENCHA_REPL}; \
     \$$tar = @$(EXT_FLASH_DEBUG); \
     \$$sc_bin =@$(TMP_DEBUG)/matcha-tock-bundle.bin; \
-    \$$kernel = @$(TMP_DEBUG)/kernel; \
+    \$$cheriot_elf = @$(TMP_DEBUG)/kernel; \
     $(PORT_PRESTART_CMDS) i @${SENCHA_RESC_DEBUG}; start"
 
 $(CHERIOT_SIM_OUT_DIR):