From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 24 Dec 2010 15:16:01 +0000 (+0100)
Subject: merge mainline into ahci
X-Git-Tag: 2.00~1204^2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=de2690be7c5b017396d73cababee24c5fa8d067d;p=thirdparty%2Fgrub.git

merge mainline into ahci
---

de2690be7c5b017396d73cababee24c5fa8d067d
diff --cc grub-core/Makefile.core.def
index 000000000,37c0ce970..dde945412
mode 000000,100644..100644
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@@ -1,0 -1,1517 +1,1523 @@@
+ AutoGen definitions Makefile.tpl;
+ 
+ script = {
+   installdir = noinst;
+   name = gensyminfo.sh;
+   common = gensyminfo.sh.in;
+ };
+ 
+ script = {
+   installdir = noinst;
+   name = genmod.sh;
+   common = genmod.sh.in;
+ };
+ 
+ kernel = {
+   name = kernel;
+ 
+   nostrip = emu;
+ 
+   emu_ldflags              = '-Wl,-r,-d';
+   x86_efi_ldflags          = '-Wl,-r,-d';
+   x86_efi_stripflags       = '--strip-unneeded -K start -R .note -R .comment';
+ 
+   i386_pc_ldflags          = '$(TARGET_IMG_LDFLAGS)';
+   i386_pc_ldflags          = '$(TARGET_IMG_BASE_LDOPT),0x8200';
+ 
+   i386_qemu_ldflags        = '$(TARGET_IMG_LDFLAGS)';
+   i386_qemu_ldflags        = '$(TARGET_IMG_BASE_LDOPT),0x8200';
+ 
+   ldadd = '$(LDADD_KERNEL)';
+ 
+   i386_coreboot_ldflags    = '-Wl,-Ttext=0x8200';
+   i386_multiboot_ldflags   = '-Wl,-Ttext=0x8200';
+   i386_ieee1275_ldflags    = '-Wl,-Ttext=0x10000';
+   mips_yeeloong_ldflags    = '-Wl,-Ttext,0x80200000';
+   powerpc_ieee1275_ldflags = '-Wl,-Ttext,0x200000';
+   sparc64_ieee1275_ldflags = '-Wl,-Ttext,0x4400';
+ 
+   mips_yeeloong_cppflags = '-DUSE_ASCII_FAILBACK';
+   i386_qemu_cppflags     = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)';
+   emu_cflags = '$(CFLAGS_GNULIB)';
+   emu_cppflags = '$(CPPFLAGS_GNULIB)';
+ 
+   i386_pc_startup = kern/i386/pc/startup.S;
+   i386_efi_startup = kern/i386/efi/startup.S;
+   x86_64_efi_startup = kern/x86_64/efi/startup.S;
+   i386_qemu_startup = kern/i386/qemu/startup.S;
+   i386_ieee1275_startup = kern/i386/ieee1275/startup.S;
+   i386_coreboot_startup = kern/i386/coreboot/startup.S;
+   i386_multiboot_startup = kern/i386/coreboot/startup.S;
+   mips_yeeloong_startup = kern/mips/startup.S;
+   sparc64_ieee1275_startup = kern/sparc64/ieee1275/crt0.S;
+   powerpc_ieee1275_startup = kern/powerpc/ieee1275/startup.S;
+ 
+   common = kern/command.c;
+   common = kern/corecmd.c;
+   common = kern/device.c;
+   common = kern/disk.c;
+   common = kern/dl.c;
+   common = kern/env.c;
+   common = kern/err.c;
+   common = kern/file.c;
+   common = kern/fs.c;
+   common = kern/list.c;
+   common = kern/main.c;
+   common = kern/misc.c;
+   common = kern/parser.c;
+   common = kern/partition.c;
+   common = kern/rescue_parser.c;
+   common = kern/rescue_reader.c;
+   common = kern/term.c;
+ 
+   noemu = kern/mm.c;
+   noemu = kern/time.c;
+   noemu = kern/generic/millisleep.c;
+ 
+   noemu_nodist = symlist.c;
+ 
+   i386_pc = kern/generic/rtc_get_time_ms.c;
+   x86_efi = kern/generic/rtc_get_time_ms.c;
+   i386_qemu = kern/generic/rtc_get_time_ms.c;
+   i386_coreboot = kern/generic/rtc_get_time_ms.c;
+   i386_multiboot = kern/generic/rtc_get_time_ms.c;
+   mips_yeeloong = kern/generic/rtc_get_time_ms.c;
+ 
+   ieee1275 = disk/ieee1275/ofdisk.c;
+   ieee1275 = kern/ieee1275/cmain.c;
+   ieee1275 = kern/ieee1275/ieee1275.c;
+   ieee1275 = kern/ieee1275/mmap.c;
+   ieee1275 = kern/ieee1275/openfw.c;
+   ieee1275 = term/ieee1275/ofconsole.c;
+ 
+   terminfoinkernel = term/terminfo.c;
+   terminfoinkernel = term/tparm.c;
+   terminfoinkernel = commands/extcmd.c;
+   terminfoinkernel = lib/arg.c;
+ 
+   i386 = kern/i386/dl.c;
+ 
+   i386_coreboot_multiboot_qemu = kern/i386/coreboot/init.c;
+   i386_coreboot_multiboot_qemu = term/i386/pc/vga_text.c;
+ 
+   i386_coreboot_multiboot_qemu = term/i386/vga_common.c;
+   i386_pc = term/i386/vga_common.c;
+ 
+   x86 = kern/i386/pit.c;
+ 
+   x86_efi = disk/efi/efidisk.c;
+   x86_efi = kern/efi/efi.c;
+   x86_efi = kern/efi/init.c;
+   x86_efi = kern/efi/mm.c;
+   x86_efi = kern/i386/efi/init.c;
+   x86_efi = term/efi/console.c;
+ 
+   i386_efi = kern/i386/tsc.c;
+ 
+   x86_64_efi = kern/i386/tsc.c;
+   x86_64_efi = kern/x86_64/dl.c;
+   x86_64_efi = kern/x86_64/efi/callwrap.S;
+ 
+   i386_pc = kern/i386/pc/init.c;
+   i386_pc = kern/i386/pc/mmap.c;
+   i386_pc = kern/i386/tsc.c;
+   i386_pc = term/i386/pc/console.c;
+ 
+   i386_qemu = bus/pci.c;
+   i386_qemu = kern/i386/qemu/init.c;
+   i386_qemu = kern/i386/qemu/mmap.c;
+   i386_qemu = kern/i386/tsc.c;
+ 
+   i386_coreboot = kern/i386/coreboot/mmap.c;
+   i386_coreboot = kern/i386/tsc.c;
+ 
+   i386_multiboot = kern/i386/multiboot_mmap.c;
+   i386_multiboot = kern/i386/tsc.c;
+ 
+   i386_ieee1275 = kern/ieee1275/init.c;
+ 
+   mips_yeeloong = term/ns8250.c;
+   mips_yeeloong = bus/bonito.c;
+   mips_yeeloong = bus/cs5536.c;
+   mips_yeeloong = bus/pci.c;
+   mips_yeeloong = kern/mips/cache.S;
+   mips_yeeloong = kern/mips/dl.c;
+   mips_yeeloong = kern/mips/init.c;
+   mips_yeeloong = kern/mips/yeeloong/init.c;
+   mips_yeeloong = term/at_keyboard.c;
+   mips_yeeloong = term/serial.c;
+   mips_yeeloong = video/sm712.c;
+   extra_dist = video/sm712_init.c;
+   mips_yeeloong = commands/keylayouts.c;
+ 
+   powerpc_ieee1275 = kern/ieee1275/init.c;
+   powerpc_ieee1275 = kern/powerpc/cache.S;
+   powerpc_ieee1275 = kern/powerpc/dl.c;
+ 
+   sparc64_ieee1275 = kern/sparc64/cache.S;
+   sparc64_ieee1275 = kern/sparc64/dl.c;
+   sparc64_ieee1275 = kern/sparc64/ieee1275/ieee1275.c;
+   sparc64_ieee1275 = kern/sparc64/ieee1275/init.c;
+ 
+   emu = disk/host.c;
+   emu = gnulib/progname.c;
+   emu = gnulib/error.c;
+   emu = kern/emu/cache.S;
+   emu = kern/emu/console.c;
+   emu = kern/emu/getroot.c;
+   emu = kern/emu/hostdisk.c;
+   emu = kern/emu/hostfs.c;
+   emu = kern/emu/main.c;
+   emu = kern/emu/misc.c;
+   emu = kern/emu/mm.c;
+   emu = kern/emu/time.c;
+ 
+   videoinkernel = term/gfxterm.c;
+   videoinkernel = font/font.c;
+   videoinkernel = font/font_cmd.c;
+   videoinkernel = io/bufio.c;
+   videoinkernel = video/bitmap.c;
+   videoinkernel = video/bitmap_scale.c;
+   videoinkernel = video/fb/fbblit.c;
+   videoinkernel = video/fb/fbfill.c;
+   videoinkernel = video/fb/fbutil.c;
+   videoinkernel = video/fb/video_fb.c;
+   videoinkernel = video/video.c;
+ 
+   videoinkernel = commands/boot.c;
+ 
+   extra_dist = kern/i386/realmode.S;
+   extra_dist = kern/i386/pc/lzma_decode.S;
+   extra_dist = kern/mips/cache_flush.S;
+ };
+ 
+ program = {
+   name = grub-emu;
+   mansection = 1;
+ 
+   emu = kern/emu/full.c;
+   emu_nodist = grub_emu_init.c;
+ 
+   ldadd = 'kernel.img$(EXEEXT)';
+   ldadd = '$(MODULE_FILES)';
+   ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
+ 
+   enable = emu;
+ };
+ 
+ program = {
+   name = grub-emu-lite;
+ 
+   emu = kern/emu/lite.c;
+   emu_nodist = symlist.c;
+ 
+   ldadd = 'kernel.img$(EXEEXT)';
+   ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR)';
+ 
+   enable = emu;
+ };
+ 
+ image = {
+   name = boot;
+   i386_pc = boot/i386/pc/boot.S;
+   i386_qemu = boot/i386/qemu/boot.S;
+   sparc64_ieee1275 = boot/sparc64/ieee1275/boot.S;
+ 
+   i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
+   i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x7C00';
+ 
+   i386_qemu_ldflags = '$(TARGET_IMG_LDFLAGS)';
+   i386_qemu_ldflags = '$(TARGET_IMG_BASE_LDOPT),$(GRUB_BOOT_MACHINE_LINK_ADDR)';
+   i386_qemu_ccasflags = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)';
+ 
+   sparc64_ieee1275_objcopyflags = '-O a.out-sunos-big';
+   sparc64_ieee1275_ldflags = ' -Wl,-Ttext=0x4000';
+ 
+   objcopyflags = '-O binary';
+   enable = i386_pc;
+   enable = i386_qemu;
+   enable = sparc64_ieee1275;
+ };
+ 
+ image = {
+   name = cdboot;
+   i386_pc = boot/i386/pc/cdboot.S;
+   i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
+   i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x7C00';
+   objcopyflags = '-O binary';
+   enable = i386_pc;
+ };
+ 
+ image = {
+   name = pxeboot;
+   i386_pc = boot/i386/pc/pxeboot.S;
+ 
+   i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
+   i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x7C00';
+ 
+   objcopyflags = '-O binary';
+   enable = i386_pc;
+ };
+ 
+ image = {
+   name = diskboot;
+   i386_pc = boot/i386/pc/diskboot.S;
+ 
+   i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
+   i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x8000';
+ 
+   sparc64_ieee1275 = boot/sparc64/ieee1275/diskboot.S;
+   sparc64_ieee1275_ldflags = '-Wl,-Ttext=0x4200';
+ 
+   objcopyflags = '-O binary';
+ 
+   enable = i386_pc;
+   enable = sparc64_ieee1275;
+ };
+ 
+ image = {
+   name = lnxboot;
+   i386_pc = boot/i386/pc/lnxboot.S;
+ 
+   i386_pc_ldflags = '$(TARGET_IMG_LDFLAGS)';
+   i386_pc_ldflags = '$(TARGET_IMG_BASE_LDOPT),0x6000';
+ 
+   objcopyflags = '-O binary';
+   enable = i386_pc;
+ };
+ 
+ image = {
+   name = xz_decompress;
+   mips = boot/mips/startup_raw.S;
+   common = boot/decompressor/minilib.c;
+   common = boot/decompressor/xz.c;
+   common = lib/xzembed/xz_dec_bcj.c;
+   common = lib/xzembed/xz_dec_lzma2.c;
+   common = lib/xzembed/xz_dec_stream.c;
+ 
+   cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/xzembed';
+ 
+   mips_cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/xzembed -DGRUB_EMBED_DECOMPRESSOR=1 -DGRUB_MACHINE_LINK_ADDR=0x80200000';
+ 
+   objcopyflags = '-O binary';
+   ldflags = '-static-libgcc -Wl,-Ttext,0x80100000';
+   ldadd = '-lgcc';
+   cflags = '-static-libgcc';
+   enable = mips;
+ };
+ 
+ image = {
+   name = none_decompress;
+   mips = boot/mips/startup_raw.S;
+   common = boot/decompressor/none.c;
+ 
+   mips_cppflags = '-DGRUB_EMBED_DECOMPRESSOR=1 -DGRUB_MACHINE_LINK_ADDR=0x80200000';
+ 
+   objcopyflags = '-O binary';
+   ldflags = '-static-libgcc -Wl,-Ttext,0x80100000';
+   ldadd = '-lgcc';
+   cflags = '-static-libgcc';
+   enable = mips;
+ };
+ 
+ image = {
+   name = fwstart;
+   mips_yeeloong = boot/mips/yeeloong/fwstart.S;
+   objcopyflags = '-O binary';
+   enable = mips_yeeloong;
+ };
+ 
+ module = {
+   name = trig;
+   common_nodist = trigtables.c;
+   extra_dist = gentrigtables.c;
+ };
+ 
+ module = {
+   name = cs5536;
+   x86 = bus/cs5536.c;
+   enable = x86;
+ };
+ 
+ module = {
+   name = libusb;
+   emu = bus/usb/emu/usb.c;
+   enable = emu;
+   condition = COND_GRUB_EMU_USB;
+ };
+ 
+ module = {
+   name = lsspd;
+   mips_yeeloong = commands/mips/yeeloong/lsspd.c;
+   enable = mips_yeeloong;
+ };
+ 
+ module = {
+   name = usb;
+   common = bus/usb/usb.c;
+   noemu = bus/usb/usbtrans.c;
+   noemu = bus/usb/usbhub.c;
+   enable = emu;
+   enable = usb;
+   emu_condition = COND_GRUB_EMU_USB;
+ };
+ 
+ module = {
+   name = usbserial_common;
+   common = bus/usb/serial/common.c;
+   enable = usb;
+ };
+ 
+ module = {
+   name = usbserial_pl2303;
+   common = bus/usb/serial/pl2303.c;
+   enable = usb;
+ };
+ 
+ module = {
+   name = usbserial_ftdi;
+   common = bus/usb/serial/ftdi.c;
+   enable = usb;
+ };
+ 
+ module = {
+   name = uhci;
+   common = bus/usb/uhci.c;
+   enable = x86;
+ };
+ 
+ module = {
+   name = ohci;
+   common = bus/usb/ohci.c;
+   enable = pci;
+ };
+ 
+ module = {
+   name = pci;
+   noemu = bus/pci.c;
+   emu = bus/emu/pci.c;
+   emu = commands/lspci.c;
+ 
+   enable = emu;
+   enable = i386_pc;
+   enable = x86_efi;
+   enable = i386_ieee1275;
+   enable = i386_coreboot;
+   enable = i386_multiboot;
+   emu_condition = COND_GRUB_EMU_PCI;
+ };
+ 
+ library = {
+   name = libgnulib.a;
+   common = gnulib/regex.c;
+   cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
+   cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
+ };
+ 
+ module = {
+   name = cmostest;
+   common = commands/i386/cmostest.c;
+   enable = cmos;
+ };
+ 
+ module = {
+   name = iorw;
+   common = commands/iorw.c;
+   enable = x86;
+ };
+ 
+ module = {
+   name = regexp;
+   common = commands/regexp.c;
+   common = commands/wildcard.c;
+   ldadd = libgnulib.a;
+   cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
+   cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
+ };
+ 
+ module = {
+   name = acpi;
+ 
+   common = commands/acpi.c;
+   x86_efi = commands/efi/acpi.c;
+   i386_pc = commands/i386/pc/acpi.c;
+   i386_coreboot = commands/i386/pc/acpi.c;
+   i386_multiboot = commands/i386/pc/acpi.c;
+ 
+   enable = x86_efi;
+   enable = i386_pc;
+   enable = i386_coreboot;
+   enable = i386_multiboot;
+ };
+ 
+ module = {
+   name = lsacpi;
+ 
+   common = commands/lsacpi.c;
+ 
+   enable = x86_efi;
+   enable = i386_pc;
+   enable = i386_coreboot;
+   enable = i386_multiboot;
+ };
+ 
+ module = {
+   name = lsefisystab;
+ 
+   common = commands/efi/lsefisystab.c;
+ 
+   enable = x86_efi;
+ };
+ 
+ module = {
+   name = lssal;
+ 
+   common = commands/efi/lssal.c;
+ 
+   enable = x86_efi;
+ };
+ 
+ module = {
+   name = lsefimmap;
+ 
+   common = commands/efi/lsefimmap.c;
+ 
+   enable = x86_efi;
+ };
+ 
+ module = {
+   name = blocklist;
+   common = commands/blocklist.c;
+ };
+ 
+ module = {
+   name = boot;
+   common = commands/boot.c;
+   i386_pc = lib/i386/pc/biosnum.c;
+   enable = videomodules;
+ };
+ 
+ module = {
+   name = cat;
+   common = commands/cat.c;
+ };
+ 
+ module = {
+   name = cmp;
+   common = commands/cmp.c;
+ };
+ 
+ module = {
+   name = configfile;
+   common = commands/configfile.c;
+ };
+ 
+ module = {
+   name = cpuid;
+   x86 = commands/i386/cpuid.c;
+   enable = x86;
+ };
+ 
+ module = {
+   name = date;
+   common = commands/date.c;
+ };
+ 
+ module = {
+   name = drivemap;
+ 
+   i386_pc = commands/i386/pc/drivemap.c;
+   i386_pc = commands/i386/pc/drivemap_int13h.S;
+   enable = i386_pc;
+ };
+ 
+ module = {
+   name = echo;
+   common = commands/echo.c;
+ };
+ 
+ module = {
+   name = extcmd;
+   common = commands/extcmd.c;
+   common = lib/arg.c;
+   enable = terminfomodule;
+ };
+ 
+ module = {
+   name = fixvideo;
+   x86_efi = commands/efi/fixvideo.c;
+   enable = x86_efi;
+ };
+ 
+ module = {
+   name = gptsync;
+   common = commands/gptsync.c;
+ };
+ 
+ module = {
+   name = halt;
+   nopc = commands/halt.c;
+   i386_pc = commands/i386/pc/halt.c;
+   i386_pc = commands/acpihalt.c;
+   i386_coreboot = commands/acpihalt.c;
+   i386_multiboot = commands/acpihalt.c;
+   x86_efi = commands/acpihalt.c;
+   i386_multiboot = lib/i386/halt.c;
+   i386_coreboot = lib/i386/halt.c;
+   i386_qemu = lib/i386/halt.c;
+   x86_efi = lib/efi/halt.c;
+   ieee1275 = lib/ieee1275/halt.c;
+   emu = lib/emu/halt.c;
+ };
+ 
+ module = {
+   name = hashsum;
+   common = commands/hashsum.c;
+ };
+ 
+ module = {
+   name = hdparm;
+   common = commands/hdparm.c;
+   common = lib/hexdump.c;
+   enable = pci;
+ };
+ 
+ module = {
+   name = help;
+   common = commands/help.c;
+ };
+ 
+ module = {
+   name = hexdump;
+   common = commands/hexdump.c;
+   common = lib/hexdump.c;
+ };
+ 
+ module = {
+   name = keystatus;
+   common = commands/keystatus.c;
+ };
+ 
+ module = {
+   name = loadbios;
+   x86_efi = commands/efi/loadbios.c;
+   enable = x86_efi;
+ };
+ 
+ module = {
+   name = loadenv;
+   common = commands/loadenv.c;
+   common = lib/envblk.c;
+ };
+ 
+ module = {
+   name = ls;
+   common = commands/ls.c;
+ };
+ 
+ module = {
+   name = lsmmap;
+   common = commands/lsmmap.c;
+ };
+ 
+ module = {
+   name = lspci;
+   common = commands/lspci.c;
+ 
+   enable = pci;
+ };
+ 
+ module = {
+   name = memrw;
+   common = commands/memrw.c;
+ };
+ 
+ module = {
+   name = minicmd;
+   common = commands/minicmd.c;
+ };
+ 
+ module = {
+   name = parttool;
+   common = commands/parttool.c;
+ };
+ 
+ module = {
+   name = password;
+   common = commands/password.c;
+ };
+ 
+ module = {
+   name = password_pbkdf2;
+   common = commands/password_pbkdf2.c;
+ };
+ 
+ module = {
+   name = play;
+   x86 = commands/i386/pc/play.c;
+   enable = x86;
+ };
+ 
+ module = {
+   name = probe;
+   common = commands/probe.c;
+ };
+ 
+ module = {
+   name = pxecmd;
+   i386_pc = commands/i386/pc/pxecmd.c;
+   enable = i386_pc;
+ };
+ 
+ module = {
+   name = read;
+   common = commands/read.c;
+ };
+ 
+ module = {
+   name = reboot;
+   common = commands/reboot.c;
+ };
+ 
+ module = {
+   name = search;
+   common = commands/search_wrap.c;
+   extra_dist = commands/search.c;
+ };
+ 
+ module = {
+   name = search_fs_file;
+   common = commands/search_file.c;
+ };
+ 
+ module = {
+   name = search_fs_uuid;
+   common = commands/search_uuid.c;
+ };
+ 
+ module = {
+   name = search_label;
+   common = commands/search_label.c;
+ };
+ 
+ module = {
+   name = setpci;
+   common = commands/setpci.c;
+   enable = x86;
+ };
+ 
+ module = {
+   name = sleep;
+   common = commands/sleep.c;
+ };
+ 
+ module = {
+   name = suspend;
+   ieee1275 = commands/ieee1275/suspend.c;
+   enable = i386_ieee1275;
+   enable = powerpc_ieee1275;
+ };
+ 
+ module = {
+   name = terminal;
+   common = commands/terminal.c;
+ };
+ 
+ module = {
+   name = test;
+   common = commands/test.c;
+ };
+ 
+ module = {
+   name = true;
+   common = commands/true.c;
+ };
+ 
+ module = {
+   name = usbtest;
+   common = commands/usbtest.c;
+   enable = usb;
+   enable = emu;
+   emu_condition = COND_GRUB_EMU_USB;
+ };
+ 
+ module = {
+   name = videoinfo;
+   common = commands/videoinfo.c;
+ };
+ 
+ module = {
+   name = videotest;
+   common = commands/videotest.c;
+ };
+ 
+ module = {
+   name = xnu_uuid;
+   common = commands/xnu_uuid.c;
+ };
+ 
+ module = {
+   name = dm_nv;
+   common = disk/dmraid_nvidia.c;
+ };
+ 
+ module = {
+   name = loopback;
+   common = disk/loopback.c;
+ };
+ 
+ module = {
+   name = lvm;
+   common = disk/lvm.c;
+ };
+ 
+ module = {
+   name = mdraid09;
+   common = disk/mdraid_linux.c;
+ };
+ 
+ module = {
+   name = mdraid1x;
+   common = disk/mdraid1x_linux.c;
+ };
+ 
+ module = {
+   name = raid;
+   common = disk/raid.c;
+ };
+ 
+ module = {
+   name = raid5rec;
+   common = disk/raid5_recover.c;
+ };
+ 
+ module = {
+   name = raid6rec;
+   common = disk/raid6_recover.c;
+ };
+ 
+ module = {
+   name = scsi;
+   common = disk/scsi.c;
+ };
+ 
+ module = {
+   name = memdisk;
+   common = disk/memdisk.c;
+ };
+ 
+ module = {
+   name = ata;
+   common = disk/ata.c;
+   enable = pci;
+ };
+ 
+ module = {
 -  name = ata_pthru;
 -  common = disk/ata_pthru.c;
++  name = ahci;
++  common = disk/ahci.c;
++  enable = pci;
++};
++
++module = {
++  name = pata;
++  common = disk/pata.c;
+   enable = pci;
+ };
+ 
+ module = {
+   name = biosdisk;
+   i386_pc = disk/i386/pc/biosdisk.c;
+   enable = i386_pc;
+ };
+ 
+ module = {
+   name = usbms;
+   common = disk/usbms.c;
+   enable = usb;
+   enable = emu;
+   emu_condition = COND_GRUB_EMU_USB;
+ };
+ 
+ module = {
+   name = nand;
+   ieee1275 = disk/ieee1275/nand.c;
+   enable = i386_ieee1275;
+ };
+ 
+ module = {
+   name = efiemu;
+   common = efiemu/main.c;
+   common = efiemu/i386/loadcore32.c;
+   common = efiemu/i386/loadcore64.c;
+   i386_pc = efiemu/i386/pc/cfgtables.c;
+   i386_coreboot = efiemu/i386/pc/cfgtables.c;
+   i386_multiboot = efiemu/i386/pc/cfgtables.c;
+   i386_ieee1275 = efiemu/i386/nocfgtables.c;
+   i386_qemu = efiemu/i386/nocfgtables.c;
+   common = efiemu/mm.c;
+   common = efiemu/loadcore_common.c;
+   common = efiemu/symbols.c;
+   common = efiemu/loadcore32.c;
+   common = efiemu/loadcore64.c;
+   common = efiemu/prepare32.c;
+   common = efiemu/prepare64.c;
+   common = efiemu/pnvram.c;
+   common = efiemu/i386/coredetect.c;
+ 
+   extra_dist = efiemu/prepare.c;
+   extra_dist = efiemu/loadcore.c;
+   extra_dist = efiemu/runtime/efiemu.S;
+   extra_dist = efiemu/runtime/efiemu.c;
+ 
+   enable = i386_pc;
+   enable = i386_coreboot;
+   enable = i386_ieee1275;
+   enable = i386_multiboot;
+   enable = i386_qemu;
+ };
+ 
+ module = {
+   name = font;
+   common = font/font.c;
+   common = font/font_cmd.c;
+   enable = videomodules;
+ };
+ 
+ module = {
+   name = affs;
+   common = fs/affs.c;
+ };
+ 
+ module = {
+   name = afs;
+   common = fs/afs.c;
+ };
+ 
+ module = {
+   name = afs_be;
+   common = fs/afs_be.c;
+ };
+ 
+ module = {
+   name = befs;
+   common = fs/befs.c;
+ };
+ 
+ module = {
+   name = befs_be;
+   common = fs/befs_be.c;
+ };
+ 
+ module = {
+   name = btrfs;
+   common = fs/btrfs.c;
+ };
+ 
+ module = {
+   name = cpio;
+   common = fs/cpio.c;
+ };
+ 
+ module = {
+   name = ext2;
+   common = fs/ext2.c;
+ };
+ 
+ module = {
+   name = fat;
+   common = fs/fat.c;
+ };
+ 
+ module = {
+   name = fshelp;
+   common = fs/fshelp.c;
+ };
+ 
+ module = {
+   name = hfs;
+   common = fs/hfs.c;
+ };
+ 
+ module = {
+   name = hfsplus;
+   common = fs/hfsplus.c;
+ };
+ 
+ module = {
+   name = iso9660;
+   common = fs/iso9660.c;
+ };
+ 
+ module = {
+   name = jfs;
+   common = fs/jfs.c;
+ };
+ 
+ module = {
+   name = minix;
+   common = fs/minix.c;
+ };
+ 
+ module = {
+   name = minix2;
+   common = fs/minix2.c;
+ };
+ 
+ module = {
+   name = nilfs2;
+   common = fs/nilfs2.c;
+ };
+ 
+ module = {
+   name = ntfs;
+   common = fs/ntfs.c;
+ };
+ 
+ module = {
+   name = ntfscomp;
+   common = fs/ntfscomp.c;
+ };
+ 
+ module = {
+   name = reiserfs;
+   common = fs/reiserfs.c;
+ };
+ 
+ module = {
+   name = sfs;
+   common = fs/sfs.c;
+ };
+ 
+ module = {
+   name = tar;
+   common = fs/tar.c;
+ };
+ 
+ module = {
+   name = udf;
+   common = fs/udf.c;
+ };
+ 
+ module = {
+   name = ufs1;
+   common = fs/ufs.c;
+ };
+ 
+ module = {
+   name = ufs2;
+   common = fs/ufs2.c;
+ };
+ 
+ module = {
+   name = xfs;
+   common = fs/xfs.c;
+ };
+ 
+ module = {
+   name = zfs;
+   common = fs/zfs/zfs.c;
+   common = fs/zfs/zfs_lzjb.c;
+   common = fs/zfs/zfs_sha256.c;
+   common = fs/zfs/zfs_fletcher.c;
+ };
+ 
+ module = {
+   name = zfsinfo;
+   common = fs/zfs/zfsinfo.c;
+ };
+ 
+ module = {
+   name = pxe;
+   i386_pc = fs/i386/pc/pxe.c;
+   enable = i386_pc;
+ };
+ 
+ module = {
+   name = gettext;
+   common = gettext/gettext.c;
+ };
+ 
+ module = {
+   name = gfxmenu;
+   common = gfxmenu/gfxmenu.c;
+   common = gfxmenu/model.c;
+   common = gfxmenu/view.c;
+   common = gfxmenu/font.c;
+   common = gfxmenu/icon_manager.c;
+   common = gfxmenu/theme_loader.c;
+   common = gfxmenu/widget-box.c;
+   common = gfxmenu/gui_canvas.c;
+   common = gfxmenu/gui_circular_progress.c;
+   common = gfxmenu/gui_box.c;
+   common = gfxmenu/gui_label.c;
+   common = gfxmenu/gui_list.c;
+   common = gfxmenu/gui_image.c;
+   common = gfxmenu/gui_progress_bar.c;
+   common = gfxmenu/gui_util.c;
+   common = gfxmenu/gui_string_util.c;
+   common = gfxmenu/named_colors.c;
+ };
+ 
+ module = {
+   name = hello;
+   common = hello/hello.c;
+ };
+ 
+ module = {
+   name = gzio;
+   common = io/gzio.c;
+ };
+ 
+ module = {
+   name = bufio;
+   common = io/bufio.c;
+   enable = videomodules;
+ };
+ 
+ module = {
+   name = elf;
+   common = kern/elf.c;
+ };
+ 
+ module = {
+   name = crypto;
+   common = lib/crypto.c;
+ 
+   extra_dist = lib/libgcrypt-grub/cipher/crypto.lst;
+ };
+ 
+ module = {
+   name = pbkdf2;
+   common = lib/pbkdf2.c;
+ };
+ 
+ module = {
+   name = relocator;
+   common = lib/relocator.c;
+   x86 = lib/i386/relocator16.S;
+   x86 = lib/i386/relocator32.S;
+   x86 = lib/i386/relocator64.S;
+   i386 = lib/i386/relocator_asm.S;
+   x86_64 = lib/x86_64/relocator_asm.S;
+   x86 = lib/i386/relocator.c;
+   ieee1275 = lib/ieee1275/relocator.c;
+   x86_efi = lib/efi/relocator.c;
+   mips = lib/mips/relocator_asm.S;
+   mips = lib/mips/relocator.c;
+   powerpc = lib/powerpc/relocator_asm.S;
+   powerpc = lib/powerpc/relocator.c;
+ 
+   extra_dist = lib/i386/relocator_common.S;
+   extra_dist = kern/powerpc/cache_flush.S;
+ 
+   enable = mips;
+   enable = powerpc;
+   enable = x86;
+ };
+ 
+ module = {
+   name = datetime;
+   cmos = lib/cmos_datetime.c;
+   x86_efi = lib/efi/datetime.c;
+   sparc64_ieee1275 = lib/ieee1275/datetime.c;
+   powerpc_ieee1275 = lib/ieee1275/datetime.c;
+   enable = noemu;
+ };
+ 
+ module = {
+   name = setjmp;
+   common = lib/setjmp.S;
+   extra_dist = lib/i386/setjmp.S;
+   extra_dist = lib/mips/setjmp.S;
+   extra_dist = lib/x86_64/setjmp.S;
+   extra_dist = lib/sparc64/setjmp.S;
+   extra_dist = lib/powerpc/setjmp.S;
+ };
+ 
+ module = {
+   name = aout;
+   common = loader/aout.c;
+   enable = x86;
+ };
+ 
+ module = {
+   name = bsd;
+   x86 = loader/i386/bsd.c;
+   x86 = loader/i386/bsd32.c;
+   x86 = loader/i386/bsd64.c;
+ 
+   extra_dist = loader/i386/bsdXX.c;
+   extra_dist = loader/i386/bsd_pagetable.c;
+ 
+   enable = x86;
+ };
+ 
+ module = {
+   name = linux16;
+   i386_pc = loader/i386/pc/linux.c;
+   enable = i386_pc;
+ };
+ 
+ module = {
+   name = ntldr;
+   i386_pc = loader/i386/pc/ntldr.c;
+   enable = i386_pc;
+ };
+ 
+ module = {
+   name = multiboot2;
+   cppflags = "-DGRUB_USE_MULTIBOOT2";
+ 
+   common = loader/multiboot.c;
+   common = loader/multiboot_mbi2.c;
+   enable = x86;
+   enable = mips;
+ };
+ 
+ module = {
+   name = multiboot;
+   common = loader/multiboot.c;
+   x86 = loader/i386/multiboot_mbi.c;
+   extra_dist = loader/multiboot_elfxx.c;
+   enable = x86;
+ };
+ 
+ module = {
+   name = linux;
+   x86 = loader/i386/linux.c;
+   i386_pc = lib/i386/pc/vesa_modes_table.c;
+   mips = loader/mips/linux.c;
+   powerpc_ieee1275 = loader/powerpc/ieee1275/linux.c;
+   sparc64_ieee1275 = loader/sparc64/ieee1275/linux.c;
+   enable = noemu;
+ };
+ 
+ module = {
+   name = xnu;
+   x86 = loader/xnu_resume.c;
+   x86 = loader/i386/xnu.c;
+   x86 = loader/macho32.c;
+   x86 = loader/macho64.c;
+   x86 = loader/macho.c;
+   x86 = loader/xnu.c;
+ 
+   extra_dist = loader/machoXX.c;
+   enable = x86;
+ };
+ 
+ module = {
+   name = appleldr;
+   x86_efi = loader/efi/appleloader.c;
+   enable = x86_efi;
+ };
+ 
+ module = {
+   name = chain;
+   x86_efi = loader/efi/chainloader.c;
+   i386_pc = loader/i386/pc/chainloader.c;
+   enable = i386_pc;
+   enable = x86_efi;
+ };
+ 
+ module = {
+   name = mmap;
+   common = mmap/mmap.c;
+   x86 = mmap/i386/uppermem.c;
+   x86 = mmap/i386/mmap.c;
+ 
+   i386_pc = mmap/i386/pc/mmap.c;
+   i386_pc = mmap/i386/pc/mmap_helper.S;
+ 
+   x86_efi = mmap/efi/mmap.c;
+ 
+   mips_yeeloong = mmap/mips/yeeloong/uppermem.c;
+ 
+   enable = x86;
+   enable = mips_yeeloong;
+ };
+ 
+ module = {
+   name = normal;
+   common = normal/main.c;
+   common = normal/cmdline.c;
+   common = normal/dyncmd.c;
+   common = normal/auth.c;
+   common = normal/autofs.c;
+   common = normal/color.c;
+   common = normal/completion.c;
+   common = normal/datetime.c;
+   common = normal/menu.c;
+   common = normal/menu_entry.c;
+   common = normal/menu_text.c;
+   common = normal/misc.c;
+   common = normal/crypto.c;
+   common = normal/term.c;
+   common = normal/context.c;
+   common = normal/charset.c;
+ 
+   common = script/main.c;
+   common = script/script.c;
+   common = script/execute.c;
+   common = script/function.c;
+   common = script/lexer.c;
+   common = script/argv.c;
+ 
+   common = commands/menuentry.c;
+ 
+   common = unidata.c;
+   common_nodist = grub_script.tab.c;
+   common_nodist = grub_script.yy.c;
+   common_nodist = grub_script.tab.h;
+   common_nodist = grub_script.yy.h;
+ 
+   extra_dist = script/yylex.l;
+   extra_dist = script/parser.y;
+ 
+   cflags = '$(CFLAGS_POSIX) -Wno-error';
+   cppflags = '$(CPPFLAGS_POSIX)';
+ };
+ 
+ module = {
+   name = part_acorn;
+   common = partmap/acorn.c;
+ };
+ 
+ module = {
+   name = part_amiga;
+   common = partmap/amiga.c;
+ };
+ 
+ module = {
+   name = part_apple;
+   common = partmap/apple.c;
+ };
+ 
+ module = {
+   name = part_gpt;
+   common = partmap/gpt.c;
+ };
+ 
+ module = {
+   name = part_msdos;
+   common = partmap/msdos.c;
+ };
+ 
+ module = {
+   name = part_sun;
+   common = partmap/sun.c;
+ };
+ 
+ module = {
+   name = part_bsd;
+   common = partmap/bsdlabel.c;
+ };
+ 
+ module = {
+   name = part_sunpc;
+   common = partmap/sunpc.c;
+ };
+ 
+ module = {
+   name = msdospart;
+   common = parttool/msdospart.c;
+ };
+ 
+ module = {
+   name = at_keyboard;
+   common = term/at_keyboard.c;
+   enable = x86;
+ };
+ 
+ module = {
+   name = gfxterm;
+   common = term/gfxterm.c;
+   enable = videomodules;
+ };
+ 
+ module = {
+   name = serial;
+   common = term/serial.c;
+   x86 = term/ns8250.c;
+ 
+   enable = emu;
+   enable = i386;
+   enable = x86_64_efi;
+   emu_condition = COND_GRUB_EMU_USB;
+ };
+ 
+ module = {
+   name = sendkey;
+   i386_pc = commands/i386/pc/sendkey.c;
+   enable = i386_pc;
+ };
+ 
+ module = {
+   name = terminfo;
+   common = term/terminfo.c;
+   common = term/tparm.c;
+   enable = terminfomodule;
+ };
+ 
+ module = {
+   name = usb_keyboard;
+   common = term/usb_keyboard.c;
+   enable = usb;
+ };
+ 
+ module = {
+   name = vga;
+   i386_pc = video/i386/pc/vga.c;
+   enable = i386_pc;
+ };
+ 
+ module = {
+   name = vga_text;
+   common = term/i386/pc/vga_text.c;
+   common = term/i386/vga_common.c;
+   enable = i386_pc;
+   enable = i386_coreboot;
+   enable = i386_multiboot;
+ };
+ 
+ module = {
+   name = video_cirrus;
+   x86 = video/cirrus.c;
+   enable = x86;
+ };
+ 
+ module = {
+   name = video_bochs;
+   x86 = video/bochs.c;
+   enable = x86;
+ };
+ 
+ module = {
+   name = functional_test;
+   common = tests/lib/functional_test.c;
+   common = tests/lib/test.c;
+ };
+ 
+ module = {
+   name = example_functional_test;
+   common = tests/example_functional_test.c;
+   cflags = -Wno-format;
+ };
+ 
+ module = {
+   name = bitmap;
+   common = video/bitmap.c;
+   enable = videomodules;
+ };
+ 
+ module = {
+   name = bitmap_scale;
+   common = video/bitmap_scale.c;
+   enable = videomodules;
+ };
+ 
+ module = {
+   name = efi_gop;
+   x86_efi = video/efi_gop.c;
+   enable = x86_efi;
+ };
+ 
+ module = {
+   name = efi_uga;
+   x86_efi = video/efi_uga.c;
+   enable = x86_efi;
+ };
+ 
+ module = {
+   name = jpeg;
+   common = video/readers/jpeg.c;
+ };
+ 
+ module = {
+   name = png;
+   common = video/readers/png.c;
+ };
+ 
+ module = {
+   name = tga;
+   common = video/readers/tga.c;
+ };
+ 
+ module = {
+   name = vbe;
+   i386_pc = video/i386/pc/vbe.c;
+   enable = i386_pc;
+ };
+ 
+ module = {
+   name = video_fb;
+   common = video/fb/video_fb.c;
+   common = video/fb/fbblit.c;
+   common = video/fb/fbfill.c;
+   common = video/fb/fbutil.c;
+   enable = videomodules;
+ };
+ 
+ module = {
+   name = video;
+   common = video/video.c;
+   enable = videomodules;
+ };
+ 
+ module = {
+   name = ieee1275_fb;
+   ieee1275 = video/ieee1275.c;
+   enable = powerpc;
+   enable = sparc64;
+ };
+ 
+ module = {
+   name = sdl;
+   emu = video/emu/sdl.c;
+   enable = emu;
+   condition = COND_GRUB_EMU_SDL;
+ };
+ 
+ module = {
+   name = datehook;
+   common = hook/datehook.c;
+ };
+ 
+ module = {
+   name = legacycfg;
+   common = commands/legacycfg.c;
+   common = lib/legacy_parse.c;
+   emu = lib/i386/pc/vesa_modes_table.c;
+   enable = i386_pc;
+   enable = emu;
+ };
+ 
+ module = {
+   name = test_blockarg;
+   common = tests/test_blockarg.c;
+ };
+ 
+ module = {
+   name = xzio;
+   common = io/xzio.c;
+   common = lib/xzembed/xz_dec_bcj.c;
+   common = lib/xzembed/xz_dec_lzma2.c;
+   common = lib/xzembed/xz_dec_stream.c;
+   cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/xzembed';
+ };
+ 
+ module = {
+   name = testload;
+   common = commands/testload.c;
+ };
+ 
+ module = {
+   name = lsapm;
+   common = commands/i386/pc/lsapm.c;
+   enable = i386_pc;
+ };
+ 
+ module = {
+   name = keylayouts;
+   common = commands/keylayouts.c;
+   enable = videomodules;
+ };
diff --cc grub-core/commands/crc.c
index 1c1a690aa,000000000..1c1a690aa
mode 100644,000000..100644
--- a/grub-core/commands/crc.c
+++ b/grub-core/commands/crc.c
diff --cc grub-core/commands/hdparm.c
index 02ae8f36b,b6ab78755..0154ece57
--- a/grub-core/commands/hdparm.c
+++ b/grub-core/commands/hdparm.c
@@@ -271,10 -270,9 +271,10 @@@ static int get_int_arg (const struct gr
  }
  
  static grub_err_t
