Skip to content

Commit 6605aef

Browse files
jwnrtjwnrt
committed
[test] Merge fpga_{cw310,hyper310_*} exec envs
These are now equivalent. Signed-off-by: James Wainwright <[email protected]>
1 parent a009010 commit 6605aef

File tree

16 files changed

+61
-112
lines changed

16 files changed

+61
-112
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ jobs:
462462
timeout: 90
463463

464464
execute_rom_ext_fpga_tests_cw310:
465-
name: Hyper310 ROM_EXT Tests
465+
name: CW310 ROM_EXT Tests
466466
needs: chip_earlgrey_cw310_hyperdebug
467467
uses: ./.github/workflows/fpga.yml
468468
secrets: inherit
@@ -471,7 +471,7 @@ jobs:
471471
bitstream: chip_earlgrey_cw310_hyperdebug
472472
board: cw310
473473
interface: hyper310
474-
tag_filters: hyper310_rom_ext
474+
tag_filters: cw310_rom_ext
475475

476476
execute_sival_fpga_tests_cw310:
477477
name: CW310 SiVal Tests
@@ -580,7 +580,7 @@ jobs:
580580
bitstream: chip_earlgrey_cw340
581581
board: cw340
582582
interface: cw340
583-
tag_filters: "manuf,-hyper310"
583+
tag_filters: "manuf,-cw310"
584584

585585
verify_fpga_jobs:
586586
name: Verify FPGA jobs

‎hw/top_earlgrey/BUILD‎

Lines changed: 2 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -170,59 +170,6 @@ fpga_cw310(
170170
rom_ext = "//sw/device/silicon_creator/rom_ext:rom_ext_slot_a",
171171
)
172172

