diff options
Diffstat (limited to 'libre/grub')
| -rw-r--r-- | libre/grub/0006-tsc-Change-default-tsc-calibration-method-to-pmtimer-on-EFI-systems.patch | 31 | ||||
| -rw-r--r-- | libre/grub/PKGBUILD | 17 |
2 files changed, 40 insertions, 8 deletions
diff --git a/libre/grub/0006-tsc-Change-default-tsc-calibration-method-to-pmtimer-on-EFI-systems.patch b/libre/grub/0006-tsc-Change-default-tsc-calibration-method-to-pmtimer-on-EFI-systems.patch new file mode 100644 index 000000000..38dcddad6 --- /dev/null +++ b/libre/grub/0006-tsc-Change-default-tsc-calibration-method-to-pmtimer-on-EFI-systems.patch @@ -0,0 +1,31 @@ +From 446794de8da4329ea532cbee4ca877bcafd0e534 Mon Sep 17 00:00:00 2001 +From: "David E. Box" <david.e.box@linux.intel.com> +Date: Fri, 15 Sep 2017 15:37:05 -0700 +Subject: tsc: Change default tsc calibration method to pmtimer on EFI systems + +On efi systems, make pmtimer based tsc calibration the default over the +pit. This prevents Grub from hanging on Intel SoC systems that power gate +the pit. + +Signed-off-by: David E. Box <david.e.box@linux.intel.com> +Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> +--- + grub-core/kern/i386/tsc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub-core/kern/i386/tsc.c b/grub-core/kern/i386/tsc.c +index 2e85289d8..f266eb131 100644 +--- a/grub-core/kern/i386/tsc.c ++++ b/grub-core/kern/i386/tsc.c +@@ -68,7 +68,7 @@ grub_tsc_init (void) + #ifdef GRUB_MACHINE_XEN + (void) (grub_tsc_calibrate_from_xen () || calibrate_tsc_hardcode()); + #elif defined (GRUB_MACHINE_EFI) +- (void) (grub_tsc_calibrate_from_pit () || grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_efi() || calibrate_tsc_hardcode()); ++ (void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit () || grub_tsc_calibrate_from_efi() || calibrate_tsc_hardcode()); + #elif defined (GRUB_MACHINE_COREBOOT) + (void) (grub_tsc_calibrate_from_pmtimer () || grub_tsc_calibrate_from_pit () || calibrate_tsc_hardcode()); + #else +-- +cgit v1.1-26-g67d0 + diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD index 39899b17f..14efe54da 100644 --- a/libre/grub/PKGBUILD +++ b/libre/grub/PKGBUILD @@ -34,11 +34,12 @@ _UNIFONT_VER='10.0.06' [[ "${CARCH}" = 'i686' ]] && _EMU_ARCH='i386' pkgbase='grub' -pkgname=('grub' 'grub-am335x_bone' 'grub-udoo' 'grub-omap3_beagle' - 'grub-omap3_beagle_xm' 'grub-omap3_beagle_xm_ab') +pkgname=('grub') +[[ $CARCH = armv7h ]] && pkgname+=('grub-am335x_bone' 'grub-udoo' 'grub-omap3_beagle' + 'grub-omap3_beagle_xm' 'grub-omap3_beagle_xm_ab') pkgdesc='GNU GRand Unified Bootloader (2), (Parabola rebranded)' pkgver='2.02' -pkgrel='3.parabola1' +pkgrel='4.parabola1' epoch='2' url='https://www.gnu.org/software/grub/' arch=('x86_64' 'i686' 'armv7h') @@ -78,6 +79,7 @@ source=("https://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz"{,.sig} '0003-10_linux-20_linux_xen-detect-parabola-initramfs.patch' '0004-add-GRUB_COLOR_variables.patch' '0005-Allow_GRUB_to_mount_ext234_filesystems_that_have_the_encryption_feature.patch' + '0006-tsc-Change-default-tsc-calibration-method-to-pmtimer-on-EFI-systems.patch' 'grub.default' '0003-10_linux-20_linux_xen-detect-am335x_bone+am335x_boneblack-devicetree-file.patch' '0003-10_linux-20_linux_xen-detect-omap3_beagle-devicetree-file.patch' @@ -94,6 +96,7 @@ sha256sums=('810b3798d316394f94096ec2797909dbf23c858e48f7b3830826b8daa06b7b0f' '3f68a78ecba0284b9d39af60431236cb2ebc8547d3dc1fb26a1ac7a6b9afbbc7' 'a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29' '535422c510a050d41efe7720dbe54de29e04bdb8f86fd5aea5feb0b24f7abe46' + 'c38f2b2caae33008b35a37d8293d8bf13bf6fd779a4504925da1837fd007aeb5' '959f3d8d65d9504df798924554c3de0e92dfcd39e087b099a5f5e0a9b7885102' '9ece1db537a989ce4dc55ece471883e19b8ab16902f8c4feb68436c3b5700f71' 'de71452b9b0fbfb08ea742e9fa217ab34fddf6312452f155fb9d82ebf1c024a5' @@ -118,6 +121,9 @@ prepare() { msg "Patch to allow GRUB to mount ext2/3/4 filesystems that have the encryption feature" patch -Np1 -i "${srcdir}/0005-Allow_GRUB_to_mount_ext234_filesystems_that_have_the_encryption_feature.patch" + msg "Patch to change default tsc calibration method to pmtimer on EFI systems" + patch -Np1 -i "${srcdir}/0006-tsc-Change-default-tsc-calibration-method-to-pmtimer-on-EFI-systems.patch" + msg 'Fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme' sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "configure.ac" @@ -772,7 +778,6 @@ package_grub() { } package_grub-am335x_bone() { - arch=(armv7h) pkgdesc='GNU GRand Unified Bootloader (2) for BeagleBone and BeagleBone Black (am335x-bone), (Parabola rebranded)' optdepends+=('dosfstools: For grub-mkrescue FAT FS' 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' @@ -806,7 +811,6 @@ package_grub-am335x_bone() { } package_grub-omap3_beagle() { - arch=(armv7h) pkgdesc='GNU GRand Unified Bootloader (2) for BeagleBoard (omap3_beagle), (Parabola rebranded)' provides+=('grub-beagleboard') optdepends+=('dosfstools: For grub-mkrescue FAT FS' @@ -841,7 +845,6 @@ package_grub-omap3_beagle() { } package_grub-omap3_beagle_xm() { - arch=(armv7h) pkgdesc='GNU GRand Unified Bootloader (2) for BeagleBoard-xM (omap3_beagle_xm), (Parabola rebranded)' provides+=('grub-beagleboard') optdepends+=('dosfstools: For grub-mkrescue FAT FS' @@ -876,7 +879,6 @@ package_grub-omap3_beagle_xm() { } package_grub-omap3_beagle_xm_ab() { - arch=(armv7h) pkgdesc='GNU GRand Unified Bootloader (2) for BeagleBoard-xM rev A/B (omap3_beagle_xm_ab), (Parabola rebranded)' provides+=('grub-beagleboard') optdepends+=('dosfstools: For grub-mkrescue FAT FS' @@ -911,7 +913,6 @@ package_grub-omap3_beagle_xm_ab() { } package_grub-udoo() { - arch=(armv7h) pkgdesc='GNU GRand Unified Bootloader (2) for UDOO (udoo), (Parabola rebranded)' optdepends+=('dosfstools: For grub-mkrescue FAT FS' 'os-prober: To detect other OSes when generating grub.cfg in BIOS systems' |