From dd6358438c0641919a7929270edd57434d56eac7 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Tue, 20 Aug 2019 13:59:17 -0700 Subject: qemuriscv64: Specify the firmware as a bios instead of kernel Now that we have a -bios option for the RISC-V virt machine in QEMU we can pass OpenSBI in via -bios and the kernel in via -kernel. We no longer need to pass the kernel in via -device loader so let's remove that. (From OE-Core rev: 65e7f371f19e053d0bac7771a80615f6bada74c7) Signed-off-by: Alistair Francis Signed-off-by: Richard Purdie --- meta/conf/machine/include/riscv/qemuriscv.inc | 2 +- meta/conf/machine/qemuriscv64.conf | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/meta/conf/machine/include/riscv/qemuriscv.inc b/meta/conf/machine/include/riscv/qemuriscv.inc index 84d09fa78e..f1cb62818b 100644 --- a/meta/conf/machine/include/riscv/qemuriscv.inc +++ b/meta/conf/machine/include/riscv/qemuriscv.inc @@ -26,7 +26,7 @@ UBOOT_ENTRYPOINT_riscv64 = "0x80200000" QB_KERNEL_CMDLINE_APPEND = "earlycon=sbi" QB_MEM = "-m 512" QB_MACHINE = "-machine virt" -QB_DEFAULT_KERNEL = "fw_jump.elf" +QB_DEFAULT_BIOS = "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/meta/conf/machine/qemuriscv64.conf b/meta/conf/machine/qemuriscv64.conf index dba8f09e93..99b48b309b 100644 --- a/meta/conf/machine/qemuriscv64.conf +++ b/meta/conf/machine/qemuriscv64.conf @@ -4,8 +4,6 @@ require conf/machine/include/riscv/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" -- cgit 1.2.3-korg