roms: build improvements
cover roms: build improvements
Hi,
Here comes a patch series with a bunch of improvements for rom builds. It enables parallel builds for some of the roms, and it starts adding support for cross builds.
cheers,
Gerd
Gerd Hoffmann (7):
roms: add 'make clean'
roms: enable parallel builds for 'make lgplvgabios'
roms: build lgplvgabios isavga variant
roms: parallel ipxe builds
roms: rewrite scripts/refresh-pxe-roms.sh
roms: add rules to build slof
roms: enable ipxe cross builds
roms/Makefile | 63 ++++++++++++++++++++++++++++++----- scripts/refresh-pxe-roms.sh | 80 ++++----------------------------------------- 2 files changed, 60 insertions(+), 83 deletions(-)
Signature · 1 line
1.8.3.1
PATCH 1/7 roms: add 'make clean'
--- roms/Makefile | 7 +++++++ 1 file changed, 7 insertions(+)
roms/Makefile +7 -0
@@ -75,3 +75,10 @@ efi-rom-%: ipxe/src/config/local/general.h ipxe/src/config/local/%: config.ipxe.% cp $< $@ + + +clean: + rm -rf seabios/.config seabios/out + $(MAKE) $(MAKEFLAGS) -C vgabios clean + rm -f vgabios/VGABIOS-lgpl-latest* + $(MAKE) $(MAKEFLAGS) -C ipxe/src veryclean
Signature · 1 line
1.8.3.1
PATCH 2/7 roms: enable parallel builds for 'make lgplvgabios'
In reply to Gerd HoffmannRecurse into vgabios once, adjust dependencies, call make using $(MAKE) $(MAKEFLAGS) so jobserver mode works.
--- roms/Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
roms/Makefile +7 -2
@@ -1,5 +1,6 @@ vgabios_variants := stdvga cirrus vmware qxl +vgabios_targets := $(patsubst %,vgabios-%.bin,$(vgabios_variants)) pxerom_variants := e1000 eepro100 ne2k_pci pcnet rtl8139 virtio pxe-rom-e1000 efi-rom-e1000 : VID := 8086
@@ -49,12 +50,16 @@ seavgabios-%: config.vga.% make -C seabios out/vgabios.bin cp seabios/out/vgabios.bin ../pc-bios/vgabios-$*.bin + lgplvgabios: $(patsubst %,lgplvgabios-%,$(vgabios_variants)) -lgplvgabios-%: - make -C vgabios vgabios-$*.bin +lgplvgabios-%: build-lgplvgabios cp vgabios/VGABIOS-lgpl-latest.$*.bin ../pc-bios/vgabios-$*.bin +build-lgplvgabios: + $(MAKE) $(MAKEFLAGS) -C vgabios $(vgabios_targets) + + pxerom: $(patsubst %,pxe-rom-%,$(pxerom_variants)) pxe-rom-%: ipxe/src/config/local/general.h
Signature · 1 line
1.8.3.1
PATCH 3/7 roms: build lgplvgabios isavga variant
In reply to Gerd HoffmannAdd logic to also build+install the isavga vgabios variant.
--- roms/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
roms/Makefile +4 -2
@@ -1,6 +1,6 @@ -vgabios_variants := stdvga cirrus vmware qxl -vgabios_targets := $(patsubst %,vgabios-%.bin,$(vgabios_variants)) +vgabios_variants := stdvga cirrus vmware qxl isavga +vgabios_targets := $(subst -isavga,,$(patsubst %,vgabios-%.bin,$(vgabios_variants))) pxerom_variants := e1000 eepro100 ne2k_pci pcnet rtl8139 virtio pxe-rom-e1000 efi-rom-e1000 : VID := 8086
@@ -53,6 +53,8 @@ seavgabios-%: config.vga.% lgplvgabios: $(patsubst %,lgplvgabios-%,$(vgabios_variants)) +lgplvgabios-isavga: build-lgplvgabios + cp vgabios/VGABIOS-lgpl-latest.bin ../pc-bios/vgabios.bin lgplvgabios-%: build-lgplvgabios cp vgabios/VGABIOS-lgpl-latest.$*.bin ../pc-bios/vgabios-$*.bin
Signature · 1 line
1.8.3.1
PATCH 4/7 roms: parallel ipxe builds
In reply to Gerd HoffmannEnable parallel ipxe builds. Reduce the recursive make calls. Call recursive make properly using $(MAKE) $(MAKEFLAGS).
--- roms/Makefile | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
roms/Makefile +12 -6
@@ -2,6 +2,7 @@ vgabios_variants := stdvga cirrus vmware qxl isavga vgabios_targets := $(subst -isavga,,$(patsubst %,vgabios-%.bin,$(vgabios_variants))) pxerom_variants := e1000 eepro100 ne2k_pci pcnet rtl8139 virtio +pxerom_targets := 8086100e 80861209 10500940 10222000 10ec8139 1af41000 pxe-rom-e1000 efi-rom-e1000 : VID := 8086 pxe-rom-e1000 efi-rom-e1000 : DID := 100e
@@ -64,22 +65,27 @@ build-lgplvgabios: pxerom: $(patsubst %,pxe-rom-%,$(pxerom_variants)) -pxe-rom-%: ipxe/src/config/local/general.h - make -C ipxe/src bin/$(VID)$(DID).rom +pxe-rom-%: build-pxe-roms cp ipxe/src/bin/$(VID)$(DID).rom ../pc-bios/pxe-$*.rom efirom: $(patsubst %,efi-rom-%,$(pxerom_variants)) -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 +efi-rom-%: build-pxe-roms build-efi-roms $(EFIROM) -f "0x$(VID)" -i "0x$(DID)" -l 0x02 \ -b ipxe/src/bin/$(VID)$(DID).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 +build-pxe-roms: ipxe/src/config/local/general.h + $(MAKE) $(MAKEFLAGS) -C ipxe/src GITVERSION="" \ + $(patsubst %,bin/%.rom,$(pxerom_targets)) + +build-efi-roms: build-pxe-roms ipxe/src/config/local/general.h + $(MAKE) $(MAKEFLAGS) -C ipxe/src GITVERSION="" \ + $(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \ + $(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets)) + ipxe/src/config/local/%: config.ipxe.% cp $< $@
Signature · 1 line
1.8.3.1
PATCH 5/7 roms: rewrite scripts/refresh-pxe-roms.sh
In reply to Gerd HoffmannJust use the Makefile in roms/
--- scripts/refresh-pxe-roms.sh | 80 ++++----------------------------------------- 1 file changed, 6 insertions(+), 74 deletions(-)
scripts/refresh-pxe-roms.sh +6 -74
@@ -21,79 +21,11 @@ # Usage: Run from root of qemu tree # ./scripts/refresh-pxe-roms.sh -QEMU_DIR=$PWD -ROM_DIR="pc-bios" -BUILD_DIR="roms/ipxe" -LOCAL_CONFIG="src/config/local/general.h" - -function cleanup () -{ - if [ -n "$SAVED_CONFIG" ]; then - cp "$SAVED_CONFIG" "$BUILD_DIR"/"$LOCAL_CONFIG" - rm "$SAVED_CONFIG" - fi - cd "$QEMU_DIR" -} - -function make_rom () -{ - cd "$BUILD_DIR"/src - - BUILD_LOG=$(mktemp) - - echo Building "$2"... - make bin/"$1".rom > "$BUILD_LOG" 2>&1 - if [ $? -ne 0 ]; then - echo Build failed - tail --lines=100 "$BUILD_LOG" - rm "$BUILD_LOG" - cleanup - exit 1 - fi - rm "$BUILD_LOG" - - cp bin/"$1".rom "$QEMU_DIR"/"$ROM_DIR"/"$2" - - cd "$QEMU_DIR" -} - -if [ ! -d "$QEMU_DIR"/"$ROM_DIR" ]; then - echo "error: can't find $ROM_DIR directory," \ - "run me from the root of the qemu tree" - exit 1 -fi - -if [ ! -d "$BUILD_DIR"/src ]; then - echo "error: $BUILD_DIR not populated, try:" - echo " git submodule init $BUILD_DIR" - echo " git submodule update $BUILD_DIR" - exit 1 -fi - -if [ -e "$BUILD_DIR"/"$LOCAL_CONFIG" ]; then - SAVED_CONFIG=$(mktemp) - cp "$BUILD_DIR"/"$LOCAL_CONFIG" "$SAVED_CONFIG" -fi - -echo "#undef BANNER_TIMEOUT" > "$BUILD_DIR"/"$LOCAL_CONFIG" -echo "#define BANNER_TIMEOUT 0" >> "$BUILD_DIR"/"$LOCAL_CONFIG" - -IPXE_VERSION=$(cd "$BUILD_DIR" && git describe --tags) -if [ -z "$IPXE_VERSION" ]; then - echo "error: unable to retrieve git version" - cleanup - exit 1 +targets="pxerom" +if test -x "$(which EfiRom 2>/dev/null)"; then + targets="$targets efirom" fi -echo "#undef PRODUCT_NAME" >> "$BUILD_DIR"/"$LOCAL_CONFIG" -echo "#define PRODUCT_NAME \"iPXE $IPXE_VERSION\"" >> "$BUILD_DIR"/"$LOCAL_CONFIG" - -make_rom 8086100e pxe-e1000.rom -make_rom 80861209 pxe-eepro100.rom -make_rom 10500940 pxe-ne2k_pci.rom -make_rom 10222000 pxe-pcnet.rom -make_rom 10ec8139 pxe-rtl8139.rom -make_rom 1af41000 pxe-virtio.rom - -echo done -cleanup +cd roms +make -j4 $targets || exit 1 +make clean
Signature · 1 line
1.8.3.1
PATCH 6/7 roms: add rules to build slof
In reply to Gerd HoffmannAdd some logic to detect cross compilers. Add support for "make slof", which should JustWork[tm] if you are on a ppx64 machine or have a ppc64 cross compiler installed somewhere in your path.
--- roms/Makefile | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
roms/Makefile +22 -0
@@ -18,6 +18,21 @@ pxe-rom-virtio efi-rom-virtio : VID := 1af4 pxe-rom-virtio efi-rom-virtio : DID := 1000 # +# cross compiler auto detection +# +path := $(subst :, ,$(PATH)) +system := $(shell uname -s | tr "A-Z" "a-z") + +# first find cross binutils in path +find-cross-ld = $(firstword $(wildcard $(patsubst %,%/$(1)-*$(system)*-ld,$(path)))) +# then check we have cross gcc too +find-cross-gcc = $(firstword $(wildcard $(patsubst %ld,%gcc,$(call find-cross-ld,$(1))))) +# finally strip off path + toolname so we get the prefix +find-cross-prefix = $(subst gcc,,$(notdir $(call find-cross-gcc,$(1)))) + +powerpc64_cross_prefix := $(call find-cross-prefix,powerpc64) + +# # EfiRom utility is shipped with edk2 / tianocore, in BaseTools/ # # We need that to combine multiple images (legacy bios,
@@ -37,6 +52,7 @@ default: @echo " pxerom -- update nic roms (bios only)" @echo " efirom -- update nic roms (bios+efi, this needs" @echo " the EfiRom utility from edk2 / tianocore)" + @echo " slof -- update slof.bin" bios: config.seabios sh configure-seabios.sh $<
@@ -90,8 +106,14 @@ ipxe/src/config/local/%: config.ipxe.% cp $< $@ +slof: + $(MAKE) $(MAKEFLAGS) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu + cp SLOF/boot_rom.bin ../pc-bios/slof.bin + + clean: rm -rf seabios/.config seabios/out $(MAKE) $(MAKEFLAGS) -C vgabios clean rm -f vgabios/VGABIOS-lgpl-latest* $(MAKE) $(MAKEFLAGS) -C ipxe/src veryclean + $(MAKE) $(MAKEFLAGS) -C SLOF clean
Signature · 1 line
1.8.3.1
PATCH 7/7 roms: enable ipxe cross builds
In reply to Gerd Hoffmann--- roms/Makefile | 3 +++ 1 file changed, 3 insertions(+)
roms/Makefile +3 -0
@@ -31,6 +31,7 @@ find-cross-gcc = $(firstword $(wildcard $(patsubst %ld,%gcc,$(call find-cross-ld find-cross-prefix = $(subst gcc,,$(notdir $(call find-cross-gcc,$(1)))) powerpc64_cross_prefix := $(call find-cross-prefix,powerpc64) +x86_64_cross_prefix := $(call find-cross-prefix,x86_64) # # EfiRom utility is shipped with edk2 / tianocore, in BaseTools/
@@ -95,10 +96,12 @@ efi-rom-%: build-pxe-roms build-efi-roms build-pxe-roms: ipxe/src/config/local/general.h $(MAKE) $(MAKEFLAGS) -C ipxe/src GITVERSION="" \ + CROSS_COMPILE=$(x86_64_cross_prefix) \ $(patsubst %,bin/%.rom,$(pxerom_targets)) build-efi-roms: build-pxe-roms ipxe/src/config/local/general.h $(MAKE) $(MAKEFLAGS) -C ipxe/src GITVERSION="" \ + CROSS_COMPILE=$(x86_64_cross_prefix) \ $(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \ $(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets))
Signature · 1 line
1.8.3.1