On Thu, May 08, 2025 at 03:35:31PM +0200, Philippe Mathieu-Daudé wrote: > Date: Thu, 8 May 2025 15:35:31 +0200 > From: Philippe Mathieu-Daudé <phi...@linaro.org> > Subject: [PATCH v4 08/27] hw/i386/pc: Remove multiboot.bin > X-Mailer: git-send-email 2.47.1 > > All PC machines now use the multiboot_dma.bin binary, > we can remove the non-DMA version (multiboot.bin). > > Suggested-by: Thomas Huth <th...@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org> > --- > pc-bios/optionrom/optionrom.h | 4 - > hw/i386/pc.c | 1 - > pc-bios/meson.build | 1 - > pc-bios/multiboot.bin | Bin 1024 -> 0 bytes > pc-bios/optionrom/Makefile | 2 +- > pc-bios/optionrom/multiboot.S | 232 ----------------------------- > pc-bios/optionrom/multiboot_dma.S | 234 +++++++++++++++++++++++++++++- > 7 files changed, 233 insertions(+), 241 deletions(-) > delete mode 100644 pc-bios/multiboot.bin > delete mode 100644 pc-bios/optionrom/multiboot.S > > diff --git a/pc-bios/optionrom/optionrom.h b/pc-bios/optionrom/optionrom.h > index 7bcdf0eeb24..2e6e2493f83 100644 > --- a/pc-bios/optionrom/optionrom.h > +++ b/pc-bios/optionrom/optionrom.h > @@ -117,16 +117,12 @@ > * > * Clobbers: %eax, %edx, %es, %ecx, %edi and adresses %esp-20 to %esp > */ > -#ifdef USE_FW_CFG_DMA > #define read_fw_blob_dma(var) \ > read_fw var ## _SIZE; \ > mov %eax, %ecx; \ > read_fw var ## _ADDR; \ > mov %eax, %edi ; \ > read_fw_dma var ## _DATA, %ecx, %edi > -#else > -#define read_fw_blob_dma(var) read_fw_blob(var) > -#endif
It seems read_fw_blob() could be dropped as well and this is not a big deal. So, Reviewed-by: Zhao Liu <zhao1....@intel.com>
