[OE-core] [PATCH 3/3] qemuriscv64: Specify the firmware as a bios instead of kernel

[Alistair Francis]

On Thu, Aug 15, 2019 at 11:40 PM Jacob Kroon <jacob.kroon at mikrodidakt.se> wrote:
>
> Hi,
>
> On 8/15/19 11:31 PM, Alistair Francis wrote:
> > Signed-off-by: Alistair Francis <alistair.francis at wdc.com>
> > ---
> >   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"
> > -
>
> Was it intentional to remove these lines aswell ? I can't tell from the
> commit message.

This was intentional.

We used to use:
 -kernel: Specify the firmware
 -device (above): Specify the kernel

Now we can use:
 -bios: Specify the firmware
 -kernel: Specify the kernel

So this line isn't required.

Alistair

>
> /Jacob
>
> >   EXTRA_IMAGEDEPENDS += "u-boot"
> >   UBOOT_MACHINE = "qemu-riscv64_defconfig"
> >   UBOOT_ELF = "u-boot"
> >
>
>
>
> [mikrodidakt]
> Jacob Kroon • +46 46325040
>
> mikrodidakt.se • Skiffervägen 48, SE-224 78 LUND, Sweden
>
> Consultans since 1980 • SW, HW, Embedded Systems, Linux
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core