On Tue, Aug 20, 2019 at 2:03 PM Alistair Francis <alistair.fran...@wdc.com> wrote: > > 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. >
have you tried running bitbake -ctestimage with this change ? > Signed-off-by: Alistair Francis <alistair.fran...@wdc.com> > --- > v2: > - Improve the commit message > > 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 797a27660d..2ebd0a01f2 100644 > --- a/meta/conf/machine/include/riscv/qemuriscv.inc > +++ b/meta/conf/machine/include/riscv/qemuriscv.inc > @@ -28,7 +28,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" > -- > 2.22.0 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core