qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [FOR 4.1 PATCH] riscv: roms: Fix make rules for building sifive_u bios
@ 2019-08-03  6:08 Bin Meng
  2019-08-04 15:10 ` Bin Meng
                   ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Bin Meng @ 2019-08-03  6:08 UTC (permalink / raw)
  To: Gerd Hoffmann, Igor Mammedov, Laszlo Ersek, Michael S. Tsirkin,
	Philippe Mathieu-Daudé,
	Alistair Francis, Palmer Dabbelt, qemu-devel, qemu-riscv

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



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* Re: [Qemu-devel] [FOR 4.1 PATCH] riscv: roms: Fix make rules for building sifive_u bios
  2019-08-03  6:08 [Qemu-devel] [FOR 4.1 PATCH] riscv: roms: Fix make rules for building sifive_u bios Bin Meng
@ 2019-08-04 15:10 ` Bin Meng
  2019-08-05  7:13 ` [Qemu-devel] [Qemu-riscv] " Chih-Min Chao
  2019-08-05 17:01 ` [Qemu-devel] " Alistair Francis
  2 siblings, 0 replies; 9+ messages in thread
From: Bin Meng @ 2019-08-04 15:10 UTC (permalink / raw)
  To: Alistair Francis, Palmer Dabbelt,
	qemu-devel@nongnu.org Developers, open list:RISC-V

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


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [Qemu-devel] [Qemu-riscv] [FOR 4.1 PATCH] riscv: roms: Fix make rules for building sifive_u bios
  2019-08-03  6:08 [Qemu-devel] [FOR 4.1 PATCH] riscv: roms: Fix make rules for building sifive_u bios Bin Meng
  2019-08-04 15:10 ` Bin Meng
@ 2019-08-05  7:13 ` Chih-Min Chao
  2019-08-05 17:01 ` [Qemu-devel] " Alistair Francis
  2 siblings, 0 replies; 9+ messages in thread
From: Chih-Min Chao @ 2019-08-05  7:13 UTC (permalink / raw)
  To: Bin Meng
  Cc: open list:RISC-V, Michael S. Tsirkin, Laszlo Ersek,
	Palmer Dabbelt, qemu-devel@nongnu.org Developers,
	Alistair Francis, Gerd Hoffmann, Igor Mammedov,
	Philippe Mathieu-Daudé

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>

^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [Qemu-devel] [FOR 4.1 PATCH] riscv: roms: Fix make rules for building sifive_u bios
  2019-08-03  6:08 [Qemu-devel] [FOR 4.1 PATCH] riscv: roms: Fix make rules for building sifive_u bios Bin Meng
  2019-08-04 15:10 ` Bin Meng
  2019-08-05  7:13 ` [Qemu-devel] [Qemu-riscv] " Chih-Min Chao
@ 2019-08-05 17:01 ` Alistair Francis
  2019-08-11  7:16   ` Bin Meng
  2 siblings, 1 reply; 9+ messages in thread
From: Alistair Francis @ 2019-08-05 17:01 UTC (permalink / raw)
  To: Bin Meng
  Cc: open list:RISC-V, Michael S. Tsirkin, Laszlo Ersek,
	Palmer Dabbelt, qemu-devel@nongnu.org Developers,
	Alistair Francis, Gerd Hoffmann, Igor Mammedov,
	Philippe Mathieu-Daudé

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
>
>


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [Qemu-devel] [FOR 4.1 PATCH] riscv: roms: Fix make rules for building sifive_u bios
  2019-08-05 17:01 ` [Qemu-devel] " Alistair Francis
@ 2019-08-11  7:16   ` Bin Meng
  2019-08-12  8:38     ` Peter Maydell
  0 siblings, 1 reply; 9+ messages in thread