- grub_cmd_hdparm (grub_extcmd_t cmd, int argc, char **args) // state????
+ grub_cmd_hdparm (grub_extcmd_context_t ctxt, int argc, char **args) // state????
  {
-   struct grub_arg_list *state = cmd->state;
+   struct grub_arg_list *state = ctxt->state;
 +  struct grub_ata *ata;
  
    /* Check command line.  */
    if (argc != 1)
diff --cc grub-core/commands/i386/pc/vbeinfo.c
index c266bbfcb,000000000..c266bbfcb
mode 100644,000000..100644
--- a/grub-core/commands/i386/pc/vbeinfo.c
+++ b/grub-core/commands/i386/pc/vbeinfo.c
diff --cc grub-core/commands/i386/pc/vbetest.c
index d2921c09d,000000000..d2921c09d
mode 100644,000000..100644
--- a/grub-core/commands/i386/pc/vbetest.c
+++ b/grub-core/commands/i386/pc/vbetest.c
diff --cc grub-core/disk/ahci.c
index 946db82e1,000000000..946db82e1
mode 100644,000000..100644
--- a/grub-core/disk/ahci.c
+++ b/grub-core/disk/ahci.c
diff --cc grub-core/disk/ata.c
index 3d9de23dd,fe677e2a0..04b81cd27
--- a/grub-core/disk/ata.c
+++ b/grub-core/disk/ata.c
@@@ -378,30 -696,34 +378,29 @@@ grub_ata_iterate (int (*hook_in) (cons
  static grub_err_t
  grub_ata_open (const char *name, grub_disk_t disk)
  {
 -  struct grub_ata_device *dev;
 -  grub_err_t err;
 -
 -  for (dev = grub_ata_devices; dev; dev = dev->next)
 -    {
 -      char devname[10];
 -      grub_snprintf (devname, sizeof (devname),
 -		     "ata%d", dev->port * 2 + dev->device);
 -      if (grub_strcmp (name, devname) == 0)
 -	break;
 -    }
 -
 -  if (! dev)
 -    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "can't open device");
 +  unsigned id, bus;
 +  struct grub_ata *ata;
  
 -  if (dev->atapi)
 +  for (id = 0; id < GRUB_SCSI_NUM_SUBSYSTEMS; id++)
 +    if (grub_strncmp (grub_scsi_names[id], name,
 +		      grub_strlen (grub_scsi_names[id])) == 0
 +	&& grub_isdigit (name[grub_strlen (grub_scsi_names[id])]))
 +      break;
 +  if (id == GRUB_SCSI_NUM_SUBSYSTEMS)
      return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not an ATA harddisk");
 +  bus = grub_strtoul (name + grub_strlen (grub_scsi_names[id]), 0, 0);
 +  ata = grub_ata_real_open (id, bus);
 +  if (!ata)
 +    return grub_errno;
  
 -  err = check_device (dev);
 -
 -  if (err)
 -    return err;
 +  if (ata->atapi)
 +    return grub_error (GRUB_ERR_UNKNOWN_DEVICE, "not an ATA harddisk");
  
 -  disk->total_sectors = dev->size;
 +  disk->total_sectors = ata->size;
  
 -  disk->id = (unsigned long) dev;
 +  disk->id = grub_make_scsi_id (id, bus, 0);
  
-   disk->has_partitions = 1;
 -  disk->data = dev;
 +  disk->data = ata;
  
    return 0;
  }
diff --cc grub-core/disk/pata.c
index b6edf78d6,000000000..b6edf78d6
mode 100644,000000..100644
--- a/grub-core/disk/pata.c
+++ b/grub-core/disk/pata.c
diff --cc grub-core/efiemu/runtime/efiemu.sh
index 5a492dc2f,000000000..5a492dc2f
mode 100644,000000..100644
--- a/grub-core/efiemu/runtime/efiemu.sh
+++ b/grub-core/efiemu/runtime/efiemu.sh
diff --cc grub-core/gnulib/alloca.h
index 107534e98,000000000..107534e98
mode 100644,000000..100644
--- a/grub-core/gnulib/alloca.h
+++ b/grub-core/gnulib/alloca.h
diff --cc grub-core/gnulib/argp-version-etc.c
index f500a8f56,000000000..f500a8f56
mode 100644,000000..100644
--- a/grub-core/gnulib/argp-version-etc.c
+++ b/grub-core/gnulib/argp-version-etc.c
diff --cc grub-core/gnulib/argp-version-etc.h
index 7c12c0181,000000000..7c12c0181
mode 100644,000000..100644
--- a/grub-core/gnulib/argp-version-etc.h
+++ b/grub-core/gnulib/argp-version-etc.h
diff --cc grub-core/gnulib/fnmatch.h
index b086b45aa,000000000..b086b45aa
mode 100644,000000..100644
--- a/grub-core/gnulib/fnmatch.h
+++ b/grub-core/gnulib/fnmatch.h
diff --cc grub-core/gnulib/getopt.h
index d2d3e6e63,000000000..d2d3e6e63
mode 100644,000000..100644
--- a/grub-core/gnulib/getopt.h
+++ b/grub-core/gnulib/getopt.h
diff --cc grub-core/kern/i386/ieee1275/init.c
index 9fb98739b,000000000..9fb98739b
mode 100644,000000..100644
--- a/grub-core/kern/i386/ieee1275/init.c
+++ b/grub-core/kern/i386/ieee1275/init.c
diff --cc grub-core/kern/i386/loader.S
index ed57c43ca,000000000..ed57c43ca
mode 100644,000000..100644
--- a/grub-core/kern/i386/loader.S
+++ b/grub-core/kern/i386/loader.S
diff --cc grub-core/kern/i386/misc.S
index 7d57df9b9,000000000..7d57df9b9
mode 100644,000000..100644
--- a/grub-core/kern/i386/misc.S
+++ b/grub-core/kern/i386/misc.S
diff --cc grub-core/lib/crc.c
index bc0d8aa8d,000000000..bc0d8aa8d
mode 100644,000000..100644
--- a/grub-core/lib/crc.c
+++ b/grub-core/lib/crc.c
diff --cc grub-core/loader/i386/bsd_helper.S
index 25aee3a80,000000000..25aee3a80
mode 100644,000000..100644
--- a/grub-core/loader/i386/bsd_helper.S
+++ b/grub-core/loader/i386/bsd_helper.S
diff --cc grub-core/loader/i386/bsd_trampoline.S
index a568fff4d,000000000..a568fff4d
mode 100644,000000..100644
--- a/grub-core/loader/i386/bsd_trampoline.S
+++ b/grub-core/loader/i386/bsd_trampoline.S
diff --cc grub-core/loader/i386/efi/linux.c
index d37feb983,000000000..d37feb983
mode 100644,000000..100644
--- a/grub-core/loader/i386/efi/linux.c
+++ b/grub-core/loader/i386/efi/linux.c
diff --cc grub-core/loader/i386/ieee1275/linux.c
index 9f7556ffa,000000000..9f7556ffa
mode 100644,000000..100644
--- a/grub-core/loader/i386/ieee1275/linux.c
+++ b/grub-core/loader/i386/ieee1275/linux.c
diff --cc grub-core/loader/i386/linux_trampoline.S
index 4acea7b11,000000000..4acea7b11
mode 100644,000000..100644
--- a/grub-core/loader/i386/linux_trampoline.S
+++ b/grub-core/loader/i386/linux_trampoline.S
diff --cc include/grub/disk.h
index ac3fb6497,66db1149a..a127a8174
--- a/include/grub/disk.h
+++ b/include/grub/disk.h
@@@ -165,5 -163,27 +163,16 @@@ grub_uint64_t EXPORT_FUNC(grub_disk_get
  
  extern void (* EXPORT_VAR(grub_disk_firmware_fini)) (void);
  extern int EXPORT_VAR(grub_disk_firmware_is_tainted);
-  
+ 
 -/* ATA pass through parameters and function.  */
 -struct grub_disk_ata_pass_through_parms
 -{
 -  grub_uint8_t taskfile[8];
 -  void * buffer;
 -  int size;
 -};
 -
 -extern grub_err_t (* EXPORT_VAR(grub_disk_ata_pass_through)) (grub_disk_t,
 -		   struct grub_disk_ata_pass_through_parms *);
 -
+ #if defined (GRUB_UTIL) || defined (GRUB_MACHINE_EMU)
+ void grub_lvm_init (void);
+ void grub_mdraid09_init (void);
+ void grub_mdraid1x_init (void);
+ void grub_raid_init (void);
+ void grub_lvm_fini (void);
+ void grub_mdraid09_fini (void);
+ void grub_mdraid1x_fini (void);
+ void grub_raid_fini (void);
+ #endif
+ 
  #endif /* ! GRUB_DISK_HEADER */