[Xen-changelog] [xen-unstable] firmware: Use mkhex from hvmloader directory for etherboot ROMs

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Julian Pidancet <julian.pidancet@xxxxxxxxx>
# Date 1329137346 0
# Node ID ab47cfef2b0a774d3c576c5c7a4a3cda350cf61a
# Parent  0fe9e2556e201eb4d9fe41c95b610697e1ca2c4c
firmware: Use mkhex from hvmloader directory for etherboot ROMs

To remain consistent with how other ROMs are built into hvmloader,
call mkhex on etherboot ROMs from the hvmloader directory, instead of
the etherboot directory. In other words, eb-roms.h is not used any
more.

Introduce ETHERBOOT_NICS config option to choose which ROMs should be
built (kept rtl8139 and 8086100e per default as before).

Signed-off-by: Julian Pidancet <julian.pidancet@xxxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---


diff -r 0fe9e2556e20 -r ab47cfef2b0a Config.mk
--- a/Config.mk Mon Feb 13 12:48:20 2012 +0000
+++ b/Config.mk Mon Feb 13 12:49:06 2012 +0000
@@ -222,6 +222,8 @@
 QEMU_UPSTREAM_REVISION ?= master
 SEABIOS_UPSTREAM_TAG ?= rel-1.6.3.1
 
+ETHERBOOT_NICS ?= rtl8139 8086100e
+
 # Specify which qemu-dm to use. This may be `ioemu' to use the old
 # Mercurial in-tree version, or a local directory, or a git URL.
 # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
diff -r 0fe9e2556e20 -r ab47cfef2b0a tools/firmware/etherboot/Config
--- a/tools/firmware/etherboot/Config   Mon Feb 13 12:48:20 2012 +0000
+++ b/tools/firmware/etherboot/Config   Mon Feb 13 12:49:06 2012 +0000
@@ -1,5 +1,3 @@
-
-NICS = rtl8139 8086100e
 
 CFLAGS += -UPXE_DHCP_STRICT
 CFLAGS += -DPXE_DHCP_STRICT
diff -r 0fe9e2556e20 -r ab47cfef2b0a tools/firmware/etherboot/Makefile
--- a/tools/firmware/etherboot/Makefile Mon Feb 13 12:48:20 2012 +0000
+++ b/tools/firmware/etherboot/Makefile Mon Feb 13 12:49:06 2012 +0000
@@ -17,23 +17,16 @@
 D=ipxe
 T=ipxe.tar.gz
 
-ROMS = $(addprefix $D/src/bin/, $(addsuffix .rom, $(NICS)))
+ROMS = $(addprefix $D/src/bin/, $(addsuffix .rom, $(ETHERBOOT_NICS)))
 
 .NOTPARALLEL:
 
 .PHONY: all
-all: eb-roms.h
+all: $(ROMS)
 
 %.rom: $D/src/arch/i386/Makefile
        $(MAKE) -C $D/src bin/$(*F).rom
 
-eb-roms.h.new: $(ROMS)
-       cat $^ | ../hvmloader/mkhex etherboot >$@
-
-eb-roms.h: Config
-       $(MAKE) NO_WERROR=1 $@.new
-       mv -f $@.new $@
-
 $T:
        if ! wget -O _$T $(IPXE_TARBALL_URL); then \
                $(GIT) clone $(IPXE_GIT_URL) $D.git; \
@@ -56,7 +49,7 @@
 
 .PHONY: clean
 clean:
-       rm -rf $D $D.git *~ eb-roms.h _$T $T
+       rm -rf $D $D.git *~ _$T $T
 
 .PHONY: distclean
 distclean: clean
diff -r 0fe9e2556e20 -r ab47cfef2b0a tools/firmware/hvmloader/Makefile
--- a/tools/firmware/hvmloader/Makefile Mon Feb 13 12:48:20 2012 +0000
+++ b/tools/firmware/hvmloader/Makefile Mon Feb 13 12:49:06 2012 +0000
@@ -58,6 +58,8 @@
 CIRRUSVGA_ROM := ../vgabios/VGABIOS-lgpl-latest.cirrus.bin
 endif
 
+ETHERBOOT_ROMS := $(addprefix ../etherboot/ipxe/src/bin/, $(addsuffix .rom, 
$(ETHERBOOT_NICS)))
+
 .PHONY: all
 all: subdirs-all
        $(MAKE) hvmloader
@@ -70,7 +72,7 @@
        $(OBJCOPY) hvmloader.tmp hvmloader
        rm -f hvmloader.tmp
 
-roms.inc: $(ROMBIOS_ROM) $(SEABIOS_ROM) $(STDVGA_ROM) $(CIRRUSVGA_ROM) 
../etherboot/eb-roms.h
+roms.inc: $(ROMBIOS_ROM) $(SEABIOS_ROM) $(STDVGA_ROM) $(CIRRUSVGA_ROM) 
$(ETHERBOOT_ROMS)
        echo "/* Autogenerated file. DO NOT EDIT */" > $@.new
 
 ifneq ($(ROMBIOS_ROM),)
@@ -95,10 +97,11 @@
        sh ./mkhex vgabios_cirrusvga $(CIRRUSVGA_ROM) >> $@.new
        echo "#endif" >> $@.new
 endif
-
+ifneq ($(ETHERBOOT_ROMS),)
        echo "#ifdef ROM_INCLUDE_ETHERBOOT" >> $@.new
-       cat ../etherboot/eb-roms.h >> $@.new
+       sh ./mkhex etherboot $(ETHERBOOT_ROMS) >> $@.new
        echo "#endif" >> $@.new
+endif
 
        mv $@.new $@
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog