diff options
| author | Paolo Bonzini | 2011-11-03 15:14:00 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2011-11-07 17:57:36 +0100 |
| commit | 6329866f818db89645ca39fdf21a90f9d059be16 (patch) | |
| tree | e07c25dd065cf20729184e6cd42c13b4f1384027 | |
| parent | Merge remote-tracking branch 'kwolf/for-anthony' into staging (diff) | |
| download | qemu-6329866f818db89645ca39fdf21a90f9d059be16.tar.gz qemu-6329866f818db89645ca39fdf21a90f9d059be16.tar.xz qemu-6329866f818db89645ca39fdf21a90f9d059be16.zip | |
add sgabios blob and submodule
The rom was not added together with the sgabios device and is
not installed.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | pc-bios/README | 6 | ||||
| -rwxr-xr-x | pc-bios/sgabios.bin | bin | 0 -> 4096 bytes | |||
| m--------- | roms/sgabios | 0 |
5 files changed, 10 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules index 2a43dbcd7c..eca876f85d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -16,3 +16,6 @@ [submodule "roms/qemu-palcode"] path = roms/qemu-palcode url = git://repo.or.cz/qemu-palcode.git +[submodule "roms/sgabios"] + path = roms/sgabios + url = git://git.qemu.org/sgabios.git @@ -253,7 +253,7 @@ ar de en-us fi fr-be hr it lv nl pl ru th \ common de-ch es fo fr-ca hu ja mk nl-be pt sl tr ifdef INSTALL_BLOBS -BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin \ +BLOBS=bios.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \ vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin \ ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc \ pxe-e1000.rom pxe-eepro100.rom pxe-ne2k_pci.rom \ diff --git a/pc-bios/README b/pc-bios/README index 0668559842..1cebbbc89a 100644 --- a/pc-bios/README +++ b/pc-bios/README @@ -19,6 +19,12 @@ https://github.com/dgibson/SLOF, and the image currently in qemu is built from git tag qemu-slof-20111013. +- sgabios (the Serial Graphics Adapter option ROM) provides a means for + legacy x86 software to communicate with an attached serial console as + if a video card were attached. The master sources reside in a subversion + repository at http://sgabios.googlecode.com/svn/trunk. A git mirror is + available at git://git.qemu.org/sgabios.git. + - The PXE roms come from the iPXE project. Built with BANNER_TIME 0. Sources available at http://ipxe.org. Vendor:Device ID -> ROM mapping: diff --git a/pc-bios/sgabios.bin b/pc-bios/sgabios.bin Binary files differnew file mode 100755 index 0000000000..c3da4c3d0a --- /dev/null +++ b/pc-bios/sgabios.bin diff --git a/roms/sgabios b/roms/sgabios new file mode 160000 +Subproject 23d474943dcd55d0550a3d20b3d30e9040a4f15 |