From: Bin Meng <bmeng.cn@gmail.com>
To: Alistair Francis <Alistair.Francis@wdc.com>,
Bastian Koppelmann <kbastian@mail.uni-paderborn.de>,
Palmer Dabbelt <palmerdabbelt@google.com>,
Sagar Karandikar <sagark@eecs.berkeley.edu>,
qemu-devel@nongnu.org, qemu-riscv@nongnu.org
Cc: Bin Meng <bin.meng@windriver.com>
Subject: [PATCH v6 3/6] roms/Makefile: Build the generic platform for RISC-V OpenSBI firmware
Date: Mon, 3 Aug 2020 00:30:29 -0700 [thread overview]
Message-ID: <1596439832-29238-4-git-send-email-bmeng.cn@gmail.com> (raw)
In-Reply-To: <1596439832-29238-1-git-send-email-bmeng.cn@gmail.com>
From: Bin Meng <bin.meng@windriver.com>
The RISC-V generic platform is a flattened device tree (FDT) based
platform where all platform specific functionality is provided based
on FDT passed by previous booting stage. The support was added in
the upstream OpenSBI v0.8 release recently.
Update our Makefile to build the generic platform instead of building
virt and sifive_u separately for RISC-V OpenSBI firmware, and change
to use fw_dynamic type images as well.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
(no changes since v3)
Changes in v3:
- Change fw_jump to fw_dynamic in the make rules
Changes in v2:
- Copy the ELF images too in the make rules
roms/Makefile | 32 ++++++++++----------------------
1 file changed, 10 insertions(+), 22 deletions(-)
diff --git a/roms/Makefile b/roms/Makefile
index f9acf39..5d9f15b 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -64,10 +64,8 @@ default help:
@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 " opensbi32-sifive_u -- update OpenSBI for 32-bit sifive_u machine"
- @echo " opensbi64-sifive_u -- update OpenSBI for 64-bit sifive_u machine"
+ @echo " opensbi32-generic -- update OpenSBI for 32-bit generic machine"
+ @echo " opensbi64-generic -- update OpenSBI for 64-bit generic machine"
@echo " bios-microvm -- update bios-microvm.bin (qboot)"
@echo " clean -- delete the files generated by the previous" \
"build targets"
@@ -170,29 +168,19 @@ skiboot:
efi: edk2-basetools
$(MAKE) -f Makefile.edk2
-opensbi32-virt:
+opensbi32-generic:
$(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
+ PLATFORM="generic"
+ cp opensbi/build/platform/generic/firmware/fw_dynamic.bin ../pc-bios/opensbi-riscv32-generic-fw_dynamic.bin
+ cp opensbi/build/platform/generic/firmware/fw_dynamic.elf ../pc-bios/opensbi-riscv32-generic-fw_dynamic.elf
-opensbi64-virt:
+opensbi64-generic:
$(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
-
-opensbi32-sifive_u:
- $(MAKE) -C opensbi \
- CROSS_COMPILE=$(riscv32_cross_prefix) \
- PLATFORM="sifive/fu540"
- cp opensbi/build/platform/sifive/fu540/firmware/fw_jump.bin ../pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin
-
-opensbi64-sifive_u:
- $(MAKE) -C opensbi \
- CROSS_COMPILE=$(riscv64_cross_prefix) \
- PLATFORM="sifive/fu540"
- cp opensbi/build/platform/sifive/fu540/firmware/fw_jump.bin ../pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin
+ PLATFORM="generic"
+ cp opensbi/build/platform/generic/firmware/fw_dynamic.bin ../pc-bios/opensbi-riscv64-generic-fw_dynamic.bin
+ cp opensbi/build/platform/generic/firmware/fw_dynamic.elf ../pc-bios/opensbi-riscv64-generic-fw_dynamic.elf
bios-microvm:
$(MAKE) -C qboot
--
2.7.4
next prev parent reply other threads:[~2020-08-03 7:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-03 7:30 [PATCH v6 0/6] riscv: Switch to use generic platform fw_dynamic type opensbi bios images Bin Meng
2020-08-03 7:30 ` [PATCH v6 1/6] configure: Create symbolic links for pc-bios/*.elf files Bin Meng
2020-08-03 7:30 ` [PATCH v6 2/6] roms/opensbi: Upgrade from v0.7 to v0.8 Bin Meng
2020-08-03 7:30 ` Bin Meng [this message]
2020-08-03 7:30 ` [PATCH v6 4/6] hw/riscv: Use pre-built bios image of generic platform for virt & sifive_u Bin Meng
2020-08-03 7:30 ` [PATCH v6 5/6] hw/riscv: spike: Change the default bios to use generic platform image Bin Meng
2020-08-03 7:30 ` [PATCH v6 6/6] gitlab-ci/opensbi: Update GitLab CI to build generic platform Bin Meng
2020-08-12 3:25 ` [PATCH v6 0/6] riscv: Switch to use generic platform fw_dynamic type opensbi bios images Alistair Francis
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=1596439832-29238-4-git-send-email-bmeng.cn@gmail.com \
--to=bmeng.cn@gmail.com \
--cc=Alistair.Francis@wdc.com \
--cc=bin.meng@windriver.com \
--cc=kbastian@mail.uni-paderborn.de \
--cc=palmerdabbelt@google.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=sagark@eecs.berkeley.edu \
/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 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).