提交 16a91899 编写于 作者: P Peter Maydell

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

seabios: update to 1.7.5-rc1
ipxe: update to current git

# gpg: Signature made Thu 15 May 2014 13:29:37 BST 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-2:
  ipxe: update to current git
  seabios: update to 1.7.5-rc1
Signed-off-by: NPeter Maydell <peter.maydell@linaro.org>
无法预览此类型文件
#undef BANNER_TIMEOUT
#define BANNER_TIMEOUT 0
#define BANNER_TIMEOUT 30
#undef ROM_BANNER_TIMEOUT
#define ROM_BANNER_TIMEOUT 0
# for qemu machine types 1.7 + older
# need to turn off features (xhci) to make it fit into 128k
# need to turn off features (xhci,uas) to make it fit into 128k
CONFIG_QEMU=y
CONFIG_ROM_SIZE=128
CONFIG_XEN=n
CONFIG_USB_XHCI=n
CONFIG_USB_UAS=n
ipxe @ 69313eda
Subproject commit 09c5109b8585178172c7608de8d52e9d9af0b680
Subproject commit 69313edad85f8958acc8a47272b3c3da494835ec
seabios @ b1d4dc90
Subproject commit 96917a8ed761f017fc8c72ba3b9181fbac03ac59
Subproject commit b1d4dc908401719c5de78c25313cf82c7cd1d602
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册