Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/kraxel/tags/pull-seabios-1.8.2-…
Browse files Browse the repository at this point in the history
…20150617-1' into staging

update seabios to release 1.8.2
add vgabios for virtio-vga

# gpg: Signature made Wed Jun 17 08:34:22 2015 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <[email protected]>"
# gpg:                 aka "Gerd Hoffmann <[email protected]>"
# gpg:                 aka "Gerd Hoffmann (private) <[email protected]>"

* remotes/kraxel/tags/pull-seabios-1.8.2-20150617-1:
  update seabios and vgabios binaries
  tag our seabios builds
  update seabios submodule to release 1.8.2

Signed-off-by: Peter Maydell <[email protected]>
  • Loading branch information
pm215 committed Jun 17, 2015
2 parents 8c29f8d + f3bcd42 commit a09f4a9
Show file tree
Hide file tree
Showing 10 changed files with 6 additions and 1 deletion.
Binary file modified pc-bios/bios-256k.bin
Binary file not shown.
Binary file modified pc-bios/bios.bin
Binary file not shown.
Binary file modified pc-bios/vgabios-cirrus.bin
Binary file not shown.
Binary file modified pc-bios/vgabios-qxl.bin
Binary file not shown.
Binary file modified pc-bios/vgabios-stdvga.bin
Binary file not shown.
Binary file added pc-bios/vgabios-virtio.bin
Binary file not shown.
Binary file modified pc-bios/vgabios-vmware.bin
Binary file not shown.
Binary file modified pc-bios/vgabios.bin
Binary file not shown.
5 changes: 5 additions & 0 deletions roms/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ powerpc64_cross_prefix := $(call find-cross-prefix,powerpc64)
powerpc_cross_prefix := $(call find-cross-prefix,powerpc)
x86_64_cross_prefix := $(call find-cross-prefix,x86_64)

# tag our seabios builds
SEABIOS_VERSION="$(shell cd seabios; git describe --tags --long) by qemu-project.org"

#
# EfiRom utility is shipped with edk2 / tianocore, in BaseTools/
#
Expand Down Expand Up @@ -75,10 +78,12 @@ build-seabios-config-%: config.%
mkdir -p seabios/builds/$*
cp $< seabios/builds/$*/.config
$(MAKE) -C seabios \
VERSION=$(SEABIOS_VERSION) \
CROSS_COMPILE=$(x86_64_cross_prefix) \
KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \
OUT=$(CURDIR)/seabios/builds/$*/ oldnoconfig
$(MAKE) -C seabios \
VERSION=$(SEABIOS_VERSION) \
CROSS_COMPILE=$(x86_64_cross_prefix) \
KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \
OUT=$(CURDIR)/seabios/builds/$*/ all
Expand Down
2 changes: 1 addition & 1 deletion roms/seabios
Submodule seabios updated from 4adadb to 33fbe1

0 comments on commit a09f4a9

Please sign in to comment.