Merge mainline into arm

grub-core/Makefile.core.def

@@ -80,7 +80,7 @@ kernel = {
   mips_qemu_mips_ldflags    = '-Wl,-Ttext,0x80200000';
 
   mips_arc_cppflags = '-DGRUB_DECOMPRESSOR_LINK_ADDR=$(TARGET_DECOMPRESSOR_LINK_ADDR)';
-  mips_loongson_cppflags = '-DUSE_ASCII_FAILBACK';
+  mips_loongson_cppflags = '-DUSE_ASCII_FALLBACK';
   i386_qemu_cppflags     = '-DGRUB_BOOT_MACHINE_LINK_ADDR=$(GRUB_BOOT_MACHINE_LINK_ADDR)';
   emu_cflags = '$(CFLAGS_GNULIB)';
   emu_cppflags = '$(CPPFLAGS_GNULIB)';
@@ -151,6 +151,7 @@ kernel = {
   i386_multiboot = kern/i386/coreboot/init.c;
   i386_qemu = kern/i386/qemu/init.c;
   i386_coreboot_multiboot_qemu = term/i386/pc/vga_text.c;
+  i386_coreboot = video/i386/coreboot/cbfb.c;
 
   efi = disk/efi/efidisk.c;
   efi = kern/efi/efi.c;
@@ -185,6 +186,7 @@ kernel = {
   i386_qemu = kern/i386/qemu/mmap.c;
 
   i386_coreboot = kern/i386/coreboot/mmap.c;
+  i386_coreboot = kern/i386/coreboot/cbtable.c;
 
   i386_multiboot = kern/i386/multiboot_mmap.c;
 
@@ -196,6 +198,7 @@ kernel = {
   mips_qemu_mips = term/ns8250.c;
   mips_qemu_mips = term/serial.c;
   mips_qemu_mips = term/at_keyboard.c;
+  mips_qemu_mips = commands/boot.c;
   mips_qemu_mips = commands/keylayouts.c;
   mips_qemu_mips = term/i386/pc/vga_text.c;
   mips_qemu_mips = kern/vga_init.c;
@@ -210,6 +213,7 @@ kernel = {
   mips_loongson = bus/pci.c;
   mips_loongson = kern/mips/loongson/init.c;
   mips_loongson = term/at_keyboard.c;
+  mips_loongson = commands/boot.c;
   mips_loongson = term/serial.c;
   mips_loongson = video/sm712.c;
   mips_loongson = video/sis315pro.c;
@@ -250,17 +254,12 @@ kernel = {
   videoinkernel = font/font.c;
   videoinkernel = font/font_cmd.c;
   videoinkernel = io/bufio.c;
-  videoinkernel = video/bitmap.c;
-  videoinkernel = video/bitmap_scale.c;
-  videoinkernel = video/colors.c;
   videoinkernel = video/fb/fbblit.c;
   videoinkernel = video/fb/fbfill.c;
   videoinkernel = video/fb/fbutil.c;
   videoinkernel = video/fb/video_fb.c;
   videoinkernel = video/video.c;
 
-  videoinkernel = commands/boot.c;
-
   extra_dist = kern/i386/int.S;
   extra_dist = kern/i386/realmode.S;
   extra_dist = boot/i386/pc/lzma_decode.S;
@@ -419,6 +418,7 @@ image = {
 image = {
   name = lzma_decompress;
   i386_pc = boot/i386/pc/startup_raw.S;
+  i386_pc_nodist = rs_decoder.h;
 
   objcopyflags = '-O binary';
   ldflags = '$(TARGET_IMG_LDFLAGS) $(TARGET_IMG_BASE_LDOPT),0x8200';
@@ -581,22 +581,33 @@ module = {
   enable = x86;
 };
 
+module = {
+  name = cbtable;
+  common = kern/i386/coreboot/cbtable.c;
+  enable = i386_pc;
+  enable = i386_efi;
+  enable = i386_qemu;
+  enable = i386_multiboot;
+  enable = i386_ieee1275;
+  enable = x86_64_efi;
+};
+
 module = {
   name = cbtime;
   common = commands/i386/coreboot/cb_timestamps.c;
-  enable = i386_coreboot;
+  enable = x86;
 };
 
 module = {
   name = cbls;
   common = commands/i386/coreboot/cbls.c;
-  enable = i386_coreboot;
+  enable = x86;
 };
 
 module = {
   name = cbmemc;
   common = term/i386/coreboot/cbmemc.c;
-  enable = i386_coreboot;
+  enable = x86;
 };
 
 module = {
@@ -679,7 +690,12 @@ module = {
   name = boot;
   common = commands/boot.c;
   i386_pc = lib/i386/pc/biosnum.c;
-  enable = videomodules;
+  enable = x86;
+  enable = emu;
+  enable = sparc64_ieee1275;
+  enable = powerpc_ieee1275;
+  enable = mips_arc;
+  enable = ia64_efi;
 };
 
 module = {
@@ -721,6 +737,11 @@ module = {
   common = commands/echo.c;
 };
 
+module = {
+  name = eval;
+  common = commands/eval.c;
+};
+
 module = {
   name = extcmd;
   common = commands/extcmd.c;
@@ -1161,6 +1182,16 @@ module = {
   cppflags = '-I$(srcdir)/lib/posix_wrap -I$(srcdir)/lib/minilzo -DMINILZO_HAVE_CONFIG_H';
 };
 
+module = {
+  name = archelp;
+  common = fs/archelp.c;
+};
+
+module = {
+  name = cbfs;
+  common = fs/cbfs.c;
+};
+
 module = {
   name = cpio;
   common = fs/cpio.c;
@@ -1327,6 +1358,7 @@ module = {
   name = zfs;
   common = fs/zfs/zfs.c;
   common = fs/zfs/zfs_lzjb.c;
+  common = fs/zfs/zfs_lz4.c;
   common = fs/zfs/zfs_sha256.c;
   common = fs/zfs/zfs_fletcher.c;
 };
@@ -1683,6 +1715,11 @@ module = {
   common = partmap/sunpc.c;
 };
 
+module = {
+  name = part_dfly;
+  common = partmap/dfly.c;
+};
+
 module = {
   name = msdospart;
   common = parttool/msdospart.c;
@@ -1700,6 +1737,11 @@ module = {
   enable = videomodules;
 };
 
+module = {
+  name = gfxterm_background;
+  common = term/gfxterm_background.c;
+};
+
 module = {
   name = serial;
   common = term/serial.c;
@@ -1801,13 +1843,11 @@ module = {
 module = {
   name = bitmap;
   common = video/bitmap.c;
-  enable = videomodules;
 };
 
 module = {
   name = bitmap_scale;
   common = video/bitmap_scale.c;
-  enable = videomodules;
 };
 
 module = {
@@ -1856,22 +1896,20 @@ module = {
 module = {
   name = video;
   common = video/video.c;
-  common = video/colors.c;
   enable = videomodules;
 };
 
+module = {
+  name = video_colors;
+  common = video/colors.c;
+};
+
 module = {
   name = ieee1275_fb;
   ieee1275 = video/ieee1275.c;
   enable = powerpc_ieee1275;
 };
 
-module = {
-  name = coreboot_fb;
-  common = video/i386/coreboot/cbfb.c;
-  enable = i386_coreboot;
-};
-
 module = {
   name = sdl;
   emu = video/emu/sdl.c;
@@ -1991,7 +2029,7 @@ module = {
 module = {
   name = keylayouts;
   common = commands/keylayouts.c;
-  enable = videomodules;
+  enable = x86;
 };
 
 module = {