| Message ID | 1593746287-19251-4-git-send-email-bmeng.cn@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | riscv: Switch to use generic platform fw_dynamic type opensbi bios images | expand |
On Thu, Jul 2, 2020 at 8:22 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > 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> Alistair > > --- > > 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 > >
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