diff --git a/platform/andes/ae350/platform.c b/platform/andes/ae350/platform.c
index 21065891..5f1ab6cf 100644
--- a/platform/andes/ae350/platform.c
+++ b/platform/andes/ae350/platform.c
@@ -48,9 +48,7 @@ static int ae350_final_init(bool cold_boot)
 		return 0;
 
 	fdt = sbi_scratch_thishart_arg1_ptr();
-	fdt_plic_fixup(fdt, "riscv,plic0");
-
-	fdt_reserved_memory_fixup(fdt);
+	fdt_fixups(fdt);
 
 	return 0;
 }
diff --git a/platform/ariane-fpga/platform.c b/platform/ariane-fpga/platform.c
index 245dcd7f..bba04d63 100644
--- a/platform/ariane-fpga/platform.c
+++ b/platform/ariane-fpga/platform.c
@@ -55,10 +55,9 @@ static int ariane_final_init(bool cold_boot)
 
 	if (!cold_boot)
 		return 0;
-	fdt = sbi_scratch_thishart_arg1_ptr();
-	fdt_plic_fixup(fdt, "riscv,plic0");
 
-	fdt_reserved_memory_fixup(fdt);
+	fdt = sbi_scratch_thishart_arg1_ptr();
+	fdt_fixups(fdt);
 
 	return 0;
 }
diff --git a/platform/qemu/virt/platform.c b/platform/qemu/virt/platform.c
index c2e3b70c..539006eb 100644
--- a/platform/qemu/virt/platform.c
+++ b/platform/qemu/virt/platform.c
@@ -47,9 +47,7 @@ static int virt_final_init(bool cold_boot)
 		return 0;
 
 	fdt = sbi_scratch_thishart_arg1_ptr();
-	fdt_plic_fixup(fdt, "riscv,plic0");
-
-	fdt_reserved_memory_fixup(fdt);
+	fdt_fixups(fdt);
 
 	return 0;
 }
diff --git a/platform/sifive/fu540/platform.c b/platform/sifive/fu540/platform.c
index 6a8c7b26..db647ca0 100644
--- a/platform/sifive/fu540/platform.c
+++ b/platform/sifive/fu540/platform.c
@@ -60,9 +60,7 @@ static void fu540_modify_dt(void *fdt)
 {
 	fdt_cpu_fixup(fdt);
 
-	fdt_plic_fixup(fdt, "riscv,plic0");
-
-	fdt_reserved_memory_fixup(fdt);
+	fdt_fixups(fdt);
 }
 
 static int fu540_final_init(bool cold_boot)