Commit 349cd52c authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'kraxel/roms.1' into staging 

# By Gerd Hoffmann
# Via Gerd Hoffmann
* kraxel/roms.1:
  roms: add support for building sgabios
  roms: enable parallel seabios / seavgabios builds
  roms: enable ipxe cross builds
  roms: add rules to build slof
  roms: rewrite scripts/refresh-pxe-roms.sh
  roms: parallel ipxe builds
  roms: build lgplvgabios isavga variant
  roms: enable parallel builds for 'make lgplvgabios'
  roms: add 'make clean'

Message-id: 1380532378-22138-1-git-send-email-kraxel@redhat.com
parents eb322b81 774e80ea

roms/Makefile

+81 −18
Original line number Diff line number Diff line 


vgabios_variants := stdvga cirrus vmware qxl

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
@@ -15,6 +17,22 @@ pxe-rom-rtl8139 efi-rom-rtl8139 : DID := 8139 
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)

x86_64_cross_prefix := $(call find-cross-prefix,x86_64)



#

# EfiRom utility is shipped with edk2 / tianocore, in BaseTools/

#
@@ -32,46 +50,91 @@ default: 
	@echo "  bios           -- update bios.bin (seabios)"

	@echo "  seavgabios     -- update vgabios binaries (seabios)"

	@echo "  lgplvgabios    -- update vgabios binaries (lgpl)"

	@echo "  sgabios        -- update sgabios binaries"

	@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 $<

	make -C seabios out/bios.bin

	cp seabios/out/bios.bin ../pc-bios/bios.bin

	cp seabios/out/*dsdt.aml ../pc-bios/

bios: build-seabios-config-seabios

	cp seabios/builds/seabios/bios.bin ../pc-bios/bios.bin

	cp seabios/builds/seabios/*dsdt.aml ../pc-bios/



seavgabios: $(patsubst %,seavgabios-%,$(vgabios_variants))



seavgabios-%: config.vga.%

	sh configure-seabios.sh $<

	make -C seabios out/vgabios.bin

	cp seabios/out/vgabios.bin ../pc-bios/vgabios-$*.bin

seavgabios-isavga: build-seabios-config-vga-isavga

	cp seabios/builds/vga-isavga/vgabios.bin ../pc-bios/vgabios.bin



seavgabios-%: build-seabios-config-vga-%

	cp seabios/builds/vga-$*/vgabios.bin ../pc-bios/vgabios-$*.bin



build-seabios-config-%: config.%

	mkdir -p seabios/builds/$*

	cp $< seabios/builds/$*/.config

	$(MAKE) $(MAKEFLAGS) -C seabios \

		KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \

		OUT=$(CURDIR)/seabios/builds/$*/ oldnoconfig

	$(MAKE) $(MAKEFLAGS) -C seabios \

		KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \

		OUT=$(CURDIR)/seabios/builds/$*/ all





lgplvgabios: $(patsubst %,lgplvgabios-%,$(vgabios_variants))



lgplvgabios-%:

	make -C vgabios vgabios-$*.bin

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



build-lgplvgabios:

	$(MAKE) $(MAKEFLAGS) -C vgabios $(vgabios_targets)





.PHONY: sgabios

sgabios:

	$(MAKE) $(MAKEFLAGS) -C sgabios

	cp sgabios/sgabios.bin ../pc-bios





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="" \

		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))



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 seabios/builds

	$(MAKE) $(MAKEFLAGS) -C vgabios clean

	rm -f vgabios/VGABIOS-lgpl-latest*

	$(MAKE) $(MAKEFLAGS) -C sgabios clean

	rm -f sgabios/.depend

	$(MAKE) $(MAKEFLAGS) -C ipxe/src veryclean

	$(MAKE) $(MAKEFLAGS) -C SLOF clean

roms/config.vga.cirrus→roms/config.vga-cirrus

+0 −0

File moved.

View file

roms/config.vga.isavga→roms/config.vga-isavga

+0 −0

File moved.

View file

roms/config.vga.qxl→roms/config.vga-qxl

+0 −0

File moved.

View file

roms/config.vga.stdvga→roms/config.vga-stdvga

+0 −0

File moved.

View file