[Xen-devel] [PATCH 1/5] tools/firmware: Build ipxe as a standalone ROM

[Anoob Soman <anoob.soman@xxxxxxxxxx>]

This patches doesn't get rid of etherboot[] from roms.inc. Instead,
makes a standalone iPXE rom, which will later be used by hvmloader (when
all the plubming to use standalone iPXE rom are in place)

Signed-off-by: Anoob Soman <anoob.soman@xxxxxxxxxx>
---
 tools/firmware/Makefile           | 3 +++
 tools/firmware/hvmloader/Makefile | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
index 5a7cf77..20cab38 100644
--- a/tools/firmware/Makefile
+++ b/tools/firmware/Makefile
@@ -59,6 +59,9 @@ ifeq ($(CONFIG_PV_SHIM),y)
        $(INSTALL_DATA) xen-dir/xen-shim $(INST_DIR)/xen-shim
        $(INSTALL_DATA) xen-dir/xen-shim-syms $(DEBG_DIR)/xen-shim-syms
 endif
+ifeq ($(CONFIG_ROMBIOS),y)
+       $(INSTALL_DATA) etherboot/ipxe/src/bin/ipxe.bin $(INST_DIR)/ipxe.bin
+endif
 
 .PHONY: uninstall
 uninstall:
diff --git a/tools/firmware/hvmloader/Makefile 
b/tools/firmware/hvmloader/Makefile
index a5b4c32..087b41d 100644
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -52,6 +52,7 @@ else
 CIRRUSVGA_ROM := ../vgabios/VGABIOS-lgpl-latest.cirrus.bin
 endif
 ETHERBOOT_ROMS := $(addprefix ../etherboot/ipxe/src/bin/, $(addsuffix .rom, 
$(ETHERBOOT_NICS)))
+ETHERBOOT_ROM  := ../etherboot/ipxe/src/bin/ipxe.bin
 endif
 
 ROMS := 
@@ -71,7 +72,7 @@ all: acpi subdirs-all
 acpi:
        $(MAKE) -C $(ACPI_PATH)  ACPI_BUILD_DIR=$(CURDIR) 
DSDT_FILES="$(DSDT_FILES)"
 
-rombios.o: roms.inc
+rombios.o: $(ETHERBOOT_ROM) roms.inc
 smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(SMBIOS_REL_DATE)\""
 
 ACPI_PATH = ../../libacpi
@@ -113,6 +114,11 @@ endif
 
        mv $@.new $@
 
+ifneq ($(ETHERBOOT_ROMS),)
+$(ETHERBOOT_ROM): $(ETHERBOOT_ROMS)
+       cat $^ > $@
+endif
+
 .PHONY: clean
 clean: subdirs-clean
        rm -f roms.inc roms.inc.new acpi.h
-- 
1.8.3.1


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel