Skip to content

Commit 32de450

Browse files
committed
[ot] hw/opentitan: ot_otp: merge OTP implementation from EarlGrey and Darjeeling
- merge and adapt common code into OtOTPEngine - keep only OTP top-specific implementation in ot_otp_eg.c and ot_otp_dj.c, which implement the OtOTPImplIf interface (specialization for Tops) - regenerate OTP partition descriptions and key seed definition with otptool.py Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
1 parent ecd3bcd commit 32de450

File tree

9 files changed

+3869
-6443
lines changed

9 files changed

+3869
-6443
lines changed

hw/opentitan/Kconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,21 @@ config OT_OTP_BE_IF
124124
bool
125125

126126
config OT_OTP_DJ
127+
select OT_OTP_ENGINE
127128
select OT_OTP_IF
129+
select OT_OTP_IMPL_IF
128130
select OT_PRESENT
129131
bool
130132

131133
config OT_OTP_EG
134+
select OT_OTP_ENGINE
132135
select OT_OTP_IF
136+
select OT_OTP_IMPL_IF
137+
select OT_PRESENT
138+
bool
139+
140+
config OT_OTP_ENGINE
141+
select OT_OTP_IMPL_IF
133142
select OT_PRESENT
134143
bool
135144

hw/opentitan/meson.build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ system_ss.add(when: 'CONFIG_OT_OTBN', if_true: files('ot_otbn.c'))
3737
system_ss.add(when: 'CONFIG_OT_OTP_BE_IF', if_true: files('ot_otp_be_if.c'))
3838
system_ss.add(when: 'CONFIG_OT_OTP_DJ', if_true: files('ot_otp_dj.c'))
3939
system_ss.add(when: 'CONFIG_OT_OTP_EG', if_true: files('ot_otp_eg.c'))
40+
system_ss.add(when: 'CONFIG_OT_OTP_ENGINE', if_true: files('ot_otp_engine.c'))
4041
system_ss.add(when: 'CONFIG_OT_OTP_IF', if_true: files('ot_otp_if.c'))
4142
system_ss.add(when: 'CONFIG_OT_OTP_IMPL_IF', if_true: files('ot_otp_impl_if.c'))
4243
system_ss.add(when: 'CONFIG_OT_OTP_OT_BE', if_true: files('ot_otp_ot_be.c'))

0 commit comments

Comments
 (0)