summaryrefslogtreecommitdiff
path: root/roms
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2013-03-25 09:07:40 +0100
committerGerd Hoffmann <kraxel@redhat.com>2013-03-25 09:07:40 +0100
commit95ca557d5cfc1ef69ba9708ded552f389afe643d (patch)
treeb8a6397f8cb159e7e3b83bf24162d95033772ce3 /roms
parentfe6344a05fba26e16863fefcb823242e579b0991 (diff)
downloadqemu-95ca557d5cfc1ef69ba9708ded552f389afe643d.tar.gz
ipxe: disable two second timeout
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'roms')
-rw-r--r--roms/Makefile7
-rw-r--r--roms/config.ipxe.general.h2
2 files changed, 7 insertions, 2 deletions
diff --git a/roms/Makefile b/roms/Makefile
index 3dc560921d..7a228aed8f 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -57,13 +57,13 @@ lgplvgabios-%:
pxerom: $(patsubst %,pxe-rom-%,$(pxerom_variants))
-pxe-rom-%:
+pxe-rom-%: ipxe/src/config/local/general.h
make -C ipxe/src bin/$(VID)$(DID).rom
cp ipxe/src/bin/$(VID)$(DID).rom ../pc-bios/pxe-$*.rom
efirom: $(patsubst %,efi-rom-%,$(pxerom_variants))
-efi-rom-%:
+efi-rom-%: ipxe/src/config/local/general.h
make -C ipxe/src bin/$(VID)$(DID).rom
make -C ipxe/src bin-i386-efi/$(VID)$(DID).efidrv
make -C ipxe/src bin-x86_64-efi/$(VID)$(DID).efidrv
@@ -72,3 +72,6 @@ efi-rom-%:
-ec ipxe/src/bin-i386-efi/$(VID)$(DID).efidrv \
-ec ipxe/src/bin-x86_64-efi/$(VID)$(DID).efidrv \
-o ../pc-bios/efi-$*.rom
+
+ipxe/src/config/local/%: config.ipxe.%
+ cp $< $@
diff --git a/roms/config.ipxe.general.h b/roms/config.ipxe.general.h
new file mode 100644
index 0000000000..b3fce5326a
--- /dev/null
+++ b/roms/config.ipxe.general.h
@@ -0,0 +1,2 @@
+#undef BANNER_TIMEOUT
+#define BANNER_TIMEOUT 0