diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-29 08:12:25 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-29 08:12:25 -0500 |
| commit | c199707ad0dcbb4a72e7435551c7f23b9606a063 (patch) | |
| tree | 475d431ba95fa75a09ec3d33f17b130ce988280a | |
| parent | 6a4e17711442849bf2cc731ccddef5a2a2d92d29 (diff) | |
| parent | 6683d7bc2759e9da8b5c4907a9de85d500933ffb (diff) | |
| download | qemu-c199707ad0dcbb4a72e7435551c7f23b9606a063.tar.gz | |
Merge remote-tracking branch 'kraxel/seabios-1.7.2.2' into staging
# By Gerd Hoffmann
# Via Gerd Hoffmann
* kraxel/seabios-1.7.2.2:
update seabios to release 1.7.2.2
Revert "roms: switch oldnoconfig to olddefconfig"
Message-id: 1369736932-16627-1-git-send-email-kraxel@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | pc-bios/bios.bin | bin | 131072 -> 131072 bytes | |||
| -rwxr-xr-x | roms/configure-seabios.sh | 2 | ||||
| m--------- | roms/seabios | 0 |
3 files changed, 1 insertions, 1 deletions
diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin Binary files differindex ec9eeb12c6..c2a19b8930 100644 --- a/pc-bios/bios.bin +++ b/pc-bios/bios.bin diff --git a/roms/configure-seabios.sh b/roms/configure-seabios.sh index 4bb6c2b90f..98f59a24ba 100755 --- a/roms/configure-seabios.sh +++ b/roms/configure-seabios.sh @@ -2,4 +2,4 @@ config="$1" make -C seabios clean distclean cp "$config" seabios/.config -make -C seabios olddefconfig +make -C seabios oldnoconfig diff --git a/roms/seabios b/roms/seabios -Subproject 88cb66ea542906ffff8a80ef397b9e3adbb3311 +Subproject d4f7d90f47462b4e8836899adc5060fbde5253e |