173-
fpga_cw310(
174-
name = "fpga_hyper310_rom_with_fake_keys",
175-
testonly = True,
176-
args = [
177-
"--rcfile=",
178-
"--logging=info",
179-
"--interface={interface}",
180-
],
181-
base = ":fpga_cw310",
182-
base_bitstream = "//hw/bitstream/hyperdebug:bitstream",
183-
ecdsa_key = {"//sw/device/silicon_creator/rom/keys/fake/ecdsa:test_key_0_ecdsa_p256": "test_key_0"},
184-
exec_env = "fpga_hyper310_rom_with_fake_keys",
185-
manifest = "//sw/device/silicon_creator/rom_ext:manifest",
186-
mmi = "//hw/bitstream/hyperdebug:mmi",
187-
otp = "//hw/top_earlgrey/data/otp:img_rma",
188-
param = {
189-
"interface": "hyper310",
190-
"exit_success": DEFAULT_TEST_SUCCESS_MSG,
191-
"exit_failure": DEFAULT_TEST_FAILURE_MSG,
192-
},
193-
rom = "//sw/device/silicon_creator/rom:mask_rom",
194-
test_cmd = """
195-
--exec="transport init"
196-
--exec="fpga load-bitstream {bitstream}"
197-
--exec="bootstrap --clear-uart=true {firmware}"
198-
--exec="console --non-interactive --exit-success='{exit_success}' --exit-failure='{exit_failure}'"
199-
no-op
200-
""",
201-
)
202-
203-
fpga_cw310(
204-
name = "fpga_hyper310_rom_ext",
205-
testonly = True,
206-
base = ":fpga_hyper310_rom_with_fake_keys",
207-
ecdsa_key = {"//sw/device/silicon_creator/lib/ownership/keys/fake:app_prod_ecdsa": "prod_key_0"},
208-
exec_env = "fpga_hyper310_rom_ext",
209-
libs = [
210-
"//sw/device/lib/arch:boot_stage_owner",
211-
"//sw/device/lib/arch:fpga_cw310",
212-
"//hw/top_earlgrey/sw/dt:fpga_cw310",
213-
],
214-
linker_script = "//sw/device/lib/testing/test_framework:ottf_ld_silicon_owner_slot_a",
215-
manifest = "//sw/device/silicon_owner:manifest",
216-
otp = "//sw/device/silicon_creator/rom_ext/e2e:otp_img_secret2_locked_rma",
217-
param = {
218-
"interface": "hyper310",
219-
"exit_success": DEFAULT_TEST_SUCCESS_MSG,
220-
"exit_failure": DEFAULT_TEST_FAILURE_MSG,
221-
"assemble": "{rom_ext}@0 {firmware}@0x10000",
222-
},
223-
rom_ext = "//sw/device/silicon_creator/rom_ext:rom_ext_slot_a",
224-
)
225-
226173
# FPGA configuration used to emulate silicon targets. This rule can be used by
227174
# targets that require executing at the `rom_ext` stage level in flash, as well
228175
# as SRAM programs. Use the `fpga_cw310_sival_rom_ext` execution environment to
@@ -231,7 +178,7 @@ fpga_cw310(
231178
fpga_cw310(
232179
name = "fpga_cw310_sival",
233180
testonly = True,
234-
base = ":fpga_hyper310_rom_with_fake_keys",
181+
base = ":fpga_cw310_rom_with_fake_keys",
235182

236183
# PROD keys are allowed to run across all life cycle stages. This prod key
237184
# is used to enable execution across life cycle stages with a single
@@ -250,7 +197,7 @@ fpga_cw310(
250197
fpga_cw310(
251198
name = "fpga_cw310_sival_rom_ext",
252199
testonly = True,
253-
base = ":fpga_hyper310_rom_ext",
200+
base = ":fpga_cw310_rom_ext",
254201
ecdsa_key = {"//sw/device/silicon_creator/lib/ownership/keys/fake:app_prod_ecdsa": "prod_key_0"},
255202
exec_env = "fpga_cw310_sival_rom_ext",
256203
libs = [

‎sw/device/silicon_creator/manuf/base/BUILD‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ opentitan_binary(
4545
testonly = True,
4646
srcs = ["sram_cp_provision.c"],
4747
exec_env = {
48-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
48+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
4949
"//hw/top_earlgrey:fpga_cw340_rom_with_fake_keys": None,
5050
"//hw/top_earlgrey:silicon_creator": None,
5151
},
@@ -85,7 +85,7 @@ opentitan_binary(
8585
testonly = True,
8686
srcs = ["sram_cp_provision_functest.c"],
8787
exec_env = {
88-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
88+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
8989
"//hw/top_earlgrey:fpga_cw340_rom_with_fake_keys": None,
9090
"//hw/top_earlgrey:silicon_creator": None,
9191
},
@@ -129,7 +129,7 @@ _CP_PROVISIONING_HARNESS = "//sw/host/provisioning/cp"
129129
opentitan_test(
130130
name = "cp_provision",
131131
exec_env = {
132-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
132+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
133133
"//hw/top_earlgrey:fpga_cw340_rom_with_fake_keys": None,
134134
"//hw/top_earlgrey:silicon_creator": None,
135135
},
@@ -155,7 +155,7 @@ opentitan_test(
155155
opentitan_test(
156156
name = "cp_provision_functest",
157157
exec_env = {
158-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
158+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
159159
"//hw/top_earlgrey:fpga_cw340_rom_with_fake_keys": None,
160160
},
161161
fpga = fpga_params(
@@ -181,7 +181,7 @@ opentitan_test(
181181
testonly = True,
182182
srcs = ["sram_ft_individualize.c"],
183183
exec_env = {
184-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
184+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
185185
"//hw/top_earlgrey:fpga_cw340_rom_with_fake_keys": None,
186186
"//hw/top_earlgrey:silicon_creator": None,
187187
},
@@ -302,7 +302,7 @@ manifest(d = {
302302
srcs = ["ft_personalize.c"],
303303
ecdsa_key = {"//sw/device/silicon_creator/rom/keys/fake/ecdsa:prod_key_0_ecdsa_p256": "prod_key_0"},
304304
exec_env = {
305-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
305+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
306306
"//hw/top_earlgrey:fpga_cw340_rom_with_fake_keys": None,
307307
"//hw/top_earlgrey:silicon_creator": None,
308308
},
@@ -367,7 +367,7 @@ _FT_PROVISIONING_HARNESS = "//sw/host/provisioning/ft:ft_{}"
367367
config["owner_fw"]: OWNER_SLOTS["b"],
368368
},
369369
exec_env = [
370-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys",
370+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys",
371371
"//hw/top_earlgrey:fpga_cw340_rom_with_fake_keys",
372372
"//hw/top_earlgrey:silicon_creator",
373373
],
@@ -392,7 +392,7 @@ filegroup(
392392
opentitan_test(
393393
name = "ft_provision_{}".format(sku),
394394
exec_env = {
395-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
395+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
396396
"//hw/top_earlgrey:fpga_cw340_rom_with_fake_keys": None,
397397
"//hw/top_earlgrey:fpga_cw340_sival": None,
398398
"//hw/top_earlgrey:silicon_creator": None,
@@ -450,7 +450,7 @@ test_suite(
450450
name = "ft_provision_cw310",
451451
tags = ["manual"],
452452
tests = [
453-
":ft_provision_{}_fpga_hyper310_rom_with_fake_keys".format(sku)
453+
":ft_provision_{}_fpga_cw310_rom_with_fake_keys".format(sku)
454454
for sku in EARLGREY_SKUS.keys()
455455
],
456456
)

‎sw/device/silicon_creator/manuf/lib/BUILD‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ opentitan_test(
141141
name = "individualize_functest",
142142
srcs = ["individualize_functest.c"],
143143
exec_env = {
144-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
144+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
145145
"//hw/top_earlgrey:fpga_cw340_sival": None,
146146
},
147147
fpga = fpga_params(
@@ -207,7 +207,7 @@ opentitan_test(
207207
name = "individualize_sw_cfg_functest",
208208
srcs = ["individualize_sw_cfg_functest.c"],
209209
exec_env = {
210-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
210+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
211211
"//hw/top_earlgrey:fpga_cw340_rom_with_fake_keys": None,
212212
},
213213
fpga = fpga_params(
@@ -267,7 +267,7 @@ opentitan_test(
267267
srcs = ["personalize_functest.c"],
268268
ecdsa_key = {"//sw/device/silicon_creator/rom/keys/fake/ecdsa:dev_key_0_ecdsa_p256": "dev_key_0"},
269269
exec_env = {
270-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
270+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
271271
},
272272
fpga = fpga_params(
273273
changes_otp = True,
@@ -330,7 +330,7 @@ opentitan_test(
330330
"AST_PROGRAM_UNITTEST=1",
331331
],
332332
exec_env = {
333-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
333+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
334334
},
335335
fpga = fpga_params(
336336
tags = ["manuf"],

‎sw/device/silicon_creator/manuf/tests/BUILD‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ _MANUF_TEST_LOCKED_KEY = None
7474
ecdsa_key = _MANUF_TEST_LOCKED_KEY if (lc_state, lc_val) in _TEST_LOCKED_LC_ITEMS else ecdsa_key_for_lc_state(ECDSA_SPX_KEY_STRUCTS, lc_val),
7575
exec_env = {
7676
"//hw/top_earlgrey:fpga_cw340_sival": None,
77-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
77+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
7878
},
7979
fpga = fpga_params(
8080
changes_otp = True,
@@ -115,7 +115,7 @@ opentitan_test(
115115
srcs = ["//sw/device/silicon_creator/rom/e2e:empty_test.c"],
116116
exec_env = {
117117
"//hw/top_earlgrey:fpga_cw340_sival": None,
118-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
118+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
119119
},
120120
fpga = fpga_params(
121121
changes_otp = True,
@@ -137,7 +137,7 @@ opentitan_test(
137137
name = "manuf_cp_volatile_unlock_raw_functest",
138138
srcs = ["//sw/device/silicon_creator/rom/e2e:empty_test.c"],
139139
exec_env = {
140-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
140+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
141141
},
142142
fpga = fpga_params(
143143
changes_otp = True,
@@ -176,7 +176,7 @@ opentitan_test(
176176
srcs = ["//sw/device/silicon_creator/rom/e2e:empty_test.c"],
177177
exec_env = {
178178
"//hw/top_earlgrey:fpga_cw340_sival": None,
179-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
179+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
180180
},
181181
fpga = fpga_params(
182182
changes_otp = True,
@@ -226,7 +226,7 @@ cc_library(
226226
srcs = ["sram_empty_functest.c"],
227227
exec_env = {
228228
"//hw/top_earlgrey:fpga_cw340_sival": None,
229-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
229+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
230230
"//hw/top_earlgrey:silicon_creator": None,
231231
},
232232
fpga = fpga_params(
@@ -239,7 +239,7 @@ cc_library(
239239
kind = "ram",
240240
linker_script = "//sw/device/silicon_creator/manuf/lib:sram_program_linker_script",
241241
silicon = silicon_params(
242-
interface = "hyper310",
242+
interface = "cw310",
243243
needs_jtag = True,
244244
test_cmd = "--elf={firmware}",
245245
test_harness = "//sw/host/tests/manuf/manuf_sram_program_crc_check",
@@ -274,7 +274,7 @@ opentitan_binary(
274274
testonly = True,
275275
srcs = ["sram_device_info_flash_wr_functest.c"],
276276
exec_env = {
277-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
277+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
278278
"//hw/top_earlgrey:fpga_cw340_sival": None,
279279
},
280280
kind = "ram",
@@ -317,7 +317,7 @@ opentitan_binary(
317317
),
318318
exec_env = {
319319
"//hw/top_earlgrey:fpga_cw340_sival": None,
320-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
320+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
321321
},
322322
fpga = fpga_params(
323323
binaries = {
@@ -371,7 +371,7 @@ opentitan_binary(
371371
testonly = True,
372372
srcs = ["sram_exec_test.c"],
373373
exec_env = {
374-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
374+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
375375
"//hw/top_earlgrey:fpga_cw340_rom_with_fake_keys": None,
376376
},
377377
kind = "ram",
@@ -402,7 +402,7 @@ opentitan_binary(
402402
srcs = ["idle_functest.c"],
403403
exec_env = {
404404
"//hw/top_earlgrey:fpga_cw340_sival": None,
405-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
405+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
406406
},
407407
fpga = fpga_params(
408408
binaries = {
@@ -440,7 +440,7 @@ opentitan_test(
440440
srcs = ["//sw/device/silicon_creator/rom/e2e:empty_test.c"],
441441
exec_env = {
442442
"//hw/top_earlgrey:fpga_cw340_sival": None,
443-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
443+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
444444
},
445445
fpga = fpga_params(
446446
changes_otp = True,
@@ -468,7 +468,7 @@ opentitan_test(
468468
name = "otp_ctrl_functest",
469469
srcs = [":empty_functest.c"],
470470
exec_env = {
471-
"//hw/top_earlgrey:fpga_hyper310_rom_with_fake_keys": None,
471+
"//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,
472472
},
473473
fpga = fpga_params(
474474
changes_otp = True,

‎sw/device/silicon_creator/rom_ext/e2e/attestation/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ opentitan_test(
1414
name = "print_certs_test",
1515
srcs = ["print_certs.c"],
1616
exec_env = {
17-
"//hw/top_earlgrey:fpga_hyper310_rom_ext": None,
17+
"//hw/top_earlgrey:fpga_cw310_rom_ext": None,
1818
},
1919
fpga = fpga_params(
2020
test_cmd = """

0 commit comments

Comments
 (0)