Commit f3c62823916b55b73298ea83921fab287932a90f
1 parent
68d5736a
Update to latest Bochs BIOS
A number of our patches have been merged so we can now remove them from our queue. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6117 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
6 changed files
with
1 additions
and
94 deletions
pc-bios/bios-pq/0004_no-stack-protector.patch deleted
100644 → 0
| 1 | -Disable stack protector for BIOS | ||
| 2 | - | ||
| 3 | -Some distro GCCs (like Ubuntu) enable stack protection by default. Since the | ||
| 4 | -BIOS doesn't link against libgcc, this results in undefined references unless | ||
| 5 | -the stack protector is disabled. | ||
| 6 | - | ||
| 7 | -Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> | ||
| 8 | - | ||
| 9 | -diff --git a/bios/Makefile.in b/bios/Makefile.in | ||
| 10 | -index af674b4..5c7bd4f 100644 | ||
| 11 | ---- a/bios/Makefile.in | ||
| 12 | -+++ b/bios/Makefile.in | ||
| 13 | -@@ -41,7 +41,7 @@ RANLIB = @RANLIB@ | ||
| 14 | - | ||
| 15 | - BCC = bcc | ||
| 16 | - GCC = gcc | ||
| 17 | --GCC32 = gcc -m32 | ||
| 18 | -+GCC32 = gcc -m32 -fno-stack-protector | ||
| 19 | - AS86 = as86 | ||
| 20 | - | ||
| 21 | - BX_INCDIRS = -I.. -I$(srcdir)/.. -I../iodev -I$(srcdir)/../iodev |
pc-bios/bios-pq/0006_acpi-packing.patch deleted
100644 → 0
| 1 | -Make ACPI tables byte-aligned | ||
| 2 | - | ||
| 3 | -The ACPI spec requires structures to be byte-aligned. I'm a bit surprised we've | ||
| 4 | -gotten away with this for so long. This patch allows Knoppix to boot. This bug | ||
| 5 | -was reported by Paul Brook. | ||
| 6 | - | ||
| 7 | -Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> | ||
| 8 | - | ||
| 9 | -diff --git a/bios/rombios32.c b/bios/rombios32.c | ||
| 10 | -index 7953485..540912a 100644 | ||
| 11 | ---- a/bios/rombios32.c | ||
| 12 | -+++ b/bios/rombios32.c | ||
| 13 | -@@ -1099,6 +1099,12 @@ static void mptable_init(void) | ||
| 14 | - /* Table structure from Linux kernel (the ACPI tables are under the | ||
| 15 | - BSD license) */ | ||
| 16 | - | ||
| 17 | -+/* | ||
| 18 | -+ * All tables must be byte-packed to match the ACPI specification, since | ||
| 19 | -+ * the tables are provided by the system BIOS. | ||
| 20 | -+ */ | ||
| 21 | -+#pragma pack(1) | ||
| 22 | -+ | ||
| 23 | - #define ACPI_TABLE_HEADER_DEF /* ACPI common table header */ \ | ||
| 24 | - uint8_t signature [4]; /* ACPI signature (4 ASCII characters) */\ | ||
| 25 | - uint32_t length; /* Length of table, in bytes, including header */\ | ||
| 26 | -@@ -1326,6 +1332,10 @@ struct madt_int_override | ||
| 27 | - }; | ||
| 28 | - #endif | ||
| 29 | - | ||
| 30 | -+/* Reset to default packing */ | ||
| 31 | -+ | ||
| 32 | -+#pragma pack() | ||
| 33 | -+ | ||
| 34 | - #include "acpi-dsdt.hex" | ||
| 35 | - | ||
| 36 | - static inline uint16_t cpu_to_le16(uint16_t x) |
pc-bios/bios-pq/0007_separate-build-dir.patch deleted
100644 → 0
| 1 | -Fix bochs bios build from a separate directory | ||
| 2 | - | ||
| 3 | -Bochs keeps the BIOS-bochs-latest and BIOS-bochs-legacy binaries under revision | ||
| 4 | -control. Since the build changes these binaries, and guilt cannot handle | ||
| 5 | -changed binaries, it makes it very difficult to work with a patch queue if | ||
| 6 | -you're building from the same tree as the source is located. | ||
| 7 | - | ||
| 8 | -Bochs has some support for building from a separate directory but it's currently | ||
| 9 | -broken. This patch fixes that and allows for a sane work flow when developing | ||
| 10 | -BIOS changes for QEMU. | ||
| 11 | - | ||
| 12 | -Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> | ||
| 13 | - | ||
| 14 | -diff --git a/bios/Makefile.in b/bios/Makefile.in | ||
| 15 | -index 5c7bd4f..3d3d195 100644 | ||
| 16 | ---- a/bios/Makefile.in | ||
| 17 | -+++ b/bios/Makefile.in | ||
| 18 | -@@ -98,7 +98,7 @@ rombios32.bin: rombios32.out rombios.h | ||
| 19 | - ./biossums -pad $@ | ||
| 20 | - | ||
| 21 | - rombios32.out: rombios32start.o rombios32.o rombios32.ld | ||
| 22 | -- ld -o $@ -T rombios32.ld rombios32start.o rombios32.o | ||
| 23 | -+ ld -o $@ -T $(srcdir)/rombios32.ld rombios32start.o rombios32.o | ||
| 24 | - | ||
| 25 | - rombios32.o: rombios32.c acpi-dsdt.hex | ||
| 26 | - $(GCC32) -O2 -Wall -c -o $@ $< | ||
| 27 | -@@ -115,5 +115,4 @@ rombios32start.o: rombios32start.S | ||
| 28 | - BIOS-bochs-latest: rombios16.bin rombios32.bin | ||
| 29 | - cat rombios32.bin rombios16.bin > $@ | ||
| 30 | - | ||
| 31 | --biossums: biossums.c | ||
| 32 | -- $(GCC) -o biossums biossums.c | ||
| 33 | -+biossums: biossums.o |
pc-bios/bios-pq/HEAD
pc-bios/bios-pq/series
pc-bios/bios.bin
No preview for this file type