sencha: track renode script changes to use $cheriot_elf Bypass-Presubmit-Reason: no sencha CI tests Change-Id: Iac0c3e505158045ee0f16cd32ef977b48c974613
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) }
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):