commit 2ebf75437a6acc6862a7b73fe78f9a8077e23725
author Cindy Liu <hcindyl@google.com> Mon Jan 23 18:56:07 2023 -0800
committer Cindy Liu <hcindyl@google.com> Mon Jan 23 19:04:06 2023 -0800
tree 70f93d1447ee9fe65f68670b6ee5d9b448e21566
parent fa3186fa34d9132974c00c65bf050c6e840d7950

Change ext_flash tarball contents

Boot rom loads the binary instead of the elf.

Change-Id: Ide8775222894327b3d70421ba5024a816d82e4ad

shodan_boot.robot

diff --git a/shodan_boot.robot b/shodan_boot.robot
index 02bd00e..0420bb2 100644
--- a/shodan_boot.robot
+++ b/shodan_boot.robot
@@ -53,10 +53,12 @@
 *** 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                 cp     -f  ${MATCHA_BUNDLE_RELEASE}       ${OUT_TMP}/matcha-tock-bundle
+    Run Process                 riscv32-unknown-elf-strip  ${OUT_TMP}/matcha-tock-bundle
+    Run Process                 riscv32-unknown-elf-objcopy  -O  binary  -g  ${OUT_TMP}/matcha-tock-bundle  ${OUT_TMP}/matcha-tock-bundle.bin
     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
+    Run Process                 tar    -C    ${OUT_TMP}  -cvhf  ${ROOTDIR}/${FLASH_TAR}  matcha-tock-bundle.bin  kernel  capdl-loader
     Provides                    flash-tarball
 
 

shodan_sel4test.robot

diff --git a/shodan_sel4test.robot b/shodan_sel4test.robot
index a0e43ec..c1d3172 100644
--- a/shodan_sel4test.robot
+++ b/shodan_sel4test.robot
@@ -42,10 +42,12 @@
 *** 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                 cp     -f  ${MATCHA_BUNDLE_RELEASE}       ${OUT_TMP}/matcha-tock-bundle
+    Run Process                 riscv32-unknown-elf-strip  ${OUT_TMP}/matcha-tock-bundle
+    Run Process                 riscv32-unknown-elf-objcopy  -O  binary  -g  ${OUT_TMP}/matcha-tock-bundle  ${OUT_TMP}/matcha-tock-bundle.bin
     Run Process                 ln  -sfr  ${SEL4TEST_KERNEL_RELEASE}      ${OUT_TMP}/kernel
     Run Process                 ln  -sfr  ${SEL4TEST_ROOTSERVER_RELEASE}  ${OUT_TMP}/capdl-loader
-    Run Process                 tar  -C  ${OUT_TMP}  -cvhf  ${ROOTDIR}/${FLASH_TAR}  matcha-tock-bundle  kernel  capdl-loader
+    Run Process                 tar  -C  ${OUT_TMP}  -cvhf  ${ROOTDIR}/${FLASH_TAR}  matcha-tock-bundle.bin  kernel  capdl-loader
     Provides                    initialization
 
 Shodan seL4test with Rust syscall wrappers