From: Bin Meng @ 2019-08-11  7:16 UTC (permalink / raw)
  To: Alistair Francis
  Cc: open list:RISC-V, Michael S. Tsirkin, Laszlo Ersek,
	Palmer Dabbelt, qemu-devel@nongnu.org Developers,
	Alistair Francis, Gerd Hoffmann, Igor Mammedov,
	Philippe Mathieu-Daudé

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


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [Qemu-devel] [FOR 4.1 PATCH] riscv: roms: Fix make rules for building sifive_u bios
  2019-08-11  7:16   ` Bin Meng
@ 2019-08-12  8:38     ` Peter Maydell
  2019-08-13 13:00       ` Peter Maydell
  0 siblings, 1 reply; 9+ messages in thread
From: Peter Maydell @ 2019-08-12  8:38 UTC (permalink / raw)
  To: Bin Meng
  Cc: open list:RISC-V, Michael S. Tsirkin, Philippe Mathieu-Daudé,
	Palmer Dabbelt, qemu-devel@nongnu.org Developers,
	Alistair Francis, Gerd Hoffmann, Igor Mammedov, Alistair Francis,
	Laszlo Ersek

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


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [Qemu-devel] [FOR 4.1 PATCH] riscv: roms: Fix make rules for building sifive_u bios
  2019-08-12  8:38     ` Peter Maydell
@ 2019-08-13 13:00       ` Peter Maydell
  2019-08-13 16:52         ` Alistair Francis
  0 siblings, 1 reply; 9+ messages in thread
From: Peter Maydell @ 2019-08-13 13:00 UTC (permalink / raw)
  To: Bin Meng
  Cc: open list:RISC-V, Michael S. Tsirkin, Philippe Mathieu-Daudé,
	Palmer Dabbelt, qemu-devel@nongnu.org Developers,
	Alistair Francis, Gerd Hoffmann, Igor Mammedov, Alistair Francis,
	Laszlo Ersek

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


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [Qemu-devel] [FOR 4.1 PATCH] riscv: roms: Fix make rules for building sifive_u bios
  2019-08-13 13:00       ` Peter Maydell
@ 2019-08-13 16:52         ` Alistair Francis
  2019-08-13 23:32           ` Palmer Dabbelt
  0 siblings, 1 reply; 9+ messages in thread
From: Alistair Francis @ 2019-08-13 16:52 UTC (permalink / raw)
  To: Peter Maydell
  Cc: open list:RISC-V, Michael S. Tsirkin, Philippe Mathieu-Daudé,
	Palmer Dabbelt, qemu-devel@nongnu.org Developers,
	Alistair Francis, Gerd Hoffmann, Igor Mammedov, Bin Meng,
	Laszlo Ersek

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


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [Qemu-devel] [FOR 4.1 PATCH] riscv: roms: Fix make rules for building sifive_u bios
  2019-08-13 16:52         ` Alistair Francis
@ 2019-08-13 23:32           ` Palmer Dabbelt
  0 siblings, 0 replies; 9+ messages in thread
From: Palmer Dabbelt @ 2019-08-13 23:32 UTC (permalink / raw)
  To: alistair23
  Cc: Peter Maydell, qemu-riscv, mst, philmd, qemu-devel,
	Alistair Francis, kraxel, imammedo, bmeng.cn, lersek

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.


^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2019-08-13 23:33 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-03  6:08 [Qemu-devel] [FOR 4.1 PATCH] riscv: roms: Fix make rules for building sifive_u bios Bin Meng
2019-08-04 15:10 ` Bin Meng
2019-08-05  7:13 ` [Qemu-devel] [Qemu-riscv] " Chih-Min Chao
2019-08-05 17:01 ` [Qemu-devel] " Alistair Francis
2019-08-11  7:16   ` Bin Meng
2019-08-12  8:38     ` Peter Maydell
2019-08-13 13:00       ` Peter Maydell
2019-08-13 16:52         ` Alistair Francis
2019-08-13 23:32           ` Palmer Dabbelt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).