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>
qemu · Nov 30, 2012 · ee0caa8 · ee0caa8
2 parents 90e0793 + d7a51db
commit ee0caa8
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 1 deletion.
diff --git a/pc-bios/acpi-dsdt.aml b/pc-bios/acpi-dsdt.aml
diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin
diff --git 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