[test] Use HyperDebug for most CW310 tests

The only tests which do not use HyperDebug are the PMOD tests.

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

Author: jwnrt

.github/workflows/ci.yml

@@ -448,26 +448,26 @@ jobs:
   # CW310 FPGA jobs.
   execute_test_rom_fpga_tests_cw310:
     name: CW310 Test ROM Tests
-    needs: chip_earlgrey_cw310
+    needs: chip_earlgrey_cw310_hyperdebug
     uses: ./.github/workflows/fpga.yml
     secrets: inherit
     with:
       job_name: execute_test_rom_fpga_tests_cw310
-      bitstream: chip_earlgrey_cw310
+      bitstream: chip_earlgrey_cw310_hyperdebug
       board: cw310
-      interface: cw310
+      interface: hyper310
       tag_filters: cw310_test_rom
 
   execute_rom_fpga_tests_cw310:
     name: CW310 ROM Tests
-    needs: chip_earlgrey_cw310
+    needs: chip_earlgrey_cw310_hyperdebug
     uses: ./.github/workflows/fpga.yml
     secrets: inherit
     with:
       job_name: execute_rom_fpga_tests_cw310
-      bitstream: chip_earlgrey_cw310
+      bitstream: chip_earlgrey_cw310_hyperdebug
       board: cw310
-      interface: cw310
+      interface: hyper310
       tag_filters: "cw310_rom_with_fake_keys,cw310_rom_with_real_keys,-manuf"
       timeout: 90
 

.github/workflows/nightly.yml

@@ -48,43 +48,43 @@ jobs:
 
   execute_fpga_cw310_test_rom_tests:
     name: CW310 Test ROM Tests
-    needs: chip_earlgrey_cw310
+    needs: chip_earlgrey_cw310_hyperdebug
     uses: ./.github/workflows/fpga.yml
     secrets: inherit
     with:
       job_name: execute_fpga_cw310_test_rom_tests
-      bitstream: chip_earlgrey_cw310
+      bitstream: chip_earlgrey_cw310_hyperdebug
       board: cw310
-      interface: cw310
+      interface: hyper310
       tag_filters: cw310_test_rom,-broken,-manual
       add_default_filters: false
       cache_test_results: false
 
   execute_fpga_cw310_rom_tests:
     name: CW310 ROM Tests
-    needs: chip_earlgrey_cw310
+    needs: chip_earlgrey_cw310_hyperdebug
     uses: ./.github/workflows/fpga.yml
     secrets: inherit
     with:
       job_name: execute_fpga_cw310_rom_tests
-      bitstream: chip_earlgrey_cw310
+      bitstream: chip_earlgrey_cw310_hyperdebug
       board: cw310
-      interface: cw310
+      interface: hyper310
       tag_filters: cw310_rom_with_fake_keys,-broken,-manual
       add_default_filters: false
       cache_test_results: false
       timeout: 240
 
   execute_fpga_cw310_rom_ext_tests:
     name: CW310 ROM_EXT Tests
-    needs: chip_earlgrey_cw310
+    needs: chip_earlgrey_cw310_hyperdebug
     uses: ./.github/workflows/fpga.yml
     secrets: inherit
     with:
       job_name: execute_fpga_cw310_rom_ext_tests
-      bitstream: chip_earlgrey_cw310
+      bitstream: chip_earlgrey_cw310_hyperdebug
       board: cw310
-      interface: cw310
+      interface: hyper310
       tag_filters: cw310_rom_ext,-broken,-manual
       add_default_filters: false
       cache_test_results: false

hw/top_earlgrey/BUILD

@@ -93,13 +93,12 @@ fpga_cw310(
         "//conditions:default": [],
     }),
     base = ":fpga_cw310",
-    base_bitstream = "//hw/bitstream:bitstream",
+    base_bitstream = "//hw/bitstream/hyperdebug:bitstream",
     exec_env = "fpga_cw310_test_rom",
-    mmi = "//hw/bitstream:cw310_mmi",
-    openocd_adapter_config = "//third_party/openocd:jtag_olimex_cfg",
+    mmi = "//hw/bitstream/hyperdebug:mmi",
     otp = "//hw/top_earlgrey/data/otp:img_rma",
     param = {
-        "interface": "cw310",
+        "interface": "hyper310",
         "exit_success": DEFAULT_TEST_SUCCESS_MSG,
         "exit_failure": DEFAULT_TEST_FAILURE_MSG,
     },
@@ -162,7 +161,7 @@ fpga_cw310(
     manifest = "//sw/device/silicon_owner:manifest",
     otp = "//sw/device/silicon_creator/rom_ext/e2e:otp_img_secret2_locked_rma",
     param = {
-        "interface": "cw310",
+        "interface": "hyper310",
         "exit_success": DEFAULT_TEST_SUCCESS_MSG,
         "exit_failure": DEFAULT_TEST_FAILURE_MSG,
         "assemble": "{rom_ext}@0 {firmware}@0x10000",