From f3c62823916b55b73298ea83921fab287932a90f Mon Sep 17 00:00:00 2001 From: aliguori Date: Sun, 21 Dec 2008 01:37:01 +0000 Subject: [PATCH] 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 git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6117 c046a42c-6fe2-441c-8c8c-71466251a162 --- pc-bios/bios-pq/0004_no-stack-protector.patch | 21 ---------- pc-bios/bios-pq/0006_acpi-packing.patch | 36 ------------------ pc-bios/bios-pq/0007_separate-build-dir.patch | 33 ---------------- pc-bios/bios-pq/HEAD | 2 +- pc-bios/bios-pq/series | 3 -- pc-bios/bios.bin | Bin 131072 -> 131072 bytes 6 files changed, 1 insertion(+), 94 deletions(-) delete mode 100644 pc-bios/bios-pq/0004_no-stack-protector.patch delete mode 100644 pc-bios/bios-pq/0006_acpi-packing.patch delete mode 100644 pc-bios/bios-pq/0007_separate-build-dir.patch diff --git a/pc-bios/bios-pq/0004_no-stack-protector.patch b/pc-bios/bios-pq/0004_no-stack-protector.patch deleted file mode 100644 index a5f7bbc15c..0000000000 --- a/pc-bios/bios-pq/0004_no-stack-protector.patch +++ /dev/null @@ -1,21 +0,0 @@ -Disable stack protector for BIOS - -Some distro GCCs (like Ubuntu) enable stack protection by default. Since the -BIOS doesn't link against libgcc, this results in undefined references unless -the stack protector is disabled. - -Signed-off-by: Anthony Liguori - -diff --git a/bios/Makefile.in b/bios/Makefile.in -index af674b4..5c7bd4f 100644 ---- a/bios/Makefile.in -+++ b/bios/Makefile.in -@@ -41,7 +41,7 @@ RANLIB = @RANLIB@ - - BCC = bcc - GCC = gcc --GCC32 = gcc -m32 -+GCC32 = gcc -m32 -fno-stack-protector - AS86 = as86 - - BX_INCDIRS = -I.. -I$(srcdir)/.. -I../iodev -I$(srcdir)/../iodev diff --git a/pc-bios/bios-pq/0006_acpi-packing.patch b/pc-bios/bios-pq/0006_acpi-packing.patch deleted file mode 100644 index 0037046a67..0000000000 --- a/pc-bios/bios-pq/0006_acpi-packing.patch +++ /dev/null @@ -1,36 +0,0 @@ -Make ACPI tables byte-aligned - -The ACPI spec requires structures to be byte-aligned. I'm a bit surprised we've -gotten away with this for so long. This patch allows Knoppix to boot. This bug -was reported by Paul Brook. - -Signed-off-by: Anthony Liguori - -diff --git a/bios/rombios32.c b/bios/rombios32.c -index 7953485..540912a 100644 ---- a/bios/rombios32.c -+++ b/bios/rombios32.c -@@ -1099,6 +1099,12 @@ static void mptable_init(void) - /* Table structure from Linux kernel (the ACPI tables are under the - BSD license) */ - -+/* -+ * All tables must be byte-packed to match the ACPI specification, since -+ * the tables are provided by the system BIOS. -+ */ -+#pragma pack(1) -+ - #define ACPI_TABLE_HEADER_DEF /* ACPI common table header */ \ - uint8_t signature [4]; /* ACPI signature (4 ASCII characters) */\ - uint32_t length; /* Length of table, in bytes, including header */\ -@@ -1326,6 +1332,10 @@ struct madt_int_override - }; - #endif - -+/* Reset to default packing */ -+ -+#pragma pack() -+ - #include "acpi-dsdt.hex" - - static inline uint16_t cpu_to_le16(uint16_t x) diff --git a/pc-bios/bios-pq/0007_separate-build-dir.patch b/pc-bios/bios-pq/0007_separate-build-dir.patch deleted file mode 100644 index 5d718c4522..0000000000 --- a/pc-bios/bios-pq/0007_separate-build-dir.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix bochs bios build from a separate directory - -Bochs keeps the BIOS-bochs-latest and BIOS-bochs-legacy binaries under revision -control. Since the build changes these binaries, and guilt cannot handle -changed binaries, it makes it very difficult to work with a patch queue if -you're building from the same tree as the source is located. - -Bochs has some support for building from a separate directory but it's currently -broken. This patch fixes that and allows for a sane work flow when developing -BIOS changes for QEMU. - -Signed-off-by: Anthony Liguori - -diff --git a/bios/Makefile.in b/bios/Makefile.in -index 5c7bd4f..3d3d195 100644 ---- a/bios/Makefile.in -+++ b/bios/Makefile.in -@@ -98,7 +98,7 @@ rombios32.bin: rombios32.out rombios.h - ./biossums -pad $@ - - rombios32.out: rombios32start.o rombios32.o rombios32.ld -- ld -o $@ -T rombios32.ld rombios32start.o rombios32.o -+ ld -o $@ -T $(srcdir)/rombios32.ld rombios32start.o rombios32.o - - rombios32.o: rombios32.c acpi-dsdt.hex - $(GCC32) -O2 -Wall -c -o $@ $< -@@ -115,5 +115,4 @@ rombios32start.o: rombios32start.S - BIOS-bochs-latest: rombios16.bin rombios32.bin - cat rombios32.bin rombios16.bin > $@ - --biossums: biossums.c -- $(GCC) -o biossums biossums.c -+biossums: biossums.o diff --git a/pc-bios/bios-pq/HEAD b/pc-bios/bios-pq/HEAD index ebb8145e61..928a2334bb 100644 --- a/pc-bios/bios-pq/HEAD +++ b/pc-bios/bios-pq/HEAD @@ -1 +1 @@ -9d573204c0bef20be64f99c55c29660f5fd2fe71 +370a7e0d8419bc05192d766c11b7221e5ffc0f75 diff --git a/pc-bios/bios-pq/series b/pc-bios/bios-pq/series index bbf1aafc40..0e7558c47b 100644 --- a/pc-bios/bios-pq/series +++ b/pc-bios/bios-pq/series @@ -1,7 +1,4 @@ 0001_bx-qemu.patch 0002_e820-high-mem.patch 0003_smp-startup-poll.patch -0004_no-stack-protector.patch 0005_hpet.patch -0006_acpi-packing.patch -0007_separate-build-dir.patch diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin index 1d987d0bf89019d1a1aad2c10b541deea67f1c92..5120192dede8b85dbba691716b7de006a069e6b6 100644 GIT binary patch delta 45 zcmZo@;Am*z*kB;U$g|l{D3pnjr@38Zd%FnZ{Uc092HP`kGEPwAFf!0LuweKz9RNBv B4kZ8p delta 45 zcmZo@;Am*z*kB;U$hFx}D3pnjtGQidd%FnZ{Uc0