diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2019-11-14 10:44:32 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2019-11-14 10:44:32 +0000 |
commit | e10bf1fe00eceb2dbff973f5939036ef3f3c77a4 (patch) | |
tree | ff3689636354f390937b591d7dabdc32bbf846be /roms | |
parent | aa464db69b40b4b695be31085e6d2f1e90956c89 (diff) | |
parent | 0221d73ce6a8e075adaa0a35a6ef853d2652b855 (diff) |
Merge remote-tracking branch 'remotes/kraxel/tags/seabios-20191113-pull-request' into staging
seabios: update to pre-1.13 snapshot (with ahci fix included).
# gpg: Signature made Wed 13 Nov 2019 14:03:25 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/seabios-20191113-pull-request:
seabios: update to pre-1.13 snapshot
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'roms')
-rw-r--r-- | roms/Makefile | 2 | ||||
m--------- | roms/seabios | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/roms/Makefile b/roms/Makefile index c150170519..28e1e557b0 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -1,5 +1,5 @@ -vgabios_variants := stdvga cirrus vmware qxl isavga virtio bochs-display ramfb +vgabios_variants := stdvga cirrus vmware qxl isavga virtio bochs-display ramfb ati vgabios_targets := $(subst -isavga,,$(patsubst %,vgabios-%.bin,$(vgabios_variants))) pxerom_variants := e1000 e1000e eepro100 ne2k_pci pcnet rtl8139 virtio vmxnet3 pxerom_targets := 8086100e 808610d3 80861209 10500940 10222000 10ec8139 1af41000 15ad07b0 diff --git a/roms/seabios b/roms/seabios -Subproject a5cab58e9a3fb6e168aba919c5669bea406573b +Subproject 3bdd2b77656124e3fa7693fbfd7a06f74c38eb8 |