81987f4958
- Try to fix things for new compiler madness. I really don't know why gcc decided __attribute__((packed)) on a "typedef struct" should imply __attribute__((align (1))) and that it should have a warning that it does so. The obvious behavior would be to keep the alignment of the first element unless it's used in another object or type that /also/ hask the packed attribute. Why should it change the default alignment at all? - Merge in the BLS patches Javier and I wrote. - Attempt to fix pmtimer initialization failures to not be super duper slow. Signed-off-by: Peter Jones <pjones@redhat.com>
30 lines
893 B
Diff
30 lines
893 B
Diff
From f168a0803d8d35e431ef6888755f9b2622304846 Mon Sep 17 00:00:00 2001
|
|
From: Fedora Ninjas <grub2-owner@fedoraproject.org>
|
|
Date: Mon, 10 Feb 2014 16:13:10 -0500
|
|
Subject: [PATCH 115/206] Switch to use APM Mustang device tree, for hardware
|
|
testing.
|
|
|
|
Signed-off-by: David A. Marlin <d.marlin@redhat.com>
|
|
---
|
|
util/grub.d/10_linux.in | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
|
index 79a747ebd4d..462b461ff49 100644
|
|
--- a/util/grub.d/10_linux.in
|
|
+++ b/util/grub.d/10_linux.in
|
|
@@ -232,8 +232,8 @@ while [ "x$list" != "x" ] ; do
|
|
|
|
fdt=
|
|
for i in "dtb-${version}" "dtb-${alt_version}"; do
|
|
- if test -e "${dirname}/${i}/foundation-v8.dtb" ; then
|
|
- fdt="${i}/foundation-v8.dtb"
|
|
+ if test -e "${dirname}/${i}/apm-mustang.dtb" ; then
|
|
+ fdt="${i}/apm-mustang.dtb"
|
|
break
|
|
fi
|
|
done
|
|
--
|
|
2.15.0
|
|
|