[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-riscv] [Qemu-devel] [PATCH v1 4/5] roms: Add OpenSBI version 0
From: |
Jonathan Cameron |
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 |
On Mon, 24 Jun 2019 15:11:57 -0700
Alistair Francis <address@hidden> wrote:
> Add OpenSBI version 0.3 as a git submodule and as a prebult binary.
>
> Signed-off-by: Alistair Francis <address@hidden>
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
- [Qemu-riscv] [PATCH v1 0/5] RISC-V: Add firmware loading support and default, Alistair Francis, 2019/06/24
- [Qemu-riscv] [PATCH v1 1/5] hw/riscv: Split out the boot functions, Alistair Francis, 2019/06/24
- [Qemu-riscv] [PATCH v1 3/5] hw/riscv: Extend the kernel loading support, Alistair Francis, 2019/06/24
- [Qemu-riscv] [PATCH v1 2/5] hw/riscv: Add support for loading a firmware, Alistair Francis, 2019/06/24
- [Qemu-riscv] [PATCH v1 5/5] hw/riscv: Load OpenSBI as the default firmware, Alistair Francis, 2019/06/24
- [Qemu-riscv] [PATCH v1 4/5] roms: Add OpenSBI version 0.3, Alistair Francis, 2019/06/24
- Re: [Qemu-riscv] [PATCH v1 0/5] RISC-V: Add firmware loading support and default, Alistair Francis, 2019/06/25