Skip to content

Commit b102b7c

Browse files
committed
[ot] hw/riscv: dj+eg: remove default OTP scrambling values
Providing defaults here could be error prone. Instead, require that these properties are set by the `cfggen.py` INI file. There is already a trace in `ot_otp_dj_configure_scrmbl_key` and `ot_otp_dj_configure_digest` when these properties are not set. Signed-off-by: James Wainwright <[email protected]>
1 parent a5be9d3 commit b102b7c

File tree

2 files changed

+1
-26
lines changed

2 files changed

+1
-26
lines changed

hw/riscv/ot_darjeeling.c

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,18 +1104,7 @@ static const IbexDeviceDef ot_dj_soc_devices[] = {
11041104
OT_DJ_SOC_DEVLINK("backend", OTP_BACKEND)
11051105
),
11061106
.prop = IBEXDEVICEPROPDEFS(
1107-
IBEX_DEV_UINT_PROP("edn-ep", 1u),
1108-
IBEX_DEV_STRING_PROP("scrmbl_key",
1109-
"cebeb96ffe0eced795f8b2cfe23c1e51"
1110-
"9e4fa08047a6bcfb811b04f0a479006e"),
1111-
IBEX_DEV_STRING_PROP("digest_const",
1112-
"e048b657396b4b83277195fc471e4b26"),
1113-
IBEX_DEV_STRING_PROP("digest_iv",
1114-
"4d5a89aa9109294a"),
1115-
IBEX_DEV_STRING_PROP("sram_const",
1116-
"63b9485a3856c417cf7a50a9a91ef7f7"),
1117-
IBEX_DEV_STRING_PROP("sram_iv",
1118-
"bee3958332f2939b")
1107+
IBEX_DEV_UINT_PROP("edn-ep", 1u)
11191108
),
11201109
},
11211110
[OT_DJ_SOC_DEV_OTP_BACKEND] = {

hw/riscv/ot_earlgrey.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -567,20 +567,6 @@ static const IbexDeviceDef ot_eg_soc_devices[] = {
567567
),
568568
.prop = IBEXDEVICEPROPDEFS(
569569
IBEX_DEV_UINT_PROP("edn-ep", 1u)
570-
// Scrambling support is yet to be backported from Darjeeling
571-
// implementation. Those are the Earlgrey constants defined for
572-
// Earlgrey-M2.5.2-RC0:
573-
// IBEX_DEV_STRING_PROP("scrmbl_key",
574-
// "605fefe9977b00b6fdc21d577a172d04"
575-
// "7dcf0eebbdd268afd4e2506df1d0603f"),
576-
// IBEX_DEV_STRING_PROP("digest_const",
577-
// "30faa0c47e3809585a24109fbc53e920"),
578-
// IBEX_DEV_STRING_PROP("digest_iv",
579-
// "af12b341a53780ab"),
580-
// IBEX_DEV_STRING_PROP("sram_const",
581-
// "5f2c075769000c39cda36eab93cd263d"),
582-
// IBEX_DEV_STRING_PROP("sram_iv",
583-
// "f2dae31d857d1d39")
584570
),
585571
},
586572
[OT_EG_SOC_DEV_OTP_BACKEND] = {

0 commit comments

Comments
 (0)