Merge mainline into keylayouts
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Tue, 31 Aug 2010 12:03:29 +0000 (14:03 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Tue, 31 Aug 2010 12:03:29 +0000 (14:03 +0200)
37 files changed:
1  2 
Makefile.util.def
grub-core/Makefile.am
grub-core/Makefile.core.def
grub-core/bus/usb/ohci.c
grub-core/bus/usb/uhci.c
grub-core/bus/usb/usbhub.c
grub-core/bus/usb/usbtrans.c
grub-core/commands/cat.c
grub-core/commands/keylayouts.c
grub-core/commands/keystatus.c
grub-core/commands/sleep.c
grub-core/efiemu/runtime/efiemu.sh
grub-core/kern/emu/console.c
grub-core/kern/i386/loader.S
grub-core/kern/i386/pc/startup.S
grub-core/kern/mips/yeeloong/init.c
grub-core/kern/rescue_reader.c
grub-core/kern/term.c
grub-core/lib/crypto.c
grub-core/loader/i386/bsd_helper.S
grub-core/loader/i386/bsd_trampoline.S
grub-core/loader/i386/efi/linux.c
grub-core/loader/i386/ieee1275/linux.c
grub-core/loader/i386/linux_trampoline.S
grub-core/normal/auth.c
grub-core/normal/cmdline.c
grub-core/normal/main.c
grub-core/normal/menu.c
grub-core/normal/menu_entry.c
grub-core/normal/menu_text.c
grub-core/term/at_keyboard.c
grub-core/term/efi/console.c
grub-core/term/i386/pc/console.c
grub-core/term/ieee1275/ofconsole.c
grub-core/term/serial.c
grub-core/term/terminfo.c
grub-core/term/usb_keyboard.c

index 0000000,6b4949f..b32fe0a
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,512 +1,527 @@@
+ AutoGen definitions Makefile.tpl;
+ library = {
+   name = libgrub.a;
+   cflags = '$(CFLAGS_GCRY)';
+   cppflags = '$(CPPFLAGS_GCRY)';
+   common_nodist = grub_script.tab.c;
+   common_nodist = grub_script.yy.c;
+   common_nodist = libgrub_a_init.c;
+   common_nodist = grub_script.yy.h;
+   common_nodist = grub_script.tab.h;
+   common = grub-core/gnulib/error.c;
+   common = grub-core/gnulib/fnmatch.c;
+   common = grub-core/gnulib/getdelim.c;
+   common = grub-core/gnulib/getline.c;
+   common = grub-core/gnulib/getopt1.c;
+   common = grub-core/gnulib/getopt.c;
+   common = grub-core/gnulib/progname.c;
+   common = util/misc.c;
+   common = grub-core/kern/misc.c;
+   common = grub-core/kern/emu/mm.c;
+   common = grub-core/kern/emu/misc.c;
+   common = grub-core/kern/emu/hostfs.c;
+   common = grub-core/kern/emu/getroot.c;
+   common = grub-core/kern/emu/hostdisk.c;
+   common = grub-core/commands/blocklist.c;
+   common = grub-core/commands/extcmd.c;
+   common = grub-core/commands/ls.c;
+   common = grub-core/disk/dmraid_nvidia.c;
+   common = grub-core/disk/host.c;
+   common = grub-core/disk/loopback.c;
+   common = grub-core/disk/lvm.c;
+   common = grub-core/disk/mdraid_linux.c;
+   common = grub-core/disk/raid5_recover.c;
+   common = grub-core/disk/raid6_recover.c;
+   common = grub-core/disk/raid.c;
+   common = grub-core/fs/affs.c;
+   common = grub-core/fs/afs_be.c;
+   common = grub-core/fs/afs.c;
+   common = grub-core/fs/befs_be.c;
+   common = grub-core/fs/befs.c;
+   common = grub-core/fs/cpio.c;
+   common = grub-core/fs/ext2.c;
+   common = grub-core/fs/fat.c;
+   common = grub-core/fs/fshelp.c;
+   common = grub-core/fs/hfs.c;
+   common = grub-core/fs/hfsplus.c;
+   common = grub-core/fs/iso9660.c;
+   common = grub-core/fs/jfs.c;
+   common = grub-core/fs/minix.c;
+   common = grub-core/fs/nilfs2.c;
+   common = grub-core/fs/ntfs.c;
+   common = grub-core/fs/ntfscomp.c;
+   common = grub-core/fs/reiserfs.c;
+   common = grub-core/fs/sfs.c;
+   common = grub-core/fs/tar.c;
+   common = grub-core/fs/udf.c;
+   common = grub-core/fs/ufs2.c;
+   common = grub-core/fs/ufs.c;
+   common = grub-core/fs/xfs.c;
+   common = grub-core/kern/command.c;
+   common = grub-core/kern/device.c;
+   common = grub-core/kern/disk.c;
+   common = grub-core/kern/env.c;
+   common = grub-core/kern/err.c;
+   common = grub-core/kern/file.c;
+   common = grub-core/kern/fs.c;
+   common = grub-core/kern/list.c;
+   common = grub-core/kern/partition.c;
+   common = grub-core/lib/arg.c;
+   common = grub-core/lib/crc.c;
+   common = grub-core/lib/crypto.c;
+   common = grub-core/lib/envblk.c;
+   common = grub-core/lib/hexdump.c;
+   common = grub-core/lib/libgcrypt-grub/cipher/sha512.c;
+   common = grub-core/lib/LzFind.c;
+   common = grub-core/lib/LzmaEnc.c;
+   common = grub-core/lib/pbkdf2.c;
+   common = grub-core/normal/datetime.c;
+   common = grub-core/normal/misc.c;
+   common = grub-core/partmap/acorn.c;
+   common = grub-core/partmap/amiga.c;
+   common = grub-core/partmap/apple.c;
+   common = grub-core/partmap/gpt.c;
+   common = grub-core/partmap/msdos.c;
+   common = grub-core/partmap/sun.c;
+   common = grub-core/script/function.c;
+   common = grub-core/script/lexer.c;
+   common = grub-core/script/main.c;
+   common = grub-core/script/script.c;
+   common = grub-core/script/argv.c;
+ };
+ program = {
+   name = grub-bin2h;
+   common = util/bin2h.c;
+   ldadd = libgrub.a;
+   ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
+   mansection = 1;
+ };
+ program = {
+   name = grub-mkimage;
+   mansection = 1;
+   common = util/grub-mkimage.c;
+   common = util/resolve.c;
+   extra_dist = util/grub-mkimagexx.c;
+   ldadd = libgrub.a;
+   ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
+   cppflags = '-DGRUB_PKGLIBROOTDIR=\"$(pkglibrootdir)\"';
+ };
+ program = {
+   name = grub-mkrelpath;
+   mansection = 1;
+   common = util/grub-mkrelpath.c;
+   ldadd = libgrub.a;
+   ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
+ };
+ program = {
+   name = grub-script-check;
+   mansection = 1;
+   common = util/grub-script-check.c;
+   ldadd = libgrub.a;
+   ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
+ };
+ program = {
+   name = grub-editenv;
+   mansection = 1;
+   common = util/grub-editenv.c;
+   ldadd = libgrub.a;
+   ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
+ };
+ program = {
+   name = grub-mkpasswd-pbkdf2;
+   mansection = 1;
+   common = util/grub-mkpasswd-pbkdf2.c;
+   ldadd = libgrub.a;
+   ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
+   cflags = '$(CFLAGS_GCRY)';
+   cppflags = '$(CPPFLAGS_GCRY)';
+ };
+ program = {
+   name = grub-macho2img;
+   mansection = 1;
+   common = util/grub-macho2img.c;
+   condition = COND_APPLE_CC;
+ };
+ program = {
+   name = grub-pe2elf;
+   mansection = 1;
+   common = util/grub-pe2elf.c;
+   ldadd = libgrub.a;
+   ldadd = '$(LIBINTL)';
+   condition = COND_GRUB_PE2ELF;
+ };
+ program = {
+   name = grub-fstest;
+   mansection = 1;
+   common = util/grub-fstest.c;
+   ldadd = libgrub.a;
+   ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
+   condition = COND_GRUB_FSTEST;
+ };
+ program = {
+   name = grub-mkfont;
+   mansection = 1;
+   common = util/grub-mkfont.c;
+   common = grub-core/unidata.c;
+   cflags = '$(freetype_cflags)';
+   ldadd = libgrub.a;
+   ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
+   ldadd = '$(freetype_libs)';
+   condition = COND_GRUB_MKFONT;
+ };
+ program = {
+   name = grub-mkdevicemap;
+   installdir = sbin;
+   mansection = 8;
+   common = util/grub-mkdevicemap.c;
+   common = util/deviceiter.c;
+   nosparc64 = util/devicemap.c;
+   sparc64_ieee1275 = util/ieee1275/ofpath.c;
+   sparc64_ieee1275 = util/ieee1275/devicemap.c;
+   ldadd = libgrub.a;
+   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
+ };
+ program = {
+   name = grub-probe;
+   installdir = sbin;
+   mansection = 8;
+   common = util/grub-probe.c;
+   ldadd = libgrub.a;
+   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
+ };
+ program = {
+   name = grub-setup;
+   installdir = sbin;
+   mansection = 8;
+   i386_pc = util/i386/pc/grub-setup.c;
+   i386_pc = util/raid.c;
+   i386_pc = util/lvm.c;
+   sparc64_ieee1275 = util/ieee1275/ofpath.c;
+   sparc64_ieee1275 = util/sparc64/ieee1275/grub-setup.c;
+   sparc64_ieee1275 = util/raid.c;
+   sparc64_ieee1275 = util/lvm.c;
+   ldadd = libgrub.a;
+   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
+   enable = i386_pc;
+   enable = sparc64_ieee1275;
+ };
+ program = {
+   name = grub-ofpathname;
+   installdir = sbin;
+   ieee1275 = util/ieee1275/grub-ofpathname.c;
+   ieee1275 = util/ieee1275/ofpath.c;
+   ldadd = libgrub.a;
+   ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBUTIL)';
+   enable = sparc64_ieee1275;
+ };
++program = {
++  name = grub-mklayout;
++  mansection = 1;
++
++  common = util/grub-mklayout.c;
++
++  ldadd = libgrub.a;
++  ldadd = '$(LIBINTL) $(LIBDEVMAPPER)';
++};
++
+ data = {
+   common = util/grub.d/README;
+   installdir = grubconf;
+ };
+ script = {
+   name = '00_header';
+   common = util/grub.d/00_header.in;
+   installdir = grubconf;
+ };
+ script = {
+   name = '10_windows';
+   common = util/grub.d/10_windows.in;
+   installdir = grubconf;
+   condition = COND_HOST_WINDOWS;
+ };
+ script = {
+   name = '10_hurd';
+   common = util/grub.d/10_hurd.in;
+   installdir = grubconf;
+   condition = COND_HOST_HURD;
+ };
+ script = {
+   name = '10_kfreebsd';
+   common = util/grub.d/10_kfreebsd.in;
+   installdir = grubconf;
+   condition = COND_HOST_KFREEBSD;
+ };
+ script = {
+   name = '10_netbsd';
+   common = util/grub.d/10_netbsd.in;
+   installdir = grubconf;
+   condition = COND_HOST_NETBSD;
+ };
+ script = {
+   name = '10_linux';
+   common = util/grub.d/10_linux.in;
+   installdir = grubconf;
+   condition = COND_HOST_LINUX;
+ };
+ script = {
+   name = '20_linux_xen';
+   common = util/grub.d/20_linux_xen.in;
+   installdir = grubconf;
+   condition = COND_HOST_LINUX;
+ };
+ script = {
+   name = '30_os-prober';
+   common = util/grub.d/30_os-prober.in;
+   installdir = grubconf;
+ };
+ script = {
+   name = '40_custom';
+   common = util/grub.d/40_custom.in;
+   installdir = grubconf;
+ };
+ script = {
+   name = '41_custom';
+   common = util/grub.d/41_custom.in;
+   installdir = grubconf;
+ };
+ script = {
+   mansection = 1;
+   name = grub-mkrescue;
+   x86_noieee1275 = util/grub-mkrescue.in;
+   powerpc_ieee1275 = util/powerpc/ieee1275/grub-mkrescue.in;
+   enable = i386_pc;
+   enable = x86_efi;
+   enable = i386_qemu;
+   enable = i386_multiboot;
+   enable = i386_coreboot;
+   enable = powerpc_ieee1275;
+ };
+ script = {
+   mansection = 8;
+   installdir = sbin;
+   name = grub-install;
+   mips = util/grub-install.in;
+   i386_noefi_noieee1275 = util/grub-install.in;
+   x86_efi = util/i386/efi/grub-install.in;
+   i386_ieee1275 = util/ieee1275/grub-install.in;
+   powerpc_ieee1275 = util/ieee1275/grub-install.in;
+   enable = x86;
+   enable = mips;
+   enable = powerpc_ieee1275;
+ };
+ script = {
+   name = grub-mkconfig;
+   common = util/grub-mkconfig.in;
+   mansection = 8;
+   installdir = sbin;
+ };
+ script = {
+   name = grub-set-default;
+   common = util/grub-set-default.in;
+   mansection = 8;
+   installdir = sbin;
+ };
+ script = {
+   name = grub-reboot;
+   common = util/grub-reboot.in;
+   mansection = 8;
+   installdir = sbin;
+ };
+ script = {
+   name = grub-mkconfig_lib;
+   common = util/grub-mkconfig_lib.in;
+   installdir = noinst;
+ };
+ script = {
+   name = update-grub_lib;
+   common = util/update-grub_lib.in;
+   installdir = noinst;
+ };
++script = {
++  name = grub-kbdcomp;
++  common = util/grub-kbdcomp.in;
++};
++
+ script = {
+   name = grub-shell;
+   common = tests/util/grub-shell.in;
+   installdir = noinst;
+ };
+ script = {
+   name = grub-shell-tester;
+   common = tests/util/grub-shell-tester.in;
+   installdir = noinst;
+ };
+ script = {
+   testcase;
+   name = example_scripted_test;
+   common = tests/example_scripted_test.in;
+ };
+ script = {
+   testcase;
+   name = example_grub_script_test;
+   common = tests/example_grub_script_test.in;
+ };
+ script = {
+   testcase;
+   name = grub_script_echo1;
+   common = tests/grub_script_echo1.in;
+ };
+ script = {
+   testcase;
+   name = grub_script_echo_keywords;
+   common = tests/grub_script_echo_keywords.in;
+ };
+ script = {
+   testcase;
+   name = grub_script_vars1;
+   common = tests/grub_script_vars1.in;
+ };
+ script = {
+   testcase;
+   name = grub_script_for1;
+   common = tests/grub_script_for1.in;
+ };
+ script = {
+   testcase;
+   name = grub_script_while1;
+   common = tests/grub_script_while1.in;
+ };
+ script = {
+   testcase;
+   name = grub_script_if;
+   common = tests/grub_script_if.in;
+ };
+ script = {
+   testcase;
+   name = grub_script_blanklines;
+   common = tests/grub_script_blanklines.in;
+ };
+ script = {
+   testcase;
+   name = grub_script_final_semicolon;
+   common = tests/grub_script_final_semicolon.in;
+ };
+ script = {
+   testcase;
+   name = grub_script_dollar;
+   common = tests/grub_script_dollar.in;
+ };
+ script = {
+   testcase;
+   name = grub_script_comments;
+   common = tests/grub_script_comments.in;
+ };
+ script = {
+   testcase;
+   name = grub_script_functions;
+   common = tests/grub_script_functions.in;
+ };
+ script = {
+   testcase;
+   name = grub_script_break;
+   common = tests/grub_script_break.in;
+ };
+ script = {
+   testcase;
+   name = grub_script_continue;
+   common = tests/grub_script_continue.in;
+ };
+ script = {
+   testcase;
+   name = grub_script_shift;
+   common = tests/grub_script_shift.in;
+ };
+ program = {
+   testcase;
+   name = example_unit_test;
+   common = tests/example_unit_test.c;
+   common = tests/lib/unit_test.c;
+   common = grub-core/kern/list.c;
+   common = grub-core/kern/misc.c;
+   common = grub-core/tests/lib/test.c;
+   cflags = -Wno-format;
+   ldadd = libgrub.a;
+   ldadd = '$(LIBDEVMAPPER)';
+ };
index 0000000,61a0bb3..974e253
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,331 +1,332 @@@
+ AUTOMAKE_OPTIONS = subdir-objects
+ DEPDIR=.deps-core
+ include $(top_srcdir)/conf/Makefile.common
+ CC=$(TARGET_CC)
+ CPP=$(TARGET_CC)
+ CCAS=$(TARGET_CC)
+ if COND_GRUB_MKFONT
+ if COND_HAVE_FONT_SOURCE
+ TARGET_CFLAGS += -DUSE_ASCII_FAILBACK=1 -DHAVE_UNIFONT_WIDTHSPEC=1
+ endif
+ endif
+ AM_CFLAGS = $(TARGET_CFLAGS)
+ AM_LDFLAGS = $(TARGET_LDFLAGS)
+ AM_CPPFLAGS = $(TARGET_CPPFLAGS) $(CPPFLAGS_DEFAULT)
+ AM_CCASFLAGS = $(TARGET_CCASFLAGS) $(CCASFLAGS_DEFAULT)
+ CFLAGS_PROGRAM += $(CFLAGS_PLATFORM)
+ LDFLAGS_PROGRAM += $(LDFLAGS_PLATFORM)
+ CPPFLAGS_PROGRAM += $(CPPFLAGS_PLATFORM)
+ CCASFLAGS_PROGRAM += $(CCASFLAGS_PLATFORM)
+ CFLAGS_LIBRARY += $(CFLAGS_PLATFORM) -fno-builtin
+ CPPFLAGS_LIBRARY += $(CPPFLAGS_PLATFORM)
+ CCASFLAGS_LIBRARY += $(CCASFLAGS_PLATFORM)
+ # gentrigtables
+ gentrigtables: gentrigtables.c
+       $(BUILD_CC) -o $@ -I$(top_srcdir)/include $(CPPFLAGS) -lm $<
+ CLEANFILES += gentrigtables
+ # trigtables.c
+ trigtables.c: gentrigtables gentrigtables.c $(top_srcdir)/configure.ac
+       $(builddir)/gentrigtables > $@
+ CLEANFILES += trigtables.c
+ # XXX Use Automake's LEX & YACC support
+ grub_script.tab.h: script/parser.y
+       $(YACC) -d -p grub_script_yy -b grub_script $<
+ grub_script.tab.c: grub_script.tab.h
+ CLEANFILES += grub_script.tab.c grub_script.tab.h
+ # For the lexer.
+ grub_script.yy.h: script/yylex.l
+       $(LEX) -o grub_script.yy.c --header-file=grub_script.yy.h $<
+ grub_script.yy.c: grub_script.yy.h
+ CLEANFILES += grub_script.yy.c grub_script.yy.h
+ include $(srcdir)/Makefile.core.am
+ include $(srcdir)/Makefile.gcry.am
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cache.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/device.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/disk.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/dl.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/elf.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/elfload.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/file.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/fs.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i18n.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/kernel.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/list.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/misc.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/net.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/parser.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/partition.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/reader.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/symbol.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/term.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/time.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/types.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/mm_private.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/boot.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+ if COND_i386_pc
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/biosdisk.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/loader.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/vga.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/vbe.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/pxe.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
+ endif
+ if COND_i386_efi
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/time.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
+ endif
+ if COND_i386_coreboot
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
+ endif
+ if COND_i386_multiboot
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
+ endif
+ if COND_i386_qemu
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/boot.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/console.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/init.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
+ endif
+ if COND_i386_ieee1275
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/loader.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/msdos_partition.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/terminfo.h
+ endif
+ if COND_x86_64_efi
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/time.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/disk.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/i386/pit.h
+ endif
+ if COND_mips_yeeloong
++KERNEL_HEADER_FILES += $(top_builddir)/include/grub/keyboard_layouts.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/memory.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/cache.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bitmap.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/font.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bitmap_scale.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bufio.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/pci.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/cs5536.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/pci.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/serial.h
+ endif
+ if COND_powerpc_ieee1275
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
+ endif
+ if COND_sparc64_ieee1275
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libgcc.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/ieee1275/ieee1275.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/machine/kernel.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sparc64/ieee1275/ieee1275.h
+ endif
+ if COND_emu
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/time.h
+ KERNEL_HEADER_FILES += $(top_builddir)/include/grub/cpu/types.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gzio.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/menu.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/datetime.h
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/emu/misc.h
+ if COND_GRUB_EMU_SDL
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/sdl.h
+ endif
+ if COND_GRUB_EMU_USB
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libusb.h
+ endif
+ if COND_GRUB_EMU_PCI
+ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/libpciaccess.h
+ endif
+ endif
+ symlist.h: $(top_builddir)/config.h $(KERNEL_HEADER_FILES)
+       @list='$^'; \
+       for p in $$list; do \
+         echo "#include <$$p>" >> $@ || (rm -f $@; exit 1); \
+       done
+ CLEANFILES += symlist.h
+ BUILT_SOURCES += symlist.h
+ symlist.c: symlist.h gensymlist.sh
+       $(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) -DGRUB_SYMBOL_GENERATOR=1 symlist.h > symlist.p || (rm -f symlist.p; exit 1)
+       cat symlist.p | /bin/sh $(srcdir)/gensymlist.sh $(top_builddir)/config.h $(KERNEL_HEADER_FILES) >$@ || (rm -f $@; exit 1)
+       rm -f symlist.p
+ CLEANFILES += symlist.c
+ BUILT_SOURCES += symlist.c
+ noinst_DATA += kernel_syms.lst
+ kernel_syms.lst: $(KERNEL_HEADER_FILES) $(top_builddir)/config.h
+       $(TARGET_CPP) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_KERNEL) $(CPPFLAGS) $(CFLAGS) -DGRUB_SYMBOL_GENERATOR=1 $^ >kernel_syms.input
+       if grep "^#define HAVE_ASM_USCORE" $(top_builddir)/config.h; then u="_"; else u=""; fi; \
+       cat kernel_syms.input | grep -v '^#' | sed -n \
+         -e '/EXPORT_FUNC *([a-zA-Z0-9_]*)/{s/.*EXPORT_FUNC *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
+         -e '/EXPORT_VAR *([a-zA-Z0-9_]*)/{s/.*EXPORT_VAR *(\([a-zA-Z0-9_]*\)).*/'"$$u"'\1 kernel/;p;}' \
+         | sort -u >$@
+       rm -f kernel_syms.input
+ CLEANFILES += kernel_syms.lst
+ if COND_emu
+ kern/emu/grub_emu-main.$(OBJEXT):grub_emu_init.h
+ grub_emu-grub_emu_init.$(OBJEXT):grub_emu_init.h
+ kern/emu/grub_emu_dyn-main.$(OBJEXT):grub_emu_init.h
+ grub_emu_dyn-grub_emu_init.$(OBJEXT):grub_emu_init.h
+ grub_emu_init.h: genemuinitheader.sh $(MOD_FILES)
+       rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinitheader.sh $(NM) > $@
+ CLEANFILES += grub_emu_init.h
+ grub_emu_init.c: grub_emu_init.h genemuinit.sh $(MOD_FILES)
+       rm -f $@; echo $(MOD_FILES) | sh $(srcdir)/genemuinit.sh $(NM) > $@
+ CLEANFILES += grub_emu_init.c
+ endif
+ # .lst files
+ platform_DATA += moddep.lst
+ platform_DATA += fs.lst
+ platform_DATA += command.lst
+ platform_DATA += partmap.lst
+ platform_DATA += handler.lst
+ platform_DATA += terminal.lst
+ platform_DATA += parttool.lst
+ platform_DATA += video.lst
+ platform_DATA += crypto.lst
+ CLEANFILES += moddep.lst
+ CLEANFILES += handler.lst
+ CLEANFILES += terminal.lst
+ CLEANFILES += parttool.lst
+ CLEANFILES += video.lst
+ CLEANFILES += crypto.lst
+ fs.lst: $(FS_FILES)
+       cat $^ /dev/null | sort | uniq > $@
+ CLEANFILES += fs.lst
+ command.lst: $(COMMAND_FILES)
+       cat $^ /dev/null | sort | uniq > $@
+ CLEANFILES += command.lst
+ partmap.lst: $(PARTMAP_FILES)
+       cat $^ /dev/null | sort | uniq > $@
+ CLEANFILES += partmap.lst
+ handler.lst: $(HANDLER_FILES)
+       cat $^ /dev/null | sort | uniq > $@
+ CLEANFILES += handler.lst
+ terminal.lst: $(TERMINAL_FILES)
+       cat $^ /dev/null | sort | uniq > $@
+ CLEANFILES += terminal.lst
+ parttool.lst: $(PARTTOOL_FILES)
+       cat $^ /dev/null | sort | uniq > $@
+ CLEANFILES += parttool.lst
+ video.lst: $(VIDEO_FILES)
+       cat $^ /dev/null | sort | uniq > $@
+ CLEANFILES += video.lst
+ # but, crypto.lst is simply copied
+ crypto.lst: $(srcdir)/lib/libgcrypt-grub/cipher/crypto.lst
+       cp $^ $@
+ CLEANFILES += crypto.lst
+ # generate global module dependencies list
+ moddep.lst: kernel_syms.lst genmoddep.awk $(DEF_FILES) $(UND_FILES)
+       cat $(DEF_FILES) kernel_syms.lst /dev/null \
+         | $(AWK) -f $(srcdir)/genmoddep.awk $(UND_FILES) > $@ \
+         || (rm -f $@; exit 1)
+ if COND_ENABLE_EFIEMU
+ efiemu32.o: efiemu/runtime/efiemu.c $(TARGET_OBJ2ELF)
+       -rm -f $@; \
+       if test "x$(TARGET_APPLE_CC)" = x1; then \
+         $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF32 -DAPPLE_CC -m32 -Wall -Werror -nostdlib -O2 -c -o $@.bin $< || exit 1; \
+         $(OBJCONV) -felf32 -nu -nd $@.bin $@ || exit 1; \
+         rm -f $@.bin; \
+       else \
+         $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF32 -m32 -Wall -Werror -nostdlib -O2 -c -o $@ $< || exit 1; \
+         if test ! -z "$(TARGET_OBJ2ELF)"; then $(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi; \
+       fi
+ efiemu64_c.o: efiemu/runtime/efiemu.c
+       if test "x$(TARGET_APPLE_CC)" = x1; then \
+         $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF64 -DAPPLE_CC=1 -m64 -nostdlib -Wall -Werror -mno-red-zone -c -o $@ $< || exit 1; \
+       else \
+         $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF64 -m64 -nostdlib -Wall -Werror -O2 -mcmodel=large -mno-red-zone -c -o $@ $< || exit 1; \
+       fi
+ efiemu64_s.o: efiemu/runtime/efiemu.S
+       -rm -f $@
+       if test "x$(TARGET_APPLE_CC)" = x1; then \
+         $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF64 -DAPPLE_CC=1 -m64 -Wall -Werror -nostdlib -O2 -mno-red-zone -c -o $@ $< || exit 1; \
+       else \
+         $(TARGET_CC) $(DEFS) $(INCLUDES) $(CPPFLAGS_EFIEMU) $(CPPFLAGS_DEFAULT) -DELF64 -m64 -Wall -Werror -nostdlib -O2 -mcmodel=large -mno-red-zone -c -o $@ $< || exit 1; \
+       fi
+ efiemu64.o: efiemu64_c.o efiemu64_s.o $(TARGET_OBJ2ELEF)
+       -rm -f $@; \
+       if test "x$(TARGET_APPLE_CC)" = x1; then \
+         rm -f $@.bin; \
+         $(TARGET_CC) -m64 -Wl,-r -nostdlib -o $@.bin $^ || exit 1; \
+         $(OBJCONV) -felf64 -nu -nd $@.bin $@ || exit 1; \
+         rm -f $@.bin; \
+       else \
+         $(TARGET_CC) -m64 -nostdlib -Wl,-r -o $@ $^ || exit 1; \
+         if test ! -z "$(TARGET_OBJ2ELF)"; then $(TARGET_OBJ2ELF) $@ || (rm -f $@; exit 1); fi; \
+       fi
+ platform_DATA += efiemu32.o efiemu64.o
+ CLEANFILES += efiemu32.o efiemu64.o efiemu64_c.o efiemu64_s.o
+ endif
index 0000000,74fd1d3..992f4df
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,1421 +1,1431 @@@
+ AutoGen definitions Makefile.tpl;
+ 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),$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+   i386_qemu_ldflags        = '$(TARGET_IMG_LDFLAGS)';
+   i386_qemu_ldflags        = '$(TARGET_IMG_BASE_LDOPT),$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+   i386_coreboot_ldflags    = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+   i386_multiboot_ldflags   = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+   i386_ieee1275_ldflags    = '-Wl,-Ttext=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+   mips_yeeloong_ldflags    = '-Wl,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+   powerpc_ieee1275_ldflags = '-Wl,-Ttext,$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+   mips_yeeloong_cppflags = '-DUSE_ASCII_FAILBACK';
+   i386_qemu_cppflags     = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)';
+   i386_qemu_ccasflags    = '-DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)';
+   emu_cflags = '$(CFLAGS_GNULIB)';
+   emu_cppflags = '$(CPPFLAGS_GNULIB)';
+   mips_ldadd = '-lgcc';
+   powerpc_ldadd = '-lgcc';
+   sparc64_ldadd = '-lgcc';
+   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_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;
+   noemu_noieee1275 = 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;
+   ieee1275_mips = term/terminfo.c;
+   ieee1275_mips = term/tparm.c;
+   i386 = kern/i386/dl.c;
+   i386_coreboot_multiboot_qemu = kern/i386/coreboot/init.c;
+   i386_coreboot_multiboot_qemu = kern/i386/halt.c;
+   i386_coreboot_multiboot_qemu = term/i386/pc/vga_text.c;
+   i386_pc_coreboot_multiboot_qemu = term/i386/vga_common.c;
+   i386_noefi = kern/i386/misc.S;
+   x86_noieee1275 = 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/i386/ieee1275/init.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 = commands/extcmd.c;
+   mips_yeeloong = font/font.c;
+   mips_yeeloong = font/font_cmd.c;
+   mips_yeeloong = io/bufio.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 = lib/arg.c;
+   mips_yeeloong = term/at_keyboard.c;
+   mips_yeeloong = term/gfxterm.c;
+   mips_yeeloong = term/serial.c;
+   mips_yeeloong = video/bitmap.c;
+   mips_yeeloong = video/bitmap_scale.c;
+   mips_yeeloong = video/fb/fbblit.c;
+   mips_yeeloong = video/fb/fbfill.c;
+   mips_yeeloong = video/fb/fbutil.c;
+   mips_yeeloong = video/fb/video_fb.c;
+   mips_yeeloong = video/sm712.c;
+   mips_yeeloong = video/video.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 = 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;
+   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)';
+   enable = emu;
+ };
+ program = {
+   name = grub-emu-lite;
+   emu = kern/emu/lite.c;
+   emu = kern/emu/cache.S;
+   emu_nodist = symlist.c;
+   ldadd = 'kernel.img$(EXEEXT)';
+   ldadd = '$(LIBUTIL) $(LIBCURSES) $(LIBSDL) $(LIBUSB) $(LIBPCIACCESS) $(LIBDEVMAPPER)';
+   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 = 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 = i386;
+   enable = mips_yeeloong;
+   emu_condition = COND_GRUB_EMU_USB;
+ };
+ module = {
+   name = usbserial_common;
+   common = bus/usb/serial/common.c;
+   enable = emu;
+   enable = i386_pc;
+   enable = mips_yeeloong;
+   emu_condition = COND_GRUB_EMU_USB;
+ };
+ module = {
+   name = usbserial_pl2303;
+   common = bus/usb/serial/pl2303.c;
+   enable = emu;
+   enable = i386_pc;
+   enable = mips_yeeloong;
+   emu_condition = COND_GRUB_EMU_USB;
+ };
+ module = {
+   name = usbserial_ftdi;
+   common = bus/usb/serial/ftdi.c;
+   enable = emu;
+   enable = i386_pc;
+   enable = mips_yeeloong;
+   emu_condition = COND_GRUB_EMU_USB;
+ };
+ module = {
+   name = uhci;
+   common = bus/usb/uhci.c;
+   enable = i386_pc;
+ };
+ module = {
+   name = ohci;
+   common = bus/usb/ohci.c;
+   enable = i386_pc;
+   enable = mips_yeeloong;
+ };
+ 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;
+   extra_dist = gnulib/regcomp.c;
+   extra_dist = gnulib/regexec.c;
+   extra_dist = gnulib/fnmatch_loop.c;
+   extra_dist = gnulib/regex_internal.c;
+   cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
+   cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
+ };
+ module = {
+   name = cmostest;
+   i386 = commands/i386/cmostest.c;
+   enable = i386_pc;
+   enable = i386_coreboot;
+ };
+ module = {
+   name = iorw;
+   common = commands/iorw.c;
+   enable = x86;
+ };
+ module = {
+   name = regexp;
+   common = commands/regexp.c;
+   ldadd = libgnulib.a;
+   cflags = '$(CFLAGS_POSIX) $(CFLAGS_GNULIB)';
+   cppflags = '$(CPPFLAGS_POSIX) $(CPPFLAGS_GNULIB)';
+ };
+ module = {
+   name = acpi;
+   i386 = 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 = blocklist;
+   common = commands/blocklist.c;
+ };
+ module = {
+   name = boot;
+   common = commands/boot.c;
+   i386_pc = lib/i386/pc/biosnum.c;
+ };
+ 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 = crc;
+   common = commands/crc.c;
+   common = lib/crc.c;
+ };
+ 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;
+ };
+ 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;
+ };
+ module = {
+   name = hashsum;
+   common = commands/hashsum.c;
+ };
+ module = {
+   name = hdparm;
+   common = commands/hdparm.c;
+   common = lib/hexdump.c;
+   enable = i386_pc;
+ };
+ 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 = x86;
+   enable = mips;
+ };
+ 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 = i386_pc;
+   enable = mips_yeeloong;
+   enable = emu;
+   emu_condition = COND_GRUB_EMU_USB;
+ };
+ module = {
+   name = vbeinfo;
+   i386_pc = commands/i386/pc/vbeinfo.c;
+   enable = i386_pc;
+ };
+ module = {
+   name = vbetest;
+   i386_pc = commands/i386/pc/vbetest.c;
+   enable = i386_pc;
+ };
+ 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 = mdraid;
+   common = disk/mdraid_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 = x86;
+   enable = mips;
+ };
+ module = {
+   name = ata_pthru;
+   common = disk/ata_pthru.c;
+   enable = x86;
+   enable = mips_yeeloong;
+ };
+ module = {
+   name = biosdisk;
+   i386_pc = disk/i386/pc/biosdisk.c;
+   enable = i386_pc;
+ };
+ module = {
+   name = usbms;
+   common = disk/usbms.c;
+   enable = i386_pc;
+   enable = mips_yeeloong;
+   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 = emu;
+   enable = x86;
+   enable = sparc64;
+   enable = powerpc;
+ };
+ 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 = 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 = 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 = 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 = emu;
+   enable = x86;
+   enable = sparc64;
+   enable = powerpc;
+ };
+ 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;
+   enable = mips;
+   enable = powerpc;
+   enable = x86;
+ };
+ module = {
+   name = datetime;
+   x86_noefi_mips = lib/cmos_datetime.c;
+   x86_efi = lib/efi/datetime.c;
+   sparc64_ieee1275 = lib/ieee1275/datetime.c;
+   powerpc_ieee1275 = lib/ieee1275/datetime.c;
+   enable = x86;
+   enable = mips;
+   enable = sparc64_ieee1275;
+   enable = powerpc_ieee1275;
+ };
+ 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;
+   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;
+   i386_pc = mmap/mmap.c;
+   i386_pc = mmap/i386/uppermem.c;
+   i386_pc = mmap/i386/mmap.c;
+   i386_pc = mmap/i386/pc/mmap.c;
+   i386_pc = mmap/i386/pc/mmap_helper.S;
+   x86_efi = mmap/mmap.c;
+   x86_efi = mmap/i386/uppermem.c;
+   x86_efi = mmap/i386/mmap.c;
+   x86_efi = mmap/efi/mmap.c;
+   i386_coreboot = mmap/mmap.c;
+   i386_coreboot = mmap/i386/uppermem.c;
+   i386_coreboot = mmap/i386/mmap.c;
+   i386_multiboot = mmap/mmap.c;
+   i386_multiboot = mmap/i386/uppermem.c;
+   i386_multiboot = mmap/i386/mmap.c;
+   i386_qemu = mmap/mmap.c;
+   i386_qemu = mmap/i386/uppermem.c;
+   i386_qemu = mmap/i386/mmap.c;
+   i386_ieee1275 = mmap/mmap.c;
+   i386_ieee1275 = mmap/i386/uppermem.c;
+   i386_ieee1275 = mmap/i386/mmap.c;
+   mips_yeeloong = mmap/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 = 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 = emu;
+   enable = x86;
+   enable = sparc64;
+   enable = powerpc;
+ };
+ 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;
+ };
+ module = {
+   name = usb_keyboard;
+   common = term/usb_keyboard.c;
+   enable = i386_pc;
+   enable = mips_yeeloong;
+ };
+ 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 = emu;
+   enable = x86;
+   enable = sparc64;
+   enable = powerpc;
+ };
+ module = {
+   name = bitmap_scale;
+   common = video/bitmap_scale.c;
+   enable = emu;
+   enable = x86;
+   enable = sparc64;
+   enable = powerpc;
+ };
+ 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 = emu;
+   enable = x86;
+   enable = sparc64;
+   enable = powerpc;
+ };
+ module = {
+   name = video;
+   common = video/video.c;
+   enable = emu;
+   enable = x86;
+   enable = sparc64;
+   enable = powerpc;
+ };
+ 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 = keylayouts;
++  common = commands/keylayouts.c;
++  enable = emu;
++  enable = x86;
++  enable = sparc64;
++  enable = powerpc;
++};
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index deb482a,0000000..deb482a
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
index 5a492dc,0000000..5a492dc
mode 100644,000000..100644
--- /dev/null
Simple merge
index ed57c43,0000000..ed57c43
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 25aee3a,0000000..25aee3a
mode 100644,000000..100644
--- /dev/null
index a568fff,0000000..a568fff
mode 100644,000000..100644
--- /dev/null
index d37feb9,0000000..d37feb9
mode 100644,000000..100644
--- /dev/null
index 9f7556f,0000000..9f7556f
mode 100644,000000..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -98,36 -103,139 +101,39 @@@ grub_console_putchar (struct grub_term_
    efi_call_2 (o->output_string, o, str);
  }
  
 -static int
 -grub_console_checkkey (struct grub_term_input *term __attribute__ ((unused)))
 -{
 -  grub_efi_simple_input_interface_t *i;
 -  grub_efi_input_key_t key;
 -  grub_efi_status_t status;
 -
 -  if (grub_efi_is_finished)
 -    return 0;
 -
 -  if (read_key >= 0)
 -    return 1;
 -
 -  i = grub_efi_system_table->con_in;
 -  status = efi_call_2 (i->read_key_stroke, i, &key);
 -#if 0
 -  switch (status)
 -    {
 -    case GRUB_EFI_SUCCESS:
 -      {
 -      grub_uint16_t xy;
 -
 -      xy = grub_getxy ();
 -      grub_gotoxy (0, 0);
 -      grub_printf ("scan_code=%x,unicode_char=%x  ",
 -                   (unsigned) key.scan_code,
 -                   (unsigned) key.unicode_char);
 -      grub_gotoxy (xy >> 8, xy & 0xff);
 -      }
 -      break;
 -
 -    case GRUB_EFI_NOT_READY:
 -      //grub_printf ("not ready   ");
 -      break;
 -
 -    default:
 -      //grub_printf ("device error   ");
 -      break;
 -    }
 -#endif
 +const unsigned efi_codes[] =
 +  {
 +    0, GRUB_TERM_UP, GRUB_TERM_DOWN, GRUB_TERM_RIGHT,
 +    GRUB_TERM_LEFT, GRUB_TERM_HOME, GRUB_TERM_END, GRUB_TERM_KEY_INSERT,
 +    GRUB_TERM_DC, GRUB_TERM_KEY_PPAGE, GRUB_TERM_KEY_NPAGE, GRUB_TERM_KEY_F1,
 +    GRUB_TERM_KEY_F2, GRUB_TERM_KEY_F3, GRUB_TERM_KEY_F4, GRUB_TERM_KEY_F5,
 +    GRUB_TERM_KEY_F6, GRUB_TERM_KEY_F7, GRUB_TERM_KEY_F8, GRUB_TERM_KEY_F9,
 +    GRUB_TERM_KEY_F10, 0, 0, '\e'
 +  };
  
 -  if (status == GRUB_EFI_SUCCESS)
 -    {
 -      switch (key.scan_code)
 -      {
 -      case 0x00:
 -        read_key = key.unicode_char;
 -        break;
 -      case 0x01:
 -        read_key = GRUB_TERM_UP;
 -        break;
 -      case 0x02:
 -        read_key = GRUB_TERM_DOWN;
 -        break;
 -      case 0x03:
 -        read_key = GRUB_TERM_RIGHT;
 -        break;
 -      case 0x04:
 -        read_key = GRUB_TERM_LEFT;
 -        break;
 -      case 0x05:
 -        read_key = GRUB_TERM_HOME;
 -        break;
 -      case 0x06:
 -        read_key = GRUB_TERM_END;
 -        break;
 -      case 0x07:
 -        break;
 -      case 0x08:
 -        read_key = GRUB_TERM_DC;
 -        break;
 -      case 0x09:
 -        break;
 -      case 0x0a:
 -        break;
 -      case 0x0b:
 -        read_key = 24;
 -        break;
 -      case 0x0c:
 -        read_key = 1;
 -        break;
 -      case 0x0d:
 -        read_key = 5;
 -        break;
 -      case 0x0e:
 -        read_key = 3;
 -        break;
 -      case 0x17:
 -        read_key = '\e';
 -        break;
 -      default:
 -        break;
 -      }
 -    }
 -
 -  return read_key;
 -}
  
  static int
 -grub_console_getkey (struct grub_term_input *term)
 +grub_console_getkey (struct grub_term_input *term __attribute__ ((unused)))
  {
    grub_efi_simple_input_interface_t *i;
 -  grub_efi_boot_services_t *b;
 -  grub_efi_uintn_t index;
 +  grub_efi_input_key_t key;
    grub_efi_status_t status;
 -  int key;
  
 -  if (read_key >= 0)
 -    {
 -      key = read_key;
 -      read_key = -1;
 -      return key;
 -    }
 -
+   if (grub_efi_is_finished)
+     return 0;
    i = grub_efi_system_table->con_in;
 -  b = grub_efi_system_table->boot_services;
 +  status = efi_call_2 (i->read_key_stroke, i, &key);
  
 -  do
 -    {
 -      status = efi_call_3 (b->wait_for_event, 1, &(i->wait_for_key), &index);
 -      if (status != GRUB_EFI_SUCCESS)
 -        return -1;
 +  if (status != GRUB_EFI_SUCCESS)
 +    return GRUB_TERM_NO_KEY;
  
 -      grub_console_checkkey (term);
 -    }
 -  while (read_key < 0);
 +  if (key.scan_code == 0)
 +    return key.unicode_char;
 +  else if (key.scan_code < ARRAY_SIZE (efi_codes))
 +    return efi_codes[key.scan_code];
  
 -  key = read_key;
 -  read_key = -1;
 -  return key;
 +  return GRUB_TERM_NO_KEY;
  }
  
  static grub_uint16_t
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge