mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 22:35:28 +00:00
fa8b2484d0
- Pull in fixes for TSC calibration driver preference (prefer pmtimer over PIT) to boot on Apollo Lake systems with no PIT - Fix pmtimer calibration to not take forever to fail on kvm. Signed-off-by: Peter Jones <pjones@redhat.com>
38 lines
1.2 KiB
Diff
38 lines
1.2 KiB
Diff
From c6eaa982d12e3cfc5465dda5ea372774188b6b81 Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
Date: Tue, 9 May 2017 09:02:15 +0200
|
|
Subject: [PATCH 034/198] Missing parts of previous commit
|
|
|
|
---
|
|
grub-core/Makefile.core.def | 2 ++
|
|
grub-core/kern/arm/coreboot/init.c | 1 +
|
|
2 files changed, 3 insertions(+)
|
|
|
|
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
|
|
index d2239f171..1d86bd22e 100644
|
|
--- a/grub-core/Makefile.core.def
|
|
+++ b/grub-core/Makefile.core.def
|
|
@@ -162,6 +162,8 @@ kernel = {
|
|
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 = bus/spi/rk3288_spi.c;
|
|
arm_coreboot = commands/keylayouts.c;
|
|
arm_coreboot = kern/arm/coreboot/dma.c;
|
|
diff --git a/grub-core/kern/arm/coreboot/init.c b/grub-core/kern/arm/coreboot/init.c
|
|
index 0126ff638..8d8c5b829 100644
|
|
--- a/grub-core/kern/arm/coreboot/init.c
|
|
+++ b/grub-core/kern/arm/coreboot/init.c
|
|
@@ -135,6 +135,7 @@ grub_machine_init (void)
|
|
grub_rk3288_spi_init ();
|
|
|
|
grub_machine_timer_init ();
|
|
+ grub_cros_init ();
|
|
grub_pl050_init ();
|
|
}
|
|
|
|
--
|
|
2.14.3
|
|
|