Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians...

[oweals/u-boot.git] / arch / riscv / lib / bootm.c

diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c
index efbd3e23e7a570e3f693eca1645118ebb9c7277f..c4137ded834bf7e6d5c3c2a350227e8f00a9bc8b 100644 (file)
--- a/arch/riscv/lib/bootm.c
+++ b/arch/riscv/lib/bootm.c
@@ -7,8 +7,12 @@
  */
 
 #include <common.h>
+#include <bootstage.h>
 #include <command.h>
 #include <dm.h>
+#include <fdt_support.h>
+#include <hang.h>
+#include <log.h>
 #include <dm/root.h>
 #include <image.h>
 #include <asm/byteorder.h>
@@ -24,11 +28,6 @@ __weak void board_quiesce_devices(void)
 {
 }
 
-int arch_fixup_fdt(void *blob)
-{
-       return 0;
-}
-
 /**
  * announce_and_cleanup() - Print message and prepare for kernel boot
  *
@@ -99,7 +98,7 @@ static void boot_jump_linux(bootm_headers_t *images, int flag)
                if (IMAGE_ENABLE_OF_LIBFDT && images->ft_len) {
 #ifdef CONFIG_SMP
                        ret = smp_call_function(images->ep,
-                                               (ulong)images->ft_addr, 0);
+                                               (ulong)images->ft_addr, 0, 0);
                        if (ret)
                                hang();
 #endif
@@ -108,7 +107,7 @@ static void boot_jump_linux(bootm_headers_t *images, int flag)
        }
 }
 
-int do_bootm_linux(int flag, int argc, char * const argv[],
+int do_bootm_linux(int flag, int argc, char *const argv[],
                   bootm_headers_t *images)
 {
        /* No need for those on RISC-V */
@@ -130,7 +129,7 @@ int do_bootm_linux(int flag, int argc, char * const argv[],
        return 0;
 }
 
-int do_bootm_vxworks(int flag, int argc, char * const argv[],
+int do_bootm_vxworks(int flag, int argc, char *const argv[],
                     bootm_headers_t *images)
 {
        return do_bootm_linux(flag, argc, argv, images);