From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Mon, 8 May 2017 15:51:27 +0000 (+0200)
Subject: Merge branch 'master' into arm_coreboot
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0300c6048e52d17ec5c896a267b0e6139e0aa44;p=thirdparty%2Fgrub.git

Merge branch 'master' into arm_coreboot
---

b0300c6048e52d17ec5c896a267b0e6139e0aa44
diff --cc grub-core/Makefile.core.def
index c1f367bd9,fb59a7b1d..ba1178e6a
--- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def
@@@ -154,18 -151,6 +154,21 @@@ kernel = 
    uboot = term/uboot/console.c;
    arm_uboot = kern/arm/uboot/init.c;
    arm_uboot = kern/arm/uboot/uboot.S;
++<<<<<<< HEAD
 +
 +  arm_coreboot = kern/arm/coreboot/init.c;
 +  arm_coreboot = kern/arm/coreboot/timer.c;
 +  arm_coreboot = kern/arm/coreboot/coreboot.S;
 +  arm_coreboot = lib/fdt.c;
 +  arm_coreboot = bus/fdt.c;
 +  arm_coreboot = term/ps2.c;
 +  arm_coreboot = term/arm/pl050.c;
 +  arm_coreboot = term/arm/cros.c;
 +  arm_coreboot = term/arm/cros_ec.c;
 +  arm_coreboot = commands/keylayouts.c;
 +  arm_coreboot = kern/arm/coreboot/dma.c;
++=======
++>>>>>>> master
  
    terminfoinkernel = term/terminfo.c;
    terminfoinkernel = term/tparm.c;