openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ipxe: use upstream configuration 

Upstream supports named configurations now and ships with
settings for qemu.  Use them, drop our config header copying.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2015-09-03 14:40:29 +02:00
parent f927f16213
commit cf2b4b5b77
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
roms/Makefile
View File

@ -120,20 +120,17 @@ efi-rom-%: build-pxe-roms build-efi-roms
-ec ipxe/src/bin-x86_64-efi/$(VID)$(DID).efidrv \
-o ../pc-bios/efi-$*.rom
build-pxe-roms: ipxe/src/config/local/general.h
$(MAKE) -C ipxe/src \
build-pxe-roms:
$(MAKE) -C ipxe/src CONFIG=qemu \
CROSS_COMPILE=$(x86_64_cross_prefix) \
$(patsubst %,bin/%.rom,$(pxerom_targets))
build-efi-roms: build-pxe-roms ipxe/src/config/local/general.h
$(MAKE) -C ipxe/src \
build-efi-roms: build-pxe-roms
$(MAKE) -C ipxe/src CONFIG=qemu \
CROSS_COMPILE=$(x86_64_cross_prefix) \
$(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \
$(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets))
ipxe/src/config/local/%: config.ipxe.%
cp $< $@
slof:
$(MAKE) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu

4
roms/config.ipxe.general.h
View File

@ -1,4 +0,0 @@
#undef BANNER_TIMEOUT
#define BANNER_TIMEOUT 30
#undef ROM_BANNER_TIMEOUT
#define ROM_BANNER_TIMEOUT 0