From: Jonathan Cameron <jonathan.cameron@huawei.com>
To: Alistair Francis <alistair.francis@wdc.com>
Cc: <qemu-devel@nongnu.org>, <qemu-riscv@nongnu.org>,
<alistair23@gmail.com>, <palmer@sifive.com>
Subject: Re: [Qemu-riscv] [Qemu-devel] [PATCH v1 4/5] roms: Add OpenSBI version 0.3
Date: Thu, 27 Jun 2019 12:45:02 +0100 [thread overview]
Message-ID: <20190627124502.0000681e@huawei.com> (raw)
In-Reply-To: <c010cba5f307352f3f2b699231286d54d0e029df.1561414240.git.alistair.francis@wdc.com>
On Mon, 24 Jun 2019 15:11:57 -0700
Alistair Francis <alistair.francis@wdc.com> wrote:
> Add OpenSBI version 0.3 as a git submodule and as a prebult binary.
>
> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Hi Alistair,
Looks like a cut and paste buglet in the Makefile for the roms.
Jonathan
>
> diff --git a/roms/Makefile b/roms/Makefile
> index 078d3fb705..562ed726fd 100644
> --- a/roms/Makefile
> +++ b/roms/Makefile
> @@ -37,6 +37,8 @@ find-cross-prefix = $(subst gcc,,$(notdir $(call find-cross-gcc,$(1))))
> powerpc64_cross_prefix := $(call find-cross-prefix,powerpc64)
> powerpc_cross_prefix := $(call find-cross-prefix,powerpc)
> x86_64_cross_prefix := $(call find-cross-prefix,x86_64)
> +riscv32_cross_prefix := $(call find-cross-prefix,riscv32)
> +riscv64_cross_prefix := $(call find-cross-prefix,riscv64)
>
> # tag our seabios builds
> SEABIOS_EXTRAVERSION="-prebuilt.qemu.org"
> @@ -52,18 +54,21 @@ EDK2_EFIROM = edk2/BaseTools/Source/C/bin/EfiRom
> default:
> @echo "nothing is build by default"
> @echo "available build targets:"
> - @echo " bios -- update bios.bin (seabios)"
> - @echo " vgabios -- update vgabios binaries (seabios)"
> - @echo " sgabios -- update sgabios binaries"
> - @echo " pxerom -- update nic roms (bios only)"
> - @echo " efirom -- update nic roms (bios+efi)"
> - @echo " slof -- update slof.bin"
> - @echo " skiboot -- update skiboot.lid"
> - @echo " u-boot.e500 -- update u-boot.e500"
> - @echo " u-boot.sam460 -- update u-boot.sam460"
> - @echo " efi -- update UEFI (edk2) platform firmware"
> - @echo " clean -- delete the files generated by the previous" \
> - "build targets"
> + @echo " bios -- update bios.bin (seabios)"
> + @echo " vgabios -- update vgabios binaries (seabios)"
> + @echo " sgabios -- update sgabios binaries"
> + @echo " pxerom -- update nic roms (bios only)"
> + @echo " efirom -- update nic roms (bios+efi)"
> + @echo " slof -- update slof.bin"
> + @echo " skiboot -- update skiboot.lid"
> + @echo " u-boot.e500 -- update u-boot.e500"
> + @echo " u-boot.sam460 -- update u-boot.sam460"
> + @echo " efi -- update UEFI (edk2) platform firmware"
> + @echo " opensbi32-virt -- update OpenSBI for 32-bit virt machine"
> + @echo " opensbi64-virt -- update OpenSBI for 64-bit virt machine"
> + @echo " opensbi64-sifive_u -- update OpenSBI for 64-bit sifive_u machine"
> + @echo " clean -- delete the files generated by the previous" \
> + "build targets"
>
> bios: build-seabios-config-seabios-128k build-seabios-config-seabios-256k
> cp seabios/builds/seabios-128k/bios.bin ../pc-bios/bios.bin
> @@ -162,6 +167,24 @@ skiboot:
> efi: edk2-basetools
> $(MAKE) -f Makefile.edk2
>
> +opensbi32-virt:
> + $(MAKE) -C opensbi \
> + CROSS_COMPILE=$(riscv32_cross_prefix) \
> + PLATFORM="qemu/virt"
> + cp opensbi/build/platform/qemu/virt/firmware/fw_jump.bin ../pc-bios/opensbi-riscv32-virt-fw_jump.bin
> +
> +opensbi64-virt:
> + $(MAKE) -C opensbi \
> + CROSS_COMPILE=$(riscv64_cross_prefix) \
> + PLATFORM="qemu/virt"
> + cp opensbi/build/platform/qemu/virt/firmware/fw_jump.bin ../pc-bios/opensbi-riscv64-virt-fw_jump.bin
> +
> +opensbi64-virt:
Cut and paste bug,
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
> +
> clean:
> rm -rf seabios/.config seabios/out seabios/builds
> $(MAKE) -C sgabios clean
> @@ -173,3 +196,4 @@ clean:
> $(MAKE) -C u-boot-sam460ex distclean
> $(MAKE) -C skiboot clean
> $(MAKE) -f Makefile.edk2 clean
> + $(MAKE) -C opensbi clean
> diff --git a/roms/opensbi b/roms/opensbi
> new file mode 160000
> index 0000000000..ca20ac0cd4
> --- /dev/null
> +++ b/roms/opensbi
> @@ -0,0 +1 @@
> +Subproject commit ca20ac0cd4c099006d4eea4d9ac7bd7b58e2ae0f
WARNING: multiple messages have this Message-ID (diff)
From: Jonathan Cameron <jonathan.cameron@huawei.com>
To: Alistair Francis <alistair.francis@wdc.com>
Cc: alistair23@gmail.com, palmer@sifive.com, qemu-riscv@nongnu.org,
qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH v1 4/5] roms: Add OpenSBI version 0.3
Date: Thu, 27 Jun 2019 12:45:02 +0100 [thread overview]
Message-ID: <20190627124502.0000681e@huawei.com> (raw)
In-Reply-To: <c010cba5f307352f3f2b699231286d54d0e029df.1561414240.git.alistair.francis@wdc.com>
On Mon, 24 Jun 2019 15:11:57 -0700
Alistair Francis <alistair.francis@wdc.com> wrote:
> Add OpenSBI version 0.3 as a git submodule and as a prebult binary.
>
> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Hi Alistair,
Looks like a cut and paste buglet in the Makefile for the roms.
Jonathan
>
> diff --git a/roms/Makefile b/roms/Makefile
> index 078d3fb705..562ed726fd 100644
> --- a/roms/Makefile
> +++ b/roms/Makefile
> @@ -37,6 +37,8 @@ find-cross-prefix = $(subst gcc,,$(notdir $(call find-cross-gcc,$(1))))
> powerpc64_cross_prefix := $(call find-cross-prefix,powerpc64)
> powerpc_cross_prefix := $(call find-cross-prefix,powerpc)
> x86_64_cross_prefix := $(call find-cross-prefix,x86_64)
> +riscv32_cross_prefix := $(call find-cross-prefix,riscv32)
> +riscv64_cross_prefix := $(call find-cross-prefix,riscv64)
>
> # tag our seabios builds
> SEABIOS_EXTRAVERSION="-prebuilt.qemu.org"
> @@ -52,18 +54,21 @@ EDK2_EFIROM = edk2/BaseTools/Source/C/bin/EfiRom
> default:
> @echo "nothing is build by default"
> @echo "available build targets:"
> - @echo " bios -- update bios.bin (seabios)"
> - @echo " vgabios -- update vgabios binaries (seabios)"
> - @echo " sgabios -- update sgabios binaries"
> - @echo " pxerom -- update nic roms (bios only)"
> - @echo " efirom -- update nic roms (bios+efi)"
> - @echo " slof -- update slof.bin"
> - @echo " skiboot -- update skiboot.lid"
> - @echo " u-boot.e500 -- update u-boot.e500"
> - @echo " u-boot.sam460 -- update u-boot.sam460"
> - @echo " efi -- update UEFI (edk2) platform firmware"
> - @echo " clean -- delete the files generated by the previous" \
> - "build targets"
> + @echo " bios -- update bios.bin (seabios)"
> + @echo " vgabios -- update vgabios binaries (seabios)"
> + @echo " sgabios -- update sgabios binaries"
> + @echo " pxerom -- update nic roms (bios only)"
> + @echo " efirom -- update nic roms (bios+efi)"
> + @echo " slof -- update slof.bin"
> + @echo " skiboot -- update skiboot.lid"
> + @echo " u-boot.e500 -- update u-boot.e500"
> + @echo " u-boot.sam460 -- update u-boot.sam460"
> + @echo " efi -- update UEFI (edk2) platform firmware"
> + @echo " opensbi32-virt -- update OpenSBI for 32-bit virt machine"
> + @echo " opensbi64-virt -- update OpenSBI for 64-bit virt machine"
> + @echo " opensbi64-sifive_u -- update OpenSBI for 64-bit sifive_u machine"
> + @echo " clean -- delete the files generated by the previous" \
> + "build targets"
>
> bios: build-seabios-config-seabios-128k build-seabios-config-seabios-256k
> cp seabios/builds/seabios-128k/bios.bin ../pc-bios/bios.bin
> @@ -162,6 +167,24 @@ skiboot:
> efi: edk2-basetools
> $(MAKE) -f Makefile.edk2
>
> +opensbi32-virt:
> + $(MAKE) -C opensbi \
> + CROSS_COMPILE=$(riscv32_cross_prefix) \
> + PLATFORM="qemu/virt"
> + cp opensbi/build/platform/qemu/virt/firmware/fw_jump.bin ../pc-bios/opensbi-riscv32-virt-fw_jump.bin
> +
> +opensbi64-virt:
> + $(MAKE) -C opensbi \
> + CROSS_COMPILE=$(riscv64_cross_prefix) \
> + PLATFORM="qemu/virt"
> + cp opensbi/build/platform/qemu/virt/firmware/fw_jump.bin ../pc-bios/opensbi-riscv64-virt-fw_jump.bin
> +
> +opensbi64-virt:
Cut and paste bug,
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
> +
> clean:
> rm -rf seabios/.config seabios/out seabios/builds
> $(MAKE) -C sgabios clean
> @@ -173,3 +196,4 @@ clean:
> $(MAKE) -C u-boot-sam460ex distclean
> $(MAKE) -C skiboot clean
> $(MAKE) -f Makefile.edk2 clean
> + $(MAKE) -C opensbi clean
> diff --git a/roms/opensbi b/roms/opensbi
> new file mode 160000
> index 0000000000..ca20ac0cd4
> --- /dev/null
> +++ b/roms/opensbi
> @@ -0,0 +1 @@
> +Subproject commit ca20ac0cd4c099006d4eea4d9ac7bd7b58e2ae0f
next prev parent reply other threads:[~2019-06-27 11:45 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-24 22:11 [Qemu-riscv] [PATCH v1 0/5] RISC-V: Add firmware loading support and default Alistair Francis
2019-06-24 22:11 ` [Qemu-devel] " Alistair Francis
2019-06-24 22:11 ` [Qemu-riscv] [PATCH v1 1/5] hw/riscv: Split out the boot functions Alistair Francis
2019-06-24 22:11 ` [Qemu-devel] " Alistair Francis
2019-06-24 22:11 ` [Qemu-riscv] [PATCH v1 2/5] hw/riscv: Add support for loading a firmware Alistair Francis
2019-06-24 22:11 ` [Qemu-devel] " Alistair Francis
2019-06-25 9:20 ` [Qemu-riscv] " Bin Meng
2019-06-25 9:20 ` Bin Meng
2019-06-24 22:11 ` [Qemu-riscv] [PATCH v1 3/5] hw/riscv: Extend the kernel loading support Alistair Francis
2019-06-24 22:11 ` [Qemu-devel] " Alistair Francis
2019-06-25 9:20 ` [Qemu-riscv] " Bin Meng
2019-06-25 9:20 ` Bin Meng
2019-06-24 22:11 ` [Qemu-riscv] [PATCH v1 4/5] roms: Add OpenSBI version 0.3 Alistair Francis
2019-06-24 22:11 ` [Qemu-devel] " Alistair Francis
2019-06-25 9:20 ` [Qemu-riscv] " Bin Meng
2019-06-25 9:20 ` Bin Meng
2019-06-27 11:45 ` Jonathan Cameron [this message]
2019-06-27 11:45 ` Jonathan Cameron
2019-06-24 22:12 ` [Qemu-riscv] [PATCH v1 5/5] hw/riscv: Load OpenSBI as the default firmware Alistair Francis
2019-06-24 22:12 ` [Qemu-devel] " Alistair Francis
2019-06-25 9:20 ` [Qemu-riscv] " Bin Meng
2019-06-25 9:20 ` Bin Meng
2019-06-25 17:06 ` [Qemu-riscv] [PATCH v1 0/5] RISC-V: Add firmware loading support and default Alistair Francis
2019-06-25 17:06 ` [Qemu-devel] " Alistair Francis
2019-06-26 6:21 ` [Qemu-riscv] " Palmer Dabbelt
2019-06-26 6:21 ` [Qemu-devel] " Palmer Dabbelt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190627124502.0000681e@huawei.com \
--to=jonathan.cameron@huawei.com \
--cc=alistair.francis@wdc.com \
--cc=alistair23@gmail.com \
--cc=palmer@sifive.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.