On 3/17/16 1:33 PM, Anthony PERARD wrote: > On Thu, Mar 17, 2016 at 12:37:36PM -0500, Doug Goldstein wrote: >> On 3/14/16 12:55 PM, Anthony PERARD wrote: >>> ... into the firmware directory, along with hvmloader. >>> >>> Signed-off-by: Anthony PERARD >>> --- >>> Change in V4: >>> - remove install of acpi dsdt table >>> >>> Change in V3: >>> - do not check if ROMs file exist before installing, they should exist >>> - change rules for dsdt_anycpu_qemu_xen.c in oder to generate both .c and >>> .aml files without changing temporarly the other dsdt_*.c rules. >>> --- >>> tools/firmware/Makefile | 13 +++++++++++++ >>> 1 file changed, 13 insertions(+) >>> >>> diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile >>> index 6cc86ce..6a37758 100644 >>> --- a/tools/firmware/Makefile >>> +++ b/tools/firmware/Makefile >>> @@ -19,6 +19,9 @@ SUBDIRS-y += hvmloader >>> >>> LD32BIT-$(CONFIG_FreeBSD) := LD32BIT_FLAG=-melf_i386_fbsd >>> >>> +SEABIOS_ROM := seabios-dir/out/bios.bin >>> +OVMF_ROM := ovmf-dir/ovmf.bin >>> + >>> ovmf-dir: >>> GIT=$(GIT) $(XEN_ROOT)/scripts/git-checkout.sh $(OVMF_UPSTREAM_URL) $(OVMF_UPSTREAM_REVISION) ovmf-dir >>> cp ovmf-makefile ovmf-dir/Makefile; >>> @@ -45,6 +48,16 @@ endif >>> install: all >>> [ -d $(INST_DIR) ] || $(INSTALL_DIR) $(INST_DIR) >>> [ ! -e $(TARGET) ] || $(INSTALL_DATA) $(TARGET) $(INST_DIR) >>> +ifeq ($(CONFIG_SEABIOS),y) >>> +ifeq ($(SEABIOS_PATH),) >>> + $(INSTALL_DATA) $(SEABIOS_ROM) $(INST_DIR)/seabios.bin >> >> Why install this as "seabios.bin" when the default is "bios.bin". Most >> distro's packages for SeaBIOS install it as "bios.bin" > > No reason. I guess it's fine to keep the same name ("bios.bin"). My distro > install it as "bios-256k.bin", with "bios.bin" been the small version I > guess. > > Right. All the distros should be doing that now for modern versions of SeaBIOS. When this work gets packaged up in a distro they'll likely use one of those two versions instead of using the one that Xen builds, like they mostly do with QEMU. I'd have to check how Xen builds SeaBIOS to know which it should point to. -- Doug Goldstein