From f28b3cfb9a385c36980159eac7debdd3124b30e8 Mon Sep 17 00:00:00 2001
From: Alistair Francis <alistair.francis@wdc.com>
Date: Wed, 23 Jan 2019 13:16:46 -0800
Subject: [PATCH] qemuriscv: Enable OpenSBI by default for booting

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
 conf/machine/include/qemuriscv.inc | 11 +++++------
 conf/machine/qemuriscv32.conf      |  2 ++
 conf/machine/qemuriscv64.conf      |  2 ++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/conf/machine/include/qemuriscv.inc b/conf/machine/include/qemuriscv.inc
index adf3122..abac547 100644
--- a/conf/machine/include/qemuriscv.inc
+++ b/conf/machine/include/qemuriscv.inc
@@ -5,7 +5,7 @@ require conf/machine/include/tune-riscv.inc
 
 MACHINE_FEATURES = "screen keyboard ext2 ext3 serial"
 
-KERNEL_IMAGETYPE = "vmlinux"
+KERNEL_IMAGETYPE = "Image"
 
 GDBVERSION = "riscv"
 
@@ -15,16 +15,15 @@ IMAGE_FSTYPES_append = " ext4"
 
 MACHINE_EXTRA_RRECOMMENDS += " kernel-modules"
 
-EXTRA_IMAGEDEPENDS += "riscv-pk"
-RISCV_BBL_PAYLOAD ?= "${KERNEL_IMAGETYPE}"
+EXTRA_IMAGEDEPENDS += "opensbi"
+RISCV_SBI_PLAT = "qemu/virt"
+RISCV_SBI_PAYLOAD ?= "${KERNEL_IMAGETYPE}-${MACHINE}.bin"
 
 # qemuboot options
 QB_KERNEL_CMDLINE_APPEND = "console=ttyS0,115200 console=tty"
 QB_MEM = "-m 512"
 QB_MACHINE = "-machine virt"
-QB_DEFAULT_KERNEL = "bbl"
-#QB_SLIRP_OPT = "-netdev user,id=net0,hostfwd=tcp::22222-:22"
-QB_OPT_APPEND = "-show-cursor -monitor null"
+QB_DEFAULT_KERNEL = "fw_jump.elf"
 QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no"
 QB_NETWORK_DEVICE = "-device virtio-net-device,netdev=net0,mac=@MAC@"
 QB_ROOTFS_OPT = "-drive id=disk0,file=@ROOTFS@,if=none,format=raw -device virtio-blk-device,drive=disk0"
diff --git a/conf/machine/qemuriscv32.conf b/conf/machine/qemuriscv32.conf
index e93625c..6de176a 100644
--- a/conf/machine/qemuriscv32.conf
+++ b/conf/machine/qemuriscv32.conf
@@ -6,6 +6,8 @@ require conf/machine/include/qemuriscv.inc
 
 DEFAULTTUNE = "riscv32"
 
+QB_OPT_APPEND = "-show-cursor -monitor null -device loader,file=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE},addr=0x80400000"
+
 # u-boot doesn't compile, error: "can't link hard-float modules with soft-float modules"
 # EXTRA_IMAGEDEPENDS += "u-boot"
 # UBOOT_MACHINE = "qemu-riscv32_defconfig"
diff --git a/conf/machine/qemuriscv64.conf b/conf/machine/qemuriscv64.conf
index 1f628f3..3612a9a 100644
--- a/conf/machine/qemuriscv64.conf
+++ b/conf/machine/qemuriscv64.conf
@@ -4,6 +4,8 @@
 
 require conf/machine/include/qemuriscv.inc
 
+QB_OPT_APPEND = "-show-cursor -monitor null -device loader,file=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE},addr=0x80200000"
+
 EXTRA_IMAGEDEPENDS += "u-boot"
 UBOOT_MACHINE = "qemu-riscv64_defconfig"
 UBOOT_ELF = "u-boot"