Index: boot/Makefile.grub
===================================================================
--- boot/Makefile.grub	(revision 387630023ec8e28732b8956f65e2e48339e327be)
+++ boot/Makefile.grub	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -33,4 +33,5 @@
 GRUB = grub.$(GRUB_ARCH)
 BOOT = $(DISTROOT)/boot
+BOOT_CONFIG = $(BOOT)/grub/grub.cfg
 
 ELTORITO = boot/grub/$(GRUB_ARCH).img
@@ -38,10 +39,8 @@
 
 ifeq ($(GRUB_ARCH),pc)
-	BOOT_CONFIG = $(BOOT)/grub/i386-pc/grub.cfg
 	MULTIBOOT_CMD = multiboot
 	MODULE_CMD = module
 endif
 ifeq ($(GRUB_ARCH),efi)
-	BOOT_CONFIG = $(BOOT)/grub/grub.cfg
 	MULTIBOOT_CMD = multiboot2
 	MODULE_CMD = module2
Index: boot/grub.efi/REVISION
===================================================================
--- boot/grub.efi/REVISION	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
+++ boot/grub.efi/REVISION	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -0,0 +1,1 @@
+bc220962e366b1b46769ed6f9fa5be603ba58ab5
Index: boot/grub.efi/i386-efi/command.lst
===================================================================
--- boot/grub.efi/i386-efi/command.lst	(revision 387630023ec8e28732b8956f65e2e48339e327be)
+++ boot/grub.efi/i386-efi/command.lst	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -1,8 +1,13 @@
 *acpi: acpi
-*background_image: gfxterm
+*all_functional_test: functional_test
+*background_image: gfxterm_background
 *cat: cat
 *cpuid: cpuid
 *crc: hashsum
+*cryptomount: cryptodisk
 *echo: echo
+*extract_syslinux_entries_configfile: syslinuxcfg
+*extract_syslinux_entries_source: syslinuxcfg
+*file: file
 *functional_test: functional_test
 *gettext: gettext
@@ -27,4 +32,5 @@
 *md5sum: hashsum
 *menuentry: normal
+*pcidump: pcidump
 *probe: probe
 *read_byte: memrw
@@ -41,11 +47,20 @@
 *sleep: sleep
 *submenu: normal
+*syslinux_configfile: syslinuxcfg
+*syslinux_source: syslinuxcfg
 *terminfo: terminfo
 *test_blockarg: test_blockarg
+*testspeed: testspeed
+*tr: tr
+*trust: verify
+*verify_detached: verify
 *xnu_splash: xnu
