diff --git a/devicemodel/Makefile b/devicemodel/Makefile
index 9fe3a6b30..78bd1e53a 100644
--- a/devicemodel/Makefile
+++ b/devicemodel/Makefile
@@ -68,6 +68,8 @@ SRCS += hw/platform/ioc.c
 SRCS += hw/platform/ioc_cbc.c
 SRCS += hw/platform/acpi/acpi.c
 SRCS += hw/platform/acpi/acpi_pm.c
+SRCS += hw/platform/rpmb/rpmb_sim.c
+SRCS += hw/platform/rpmb/rpmb_backend.c
 SRCS += hw/pci/wdt_i6300esb.c
 SRCS += hw/pci/lpc.c
 SRCS += hw/pci/xhci.c
@@ -83,8 +85,6 @@ SRCS += hw/pci/virtio/virtio_rnd.c
 SRCS += hw/pci/virtio/virtio_hyper_dmabuf.c
 SRCS += hw/pci/virtio/virtio_heci.c
 SRCS += hw/pci/virtio/virtio_rpmb.c
-SRCS += hw/pci/virtio/rpmb_sim.c
-SRCS += hw/pci/virtio/rpmb_backend.c
 SRCS += hw/pci/irq.c
 SRCS += hw/pci/uart.c
 SRCS += hw/pci/gvt.c
diff --git a/devicemodel/hw/pci/virtio/rpmb_backend.c b/devicemodel/hw/platform/rpmb/rpmb_backend.c
similarity index 100%
rename from devicemodel/hw/pci/virtio/rpmb_backend.c
rename to devicemodel/hw/platform/rpmb/rpmb_backend.c
diff --git a/devicemodel/hw/pci/virtio/rpmb_sim.c b/devicemodel/hw/platform/rpmb/rpmb_sim.c
similarity index 100%
rename from devicemodel/hw/pci/virtio/rpmb_sim.c
rename to devicemodel/hw/platform/rpmb/rpmb_sim.c