OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Update seabios to 1.7.4

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJS76rkAAoJEEy22O7T6HE4vgAP/itjSXiG9jLiUAa7VBtvmWET
 rUONruU9PXE/0UnKsg/jZwYiCRCPjIZMV98gCbLJ2ol4+1trfFlEoLwPRfnEVcSl
 hA4Qn/EFe+2MbWAMJySEFZcuyMmQsLe4JUJSf7kB0kaYrRmfchsLtDLtRMufjiet
 KILQVx63jzKO5iUej5ITdcDxPRjnRY0j917XSsZzQUPOE1OtpCwR7JVF3J/HqqvR
 ZXB5J8iedFDPV9w6my4jeIqJIYinW1rTTlT9BtImikYyJ6jcluJnkM8qihiLgQ2f
 KdH8OdT5nJ+Z/dpPNWkcM89uuP+gEQR+/sZpH+TPhyBb2C4kAdqtB9Vi10QkpoRv
 NJ8xk02Nr0JlEvs1fC1SVzNoIM/7HTazDDzTyLg+3MMF329jKcWQ2pqfyTqvvcC7
 Dp8S+ZSohGIJDvGXNtgHM+rDw0W97wkCC3AOWw3cOV8LMoE9qwLQ0JvNknUkDPic
 ufy10kPiF5Xujwq+RhNP7m0c061CtdWuSkxkGD58c6mkqKd2Qp/Xr9F+iL+MBDW3
 zfQfulxXO3ux3WdmcPauXMQ2zu4nEHzBWkn5H2eiVipBRRGSg7jaelhUY1X/VtoI
 f437B+XW3XMCni7gnHTjF/IXxwkQa+mcAdRVRiG+VMuI+9ObTgUhBcUXF/iLAXeT
 nR/0lSwI+ljh5wuZ9p1Z
 =sM1G
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/kraxel/tags/pull-roms-1' into staging

Update seabios to 1.7.4

# gpg: Signature made Mon 03 Feb 2014 14:42:44 GMT using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-roms-1:
  Update seabios binaries to 1.7.4
  Update seabios submodule to 1.7.4
  roms: remove explicit MAKEFLAGS from recursive make invocations

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2014-02-07 16:42:13 +00:00
commit 4db0014521
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
pc-bios/bios-256k.bin
View File

Binary file not shown.

BIN
pc-bios/bios.bin
View File

Binary file not shown.

BIN
pc-bios/vgabios-cirrus.bin
View File

Binary file not shown.

BIN
pc-bios/vgabios-qxl.bin
View File

Binary file not shown.

BIN
pc-bios/vgabios-stdvga.bin
View File

Binary file not shown.

BIN
pc-bios/vgabios-vmware.bin
View File

Binary file not shown.

BIN
pc-bios/vgabios.bin
View File

Binary file not shown.

22
roms/Makefile
View File

@ -72,11 +72,11 @@ seavgabios-%: build-seabios-config-vga-%
build-seabios-config-%: config.%
mkdir -p seabios/builds/$*
cp $< seabios/builds/$*/.config
$(MAKE) $(MAKEFLAGS) -C seabios \
$(MAKE) -C seabios \
CROSS_COMPILE=$(x86_64_cross_prefix) \
KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \
OUT=$(CURDIR)/seabios/builds/$*/ oldnoconfig
$(MAKE) $(MAKEFLAGS) -C seabios \
$(MAKE) -C seabios \
CROSS_COMPILE=$(x86_64_cross_prefix) \
KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \
OUT=$(CURDIR)/seabios/builds/$*/ all
@ -90,12 +90,12 @@ lgplvgabios-%: build-lgplvgabios
cp vgabios/VGABIOS-lgpl-latest.$*.bin ../pc-bios/vgabios-$*.bin
build-lgplvgabios:
$(MAKE) $(MAKEFLAGS) -C vgabios $(vgabios_targets)
$(MAKE) -C vgabios $(vgabios_targets)
.PHONY: sgabios
sgabios:
$(MAKE) $(MAKEFLAGS) -C sgabios
$(MAKE) -C sgabios
cp sgabios/sgabios.bin ../pc-bios
@ -114,12 +114,12 @@ efi-rom-%: build-pxe-roms build-efi-roms
-o ../pc-bios/efi-$*.rom
build-pxe-roms: ipxe/src/config/local/general.h
$(MAKE) $(MAKEFLAGS) -C ipxe/src GITVERSION="" \
$(MAKE) -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="" \
$(MAKE) -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))
@ -129,15 +129,15 @@ ipxe/src/config/local/%: config.ipxe.%
slof:
$(MAKE) $(MAKEFLAGS) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu
$(MAKE) -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
$(MAKE) -C vgabios clean
rm -f vgabios/VGABIOS-lgpl-latest*
$(MAKE) $(MAKEFLAGS) -C sgabios clean
$(MAKE) -C sgabios clean
rm -f sgabios/.depend
$(MAKE) $(MAKEFLAGS) -C ipxe/src veryclean
$(MAKE) $(MAKEFLAGS) -C SLOF clean
$(MAKE) -C ipxe/src veryclean
$(MAKE) -C SLOF clean

2
roms/seabios

@ -1 +1 @@
Subproject commit 31b8b4eea9d9ad58a73b22a6060d3ac1c419c26d
Subproject commit 96917a8ed761f017fc8c72ba3b9181fbac03ac59