[bazel] Make bootstrapping optional for QEMU

Signed-off-by: James Wainwright <[email protected]>

Author: jwnrt

hw/top_earlgrey/BUILD

@@ -159,7 +159,7 @@ sim_qemu(
     slot_spec = EARLGREY_SLOTS,
     test_cmd = """
         --exec="transport init"
-        --exec="bootstrap --clear-uart=true --reset-delay 1000ms {firmware}"
+        {bootstrap_cmd}
         --exec="console --non-interactive --exit-success='{exit_success}' --exit-failure='{exit_failure}'"
         no-op
     """,

rules/opentitan/qemu.bzl

@@ -70,6 +70,7 @@ def qemu_params(
         globals = {},
         traces = [],
         qemu_args = [],
+        bootstrap = False,
         **kwargs):
     extra_params = {
         "icount": str(icount),
@@ -79,6 +80,7 @@ def qemu_params(
         "globals": json.encode(globals),
         # The same goes for this array of strings:
         "traces": json.encode(traces),
+        "bootstrap": json.encode(bootstrap),
     }
 
     return struct(
@@ -417,28 +419,33 @@ def _test_dispatch(ctx, exec_env, firmware):
         "otp": otp_image.short_path,
     }
 
-    # Generate the flash backend image for QEMU emulation
-    # TODO: when bootstrapping is available, this should always create a blank
-    # flash image and bootstrap the data. Ideally, relevant info pages would
-    # be spliced in at this step, but that is not yet supported by either
-    # flashgen or by Bazel.
-    flash_image = gen_flash(
-        ctx,
-        flashgen = exec_env.flashgen,
-        firmware_bin = image,
-        # TODO: no support for convenience debug symbols from ELFs for now
-        firmware_elf = None,
-        # Do not sanity check ELFs, because we do not expect the binary to
-        # match the ELF because of the added manifest extensions (e.g. SPX
-        # signatures) present in the signed binary.
-        check_elfs = False,
-    )
-    data_files += [flash_image]
-    qemu_args += ["-drive", "if=mtd,id=eflash,bus=2,file=flash_img.bin,format=raw"]
-    test_script_fmt |= {
-        "flash": flash_image.short_path,
-        "mutable_flash": "flash_img.bin",
-    }
+    # If real bootstrapping is requested then prepare the correct command, otherwise we need
+    # to prepare a QEMU drive containing flash contents.
+    # Ideally, relevant info pages would be spliced in at this step, but that is
+    # not yet supported by either flashgen or by Bazel.
+    if param["bootstrap"] and json.decode(param["bootstrap"]):
+        test_script_fmt |= {"flash": ""}
+        bootstrap_cmd = "bootstrap --clear-uart=true --reset-delay 1000ms {firmware}".format(**param)
+        param["bootstrap_cmd"] = '--exec="{}"'.format(bootstrap_cmd)
+    else:
+        # Generate the flash backend image for QEMU emulation
+        flash_image = gen_flash(
+            ctx,
+            flashgen = exec_env.flashgen,
+            firmware_bin = image,
+            # TODO: no support for convenience debug symbols from ELFs for now
+            firmware_elf = None,
+            # Do not sanity check ELFs, because we do not expect the binary to
+            # match the ELF because of the added manifest extensions (e.g. SPX
+            # signatures) present in the signed binary.
+            check_elfs = False,
+        )
+        data_files += [flash_image]
+        qemu_args += ["-drive", "if=mtd,id=eflash,bus=2,file=flash_img.bin,format=raw"]
+        test_script_fmt |= {
+            "flash": flash_image.short_path,
+        }
+        param["bootstrap_cmd"] = '--exec="no-op" # SKIPPING BOOTSTRAP'
 
     # Get the pre-test_cmd args.
     args = get_fallback(ctx, "attr.args", exec_env)