Merge "Add steps to make flash tarball within the shodan_sel4test.robot"
diff --git a/opentitan_peripherals_test.robot b/opentitan_peripherals_test.robot
index 83430e0..862bb35 100644
--- a/opentitan_peripherals_test.robot
+++ b/opentitan_peripherals_test.robot
@@ -219,3 +219,12 @@
Should Pass Aon Timer Watchdog Bite Reset Smoketest
Run Test ${AON_TIMER_WDOG_BITE_BIN}
+
+Should Try To Reset On The System Reset Control Combo
+ Setup Machine
+ Create Log Tester 0
+ Execute Command sysbus.sysrst_ctrl WriteDoubleWord 0x54 0x8 # Set combo0 to just pwrButton
+ Execute Command sysbus.sysrst_ctrl WriteDoubleWord 0x74 0x8 # Set combo0 action to rstReq
+ Execute Command sysbus.sysrst_ctrl WriteDoubleWord 0x30 0x40 # Invert the pwrButton input
+ # Expect error as this should work only when done by CPU
+ Wait For Log Entry Couldn't find the cpu requesting reset.
diff --git a/shodan_boot.robot b/shodan_boot.robot
index 2cc6195..8d7edcc 100644
--- a/shodan_boot.robot
+++ b/shodan_boot.robot
@@ -7,7 +7,7 @@
*** Variables ***
${LOG_TIMEOUT} 2
-${ROOTDIR} @${CURDIR}/../..
+${ROOTDIR} ${CURDIR}/../..
${SCRIPT} sim/config/shodan.resc
${PROMPT} CANTRIP>
${UART0} sysbus.uart0
@@ -16,9 +16,19 @@
${UART3} sysbus.uart3
${UART5} sysbus.uart5
+${MATCHA_BUNDLE_RELEASE} ${ROOTDIR}/out/matcha-bundle-release.elf
+${CANTRIP_KERNEL_RELEASE} ${ROOTDIR}/out/cantrip/riscv32-unknown-elf/release/kernel/kernel.elf
+${CANTRIP_ROOTSERVER_RELEASE} ${ROOTDIR}/out/cantrip/riscv32-unknown-elf/release/capdl-loader
+${OUT_TMP} ${ROOTDIR}/out/tmp
+
+${FLASH_TAR} out/ext_flash_release.tar
+${CPIO} out/cantrip/riscv32-unknown-elf/release/ext_builtins.cpio
+
*** Keywords ***
Prepare Machine
- Execute Command path set ${ROOTDIR}
+ Execute Command path set @${ROOTDIR}
+ Execute Command $tar=@${FLASH_TAR}
+ Execute Command $cpio=@${CPIO}
Execute Script ${SCRIPT}
# Add UART5 virtual time so we can check the machine execution time
Execute Command uart5-analyzer TimestampFormat Virtual
@@ -27,9 +37,18 @@
*** Test Cases ***
+Prepare Flash Tarball
+ Run Process mkdir -p ${ROOTDIR}/out/tmp
+ Run Process ln -sfr ${MATCHA_BUNDLE_RELEASE} ${OUT_TMP}/matcha-tock-bundle
+ Run Process ln -sfr ${CANTRIP_KERNEL_RELEASE} ${OUT_TMP}/kernel
+ Run Process ln -sfr ${CANTRIP_ROOTSERVER_RELEASE} ${OUT_TMP}/capdl-loader
+ Run Process tar -C ${OUT_TMP} -cvhf ${ROOTDIR}/${FLASH_TAR} matcha-tock-bundle kernel capdl-loader
+ Provides initialization
+
Shodan Smoke Test
[Documentation] Test TockOS boot, seL4 boot and ML Execution
[Tags] ml tock seL4 uart
+ Requires initialization
Prepare Machine
Create Log Tester ${LOG_TIMEOUT}
${tockuart}= Create Terminal Tester ${UART0}
