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

Merge branch 'master' into arm_coreboot
---

2fee7bb8decccdf7b69db6684a3305662a073b09
diff --cc grub-core/kern/arm/coreboot/init.c
index f2fc58941,aec75c672..0c021697f
--- a/grub-core/kern/arm/coreboot/init.c
+++ b/grub-core/kern/arm/coreboot/init.c
@@@ -153,9 -133,6 +153,8 @@@ grub_machine_init (void
    grub_fdtbus_init (dtb, dtb_size);
  
    grub_machine_timer_init ();
 +  grub_cros_init ();
 +  grub_pl050_init ();
-   grub_machine_timer_init ();
  }
  
  void