Lncvrt/grub
1
0 Fork 0
mirror of https://git.savannah.gnu.org/git/grub.git synced 2026-10-21 14:59:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge mainline into cirrus

Browse Source
This commit is contained in:
Vladimir 'phcoder' Serbinenko committed 2010-06-21 02:15:49 +02:00
2 parents 5410ebd1f6 4f9613a3a0
commit 8e50ec9f05
235 files changed
+8914 -15402
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

kern/i386/qemu/init.c
+2 -2
View File
@@ -102,8 +102,8 @@ grub_qemu_init_cirrus (void)
| GRUB_PCI_ADDR_SPACE_MEMORY | GRUB_PCI_ADDR_MEM_TYPE_32);
addr = grub_pci_make_address (dev, GRUB_PCI_REG_COMMAND);
grub_pci_write (addr, GRUB_PCI_REG_STATUS_MEMORY_ENABLE
| GRUB_PCI_REG_STATUS_IO_ENABLE);
grub_pci_write (addr, GRUB_PCI_COMMAND_MEM_ENABLED
| GRUB_PCI_COMMAND_IO_ENABLED);
return 1;
}
kern/i386/qemu/startup.S
+1 -1
View File
@@ -27,7 +27,7 @@
_start:
jmp codestart
. = _start + GRUB_KERNEL_MACHINE_CORE_ENTRY_ADDR
. = _start + GRUB_KERNEL_I386_QEMU_CORE_ENTRY_ADDR
VARIABLE(grub_core_entry_addr)
.long 0
VARIABLE(grub_kernel_image_size)