+*zfskey: zfscrypt
 .: configfile
 [: test
 appleloader: appleldr
 authenticate: normal
+background_color: gfxterm_background
+backtrace: backtrace
 badram: mmap
 blocklist: blocklist
@@ -53,4 +68,5 @@
 break: normal
 cat: minicmd
+cbmemc: cbmemc
 chainloader: chain
 clear: normal
@@ -58,17 +74,28 @@
 configfile: configfile
 continue: normal
+coreboot_boottime: cbtime
 cutmem: mmap
 date: date
+distrust: verify
 dump: minicmd
+eval: eval
 exit: minicmd
 export: normal
 extract_entries_configfile: configfile
 extract_entries_source: configfile
+extract_legacy_entries_configfile: legacycfg
+extract_legacy_entries_source: legacycfg
 fakebios: loadbios
 false: true
 fix_video: fixvideo
+fwsetup: efifwsetup
+gdbstub: gdb
+gdbstub_break: gdb
+gdbstub_stop: gdb
 gptsync: gptsync
 halt: halt
 help: minicmd
+hexdump_random: random
+initrd16: linux16
 initrd: linux
 keymap: keylayouts
@@ -79,7 +106,18 @@
 knetbsd_module_elf: bsd
 kopenbsd_ramdisk: bsd
+legacy_check_password: legacycfg
+legacy_configfile: legacycfg
+legacy_initrd: legacycfg
+legacy_initrd_nounzip: legacycfg
+legacy_kernel: legacycfg
+legacy_password: legacycfg
+legacy_source: legacycfg
+linux16: linux16
 linux: linux
+list_trusted: verify
 loadbios: loadbios
 loadfont: font
+lscoreboot: cbls
+lsefi: lsefi
 lsefimmap: lsefimmap
 lsefisystab: lsefisystab
@@ -88,8 +126,25 @@
 lsmod: minicmd
 lssal: lssal
+macppcbless: macbless
+mactelbless: macbless
 module2: multiboot2
 module: multiboot
 multiboot2: multiboot2
 multiboot: multiboot
+nativedisk: nativedisk
+net_add_addr: net
+net_add_dns: net
+net_add_route: net
+net_bootp: net
+net_del_addr: net
+net_del_dns: net
+net_del_route: net
+net_get_dhcp_option: net
+net_ipv6_autoconf: net
+net_ls_addr: net
+net_ls_cards: net
+net_ls_dns: net
+net_ls_routes: net
+net_nslookup: net
 normal: normal
 normal_exit: normal
@@ -115,4 +170,5 @@
 test: test
 testload: testload
+time: time
 true: true
 usb: usbtest
Index: boot/grub.efi/i386-efi/crypto.lst
===================================================================
--- boot/grub.efi/i386-efi/crypto.lst	(revision 387630023ec8e28732b8956f65e2e48339e327be)
+++ boot/grub.efi/i386-efi/crypto.lst	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -6,4 +6,6 @@
 AES-192: gcry_rijndael
 AES-256: gcry_rijndael
+ADLER32: adler32
+CRC64: crc64
 ARCFOUR: gcry_arcfour
 BLOWFISH: gcry_blowfish
@@ -17,4 +19,6 @@
 DES: gcry_des
 3DES: gcry_des
+DSA: gcry_dsa
+IDEA: gcry_idea
 MD4: gcry_md4
 MD5: gcry_md5
@@ -24,4 +28,5 @@
 AES256: gcry_rijndael
 RIPEMD160: gcry_rmd160
+RSA: gcry_rsa
 SEED: gcry_seed
 SERPENT128: gcry_serpent
@@ -34,4 +39,6 @@
 SHA384: gcry_sha512
 TIGER192: gcry_tiger
+TIGER: gcry_tiger
+TIGER2: gcry_tiger
 TWOFISH: gcry_twofish
 TWOFISH128: gcry_twofish
Index: boot/grub.efi/i386-efi/fs.lst
===================================================================
--- boot/grub.efi/i386-efi/fs.lst	(revision 387630023ec8e28732b8956f65e2e48339e327be)
+++ boot/grub.efi/i386-efi/fs.lst	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -1,9 +1,10 @@
 affs
 afs
-afs_be
-befs
-befs_be
+bfs
 btrfs
+cbfs
 cpio
+cpio_be
+exfat
 ext2
 fat
@@ -14,11 +15,21 @@
 minix
 minix2
+minix2_be
+minix3
+minix3_be
+minix_be
+newc
 nilfs2
 ntfs
+odc
+procfs
 reiserfs
+romfs
 sfs
+squash4
 tar
 udf
 ufs1
+ufs1_be
 ufs2
 xfs
Index: boot/grub.efi/i386-efi/gdb_grub
===================================================================
--- boot/grub.efi/i386-efi/gdb_grub	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
+++ boot/grub.efi/i386-efi/gdb_grub	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -0,0 +1,85 @@
+###
+### Load debuging information about GNU GRUB 2 modules into GDB
+### automatically. Needs readelf, Perl and gmodule.pl script
+###
+### Has to be launched from the writable and trusted
+### directory containing *.image and *.module
+###
+### $Id: .gdbinit,v 1.1 2006/05/14 11:38:08 lkundrak Exp $
+### Lubomir Kundrak <lkudrak@skosi.org>
+###
+
+# Add section numbers and addresses to .segments.tmp
+define dump_module_sections
+	set $mod = $arg0
+
+	# FIXME: save logging status
+	set logging file .segments.tmp
+	set logging redirect on
+	set logging overwrite off
+	set logging on
+
+	printf "%s", $mod->name
+	set $segment = $mod->segment
+	while ($segment)
+		printf " %i 0x%lx", $segment->section, $segment->addr
+		set $segment = $segment->next
+	end
+	printf "\n"
+
+	set logging off
+	# FIXME: restore logging status
+end
+document dump_module_sections
+	Gather information about module whose mod structure was
+	given for use with match_and_load_symbols
+end
+
+# Generate and execute GDB commands and delete temporary files
+# afterwards
+define match_and_load_symbols
+	shell perl gmodule.pl <.segments.tmp >.loadsym.gdb
+	source .loadsym.gdb
+	shell rm -f .segments.tmp .loadsym.gdb
+end
+document match_and_load_symbols
+	Launch script, that matches section names with information
+	generated by dump_module_sections and load debugging info
+	apropriately
+end
+
+###
+
+define load_module
+	dump_module_sections $arg0
+	match_and_load_symbols
+end
+document load_module
+	Load debugging information for module given as argument.
+end
+
+define load_all_modules
+	set $this = grub_dl_head
+	while ($this != 0)
+		dump_module_sections $this
+		set $this = $this->next
+	end
+	match_and_load_symbols
+end
+document load_all_modules
+	Load debugging information for all loaded modules.
+end
+
+###
+
+set confirm off
+file kernel.exec
+target remote :1234
+
+# inform when module is loaded
+break grub_dl_add
+commands
+	silent
+	load_module mod
+	cont
+end
Index: boot/grub.efi/i386-efi/gmodule.pl
===================================================================
--- boot/grub.efi/i386-efi/gmodule.pl	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
+++ boot/grub.efi/i386-efi/gmodule.pl	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -0,0 +1,30 @@
+###
+### Generate GDB commands, that load symbols for specified module,
+### with proper section relocations. See .gdbinit
+###
+### $Id: gmodule.pl,v 1.2 2006/05/14 11:38:42 lkundrak Exp lkundrak $
+### Lubomir Kundrak <lkudrak@skosi.org>
+###
+
+use strict;
+
+while (<>) {
+	my ($name, %sections) = split;
+
+	print "add-symbol-file $name.module";
+
+	open (READELF, "readelf -S $name.mod |") or die;
+	while (<READELF>) {
+		/\[\s*(\d+)\]\s+(\.\S+)/ or next;
+
+		if ($2 eq '.text') {
+			print " $sections{$1}";
+			next;
+		}
+
+		print " -s $2 $sections{$1}"
+			if ($sections{$1} ne '0x0' and $sections{$1} ne '');
+	};
+	close (READELF);
+	print "\n";
+}
Index: boot/grub.efi/i386-efi/moddep.lst
===================================================================
--- boot/grub.efi/i386-efi/moddep.lst	(revision 387630023ec8e28732b8956f65e2e48339e327be)
+++ boot/grub.efi/i386-efi/moddep.lst	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -1,27 +1,43 @@
 videotest: font video gfxmenu
+odc: archelp
 loopback: extcmd
+macho:
 gcry_des: crypto
 memrw: extcmd
 terminfo: extcmd
 part_gpt:
+romfs: fshelp
 read:
 lsefimmap:
+aout:
 gcry_arcfour: crypto
-aout:
+tftp: net priority_queue
+newc: archelp
+minix2_be:
 elf:
+videotest_checksum: font functional_test video_fb
 password_pbkdf2: crypto gcry_sha512 pbkdf2 normal
 gcry_seed: crypto
-bsd: elf serial extcmd video aout boot cpuid relocator mmap
+pcidump: extcmd
+bsd: elf serial crypto gcry_md5 extcmd video boot aout cpuid relocator mmap
 sfs: fshelp
 reiserfs: fshelp
 part_sunpc:
-gfxmenu: trig bitmap_scale gfxterm font normal bitmap video
+gfxmenu: video_colors trig bitmap_scale gfxterm font normal video bitmap
+backtrace:
 jfs:
 help: extcmd normal
 configfile: normal
-ohci: cs5536 usb boot pci
+cbls: cbtable
+gfxterm_menu: font functional_test procfs normal video_fb
+gcry_idea: crypto
+tr: extcmd
+shift_test: functional_test
+ohci: cs5536 usb boot
 afs: fshelp
-xzio: gcry_crc
-usb_keyboard: keylayouts usb
+spkmodem: terminfo
+usb_keyboard: usb keylayouts
+xzio: crypto
+syslinuxcfg: extcmd normal
 search_fs_file:
 usbms: scsi usb
@@ -30,81 +46,126 @@
 affs: fshelp
 iso9660: fshelp
-gfxterm: bitmap_scale font extcmd bitmap video
+exfat: fshelp
+setjmp_test: functional_test setjmp
+gfxterm: font video
+efinet: net
+disk:
 appleldr: boot
 xfs: fshelp
-functional_test: extcmd
+testspeed: extcmd normal
+cpio_be: archelp
+functional_test: btrfs extcmd video video_fb
+bswap_test: functional_test
 sleep: extcmd normal
 memdisk:
 gcry_rijndael: crypto
+mdraid09_be: diskfilter
 gettext:
 gcry_sha1: crypto
+hfspluscomp: gzio hfsplus
 cmp:
-befs_be: fshelp
-usb: pci
+random: hexdump
+offsetio:
+file: macho elf extcmd offsetio
+usbserial_usbdebug: serial usb usbserial_common
+video_colors:
+morse:
 hashsum: crypto extcmd normal
+usb:
 halt: acpi
+gdb: serial backtrace
+gfxterm_background: video_colors bitmap_scale gfxterm extcmd video bitmap
 search_fs_uuid:
+gcry_dsa: verify mpi
+keystatus: extcmd
 linux: video boot relocator mmap
-keystatus: extcmd
+geli: cryptodisk crypto gcry_sha512 pbkdf2 gcry_sha256
+cmdline_cat_test: font functional_test procfs normal video_fb
 part_sun:
-video_bochs: video pci video_fb
+cbtable:
+pbkdf2_test: functional_test pbkdf2 gcry_sha1
+video_bochs: video video_fb
 bufio:
 usbserial_ftdi: serial usb usbserial_common
+legacy_password_test: functional_test legacycfg
 cpuid: extcmd
+bfs: fshelp
 hdparm: extcmd
 gcry_blowfish: crypto
 test:
 nilfs2: fshelp
+gcry_rsa: verify mpi
+cryptodisk: crypto extcmd procfs
+nativedisk:
 minicmd:
-ata: scsi pci
+signature_test: functional_test procfs
+ata: scsi
 udf: fshelp
 gzio:
 xnu_uuid: gcry_md5
-uhci: usb pci
+uhci: usb
+pata: ata
+mul_test: functional_test
+adler32: crypto
 terminal:
-raid:
+div:
+ehci: cs5536 usb boot
 crypto:
 part_bsd: part_msdos
-cs5536: pci
+cs5536:
 gcry_sha512: crypto
 password: crypto normal
 fshelp:
-xnu: bitmap_scale extcmd normal video boot bitmap relocator
+sleep_test: functional_test datetime
+iorw: extcmd
+xnu: macho bitmap_scale random extcmd video bitmap boot relocator mmap
 mmap:
-iorw: extcmd
+exfctest: functional_test
 zfsinfo: zfs
+ldm: part_gpt diskfilter part_msdos
+eval: normal
+part_dvh:
 lssal:
+ext2: fshelp
 blocklist:
-ext2: fshelp
+net: priority_queue bufio datetime boot
 part_acorn:
 videoinfo: video
-btrfs: gzio
+btrfs: lzopio gzio
 lsmmap: mmap
 bitmap:
 ntfs: fshelp
-multiboot: video boot relocator mmap
+multiboot: net video boot relocator mmap
 gcry_crc: crypto
 png: bufio bitmap
 jpeg: bufio bitmap
+macbless: disk
+div_test: functional_test div
 regexp: extcmd normal
 parttool: normal
 usbserial_pl2303: serial usb usbserial_common
-cpio:
+cpio: archelp
 gcry_rmd160: crypto
-fat:
-zfs:
-raid6rec: raid
+fat: fshelp
+ufs1_be:
+archelp:
+raid6rec: diskfilter
+http: net
+zfs: gzio
 lsefisystab:
 minix2:
 lsacpi: extcmd acpi
-loadenv: extcmd
+datehook: datetime normal
+loadenv: disk extcmd
 bitmap_scale: bitmap
-datehook: datetime normal
 probe: extcmd
-tar:
-loadbios: pci
-hfs:
+minix3:
+tar: archelp
+loadbios:
+hfs: fshelp
+procfs: archelp
 boot:
 keylayouts:
+progress: normal
 kernel:
 usbtest: usb
@@ -112,55 +173,74 @@
 acpi: extcmd mmap
 tga: bufio bitmap
-reboot:
+reboot: relocator
 serial: extcmd terminfo
-befs: fshelp
-efi_uga: video pci video_fb
-dm_nv: raid
+zfscrypt: crypto pbkdf2 zfs extcmd gcry_sha1 gcry_rijndael
+efi_uga: video video_fb
+dm_nv: diskfilter
+cmp_test: functional_test
+luks: cryptodisk crypto pbkdf2
 font: bufio video
-raid5rec: raid
+raid5rec: diskfilter
+crc64: crypto
 datetime:
+efifwsetup: reboot
+ctz_test: functional_test
 video:
-example_functional_test: functional_test
-pci:
+cbmemc: normal cbtable terminfo
 hfsplus: fshelp
 gcry_cast5: crypto
 extcmd:
+squash4: fshelp lzopio xzio gzio
+part_plan:
+minix_be:
 gcry_whirlpool: crypto
 gcry_tiger: crypto
-fixvideo: pci
-video_fb: video
+fixvideo:
 search: search_fs_uuid search_fs_file extcmd search_label
-lspci: extcmd pci
+lspci: extcmd
+cbtime: cbtable
+video_fb:
+verify: crypto extcmd mpi gcry_sha1
+minix3_be:
 trig:
-afs_be: fshelp
-msdospart: parttool
+msdospart: disk parttool
+priority_queue:
 gcry_twofish: crypto
+part_dfly:
+xnu_uuid_test: functional_test
+diskfilter:
 testload:
 part_apple:
 hexdump: extcmd
-ata_pthru: ata
+date: datetime normal
 pbkdf2: crypto
 gcry_sha256: crypto
-date: datetime normal
+ls: extcmd normal
 usbserial_common: serial usb
-ls: extcmd normal
 ntfscomp: ntfs
-video_cirrus: video pci video_fb
+lzopio: crypto
+video_cirrus: video video_fb
+hello: extcmd
 scsi:
-hello: extcmd
-normal: terminal gfxterm crypto extcmd boot
 cat: extcmd
+ahci: ata boot
+normal: terminal crypto bufio extcmd boot gettext
+linux16: video boot relocator mmap
 ufs1:
-mdraid09: raid
-lvm:
-chain: boot
+mdraid09: diskfilter
+lvm: diskfilter
+chain: net efinet boot
+cbfs: archelp
 ufs2:
-setpci: extcmd pci
+time:
+setpci: extcmd
+gptsync: disk
 search_label:
-gptsync:
 setjmp:
-multiboot2: video boot relocator mmap acpi
+multiboot2: net video boot relocator mmap acpi
 gcry_rfc2268: crypto
-mdraid1x: raid
+mdraid1x: diskfilter
+mpi: crypto
+legacycfg: password crypto gcry_md5 normal
 play:
 part_amiga:
@@ -168,4 +248,5 @@
 minix:
 echo: extcmd
+lsefi:
 gcry_serpent: crypto
 gcry_md4: crypto
@@ -174,2 +255,3 @@
 gcry_camellia: crypto
 at_keyboard: keylayouts boot
+all_video: efi_gop efi_uga video_bochs video_cirrus
Index: boot/grub.efi/i386-efi/modinfo.sh
===================================================================
--- boot/grub.efi/i386-efi/modinfo.sh	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
+++ boot/grub.efi/i386-efi/modinfo.sh	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+# User-controllable options
+grub_modinfo_target_cpu=i386
+grub_modinfo_platform=efi
+grub_disk_cache_stats=0
+grub_boot_time_stats=0
+grub_have_font_source=1
+
+# Autodetected config
+grub_have_asm_uscore=0
+grub_bss_start_symbol="__bss_start"
+grub_end_symbol="end"
+
+# Build environment
+grub_target_cc='gcc'
+grub_target_cc_version='gcc (SUSE Linux) 4.8.5'
+grub_target_cflags=' -Os -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value  -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations  -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -march=i386 -m32 -falign-jumps=1 -falign-loops=1 -falign-functions=1 -freg-struct-return -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow -msoft-float -fno-dwarf2-cfi-asm -mno-stack-arg-probe -fno-asynchronous-unwind-tables -fno-unwind-tables -Qn -fno-stack-protector -Wtrampolines -Werror'
+grub_target_cppflags=' -Wall -W  -DGRUB_MACHINE_EFI=1 -DGRUB_MACHINE=I386_EFI -m32 -nostdinc -isystem /usr/lib64/gcc/x86_64-suse-linux/4.8/include -I$(top_srcdir)/include -I$(top_builddir)/include'
+grub_target_ccasflags=' -g  -m32 -msoft-float'
+grub_target_ldflags=' -m32 -Wl,-melf_i386 -Wl,--build-id=none'
+grub_cflags=''
+grub_cppflags=' -D_FILE_OFFSET_BITS=64'
+grub_ccasflags=''
+grub_ldflags=''
+grub_target_strip='strip'
+grub_target_nm='nm'
+grub_target_ranlib='ranlib'
+grub_target_objconf=''
+grub_target_obj2elf=''
+grub_target_img_base_ldopt='-Wl,-Ttext'
+grub_target_img_ldflags='@TARGET_IMG_BASE_LDFLAGS@'
+
+# Version
+grub_version="2.02~beta2"
+grub_package="grub"
+grub_package_string="GRUB 2.02~beta2"
+grub_package_version="2.02~beta2"
+grub_package_name="GRUB"
+grub_package_bugreport="bug-grub@gnu.org"
Index: boot/grub.efi/i386-efi/partmap.lst
===================================================================
--- boot/grub.efi/i386-efi/partmap.lst	(revision 387630023ec8e28732b8956f65e2e48339e327be)
+++ boot/grub.efi/i386-efi/partmap.lst	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -3,6 +3,9 @@
 part_apple
 part_bsd
+part_dfly
+part_dvh
 part_gpt
 part_msdos
+part_plan
 part_sun
 part_sunpc
Index: boot/grub.efi/i386-efi/terminal.lst
===================================================================
--- boot/grub.efi/i386-efi/terminal.lst	(revision 387630023ec8e28732b8956f65e2e48339e327be)
+++ boot/grub.efi/i386-efi/terminal.lst	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -2,5 +2,8 @@
 iserial: serial
 iserial_*: serial
+oaudio: morse
+ocbmemc: cbmemc
 ogfxterm: gfxterm
 oserial: serial
 oserial_*: serial
+ospkmodem: spkmodem
Index: boot/grub.efi/x86_64-efi/command.lst
===================================================================
--- boot/grub.efi/x86_64-efi/command.lst	(revision 387630023ec8e28732b8956f65e2e48339e327be)
+++ boot/grub.efi/x86_64-efi/command.lst	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -1,8 +1,13 @@
 *acpi: acpi
-*background_image: gfxterm
+*all_functional_test: functional_test
+*background_image: gfxterm_background
 *cat: cat
 *cpuid: cpuid
 *crc: hashsum
+*cryptomount: cryptodisk
 *echo: echo
+*extract_syslinux_entries_configfile: syslinuxcfg
+*extract_syslinux_entries_source: syslinuxcfg
+*file: file
 *functional_test: functional_test
 *gettext: gettext
@@ -27,4 +32,5 @@
 *md5sum: hashsum
 *menuentry: normal
+*pcidump: pcidump
 *probe: probe
 *read_byte: memrw
@@ -41,11 +47,20 @@
 *sleep: sleep
 *submenu: normal
+*syslinux_configfile: syslinuxcfg
+*syslinux_source: syslinuxcfg
 *terminfo: terminfo
 *test_blockarg: test_blockarg
+*testspeed: testspeed
+*tr: tr
+*trust: verify
+*verify_detached: verify
 *xnu_splash: xnu
+*zfskey: zfscrypt
 .: configfile
 [: test
 appleloader: appleldr
 authenticate: normal
+background_color: gfxterm_background
+backtrace: backtrace
 badram: mmap
 blocklist: blocklist
@@ -53,4 +68,5 @@
 break: normal
 cat: minicmd
+cbmemc: cbmemc
 chainloader: chain
 clear: normal
@@ -58,17 +74,25 @@
 configfile: configfile
 continue: normal
+coreboot_boottime: cbtime
 cutmem: mmap
 date: date
+distrust: verify
 dump: minicmd
+eval: eval
 exit: minicmd
 export: normal
 extract_entries_configfile: configfile
 extract_entries_source: configfile
+extract_legacy_entries_configfile: legacycfg
+extract_legacy_entries_source: legacycfg
 fakebios: loadbios
 false: true
 fix_video: fixvideo
+fwsetup: efifwsetup
 gptsync: gptsync
 halt: halt
 help: minicmd
+hexdump_random: random
+initrd16: linux16
 initrd: linux
 keymap: keylayouts
@@ -79,7 +103,18 @@
 knetbsd_module_elf: bsd
 kopenbsd_ramdisk: bsd
+legacy_check_password: legacycfg
+legacy_configfile: legacycfg
+legacy_initrd: legacycfg
+legacy_initrd_nounzip: legacycfg
+legacy_kernel: legacycfg
+legacy_password: legacycfg
+legacy_source: legacycfg
+linux16: linux16
 linux: linux
+list_trusted: verify
 loadbios: loadbios
 loadfont: font
+lscoreboot: cbls
+lsefi: lsefi
 lsefimmap: lsefimmap
 lsefisystab: lsefisystab
@@ -88,8 +123,25 @@
 lsmod: minicmd
 lssal: lssal
+macppcbless: macbless
+mactelbless: macbless
 module2: multiboot2
 module: multiboot
 multiboot2: multiboot2
 multiboot: multiboot
+nativedisk: nativedisk
+net_add_addr: net
+net_add_dns: net
+net_add_route: net
+net_bootp: net
+net_del_addr: net
+net_del_dns: net
+net_del_route: net
+net_get_dhcp_option: net
+net_ipv6_autoconf: net
+net_ls_addr: net
+net_ls_cards: net
+net_ls_dns: net
+net_ls_routes: net
+net_nslookup: net
 normal: normal
 normal_exit: normal
@@ -115,4 +167,5 @@
 test: test
 testload: testload
+time: time
 true: true
 usb: usbtest
Index: boot/grub.efi/x86_64-efi/crypto.lst
===================================================================
--- boot/grub.efi/x86_64-efi/crypto.lst	(revision 387630023ec8e28732b8956f65e2e48339e327be)
+++ boot/grub.efi/x86_64-efi/crypto.lst	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -6,4 +6,6 @@
 AES-192: gcry_rijndael
 AES-256: gcry_rijndael
+ADLER32: adler32
+CRC64: crc64
 ARCFOUR: gcry_arcfour
 BLOWFISH: gcry_blowfish
@@ -17,4 +19,6 @@
 DES: gcry_des
 3DES: gcry_des
+DSA: gcry_dsa
+IDEA: gcry_idea
 MD4: gcry_md4
 MD5: gcry_md5
@@ -24,4 +28,5 @@
 AES256: gcry_rijndael
 RIPEMD160: gcry_rmd160
+RSA: gcry_rsa
 SEED: gcry_seed
 SERPENT128: gcry_serpent
@@ -34,4 +39,6 @@
 SHA384: gcry_sha512
 TIGER192: gcry_tiger
+TIGER: gcry_tiger
+TIGER2: gcry_tiger
 TWOFISH: gcry_twofish
 TWOFISH128: gcry_twofish
Index: boot/grub.efi/x86_64-efi/fs.lst
===================================================================
--- boot/grub.efi/x86_64-efi/fs.lst	(revision 387630023ec8e28732b8956f65e2e48339e327be)
+++ boot/grub.efi/x86_64-efi/fs.lst	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -1,9 +1,10 @@
 affs
 afs
-afs_be
-befs
-befs_be
+bfs
 btrfs
+cbfs
 cpio
+cpio_be
+exfat
 ext2
 fat
@@ -14,11 +15,21 @@
 minix
 minix2
+minix2_be
+minix3
+minix3_be
+minix_be
+newc
 nilfs2
 ntfs
+odc
+procfs
 reiserfs
+romfs
 sfs
+squash4
 tar
 udf
 ufs1
+ufs1_be
 ufs2
 xfs
Index: boot/grub.efi/x86_64-efi/gdb_grub
===================================================================
--- boot/grub.efi/x86_64-efi/gdb_grub	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
+++ boot/grub.efi/x86_64-efi/gdb_grub	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -0,0 +1,85 @@
+###
+### Load debuging information about GNU GRUB 2 modules into GDB
+### automatically. Needs readelf, Perl and gmodule.pl script
+###
+### Has to be launched from the writable and trusted
+### directory containing *.image and *.module
+###
+### $Id: .gdbinit,v 1.1 2006/05/14 11:38:08 lkundrak Exp $
+### Lubomir Kundrak <lkudrak@skosi.org>
+###
+
+# Add section numbers and addresses to .segments.tmp
+define dump_module_sections
+	set $mod = $arg0
+
+	# FIXME: save logging status
+	set logging file .segments.tmp
+	set logging redirect on
+	set logging overwrite off
+	set logging on
+
+	printf "%s", $mod->name
+	set $segment = $mod->segment
+	while ($segment)
+		printf " %i 0x%lx", $segment->section, $segment->addr
+		set $segment = $segment->next
+	end
+	printf "\n"
+
+	set logging off
+	# FIXME: restore logging status
+end
+document dump_module_sections
+	Gather information about module whose mod structure was
+	given for use with match_and_load_symbols
+end
+
+# Generate and execute GDB commands and delete temporary files
+# afterwards
+define match_and_load_symbols
+	shell perl gmodule.pl <.segments.tmp >.loadsym.gdb
+	source .loadsym.gdb
+	shell rm -f .segments.tmp .loadsym.gdb
+end
+document match_and_load_symbols
+	Launch script, that matches section names with information
+	generated by dump_module_sections and load debugging info
+	apropriately
+end
+
+###
+
+define load_module
+	dump_module_sections $arg0
+	match_and_load_symbols
+end
+document load_module
+	Load debugging information for module given as argument.
+end
+
+define load_all_modules
+	set $this = grub_dl_head
+	while ($this != 0)
+		dump_module_sections $this
+		set $this = $this->next
+	end
+	match_and_load_symbols
+end
+document load_all_modules
+	Load debugging information for all loaded modules.
+end
+
+###
+
+set confirm off
+file kernel.exec
+target remote :1234
+
+# inform when module is loaded
+break grub_dl_add
+commands
+	silent
+	load_module mod
+	cont
+end
Index: boot/grub.efi/x86_64-efi/gmodule.pl
===================================================================
--- boot/grub.efi/x86_64-efi/gmodule.pl	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
+++ boot/grub.efi/x86_64-efi/gmodule.pl	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -0,0 +1,30 @@
+###
+### Generate GDB commands, that load symbols for specified module,
+### with proper section relocations. See .gdbinit
+###
+### $Id: gmodule.pl,v 1.2 2006/05/14 11:38:42 lkundrak Exp lkundrak $
+### Lubomir Kundrak <lkudrak@skosi.org>
+###
+
+use strict;
+
+while (<>) {
+	my ($name, %sections) = split;
+
+	print "add-symbol-file $name.module";
+
+	open (READELF, "readelf -S $name.mod |") or die;
+	while (<READELF>) {
+		/\[\s*(\d+)\]\s+(\.\S+)/ or next;
+
+		if ($2 eq '.text') {
+			print " $sections{$1}";
+			next;
+		}
+
+		print " -s $2 $sections{$1}"
+			if ($sections{$1} ne '0x0' and $sections{$1} ne '');
+	};
+	close (READELF);
+	print "\n";
+}
Index: boot/grub.efi/x86_64-efi/moddep.lst
===================================================================
--- boot/grub.efi/x86_64-efi/moddep.lst	(revision 387630023ec8e28732b8956f65e2e48339e327be)
+++ boot/grub.efi/x86_64-efi/moddep.lst	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -1,27 +1,43 @@
 videotest: font video gfxmenu
+odc: archelp
 loopback: extcmd
+macho:
 gcry_des: crypto
 memrw: extcmd
 terminfo: extcmd
 part_gpt:
+romfs: fshelp
 read:
 lsefimmap:
+aout:
 gcry_arcfour: crypto
-aout:
+tftp: net priority_queue
+newc: archelp
+minix2_be:
 elf:
+videotest_checksum: font functional_test video_fb
 password_pbkdf2: crypto gcry_sha512 pbkdf2 normal
 gcry_seed: crypto
-bsd: elf serial extcmd video aout boot cpuid relocator mmap
+pcidump: extcmd
+bsd: elf serial crypto gcry_md5 extcmd video boot aout cpuid relocator mmap
 sfs: fshelp
 reiserfs: fshelp
 part_sunpc:
-gfxmenu: trig bitmap_scale gfxterm font normal bitmap video
+gfxmenu: video_colors trig bitmap_scale gfxterm font normal video bitmap
+backtrace:
 jfs:
 help: extcmd normal
 configfile: normal
-ohci: cs5536 usb boot pci
+cbls: cbtable
+gfxterm_menu: font functional_test procfs normal video_fb
+gcry_idea: crypto
+tr: extcmd
+shift_test: functional_test
+ohci: cs5536 usb boot
 afs: fshelp
-xzio: gcry_crc
-usb_keyboard: keylayouts usb
+spkmodem: terminfo
+usb_keyboard: usb keylayouts
+xzio: crypto
+syslinuxcfg: extcmd normal
 search_fs_file:
 usbms: scsi usb
@@ -30,81 +46,125 @@
 affs: fshelp
 iso9660: fshelp
-gfxterm: bitmap_scale font extcmd bitmap video
+exfat: fshelp
+setjmp_test: functional_test setjmp
+gfxterm: font video
+efinet: net
+disk:
 appleldr: boot
 xfs: fshelp
-functional_test: extcmd
+testspeed: extcmd normal
+cpio_be: archelp
+functional_test: btrfs extcmd video video_fb
+bswap_test: functional_test
 sleep: extcmd normal
 memdisk:
 gcry_rijndael: crypto
+mdraid09_be: diskfilter
 gettext:
 gcry_sha1: crypto
+hfspluscomp: gzio hfsplus
 cmp:
-befs_be: fshelp
-usb: pci
+random: hexdump
+offsetio:
+file: macho elf extcmd offsetio
+usbserial_usbdebug: serial usb usbserial_common
+video_colors:
+morse:
 hashsum: crypto extcmd normal
+usb:
 halt: acpi
+gfxterm_background: video_colors bitmap_scale gfxterm extcmd video bitmap
 search_fs_uuid:
+gcry_dsa: verify mpi
+keystatus: extcmd
 linux: video boot relocator mmap
-keystatus: extcmd
+geli: cryptodisk crypto gcry_sha512 pbkdf2 gcry_sha256
+cmdline_cat_test: font functional_test procfs normal video_fb
 part_sun:
-video_bochs: video pci video_fb
+cbtable:
+pbkdf2_test: functional_test pbkdf2 gcry_sha1
+video_bochs: video video_fb
 bufio:
 usbserial_ftdi: serial usb usbserial_common
+legacy_password_test: functional_test legacycfg
 cpuid: extcmd
+bfs: fshelp
 hdparm: extcmd
 gcry_blowfish: crypto
 test:
 nilfs2: fshelp
+gcry_rsa: verify mpi
+cryptodisk: crypto extcmd procfs
+nativedisk:
 minicmd:
-ata: scsi pci
+signature_test: functional_test procfs
+ata: scsi
 udf: fshelp
 gzio:
 xnu_uuid: gcry_md5
-uhci: usb pci
+uhci: usb
+pata: ata
+mul_test: functional_test
+adler32: crypto
 terminal:
-raid:
+div:
+ehci: cs5536 usb boot
 crypto:
 part_bsd: part_msdos
-cs5536: pci
+cs5536:
 gcry_sha512: crypto
 password: crypto normal
 fshelp:
-xnu: bitmap_scale extcmd normal video boot bitmap relocator
+sleep_test: functional_test datetime
+iorw: extcmd
+xnu: macho bitmap_scale random extcmd video bitmap boot relocator mmap
 mmap:
-iorw: extcmd
+exfctest: functional_test
 zfsinfo: zfs
+ldm: part_gpt diskfilter part_msdos
+eval: normal
+part_dvh:
 lssal:
+ext2: fshelp
 blocklist:
-ext2: fshelp
+net: priority_queue bufio datetime boot
 part_acorn:
 videoinfo: video
-btrfs: gzio
+btrfs: lzopio gzio
 lsmmap: mmap
 bitmap:
 ntfs: fshelp
-multiboot: video boot relocator mmap
+multiboot: net video boot relocator mmap
 gcry_crc: crypto
 png: bufio bitmap
 jpeg: bufio bitmap
+macbless: disk
+div_test: functional_test div
 regexp: extcmd normal
 parttool: normal
 usbserial_pl2303: serial usb usbserial_common
-cpio:
+cpio: archelp
 gcry_rmd160: crypto
-fat:
-zfs:
-raid6rec: raid
+fat: fshelp
+ufs1_be:
+archelp:
+raid6rec: diskfilter
+http: net
+zfs: gzio
 lsefisystab:
 minix2:
 lsacpi: extcmd acpi
-loadenv: extcmd
+datehook: datetime normal
+loadenv: disk extcmd
 bitmap_scale: bitmap
-datehook: datetime normal
 probe: extcmd
-tar:
-loadbios: pci
-hfs:
+minix3:
+tar: archelp
+loadbios:
+hfs: fshelp
+procfs: archelp
 boot:
 keylayouts:
+progress: normal
 kernel:
 usbtest: usb
@@ -114,53 +174,72 @@
 reboot:
 serial: extcmd terminfo
-befs: fshelp
-efi_uga: video pci video_fb
-dm_nv: raid
+zfscrypt: crypto pbkdf2 zfs extcmd gcry_sha1 gcry_rijndael
+efi_uga: video video_fb
+dm_nv: diskfilter
+cmp_test: functional_test
+luks: cryptodisk crypto pbkdf2
 font: bufio video
-raid5rec: raid
+raid5rec: diskfilter
+crc64: crypto
 datetime:
+efifwsetup: reboot
+ctz_test: functional_test
 video:
-example_functional_test: functional_test
-pci:
+cbmemc: normal cbtable terminfo
 hfsplus: fshelp
 gcry_cast5: crypto
 extcmd:
+squash4: fshelp lzopio xzio gzio
+part_plan:
+minix_be:
 gcry_whirlpool: crypto
 gcry_tiger: crypto
-fixvideo: pci
-video_fb: video
+fixvideo:
 search: search_fs_uuid search_fs_file extcmd search_label
-lspci: extcmd pci
+lspci: extcmd
+cbtime: cbtable
+video_fb:
+verify: crypto extcmd mpi gcry_sha1
+minix3_be:
 trig:
-afs_be: fshelp
-msdospart: parttool
+msdospart: disk parttool
+priority_queue:
 gcry_twofish: crypto
+part_dfly:
+xnu_uuid_test: functional_test
+diskfilter:
 testload:
 part_apple:
 hexdump: extcmd
-ata_pthru: ata
+date: datetime normal
 pbkdf2: crypto
 gcry_sha256: crypto
-date: datetime normal
+ls: extcmd normal
 usbserial_common: serial usb
-ls: extcmd normal
 ntfscomp: ntfs
-video_cirrus: video pci video_fb
+lzopio: crypto
+video_cirrus: video video_fb
+hello: extcmd
 scsi:
-hello: extcmd
-normal: terminal gfxterm crypto extcmd boot
 cat: extcmd
+ahci: ata boot
+normal: terminal crypto bufio extcmd boot gettext
+linux16: video boot relocator mmap
 ufs1:
-mdraid09: raid
-lvm:
-chain: boot
+mdraid09: diskfilter
+lvm: diskfilter
+chain: net efinet boot
+cbfs: archelp
 ufs2:
-setpci: extcmd pci
+time:
+setpci: extcmd
+gptsync: disk
 search_label:
-gptsync:
 setjmp:
-multiboot2: video boot relocator mmap acpi
+multiboot2: net video boot relocator mmap acpi
 gcry_rfc2268: crypto
-mdraid1x: raid
+mdraid1x: diskfilter
+mpi: crypto
+legacycfg: password crypto gcry_md5 normal
 play:
 part_amiga:
@@ -168,4 +247,5 @@
 minix:
 echo: extcmd
+lsefi:
 gcry_serpent: crypto
 gcry_md4: crypto
@@ -174,2 +254,3 @@
 gcry_camellia: crypto
 at_keyboard: keylayouts boot
+all_video: efi_gop efi_uga video_bochs video_cirrus
Index: boot/grub.efi/x86_64-efi/modinfo.sh
===================================================================
--- boot/grub.efi/x86_64-efi/modinfo.sh	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
+++ boot/grub.efi/x86_64-efi/modinfo.sh	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+# User-controllable options
+grub_modinfo_target_cpu=x86_64
+grub_modinfo_platform=efi
+grub_disk_cache_stats=0
+grub_boot_time_stats=0
+grub_have_font_source=1
+
+# Autodetected config
+grub_have_asm_uscore=0
+grub_bss_start_symbol=""
+grub_end_symbol=""
+
+# Build environment
+grub_target_cc='gcc'
+grub_target_cc_version='gcc (SUSE Linux) 4.8.5'
+grub_target_cflags=' -Os -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value  -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations  -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -m64 -freg-struct-return -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow -msoft-float -fno-dwarf2-cfi-asm -mno-stack-arg-probe -fno-asynchronous-unwind-tables -fno-unwind-tables -mcmodel=large -mno-red-zone -Qn -fno-stack-protector -Wtrampolines -Werror'
+grub_target_cppflags=' -Wall -W  -DGRUB_MACHINE_EFI=1 -DGRUB_MACHINE=X86_64_EFI -m64 -nostdinc -isystem /usr/lib64/gcc/x86_64-suse-linux/4.8/include -I$(top_srcdir)/include -I$(top_builddir)/include'
+grub_target_ccasflags=' -g  -m64 -msoft-float'
+grub_target_ldflags=' -m64 -Wl,-melf_x86_64 -Wl,--build-id=none'
+grub_cflags=''
+grub_cppflags=' -D_FILE_OFFSET_BITS=64'
+grub_ccasflags=''
+grub_ldflags=''
+grub_target_strip='strip'
+grub_target_nm='nm'
+grub_target_ranlib='ranlib'
+grub_target_objconf=''
+grub_target_obj2elf=''
+grub_target_img_base_ldopt='-Wl,-Ttext'
+grub_target_img_ldflags='@TARGET_IMG_BASE_LDFLAGS@'
+
+# Version
+grub_version="2.02~beta2"
+grub_package="grub"
+grub_package_string="GRUB 2.02~beta2"
+grub_package_version="2.02~beta2"
+grub_package_name="GRUB"
+grub_package_bugreport="bug-grub@gnu.org"
Index: boot/grub.efi/x86_64-efi/partmap.lst
===================================================================
--- boot/grub.efi/x86_64-efi/partmap.lst	(revision 387630023ec8e28732b8956f65e2e48339e327be)
+++ boot/grub.efi/x86_64-efi/partmap.lst	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -3,6 +3,9 @@
 part_apple
 part_bsd
+part_dfly
+part_dvh
 part_gpt
 part_msdos
+part_plan
 part_sun
 part_sunpc
Index: boot/grub.efi/x86_64-efi/terminal.lst
===================================================================
--- boot/grub.efi/x86_64-efi/terminal.lst	(revision 387630023ec8e28732b8956f65e2e48339e327be)
+++ boot/grub.efi/x86_64-efi/terminal.lst	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -2,5 +2,8 @@
 iserial: serial
 iserial_*: serial
+oaudio: morse
+ocbmemc: cbmemc
 ogfxterm: gfxterm
 oserial: serial
 oserial_*: serial
+ospkmodem: spkmodem
Index: boot/grub.pc/REVISION
===================================================================
--- boot/grub.pc/REVISION	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
+++ boot/grub.pc/REVISION	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -0,0 +1,1 @@
+bc220962e366b1b46769ed6f9fa5be603ba58ab5
Index: boot/grub.pc/i386-pc/command.lst
===================================================================
--- boot/grub.pc/i386-pc/command.lst	(revision 387630023ec8e28732b8956f65e2e48339e327be)
+++ boot/grub.pc/i386-pc/command.lst	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -1,9 +1,14 @@
 *acpi: acpi
-*background_image: gfxterm
+*all_functional_test: functional_test
+*background_image: gfxterm_background
 *cat: cat
 *cpuid: cpuid
 *crc: hashsum
+*cryptomount: cryptodisk
 *drivemap: drivemap
 *echo: echo
+*extract_syslinux_entries_configfile: syslinuxcfg
+*extract_syslinux_entries_source: syslinuxcfg
+*file: file
 *functional_test: functional_test
 *gettext: gettext
@@ -29,4 +34,6 @@
 *md5sum: hashsum
 *menuentry: normal
+*pcidump: pcidump
+*plan9: plan9
 *probe: probe
 *read_byte: memrw
@@ -44,10 +51,19 @@
 *sleep: sleep
 *submenu: normal
+*syslinux_configfile: syslinuxcfg
+*syslinux_source: syslinuxcfg
 *terminfo: terminfo
 *test_blockarg: test_blockarg
+*testspeed: testspeed
+*tr: tr
+*trust: verify
+*verify_detached: verify
 *xnu_splash: xnu
+*zfskey: zfscrypt
 .: configfile
 [: test
 authenticate: normal
+background_color: gfxterm_background
+backtrace: backtrace
 badram: mmap
 blocklist: blocklist
@@ -55,17 +71,23 @@
 break: normal
 cat: minicmd
+cbmemc: cbmemc
 chainloader: chain
 clear: normal
 cmosclean: cmostest
+cmosdump: cmosdump
+cmosset: cmostest
 cmostest: cmostest
 cmp: cmp
 configfile: configfile
 continue: normal
+coreboot_boottime: cbtime
 cutmem: mmap
 date: date
+distrust: verify
 dump: minicmd
 efiemu_loadcore: efiemu
 efiemu_prepare: efiemu
 efiemu_unload: efiemu
+eval: eval
 exit: minicmd
 export: normal
@@ -75,6 +97,11 @@
 extract_legacy_entries_source: legacycfg
 false: true
+freedos: freedos
+gdbstub: gdb
+gdbstub_break: gdb
+gdbstub_stop: gdb
 gptsync: gptsync
 help: minicmd
+hexdump_random: random
 initrd16: linux16
 initrd: linux
@@ -95,13 +122,32 @@
 linux16: linux16
 linux: linux
+list_trusted: verify
 loadfont: font
 lsapm: lsapm
+lscoreboot: cbls
 lsfonts: font
 lsmmap: lsmmap
 lsmod: minicmd
+macppcbless: macbless
+mactelbless: macbless
 module2: multiboot2
 module: multiboot
 multiboot2: multiboot2
 multiboot: multiboot
+nativedisk: nativedisk
+net_add_addr: net
+net_add_dns: net
+net_add_route: net
+net_bootp: net
+net_del_addr: net
+net_del_dns: net
+net_del_route: net
+net_get_dhcp_option: net
+net_ipv6_autoconf: net
+net_ls_addr: net
+net_ls_cards: net
+net_ls_dns: net
+net_ls_routes: net
+net_nslookup: net
 normal: normal
 normal_exit: normal
@@ -114,5 +160,5 @@
 password_pbkdf2: password_pbkdf2
 play: play
-pxe_unload: pxecmd
+pxechainloader: pxechain
 read: read
 reboot: reboot
@@ -129,5 +175,7 @@
 test: test
 testload: testload
+time: time
 true: true
+truecrypt: truecrypt
 usb: usbtest
 vbeinfo: videoinfo
Index: boot/grub.pc/i386-pc/crypto.lst
===================================================================
--- boot/grub.pc/i386-pc/crypto.lst	(revision 387630023ec8e28732b8956f65e2e48339e327be)
+++ boot/grub.pc/i386-pc/crypto.lst	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -6,4 +6,6 @@
 AES-192: gcry_rijndael
 AES-256: gcry_rijndael
+ADLER32: adler32
+CRC64: crc64
 ARCFOUR: gcry_arcfour
 BLOWFISH: gcry_blowfish
@@ -17,4 +19,6 @@
 DES: gcry_des
 3DES: gcry_des
+DSA: gcry_dsa
+IDEA: gcry_idea
 MD4: gcry_md4
 MD5: gcry_md5
@@ -24,4 +28,5 @@
 AES256: gcry_rijndael
 RIPEMD160: gcry_rmd160
+RSA: gcry_rsa
 SEED: gcry_seed
 SERPENT128: gcry_serpent
@@ -34,4 +39,6 @@
 SHA384: gcry_sha512
 TIGER192: gcry_tiger
+TIGER: gcry_tiger
+TIGER2: gcry_tiger
 TWOFISH: gcry_twofish
 TWOFISH128: gcry_twofish
Index: boot/grub.pc/i386-pc/fs.lst
===================================================================
--- boot/grub.pc/i386-pc/fs.lst	(revision 387630023ec8e28732b8956f65e2e48339e327be)
+++ boot/grub.pc/i386-pc/fs.lst	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -1,9 +1,10 @@
 affs
 afs
-afs_be
-befs
-befs_be
+bfs
 btrfs
+cbfs
 cpio
+cpio_be
+exfat
 ext2
 fat
@@ -14,12 +15,21 @@
 minix
 minix2
+minix2_be
+minix3
+minix3_be
+minix_be
+newc
 nilfs2
 ntfs
-pxe
+odc
+procfs
 reiserfs
+romfs
 sfs
+squash4
 tar
 udf
 ufs1
+ufs1_be
 ufs2
 xfs
Index: boot/grub.pc/i386-pc/gdb_grub
===================================================================
--- boot/grub.pc/i386-pc/gdb_grub	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
+++ boot/grub.pc/i386-pc/gdb_grub	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -0,0 +1,85 @@
+###
+### Load debuging information about GNU GRUB 2 modules into GDB
+### automatically. Needs readelf, Perl and gmodule.pl script
+###
+### Has to be launched from the writable and trusted
+### directory containing *.image and *.module
+###
+### $Id: .gdbinit,v 1.1 2006/05/14 11:38:08 lkundrak Exp $
+### Lubomir Kundrak <lkudrak@skosi.org>
+###
+
+# Add section numbers and addresses to .segments.tmp
+define dump_module_sections
+	set $mod = $arg0
+
+	# FIXME: save logging status
+	set logging file .segments.tmp
+	set logging redirect on
+	set logging overwrite off
+	set logging on
+
+	printf "%s", $mod->name
+	set $segment = $mod->segment
+	while ($segment)
+		printf " %i 0x%lx", $segment->section, $segment->addr
+		set $segment = $segment->next
+	end
+	printf "\n"
+
+	set logging off
+	# FIXME: restore logging status
+end
+document dump_module_sections
+	Gather information about module whose mod structure was
+	given for use with match_and_load_symbols
+end
+
+# Generate and execute GDB commands and delete temporary files
+# afterwards
+define match_and_load_symbols
+	shell perl gmodule.pl <.segments.tmp >.loadsym.gdb
+	source .loadsym.gdb
+	shell rm -f .segments.tmp .loadsym.gdb
+end
+document match_and_load_symbols
+	Launch script, that matches section names with information
+	generated by dump_module_sections and load debugging info
+	apropriately
+end
+
+###
+
+define load_module
+	dump_module_sections $arg0
+	match_and_load_symbols
+end
+document load_module
+	Load debugging information for module given as argument.
+end
+
+define load_all_modules
+	set $this = grub_dl_head
+	while ($this != 0)
+		dump_module_sections $this
+		set $this = $this->next
+	end
+	match_and_load_symbols
+end
+document load_all_modules
+	Load debugging information for all loaded modules.
+end
+
+###
+
+set confirm off
+file kernel.exec
+target remote :1234
+
+# inform when module is loaded
+break grub_dl_add
+commands
+	silent
+	load_module mod
+	cont
+end
Index: boot/grub.pc/i386-pc/gmodule.pl
===================================================================
--- boot/grub.pc/i386-pc/gmodule.pl	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
+++ boot/grub.pc/i386-pc/gmodule.pl	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -0,0 +1,30 @@
+###
+### Generate GDB commands, that load symbols for specified module,
+### with proper section relocations. See .gdbinit
+###
+### $Id: gmodule.pl,v 1.2 2006/05/14 11:38:42 lkundrak Exp lkundrak $
+### Lubomir Kundrak <lkudrak@skosi.org>
+###
+
+use strict;
+
+while (<>) {
+	my ($name, %sections) = split;
+
+	print "add-symbol-file $name.module";
+
+	open (READELF, "readelf -S $name.mod |") or die;
+	while (<READELF>) {
+		/\[\s*(\d+)\]\s+(\.\S+)/ or next;
+
+		if ($2 eq '.text') {
+			print " $sections{$1}";
+			next;
+		}
+
+		print " -s $2 $sections{$1}"
+			if ($sections{$1} ne '0x0' and $sections{$1} ne '');
+	};
+	close (READELF);
+	print "\n";
+}
Index: boot/grub.pc/i386-pc/moddep.lst
===================================================================
--- boot/grub.pc/i386-pc/moddep.lst	(revision 387630023ec8e28732b8956f65e2e48339e327be)
+++ boot/grub.pc/i386-pc/moddep.lst	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -1,27 +1,43 @@
 videotest: font video gfxmenu
+odc: archelp
 loopback: extcmd
+macho:
 gcry_des: crypto
 memrw: extcmd
 terminfo: extcmd
 part_gpt:
+romfs: fshelp
 read:
+aout:
 gcry_arcfour: crypto
-aout:
 vga_text:
+tftp: net priority_queue
+newc: archelp
+minix2_be:
 elf:
+videotest_checksum: font functional_test video_fb
 password_pbkdf2: crypto gcry_sha512 pbkdf2 normal
 gcry_seed: crypto
-bsd: elf serial extcmd vbe video aout boot cpuid relocator mmap
+pcidump: extcmd pci
+bsd: elf serial crypto gcry_md5 extcmd vbe video boot aout cpuid relocator mmap
 sfs: fshelp
 reiserfs: fshelp
 part_sunpc:
-gfxmenu: trig bitmap_scale gfxterm font normal bitmap video
+gfxmenu: video_colors trig bitmap_scale gfxterm font normal video bitmap
+backtrace:
 jfs:
 help: extcmd normal
 configfile: normal
+cbls: cbtable
+gfxterm_menu: font functional_test procfs normal video_fb
+gcry_idea: crypto
+tr: extcmd
+shift_test: functional_test
 ohci: cs5536 usb boot pci
 afs: fshelp
-xzio: gcry_crc
-usb_keyboard: keylayouts usb
+spkmodem: terminfo
+usb_keyboard: usb keylayouts
+xzio: crypto
+syslinuxcfg: extcmd normal
 search_fs_file:
 vga: video video_fb
@@ -31,143 +47,209 @@
 affs: fshelp
 iso9660: fshelp
-gfxterm: bitmap_scale font extcmd bitmap video
+exfat: fshelp
+setjmp_test: functional_test setjmp
+gfxterm: font video
+disk:
 xfs: fshelp
-functional_test: extcmd
+testspeed: extcmd normal
+cpio_be: archelp
+functional_test: btrfs extcmd video video_fb
+pxechain: pxe video boot relocator
+bswap_test: functional_test
 sleep: extcmd normal
-pxecmd: pxe
 memdisk:
 gcry_rijndael: crypto
+mdraid09_be: diskfilter
 gettext:
 gcry_sha1: crypto
+hfspluscomp: gzio hfsplus
 cmp:
-befs_be: fshelp
+random: hexdump acpi
+offsetio:
+file: macho elf extcmd offsetio
+usbserial_usbdebug: serial usb usbserial_common
+video_colors:
+morse:
+hashsum: crypto extcmd normal
 usb: pci
-hashsum: crypto extcmd normal
 halt: extcmd acpi
+gdb: serial backtrace
+gfxterm_background: video_colors bitmap_scale gfxterm extcmd video bitmap
 search_fs_uuid:
+gcry_dsa: verify mpi
+keystatus: extcmd
 linux: normal vbe video boot relocator mmap
-keystatus: extcmd
+geli: cryptodisk crypto gcry_sha512 pbkdf2 gcry_sha256
+cmdline_cat_test: font functional_test procfs normal video_fb
 part_sun:
+cbtable:
+plan9: extcmd video boot relocator
 sendkey: extcmd boot
+pbkdf2_test: functional_test pbkdf2 gcry_sha1
 video_bochs: video pci video_fb
 bufio:
 usbserial_ftdi: serial usb usbserial_common
+legacy_password_test: functional_test legacycfg
 cpuid: extcmd
+bfs: fshelp
 hdparm: extcmd
 gcry_blowfish: crypto
 test:
 nilfs2: fshelp
+gcry_rsa: verify mpi
+cryptodisk: crypto extcmd procfs
+nativedisk:
 minicmd:
-ata: scsi pci
+signature_test: functional_test procfs
+ata: scsi
 udf: fshelp
 gzio:
 xnu_uuid: gcry_md5
 uhci: usb pci
+pata: ata pci
+mul_test: functional_test
+adler32: crypto
 terminal:
-raid:
+div:
+ehci: cs5536 usb boot pci
 crypto:
 part_bsd: part_msdos
 cs5536: pci
+biosdisk:
 lsapm:
 gcry_sha512: crypto
-biosdisk:
 password: crypto normal
+efiemu: gcry_crc crypto cpuid acpi
 fshelp:
-efiemu: gcry_crc normal acpi
-xnu: bitmap_scale extcmd normal video bitmap boot relocator efiemu
+sleep_test: functional_test datetime
+iorw: extcmd
+xnu: macho bitmap_scale random extcmd video bitmap boot efiemu relocator mmap
 mmap: boot
-iorw: extcmd
+exfctest: functional_test
 zfsinfo: zfs
+ldm: part_gpt diskfilter part_msdos
 cmostest:
+eval: normal
+part_dvh:
+ext2: fshelp
 blocklist:
-ext2: fshelp
+net: priority_queue bufio datetime boot
 drivemap: extcmd boot mmap
 part_acorn:
 videoinfo: video
-btrfs: gzio
+btrfs: lzopio gzio
 lsmmap:
 bitmap:
 vbe: video video_fb
 ntfs: fshelp
-multiboot: vbe video boot relocator mmap lsapm
+multiboot: net vbe video boot relocator mmap lsapm
 gcry_crc: crypto
 png: bufio bitmap
 jpeg: bufio bitmap
+macbless: disk
+div_test: functional_test div
 regexp: extcmd normal
 parttool: normal
 usbserial_pl2303: serial usb usbserial_common
-cpio:
+cpio: archelp
 gcry_rmd160: crypto
-fat:
-zfs:
-raid6rec: raid
-ntldr: boot video relocator
+fat: fshelp
+ufs1_be:
+truecrypt: video boot relocator mmap gzio
+archelp:
+raid6rec: diskfilter
+ntldr: chain video boot relocator
+http: net
+zfs: gzio
 minix2:
+mda_text:
 lsacpi: extcmd acpi
-loadenv: extcmd
+datehook: datetime normal
+loadenv: disk extcmd
 bitmap_scale: bitmap
-datehook: datetime normal
 probe: extcmd
-tar:
-hfs:
+minix3:
+tar: archelp
+hfs: fshelp
+procfs: archelp
 boot:
 keylayouts:
+progress: normal
 kernel:
 usbtest: usb
-relocator:
+relocator: mmap
 acpi: extcmd mmap
 tga: bufio bitmap
-reboot:
+reboot: relocator
 serial: extcmd terminfo
-befs: fshelp
-dm_nv: raid
+zfscrypt: crypto pbkdf2 zfs extcmd gcry_sha1 gcry_rijndael
+dm_nv: diskfilter
+cmp_test: functional_test
+luks: cryptodisk crypto pbkdf2
 font: bufio video
-raid5rec: raid
+raid5rec: diskfilter
+crc64: crypto
 datetime:
+ctz_test: functional_test
 video:
-example_functional_test: functional_test
 pci:
+cbmemc: normal cbtable terminfo
+cmosdump:
 hfsplus: fshelp
 gcry_cast5: crypto
 extcmd:
+squash4: fshelp lzopio xzio gzio
+part_plan:
+minix_be:
 gcry_whirlpool: crypto
-pxe: bufio
+pxe: net boot
 gcry_tiger: crypto
-video_fb: video
 search: search_fs_uuid search_fs_file extcmd search_label
 lspci: extcmd pci
+cbtime: cbtable
+video_fb:
+verify: crypto extcmd mpi gcry_sha1
+minix3_be:
 trig:
-afs_be: fshelp
-msdospart: parttool
+msdospart: disk parttool
+priority_queue:
 gcry_twofish: crypto
+part_dfly:
+xnu_uuid_test: functional_test
+diskfilter:
 testload:
 part_apple:
 hexdump: extcmd
-ata_pthru: ata
+date: datetime normal
 pbkdf2: crypto
 gcry_sha256: crypto
-date: datetime normal
+ls: extcmd normal
 usbserial_common: serial usb
-ls: extcmd normal
 ntfscomp: ntfs
+lzopio: crypto
 video_cirrus: video pci video_fb
+hello: extcmd
 scsi:
-hello: extcmd
-normal: terminal gfxterm crypto extcmd boot
-linux16: boot video relocator mmap
 cat: extcmd
+ahci: ata boot pci
+normal: terminal crypto bufio extcmd boot gettext
+linux16: video boot relocator mmap
 ufs1:
-mdraid09: raid
-lvm:
-chain: boot video
+mdraid09: diskfilter
+lvm: diskfilter
+cbfs: archelp
+chain: video boot relocator
 ufs2:
+time:
 setpci: extcmd pci
+gptsync: disk
+freedos: chain video boot relocator
 search_label:
-gptsync:
 setjmp:
-multiboot2: vbe boot video relocator mmap lsapm acpi
+multiboot2: net vbe video boot relocator mmap lsapm acpi
 gcry_rfc2268: crypto
-mdraid1x: raid
-legacycfg: linux crypto password gcry_md5 normal
+mdraid1x: diskfilter
+mpi: crypto
+legacycfg: linux password crypto gcry_md5 normal
 play:
 part_amiga:
@@ -180,2 +262,3 @@
 gcry_camellia: crypto
 at_keyboard: keylayouts boot
+all_video: vbe vga video_bochs video_cirrus
Index: boot/grub.pc/i386-pc/modinfo.sh
===================================================================
--- boot/grub.pc/i386-pc/modinfo.sh	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
+++ boot/grub.pc/i386-pc/modinfo.sh	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+# User-controllable options
+grub_modinfo_target_cpu=i386
+grub_modinfo_platform=pc
+grub_disk_cache_stats=0
+grub_boot_time_stats=0
+grub_have_font_source=1
+
+# Autodetected config
+grub_have_asm_uscore=0
+grub_bss_start_symbol="__bss_start"
+grub_end_symbol="end"
+
+# Build environment
+grub_target_cc='gcc'
+grub_target_cc_version='gcc (SUSE Linux) 4.8.5'
+grub_target_cflags=' -Os -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value  -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations  -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -march=i386 -m32 -mrtd -mregparm=3 -falign-jumps=1 -falign-loops=1 -falign-functions=1 -freg-struct-return -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow -msoft-float -fno-dwarf2-cfi-asm -mno-stack-arg-probe -fno-asynchronous-unwind-tables -fno-unwind-tables -Qn -fno-stack-protector -Wtrampolines -Werror'
+grub_target_cppflags=' -Wall -W  -DGRUB_MACHINE_PCBIOS=1 -DGRUB_MACHINE=I386_PC -m32 -nostdinc -isystem /usr/lib64/gcc/x86_64-suse-linux/4.8/include -I$(top_srcdir)/include -I$(top_builddir)/include'
+grub_target_ccasflags=' -g  -m32 -msoft-float'
+grub_target_ldflags=' -m32 -Wl,-melf_i386 -Wl,--build-id=none'
+grub_cflags=''
+grub_cppflags=' -D_FILE_OFFSET_BITS=64'
+grub_ccasflags=''
+grub_ldflags=''
+grub_target_strip='strip'
+grub_target_nm='nm'
+grub_target_ranlib='ranlib'
+grub_target_objconf=''
+grub_target_obj2elf=''
+grub_target_img_base_ldopt='-Wl,-Ttext'
+grub_target_img_ldflags='@TARGET_IMG_BASE_LDFLAGS@'
+
+# Version
+grub_version="2.02~beta2"
+grub_package="grub"
+grub_package_string="GRUB 2.02~beta2"
+grub_package_version="2.02~beta2"
+grub_package_name="GRUB"
+grub_package_bugreport="bug-grub@gnu.org"
Index: boot/grub.pc/i386-pc/partmap.lst
===================================================================
--- boot/grub.pc/i386-pc/partmap.lst	(revision 387630023ec8e28732b8956f65e2e48339e327be)
+++ boot/grub.pc/i386-pc/partmap.lst	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -3,6 +3,9 @@
 part_apple
 part_bsd
+part_dfly
+part_dvh
 part_gpt
 part_msdos
+part_plan
 part_sun
 part_sunpc
Index: boot/grub.pc/i386-pc/terminal.lst
===================================================================
--- boot/grub.pc/i386-pc/terminal.lst	(revision 387630023ec8e28732b8956f65e2e48339e327be)
+++ boot/grub.pc/i386-pc/terminal.lst	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -2,6 +2,10 @@
 iserial: serial
 iserial_*: serial
+oaudio: morse
+ocbmemc: cbmemc
 ogfxterm: gfxterm
+omda_text: mda_text
 oserial: serial
 oserial_*: serial
+ospkmodem: spkmodem
 ovga_text: vga_text
Index: kernel/arch/amd64/src/boot/multiboot2.S
===================================================================
--- kernel/arch/amd64/src/boot/multiboot2.S	(revision 387630023ec8e28732b8956f65e2e48339e327be)
+++ kernel/arch/amd64/src/boot/multiboot2.S	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -49,4 +49,5 @@
 	
 	/* Information request tag */
+	.align 8
 	tag_info_req_start:
 		.word MULTIBOOT2_TAG_INFO_REQ
@@ -61,4 +62,5 @@
 	
 	/* Address tag */
+	.align 8
 	tag_address_start:
 		.word MULTIBOOT2_TAG_ADDRESS
@@ -72,4 +74,5 @@
 	
 	/* Entry address tag */
+	.align 8
 	tag_entry_address_start:
 		.word MULTIBOOT2_TAG_ENTRY_ADDRESS
@@ -80,4 +83,5 @@
 	
 	/* Flags tag */
+	.align 8
 	tag_flags_start:
 		.word MULTIBOOT2_TAG_FLAGS
@@ -89,4 +93,5 @@
 #ifdef CONFIG_FB
 	/* Framebuffer tag */
+	.align 8
 	tag_framebuffer_start:
 		.word MULTIBOOT2_TAG_FRAMEBUFFER
@@ -100,4 +105,5 @@
 	
 	/* Module alignment tag */
+	.align 8
 	tag_module_align_start:
 		.word MULTIBOOT2_TAG_MODULE_ALIGN
@@ -108,4 +114,5 @@
 	
 	/* Tag terminator */
+	.align 8
 	tag_terminator_start:
 		.word MULTIBOOT2_TAG_TERMINATOR
Index: kernel/arch/ia32/src/boot/multiboot2.S
===================================================================
--- kernel/arch/ia32/src/boot/multiboot2.S	(revision 387630023ec8e28732b8956f65e2e48339e327be)
+++ kernel/arch/ia32/src/boot/multiboot2.S	(revision cfb1217d7123cbca17cad6d3023e7274209f2e89)
@@ -47,4 +47,5 @@
 	
 	/* Information request tag */
+	.align 8
 	tag_info_req_start:
 		.word MULTIBOOT2_TAG_INFO_REQ
@@ -59,4 +60,5 @@
 	
 	/* Address tag */
+	.align 8
 	tag_address_start:
 		.word MULTIBOOT2_TAG_ADDRESS
@@ -70,4 +72,5 @@
 	
 	/* Entry address tag */
+	.align 8
 	tag_entry_address_start:
 		.word MULTIBOOT2_TAG_ENTRY_ADDRESS
@@ -78,4 +81,5 @@
 	
 	/* Flags tag */
+	.align 8
 	tag_flags_start:
 		.word MULTIBOOT2_TAG_FLAGS
@@ -87,4 +91,5 @@
 #ifdef CONFIG_FB
 	/* Framebuffer tag */
+	.align 8
 	tag_framebuffer_start:
 		.word MULTIBOOT2_TAG_FRAMEBUFFER
@@ -98,4 +103,5 @@
 	
 	/* Module alignment tag */
+	.align 8
 	tag_module_align_start:
 		.word MULTIBOOT2_TAG_MODULE_ALIGN
@@ -106,4 +112,5 @@
 	
 	/* Tag terminator */
+	.align 8
 	tag_terminator_start:
 		.word MULTIBOOT2_TAG_TERMINATOR
