diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-30 10:24:57 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-30 10:24:57 -0600 |
| commit | ee0caa8c8fe46b2b2c59604a3b2da0b2d3312d92 (patch) | |
| tree | d446734719333186f75f7b5004560fafd8a4f824 | |
| parent | 90e07938aa08fc179270d46c35fe9fd27c527f33 (diff) | |
| parent | d7a51dbbaa70677846453f8c961590913052dd86 (diff) | |
| download | qemu-ee0caa8c8fe46b2b2c59604a3b2da0b2d3312d92.tar.gz qemu-ee0caa8c8fe46b2b2c59604a3b2da0b2d3312d92.tar.bz2 qemu-ee0caa8c8fe46b2b2c59604a3b2da0b2d3312d92.zip | |
Merge remote-tracking branch 'kraxel/seabios-b1c35f2' into staging
* kraxel/seabios-b1c35f2:
seabios: update binaries in pc-bios/
roms: also copy the dsdt when updating seabios.
seabios: update to b1c35f2b28cc0c94ebed8176ff61ac0e0b377798
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | pc-bios/acpi-dsdt.aml | bin | 0 -> 4540 bytes | |||
| -rw-r--r-- | pc-bios/bios.bin | bin | 131072 -> 131072 bytes | |||
| -rw-r--r-- | roms/Makefile | 1 | ||||
| m--------- | roms/seabios | 0 |
4 files changed, 1 insertions, 0 deletions
diff --git a/pc-bios/acpi-dsdt.aml b/pc-bios/acpi-dsdt.aml Binary files differnew file mode 100644 index 0000000000..bb3dd83a56 --- /dev/null +++ b/pc-bios/acpi-dsdt.aml diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin Binary files differindex eac67cb05a..dc9b57ddc9 100644 --- a/pc-bios/bios.bin +++ b/pc-bios/bios.bin diff --git a/roms/Makefile b/roms/Makefile index feb9c2b145..5e645bc7d1 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -12,6 +12,7 @@ bios: config.seabios sh configure-seabios.sh $< make -C seabios out/bios.bin cp seabios/out/bios.bin ../pc-bios/bios.bin + cp seabios/out/*dsdt.aml ../pc-bios/ seavgabios: $(patsubst %,seavgabios-%,$(vgabios_variants)) diff --git a/roms/seabios b/roms/seabios -Subproject 5a023065388287e261ae9212452ff541f9fa9cd +Subproject b1c35f2b28cc0c94ebed8176ff61ac0e0b37779 |