pc-bios from debian lenny's kvm

diff --git a/qemu/pc-bios/Makefile b/qemu/pc-bios/Makefile
index 2d270f7..264bbd0 100644 (file)
--- a/qemu/pc-bios/Makefile
+++ b/qemu/pc-bios/Makefile
@@ -1,16 +1,16 @@
 #
 # NOTE: only compilable with x86 cross compile tools
 #
-include ../config-host.mak
+-include ../config-host.mak
 
 DEFINES=
 
-TARGETS=
+TARGETS+=linux_boot.bin
 
 all: $(TARGETS)
 
-%.o: %.S
-       $(CC) $(DEFINES) -c -o $@ $<
+linux_boot.bin: linux_boot.asm
+       nasm -f bin -o $@ $<
 
 %.dtb: %.dts
        dtc -O dtb -I dts -o $@ $<

diff --git a/qemu/pc-bios/README b/qemu/pc-bios/README
index ac8fc47..2fe8fa1 100644 (file)
--- a/qemu/pc-bios/README
+++ b/qemu/pc-bios/README
@@ -14,7 +14,8 @@
 - OpenBIOS (http://www.openbios.org/) is a free (GPL v2) portable
   firmware implementation. The goal is to implement a 100% IEEE
   1275-1994 (referred to as Open Firmware) compliant firmware.
-  The included Sparc32 and Sparc64 images are built from SVN revision 237.
+  The included Sparc32 image is built from SVN revision 185
+  and Sparc64 from SVN revision 181.
 
 - The PXE roms come from Rom-o-Matic etherboot 5.4.2.
   pcnet32:pcnet32 -- [0x1022,0x2000]

diff --git a/qemu/pc-bios/bamboo.dtb b/qemu/pc-bios/bamboo.dtb
deleted file mode 100644 (file)
index 81f971c..0000000
Binary files a/qemu/pc-bios/bamboo.dtb and /dev/null differ

diff --git a/qemu/pc-bios/bios.bin b/qemu/pc-bios/bios.bin
index cde8e18..7a57af9 100644 (file)
Binary files a/qemu/pc-bios/bios.bin and b/qemu/pc-bios/bios.bin differ

diff --git a/qemu/pc-bios/bios.diff b/qemu/pc-bios/bios.diff
index da510db..4f40d7a 100644 (file)
--- a/qemu/pc-bios/bios.diff
+++ b/qemu/pc-bios/bios.diff
@@ -1,17 +1,35 @@
---- bochs-2.3.7.orig/bios/rombios.h
-+++ bochs-2.3.7/bios/rombios.h
-@@ -19,7 +19,7 @@
- //  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
- 
- /* define it to include QEMU specific code */
--//#define BX_QEMU
-+#define BX_QEMU
- 
- #ifndef LEGACY
- #  define BX_ROMBIOS32     1
---- bochs-2.3.7.orig/bios/rombios.c
-+++ bochs-2.3.7/bios/rombios.c
-@@ -4404,22 +4404,25 @@
+? _rombios_.c
+? _rombiosl_.c
+? biossums
+? rombios.s
+? rombios.sym
+? rombios.txt
+? rombios16.bin
+? rombios32.bin
+? rombios32.out
+? rombiosl.s
+? rombiosl.sym
+? rombiosl.txt
+Index: BIOS-bochs-latest
+===================================================================
+RCS file: /cvsroot/bochs/bochs/bios/BIOS-bochs-latest,v
+retrieving revision 1.173
+diff -u -d -p -r1.173 BIOS-bochs-latest
+Binary files /tmp/cvsItPJ31 and BIOS-bochs-latest differ
+Index: BIOS-bochs-legacy
+===================================================================
+RCS file: /cvsroot/bochs/bochs/bios/BIOS-bochs-legacy,v
+retrieving revision 1.33
+diff -u -d -p -r1.33 BIOS-bochs-legacy
+Binary files /tmp/cvsMYE2Kz and BIOS-bochs-legacy differ
+Index: rombios.c
+===================================================================
+RCS file: /cvsroot/bochs/bochs/bios/rombios.c,v
+retrieving revision 1.207
+diff -u -d -p -r1.207 rombios.c
+--- rombios.c  21 Apr 2008 14:22:01 -0000      1.207
++++ rombios.c  28 Apr 2008 07:53:57 -0000
+@@ -4404,22 +4404,25 @@ BX_DEBUG_INT15("case default:\n");
  #endif // BX_USE_PS2_MOUSE
  
  
@@ -40,7 +58,7 @@
      write_word(ES, DI+14, 0x0000);
  
      write_word(ES, DI+16, type);
-@@ -4432,7 +4435,9 @@
+@@ -4432,7 +4435,9 @@ int15_function32(regs, ES, DS, FLAGS)
    Bit16u ES, DS, FLAGS;
  {
    Bit32u  extended_memory_size=0; // 64bits long
@@ -50,7 +68,7 @@
  
  BX_DEBUG_INT15("int15 AX=%04x\n",regs.u.r16.ax);
  
-@@ -4506,11 +4511,18 @@
+@@ -4506,11 +4511,18 @@ ASM_END
                      extended_memory_size += (1L * 1024 * 1024);
                  }
  
@@ -70,7 +88,7 @@
                          regs.u.r32.ebx = 1;
                          regs.u.r32.eax = 0x534D4150;
                          regs.u.r32.ecx = 0x14;
-@@ -4519,7 +4531,7 @@
+@@ -4519,7 +4531,7 @@ ASM_END
                          break;
                      case 1:
                          set_e820_range(ES, regs.u.r16.di,
@@ -79,7 +97,7 @@
                          regs.u.r32.ebx = 2;
                          regs.u.r32.eax = 0x534D4150;
                          regs.u.r32.ecx = 0x14;
-@@ -4528,7 +4540,7 @@
+@@ -4528,7 +4540,7 @@ ASM_END
                          break;
                      case 2:
                          set_e820_range(ES, regs.u.r16.di,
@@ -88,7 +106,7 @@
                          regs.u.r32.ebx = 3;
                          regs.u.r32.eax = 0x534D4150;
                          regs.u.r32.ecx = 0x14;
-@@ -4539,7 +4551,7 @@
+@@ -4539,7 +4551,7 @@ ASM_END
  #if BX_ROMBIOS32
                          set_e820_range(ES, regs.u.r16.di,
                                         0x00100000L,
@@ -97,7 +115,7 @@
                          regs.u.r32.ebx = 4;
  #else
                          set_e820_range(ES, regs.u.r16.di,
-@@ -4555,7 +4567,7 @@
+@@ -4555,7 +4567,7 @@ ASM_END
                      case 4:
                          set_e820_range(ES, regs.u.r16.di,
                                         extended_memory_size - ACPI_DATA_SIZE,
@@ -106,7 +124,7 @@
                          regs.u.r32.ebx = 5;
                          regs.u.r32.eax = 0x534D4150;
                          regs.u.r32.ecx = 0x14;
-@@ -4565,7 +4577,20 @@
+@@ -4565,7 +4577,20 @@ ASM_END
                      case 5:
                          /* 256KB BIOS area at the end of 4 GB */
                          set_e820_range(ES, regs.u.r16.di,
@@ -128,9 +146,30 @@
                          regs.u.r32.ebx = 0;
                          regs.u.r32.eax = 0x534D4150;
                          regs.u.r32.ecx = 0x14;
---- bochs-2.3.7.orig/bios/rombios32.c
-+++ bochs-2.3.7/bios/rombios32.c
-@@ -479,7 +479,12 @@
+Index: rombios.h
+===================================================================
+RCS file: /cvsroot/bochs/bochs/bios/rombios.h,v
+retrieving revision 1.6
+diff -u -d -p -r1.6 rombios.h
+--- rombios.h  26 Jan 2008 09:15:27 -0000      1.6
++++ rombios.h  28 Apr 2008 07:53:57 -0000
+@@ -19,7 +19,7 @@
+ //  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ 
+ /* define it to include QEMU specific code */
+-//#define BX_QEMU
++#define BX_QEMU
+ 
+ #ifndef LEGACY
+ #  define BX_ROMBIOS32     1
+Index: rombios32.c
+===================================================================
+RCS file: /cvsroot/bochs/bochs/bios/rombios32.c,v
+retrieving revision 1.26
+diff -u -d -p -r1.26 rombios32.c
+--- rombios32.c        8 Apr 2008 16:41:18 -0000       1.26
++++ rombios32.c        28 Apr 2008 07:53:58 -0000
+@@ -478,7 +478,12 @@ void smp_probe(void)
          sipi_vector = AP_BOOT_ADDR >> 12;
          writel(APIC_BASE + APIC_ICR_LOW, 0x000C4600 | sipi_vector);
  
@@ -143,3 +182,15 @@
  
          smp_cpus = readw((void *)CPU_COUNT_ADDR);
      }
+@@ -1423,9 +1428,8 @@ void acpi_bios_init(void)
+     fadt->pm1_evt_len = 4;
+     fadt->pm1_cnt_len = 2;
+     fadt->pm_tmr_len = 4;
+-    fadt->plvl2_lat = cpu_to_le16(50);
+-    fadt->plvl3_lat = cpu_to_le16(50);
+-    fadt->plvl3_lat = cpu_to_le16(50);
++    fadt->plvl2_lat = cpu_to_le16(0x0fff); // C2 state not supported
++    fadt->plvl3_lat = cpu_to_le16(0x0fff); // C3 state not supported
+     /* WBINVD + PROC_C1 + PWR_BUTTON + SLP_BUTTON + FIX_RTC */
+     fadt->flags = cpu_to_le32((1 << 0) | (1 << 2) | (1 << 4) | (1 << 5) | (1 << 6));
+     acpi_build_table_header((struct acpi_table_header *)fadt, "FACP",

diff --git a/qemu/pc-bios/openbios-sparc b/qemu/pc-bios/openbios-sparc
deleted file mode 100644 (file)
index 7a729aa..0000000
Binary files a/qemu/pc-bios/openbios-sparc and /dev/null differ

diff --git a/qemu/pc-bios/openbios-sparc32 b/qemu/pc-bios/openbios-sparc32
deleted file mode 100644 (file)
index 7c5d012..0000000
Binary files a/qemu/pc-bios/openbios-sparc32 and /dev/null differ

diff --git a/qemu/pc-bios/openbios-sparc64 b/qemu/pc-bios/openbios-sparc64
deleted file mode 100644 (file)
index 99e0d79..0000000
Binary files a/qemu/pc-bios/openbios-sparc64 and /dev/null differ

diff --git a/qemu/pc-bios/ppc_rom.bin b/qemu/pc-bios/ppc_rom.bin
deleted file mode 100644 (file)
index 0ad0282..0000000
Binary files a/qemu/pc-bios/ppc_rom.bin and /dev/null differ

diff --git a/qemu/pc-bios/pxe-e1000.bin b/qemu/pc-bios/pxe-e1000.bin
dissimilarity index 76%
index 99e4c1f..c0b57f4 100644 (file)
Binary files a/qemu/pc-bios/pxe-e1000.bin and b/qemu/pc-bios/pxe-e1000.bin differ

diff --git a/qemu/pc-bios/pxe-ne2k_pci.bin b/qemu/pc-bios/pxe-ne2k_pci.bin
dissimilarity index 71%
index 8d8fc02..efb0c3b 100644 (file)
Binary files a/qemu/pc-bios/pxe-ne2k_pci.bin and b/qemu/pc-bios/pxe-ne2k_pci.bin differ

diff --git a/qemu/pc-bios/pxe-pcnet.bin b/qemu/pc-bios/pxe-pcnet.bin
dissimilarity index 73%
index d127d33..60fba80 100644 (file)
Binary files a/qemu/pc-bios/pxe-pcnet.bin and b/qemu/pc-bios/pxe-pcnet.bin differ

diff --git a/qemu/pc-bios/pxe-rtl8139.bin b/qemu/pc-bios/pxe-rtl8139.bin
dissimilarity index 69%
index 2b5cacb..b0d54cf 100644 (file)
Binary files a/qemu/pc-bios/pxe-rtl8139.bin and b/qemu/pc-bios/pxe-rtl8139.bin differ

diff --git a/qemu/pc-bios/vgabios-cirrus.bin b/qemu/pc-bios/vgabios-cirrus.bin
index cc690d7..e45e464 100644 (file)
Binary files a/qemu/pc-bios/vgabios-cirrus.bin and b/qemu/pc-bios/vgabios-cirrus.bin differ

diff --git a/qemu/pc-bios/vgabios.bin b/qemu/pc-bios/vgabios.bin
index e3ff034..b93b273 100644 (file)
Binary files a/qemu/pc-bios/vgabios.bin and b/qemu/pc-bios/vgabios.bin differ

diff --git a/qemu/pc-bios/video.x b/qemu/pc-bios/video.x
deleted file mode 100644 (file)
index 761aa0c..0000000
Binary files a/qemu/pc-bios/video.x and /dev/null differ