riscv: Move all fdt fixups together

Keep all the fdt fixups together for better code management.

Signed-off-by: Atish Patra <atish.patra@wdc.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c
index 8ff8db6bf533b13f5777c7e7530151540b8a2798..0d06095da11aab3b6cb74a75b060fadd5d897d1e 100644 (file)
--- a/arch/riscv/lib/bootm.c
+++ b/arch/riscv/lib/bootm.c
@@ -26,39 +26,6 @@ __weak void board_quiesce_devices(void)
 {
 }
 
-int arch_fixup_fdt(void *blob)
-{
-       int err;
-#ifdef CONFIG_EFI_LOADER
-       u32 size;
-       int chosen_offset;
-
-       size = fdt_totalsize(blob);
-       err  = fdt_open_into(blob, blob, size + 32);
-       if (err < 0) {
-               printf("Device Tree can't be expanded to accommodate new node");
-               return err;
-       }
-       chosen_offset = fdt_path_offset(blob, "/chosen");
-       if (chosen_offset < 0) {
-               err = fdt_add_subnode(blob, 0, "chosen");
-               if (err < 0) {
-                       printf("chosen node can not be added\n");
-                       return err;
-               }
-       }
-       /* Overwrite the boot-hartid as U-Boot is the last stage BL */
-       fdt_setprop_u32(blob, chosen_offset, "boot-hartid", gd->arch.boot_hart);
-#endif
-
-       /* Copy the reserved-memory node to the DT used by OS */
-       err = riscv_fdt_copy_resv_mem_node(gd->fdt_blob, blob);
-       if (err < 0)
-               return err;
-
-       return 0;
-}
-
 /**
  * announce_and_cleanup() - Print message and prepare for kernel boot
  *

diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c
index af12e484db9b507f44f0ccdc8ee3cc84c09ef6c1..20e0759f135b3e81458c44223074256027482316 100644 (file)
--- a/arch/riscv/lib/fdt_fixup.c
+++ b/arch/riscv/lib/fdt_fixup.c
@@ -115,3 +115,36 @@ int board_fix_fdt(void *fdt)
        return 0;
 }
 #endif
+
+int arch_fixup_fdt(void *blob)
+{
+       int err;
+#ifdef CONFIG_EFI_LOADER
+       u32 size;
+       int chosen_offset;
+
+       size = fdt_totalsize(blob);
+       err  = fdt_open_into(blob, blob, size + 32);
+       if (err < 0) {
+               printf("Device Tree can't be expanded to accommodate new node");
+               return err;
+       }
+       chosen_offset = fdt_path_offset(blob, "/chosen");
+       if (chosen_offset < 0) {
+               err = fdt_add_subnode(blob, 0, "chosen");
+               if (err < 0) {
+                       printf("chosen node can not be added\n");
+                       return err;
+               }
+       }
+       /* Overwrite the boot-hartid as U-Boot is the last stage BL */
+       fdt_setprop_u32(blob, chosen_offset, "boot-hartid", gd->arch.boot_hart);
+#endif
+
+       /* Copy the reserved-memory node to the DT used by OS */
+       err = riscv_fdt_copy_resv_mem_node(gd->fdt_blob, blob);
+       if (err < 0)
+               return err;
+
+       return 0;
+}