riscv: Move virtio scan to board_late_init()

[platform/kernel/u-boot.git] / board / emulation / qemu-riscv / qemu-riscv.c

diff --git a/board/emulation/qemu-riscv/qemu-riscv.c b/board/emulation/qemu-riscv/qemu-riscv.c
index 041e716..173245b 100644 (file)
--- a/board/emulation/qemu-riscv/qemu-riscv.c
+++ b/board/emulation/qemu-riscv/qemu-riscv.c
@@ -4,20 +4,70 @@
  */
 
 #include <common.h>
+#include <dm.h>
+#include <dm/ofnode.h>
+#include <env.h>
 #include <fdtdec.h>
+#include <image.h>
+#include <log.h>
+#include <spl.h>
+#include <init.h>
+#include <usb.h>
+#include <virtio_types.h>
+#include <virtio.h>
 
-#define MROM_FDT_ADDR  0x1020
+DECLARE_GLOBAL_DATA_PTR;
+
+#if IS_ENABLED(CONFIG_MTD_NOR_FLASH)
+int is_flash_available(void)
+{
+       if (!ofnode_equal(ofnode_by_compatible(ofnode_null(), "cfi-flash"),
+                         ofnode_null()))
+               return 1;
+
+       return 0;
+}
+#endif
 
 int board_init(void)
 {
        return 0;
 }
 
-void *board_fdt_blob_setup(void)
+int board_late_init(void)
 {
+       /* start usb so that usb keyboard can be used as input device */
+       if (CONFIG_IS_ENABLED(USB_KEYBOARD))
+               usb_init();
+
        /*
-        * QEMU loads a generated DTB for us immediately
-        * after the reset vectors in the MROM
+        * Make sure virtio bus is enumerated so that peripherals
+        * on the virtio bus can be discovered by their drivers
         */
-       return (void *)MROM_FDT_ADDR;
+       virtio_init();
+
+       return 0;
+}
+
+#ifdef CONFIG_SPL
+u32 spl_boot_device(void)
+{
+       /* RISC-V QEMU only supports RAM as SPL boot device */
+       return BOOT_DEVICE_RAM;
+}
+#endif
+
+#ifdef CONFIG_SPL_LOAD_FIT
+int board_fit_config_name_match(const char *name)
+{
+       /* boot using first FIT config */
+       return 0;
+}
+#endif
+
+void *board_fdt_blob_setup(int *err)
+{
+       *err = 0;
+       /* Stored the DTB address there during our init */
+       return (void *)(ulong)gd->arch.firmware_fdt_addr;
 }