On Thu, Jul 9, 2020 at 10:07 PM Bin Meng <bmeng...@gmail.com> wrote: > > From: Bin Meng <bin.m...@windriver.com> > > Update virt and sifive_u machines to use the opensbi fw_dynamic bios > image built for the generic FDT platform. > > Remove the out-of-date no longer used bios images. > > Signed-off-by: Bin Meng <bin.m...@windriver.com> > Reviewed-by: Anup Patel <a...@brainfault.org> > Reviewed-by: Alistair Francis <alistair.fran...@wdc.com>
This patch seems to break 32-bit Linux boots on the sifive_u and virt machines. Alistair > > --- > > Changes in v4: > - Remove old binaries in the Makefile for `make install` bisection > > Changes in v3: > - Change to fw_dynamic.bin for virt & sifive_u > > Makefile | 4 +--- > hw/riscv/sifive_u.c | 4 ++-- > hw/riscv/virt.c | 4 ++-- > pc-bios/opensbi-riscv32-generic-fw_dynamic.bin | Bin 0 -> 62144 bytes > pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin | Bin 49520 -> 0 bytes > pc-bios/opensbi-riscv32-virt-fw_jump.bin | Bin 49504 -> 0 bytes > pc-bios/opensbi-riscv64-generic-fw_dynamic.bin | Bin 0 -> 70792 bytes > pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin | Bin 57936 -> 0 bytes > pc-bios/opensbi-riscv64-virt-fw_jump.bin | Bin 57920 -> 0 bytes > 9 files changed, 5 insertions(+), 7 deletions(-) > create mode 100644 pc-bios/opensbi-riscv32-generic-fw_dynamic.bin > delete mode 100644 pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin > delete mode 100644 pc-bios/opensbi-riscv32-virt-fw_jump.bin > create mode 100644 pc-bios/opensbi-riscv64-generic-fw_dynamic.bin > delete mode 100644 pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin > delete mode 100644 pc-bios/opensbi-riscv64-virt-fw_jump.bin > > diff --git a/Makefile b/Makefile > index b1b8a5a..f06b3ae 100644 > --- a/Makefile > +++ b/Makefile > @@ -840,9 +840,7 @@ palcode-clipper \ > u-boot.e500 u-boot-sam460-20100605.bin \ > qemu_vga.ndrv \ > edk2-licenses.txt \ > -hppa-firmware.img \ > -opensbi-riscv32-sifive_u-fw_jump.bin opensbi-riscv32-virt-fw_jump.bin \ > -opensbi-riscv64-sifive_u-fw_jump.bin opensbi-riscv64-virt-fw_jump.bin > +hppa-firmware.img > > > DESCS=50-edk2-i386-secure.json 50-edk2-x86_64-secure.json \ > diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c > index b434fd3..dc46f64 100644 > --- a/hw/riscv/sifive_u.c > +++ b/hw/riscv/sifive_u.c > @@ -60,9 +60,9 @@ > #include <libfdt.h> > > #if defined(TARGET_RISCV32) > -# define BIOS_FILENAME "opensbi-riscv32-sifive_u-fw_jump.bin" > +# define BIOS_FILENAME "opensbi-riscv32-generic-fw_dynamic.bin" > #else > -# define BIOS_FILENAME "opensbi-riscv64-sifive_u-fw_jump.bin" > +# define BIOS_FILENAME "opensbi-riscv64-generic-fw_dynamic.bin" > #endif > > static const struct MemmapEntry { > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index 85e17fe..5ca49c5 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -43,9 +43,9 @@ > #include "hw/pci-host/gpex.h" > > #if defined(TARGET_RISCV32) > -# define BIOS_FILENAME "opensbi-riscv32-virt-fw_jump.bin" > +# define BIOS_FILENAME "opensbi-riscv32-generic-fw_dynamic.bin" > #else > -# define BIOS_FILENAME "opensbi-riscv64-virt-fw_jump.bin" > +# define BIOS_FILENAME "opensbi-riscv64-generic-fw_dynamic.bin" > #endif > > static const struct MemmapEntry { > diff --git a/pc-bios/opensbi-riscv32-generic-fw_dynamic.bin > b/pc-bios/opensbi-riscv32-generic-fw_dynamic.bin > new file mode 100644 > index 0000000..23b4dfb > Binary files /dev/null and b/pc-bios/opensbi-riscv32-generic-fw_dynamic.bin > differ > diff --git a/pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin > b/pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin > deleted file mode 100644 > index 3e0da54..0000000 > Binary files a/pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin and /dev/null > differ > diff --git a/pc-bios/opensbi-riscv32-virt-fw_jump.bin > b/pc-bios/opensbi-riscv32-virt-fw_jump.bin > deleted file mode 100644 > index bc56ed6..0000000 > Binary files a/pc-bios/opensbi-riscv32-virt-fw_jump.bin and /dev/null differ > diff --git a/pc-bios/opensbi-riscv64-generic-fw_dynamic.bin > b/pc-bios/opensbi-riscv64-generic-fw_dynamic.bin > new file mode 100644 > index 0000000..16c0cf4 > Binary files /dev/null and b/pc-bios/opensbi-riscv64-generic-fw_dynamic.bin > differ > diff --git a/pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin > b/pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin > deleted file mode 100644 > index 1acee86..0000000 > Binary files a/pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin and /dev/null > differ > diff --git a/pc-bios/opensbi-riscv64-virt-fw_jump.bin > b/pc-bios/opensbi-riscv64-virt-fw_jump.bin > deleted file mode 100644 > index c62f2b4..0000000 > Binary files a/pc-bios/opensbi-riscv64-virt-fw_jump.bin and /dev/null differ > -- > 2.7.4 > >