Skip to content

Commit 839d818

Browse files
committed
[ot] hw/riscv: ot_darjeeling, ot_earlgrey: configure devices with new API
This allows to override default crypto properties with ones to be defined in an external file. Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
1 parent 42499dc commit 839d818

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

hw/riscv/ot_darjeeling.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ enum OtDjSocDevice {
150150
OT_DJ_SOC_DEV_ROM1,
151151
OT_DJ_SOC_DEV_RSTMGR,
152152
OT_DJ_SOC_DEV_RV_DM,
153-
OT_DJ_SOC_DEV_RV_DM_MEM,
154153
OT_DJ_SOC_DEV_SENSOR_CTRL,
155154
OT_DJ_SOC_DEV_SOC_PROXY,
156155
OT_DJ_SOC_DEV_SPI_DEVICE,
@@ -1595,9 +1594,9 @@ static void ot_dj_soc_realize(DeviceState *dev, Error **errp)
15951594
cpu->cpu_index = 0;
15961595

15971596
/* Link, define properties and realize devices, then connect GPIOs */
1598-
ibex_configure_devices_with_id(s->devices, dev->parent_bus, "ot_id", "",
1599-
false, ot_dj_soc_devices,
1600-
ARRAY_SIZE(ot_dj_soc_devices));
1597+
ot_common_configure_devices_with_id(s->devices, dev->parent_bus, "", false,
1598+
ot_dj_soc_devices,
1599+
ARRAY_SIZE(ot_dj_soc_devices));
16011600

16021601
Object *oas;
16031602

hw/riscv/ot_earlgrey.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ enum OtEGSocDevice {
132132
OT_EG_SOC_DEV_ROM_CTRL,
133133
OT_EG_SOC_DEV_RSTMGR,
134134
OT_EG_SOC_DEV_RV_DM,
135-
OT_EG_SOC_DEV_RV_DM_MEM,
136135
OT_EG_SOC_DEV_SENSOR_CTRL,
137136
OT_EG_SOC_DEV_SPI_DEVICE,
138137
OT_EG_SOC_DEV_SPI_HOST0,
@@ -1237,9 +1236,9 @@ static void ot_eg_soc_realize(DeviceState *dev, Error **errp)
12371236

12381237
/* Link, define properties and realize devices, then connect GPIOs */
12391238
BusState *bus = sysbus_get_default();
1240-
ibex_configure_devices_with_id(s->devices, bus, "ot_id", "", false,
1241-
ot_eg_soc_devices,
1242-
ARRAY_SIZE(ot_eg_soc_devices));
1239+
ot_common_configure_devices_with_id(s->devices, bus, "", false,
1240+
ot_eg_soc_devices,
1241+
ARRAY_SIZE(ot_eg_soc_devices));
12431242

12441243
MemoryRegion *mrs[] = { get_system_memory(), NULL, NULL, NULL };
12451244
ibex_map_devices(s->devices, mrs, ot_eg_soc_devices,

0 commit comments

Comments
 (0)