]> git.pld-linux.org Git - packages/qemu.git/commitdiff
- taken from AC-branch
authorElan Ruusamäe <glen@pld-linux.org>
Mon, 11 Feb 2008 14:11:14 +0000 (14:11 +0000)
committercvs2git <feedback@pld-linux.org>
Sun, 24 Jun 2012 12:13:13 +0000 (12:13 +0000)
Changed files:
    qemu-isa-bios-ram.patch -> 1.2
    qemu-piix-ram-size.patch -> 1.2
    qemu-ppc_old_binutils.patch -> 1.2

qemu-isa-bios-ram.patch [new file with mode: 0644]
qemu-piix-ram-size.patch [new file with mode: 0644]
qemu-ppc_old_binutils.patch [new file with mode: 0644]

diff --git a/qemu-isa-bios-ram.patch b/qemu-isa-bios-ram.patch
new file mode 100644 (file)
index 0000000..589084f
--- /dev/null
@@ -0,0 +1,24 @@
+Index: qemu-snapshot-2007-02-09_05/hw/pc.c
+===================================================================
+--- qemu-snapshot-2007-02-09_05.orig/hw/pc.c
++++ qemu-snapshot-2007-02-09_05/hw/pc.c
+@@ -522,15 +522,13 @@ static void pc_init1(int ram_size, int v
+     cpu_register_physical_memory(0xc0000, 0x10000, 
+                                  vga_bios_offset | IO_MEM_ROM);
+-    /* map the last 128KB of the BIOS in ISA space */
++    /* copy the last 128KB of the BIOS to ISA space */
+     isa_bios_size = bios_size;
+     if (isa_bios_size > (128 * 1024))
+         isa_bios_size = 128 * 1024;
+-    cpu_register_physical_memory(0xd0000, (192 * 1024) - isa_bios_size,
+-                                 IO_MEM_UNASSIGNED);
+-    cpu_register_physical_memory(0x100000 - isa_bios_size,
+-                                 isa_bios_size,
+-                                 (bios_offset + bios_size - isa_bios_size) | IO_MEM_ROM);
++    memcpy(phys_ram_base + 0x100000 - isa_bios_size,
++           phys_ram_base + bios_offset + bios_size - isa_bios_size,
++           isa_bios_size);
+     {
+         ram_addr_t option_rom_offset;
diff --git a/qemu-piix-ram-size.patch b/qemu-piix-ram-size.patch
new file mode 100644 (file)
index 0000000..220b62b
--- /dev/null
@@ -0,0 +1,50 @@
+Index: qemu-snapshot-2007-02-09_05/hw/piix_pci.c
+===================================================================
+--- qemu-snapshot-2007-02-09_05.orig/hw/piix_pci.c
++++ qemu-snapshot-2007-02-09_05/hw/piix_pci.c
+@@ -155,7 +155,7 @@ static int i440fx_load(QEMUFile* f, void
+     return 0;
+ }
+-PCIBus *i440fx_init(PCIDevice **pi440fx_state, qemu_irq *pic)
++PCIBus *i440fx_init(PCIDevice **pi440fx_state, qemu_irq *pic, int ram_size)
+ {
+     PCIBus *b;
+     PCIDevice *d;
+@@ -186,6 +186,10 @@ PCIBus *i440fx_init(PCIDevice **pi440fx_
+     d->config[0x0a] = 0x00; // class_sub = host2pci
+     d->config[0x0b] = 0x06; // class_base = PCI_bridge
+     d->config[0x0e] = 0x00; // header_type
++    ram_size = ram_size / 8 / 1024 / 1024;
++    if (ram_size > 255)
++        ram_size = 255;
++    d->config[0x57] = ram_size;
+     d->config[0x72] = 0x02; /* SMRAM */
+Index: qemu-snapshot-2007-02-09_05/hw/pc.c
+===================================================================
+--- qemu-snapshot-2007-02-09_05.orig/hw/pc.c
++++ qemu-snapshot-2007-02-09_05/hw/pc.c
+@@ -623,7 +623,7 @@ static void pc_init1(int ram_size, int v
+     }
+     if (pci_enabled) {
+-        pci_bus = i440fx_init(&i440fx_state, i8259);
++        pci_bus = i440fx_init(&i440fx_state, i8259, ram_size);
+         piix3_devfn = piix3_init(pci_bus, -1);
+     } else {
+         pci_bus = NULL;
+Index: qemu-snapshot-2007-02-09_05/hw/pc.h
+===================================================================
+--- qemu-snapshot-2007-02-09_05.orig/hw/pc.h
++++ qemu-snapshot-2007-02-09_05/hw/pc.h
+@@ -841,7 +841,7 @@ PCIBus *pci_apb_init(target_ulong specia
+ PCIBus *pci_vpb_init(void *pic, int irq, int realview);
+ /* piix_pci.c */
+-PCIBus *i440fx_init(PCIDevice **pi440fx_state, qemu_irq *pic);
++PCIBus *i440fx_init(PCIDevice **pi440fx_state, qemu_irq *pic, int ram_size);
+ void i440fx_set_smm(PCIDevice *d, int val);
+ int piix3_init(PCIBus *bus, int devfn);
+ void i440fx_init_memory_mappings(PCIDevice *d);
diff --git a/qemu-ppc_old_binutils.patch b/qemu-ppc_old_binutils.patch
new file mode 100644 (file)
index 0000000..5cd9203
--- /dev/null
@@ -0,0 +1,62 @@
+--- qemu-0.9.1/ppc.ld  2008-01-06 19:38:42.000000000 +0000
++++ qemu-0.9.1/ppc.ld.new      2008-01-21 21:51:54.000000000 +0000
+@@ -93,23 +93,23 @@
+   .tbss                 : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
+   .preinit_array     :
+   {
+-    PROVIDE_HIDDEN (__preinit_array_start = .);
++    PROVIDE (__preinit_array_start = .);
+     KEEP (*(.preinit_array))
+-    PROVIDE_HIDDEN (__preinit_array_end = .);
++    PROVIDE (__preinit_array_end = .);
+   }
+   .init_array     :
+   {
+-     PROVIDE_HIDDEN (__init_array_start = .);
++     PROVIDE (__init_array_start = .);
+      KEEP (*(SORT(.init_array.*)))
+      KEEP (*(.init_array))
+-     PROVIDE_HIDDEN (__init_array_end = .);
++     PROVIDE (__init_array_end = .);
+   }
+   .fini_array     :
+   {
+-    PROVIDE_HIDDEN (__fini_array_start = .);
++    PROVIDE (__fini_array_start = .);
+     KEEP (*(.fini_array))
+     KEEP (*(SORT(.fini_array.*)))
+-    PROVIDE_HIDDEN (__fini_array_end = .);
++    PROVIDE (__fini_array_end = .);
+   }
+   .ctors          :
+   {
+@@ -143,9 +143,9 @@
+   .got1           : { *(.got1) }
+   .got2           : { *(.got2) }
+   .dynamic        : { *(.dynamic) }
+-  .got            : SPECIAL { *(.got) }
++  .got            :  { *(.got) }
+   . = DATA_SEGMENT_RELRO_END (0, .);
+-  .plt            : SPECIAL { *(.plt) }
++  .plt            :  { *(.plt) }
+   .data           :
+   {
+     *(.data .data.* .gnu.linkonce.d.*)
+@@ -153,7 +153,7 @@
+     SORT(CONSTRUCTORS)
+   }
+   .data1          : { *(.data1) }
+-  .got            : SPECIAL { *(.got) }
++  .got            :  { *(.got) }
+   /* We want the small data sections together, so single-instruction offsets
+      can access them all, and initialized data all before uninitialized, so
+      we can shorten the on-disk segment size.  */
+@@ -172,7 +172,7 @@
+     *(.scommon)
+     PROVIDE (__sbss_end = .); PROVIDE (___sbss_end = .);
+   }
+-  .plt            : SPECIAL { *(.plt) }
++  .plt            :  { *(.plt) }
+   .bss            :
+   {
+    *(.dynbss)
This page took 0.04302 seconds and 4 git commands to generate.