| Message ID | 1564812484-20385-1-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FOR,4.1] riscv: roms: Fix make rules for building sifive_u bios | expand |
Hi Alistair/Palmer, On Sat, Aug 3, 2019 at 2:08 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > Currently the make rules are wrongly using qemu/virt opensbi image > for sifive_u machine. Correct it. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > > --- > > roms/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > Would you please look at this patch? This should be in 4.1. Regards, Bin
On Sat, Aug 3, 2019 at 2:08 PM Bin Meng <bmeng.cn@gmail.com> wrote: > Currently the make rules are wrongly using qemu/virt opensbi image > for sifive_u machine. Correct it. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > > --- > > roms/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/roms/Makefile b/roms/Makefile > index dc70fb5..775c963 100644 > --- a/roms/Makefile > +++ b/roms/Makefile > @@ -183,7 +183,7 @@ opensbi64-sifive_u: > $(MAKE) -C opensbi \ > CROSS_COMPILE=$(riscv64_cross_prefix) \ > PLATFORM="qemu/sifive_u" > - cp opensbi/build/platform/qemu/virt/firmware/fw_jump.bin > ../pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin > + cp opensbi/build/platform/qemu/sifive_u/firmware/fw_jump.bin > ../pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin > > clean: > rm -rf seabios/.config seabios/out seabios/builds > -- > 2.7.4 > > Reviewed-by: Chih-Min Chao <chihmin.chao@sifive.com>
On Fri, Aug 2, 2019 at 11:08 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > Currently the make rules are wrongly using qemu/virt opensbi image > for sifive_u machine. Correct it. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Good catch. @Palmer Dabbelt can you take this for 4.1? Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > > --- > > roms/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/roms/Makefile b/roms/Makefile > index dc70fb5..775c963 100644 > --- a/roms/Makefile > +++ b/roms/Makefile > @@ -183,7 +183,7 @@ opensbi64-sifive_u: > $(MAKE) -C opensbi \ > CROSS_COMPILE=$(riscv64_cross_prefix) \ > PLATFORM="qemu/sifive_u" > - cp opensbi/build/platform/qemu/virt/firmware/fw_jump.bin ../pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin > + cp opensbi/build/platform/qemu/sifive_u/firmware/fw_jump.bin ../pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin > > clean: > rm -rf seabios/.config seabios/out seabios/builds > -- > 2.7.4 > >
Hi Palmer, On Tue, Aug 6, 2019 at 1:04 AM Alistair Francis <alistair23@gmail.com> wrote: > > On Fri, Aug 2, 2019 at 11:08 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > > > Currently the make rules are wrongly using qemu/virt opensbi image > > for sifive_u machine. Correct it. > > > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > > Good catch. > > @Palmer Dabbelt can you take this for 4.1? > Is this patch merged for 4.1? Thanks! > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > Regards, Bin
On Sun, 11 Aug 2019 at 08:17, Bin Meng <bmeng.cn@gmail.com> wrote: > > Hi Palmer, > > On Tue, Aug 6, 2019 at 1:04 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > On Fri, Aug 2, 2019 at 11:08 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > > > > > Currently the make rules are wrongly using qemu/virt opensbi image > > > for sifive_u machine. Correct it. > > > > > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > > > > Good catch. > > > > @Palmer Dabbelt can you take this for 4.1? > > > > Is this patch merged for 4.1? Thanks! Sorry, it doesn't look like it is, and it's now missed the deadline for 4.1 (only critical showstopper bugs and security issues would go in at this point). thanks -- PMM
On Mon, 12 Aug 2019 at 09:38, Peter Maydell <peter.maydell@linaro.org> wrote: > > On Sun, 11 Aug 2019 at 08:17, Bin Meng <bmeng.cn@gmail.com> wrote: > > > > Hi Palmer, > > > > On Tue, Aug 6, 2019 at 1:04 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > > > On Fri, Aug 2, 2019 at 11:08 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > > > > > > > Currently the make rules are wrongly using qemu/virt opensbi image > > > > for sifive_u machine. Correct it. > > > > > > > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > > > > > > Good catch. > > > > > > @Palmer Dabbelt can you take this for 4.1? > > > > > > > Is this patch merged for 4.1? Thanks! > > Sorry, it doesn't look like it is, and it's now missed the > deadline for 4.1 (only critical showstopper bugs and security > issues would go in at this point). Since a very late ppc pullreq turned up which needed to also go into rc5 and meant we couldn't just have a single-change rc, I figured this was safe enough to also apply for rc5, so I've put it in. thanks -- PMM
On Tue, Aug 13, 2019 at 6:00 AM Peter Maydell <peter.maydell@linaro.org> wrote: > > On Mon, 12 Aug 2019 at 09:38, Peter Maydell <peter.maydell@linaro.org> wrote: > > > > On Sun, 11 Aug 2019 at 08:17, Bin Meng <bmeng.cn@gmail.com> wrote: > > > > > > Hi Palmer, > > > > > > On Tue, Aug 6, 2019 at 1:04 AM Alistair Francis <alistair23@gmail.com> wrote: > > > > > > > > On Fri, Aug 2, 2019 at 11:08 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > > > > > > > > > Currently the make rules are wrongly using qemu/virt opensbi image > > > > > for sifive_u machine. Correct it. > > > > > > > > > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > > > > > > > > Good catch. > > > > > > > > @Palmer Dabbelt can you take this for 4.1? > > > > > > > > > > Is this patch merged for 4.1? Thanks! > > > > Sorry, it doesn't look like it is, and it's now missed the > > deadline for 4.1 (only critical showstopper bugs and security > > issues would go in at this point). > > Since a very late ppc pullreq turned up which needed to also go into > rc5 and meant we couldn't just have a single-change rc, I figured this > was safe enough to also apply for rc5, so I've put it in. Thanks Peter! Alistair > > thanks > -- PMM
On Tue, 13 Aug 2019 09:52:13 PDT (-0700), alistair23@gmail.com wrote: > On Tue, Aug 13, 2019 at 6:00 AM Peter Maydell <peter.maydell@linaro.org> wrote: >> >> On Mon, 12 Aug 2019 at 09:38, Peter Maydell <peter.maydell@linaro.org> wrote: >> > >> > On Sun, 11 Aug 2019 at 08:17, Bin Meng <bmeng.cn@gmail.com> wrote: >> > > >> > > Hi Palmer, >> > > >> > > On Tue, Aug 6, 2019 at 1:04 AM Alistair Francis <alistair23@gmail.com> wrote: >> > > > >> > > > On Fri, Aug 2, 2019 at 11:08 PM Bin Meng <bmeng.cn@gmail.com> wrote: >> > > > > >> > > > > Currently the make rules are wrongly using qemu/virt opensbi image >> > > > > for sifive_u machine. Correct it. >> > > > > >> > > > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> > > > >> > > > Good catch. >> > > > >> > > > @Palmer Dabbelt can you take this for 4.1? >> > > > >> > > >> > > Is this patch merged for 4.1? Thanks! >> > >> > Sorry, it doesn't look like it is, and it's now missed the >> > deadline for 4.1 (only critical showstopper bugs and security >> > issues would go in at this point). >> >> Since a very late ppc pullreq turned up which needed to also go into >> rc5 and meant we couldn't just have a single-change rc, I figured this >> was safe enough to also apply for rc5, so I've put it in. > > Thanks Peter! Ya, that's great -- this will save us some headaches.
diff --git a/roms/Makefile b/roms/Makefile index dc70fb5..775c963 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -183,7 +183,7 @@ opensbi64-sifive_u: $(MAKE) -C opensbi \ CROSS_COMPILE=$(riscv64_cross_prefix) \ PLATFORM="qemu/sifive_u" - cp opensbi/build/platform/qemu/virt/firmware/fw_jump.bin ../pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin + cp opensbi/build/platform/qemu/sifive_u/firmware/fw_jump.bin ../pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin clean: rm -rf seabios/.config seabios/out seabios/builds
Currently the make rules are wrongly using qemu/virt opensbi image for sifive_u machine. Correct it. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- roms/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)