mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-27 23:34:51 +00:00
7e98da058f
This change reorganizes and cleanups our patches to reduce the patch number from 314 patches to 187. That's achieved by dropping patches that are later reverted and squashing fixes for earlier patches that introduced features. There are no code changes and the diff with upstream is the same before and after the cleanup. Having fewer patches makes easier to manage the patchset and also will ease to rebase them on top of the latest grub-2.04 release. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
68 lines
2 KiB
Diff
68 lines
2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Tue, 14 Jan 2014 13:12:23 -0500
|
|
Subject: [PATCH] Add devicetree loading
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
|
Switch to use APM Mustang device tree, for hardware testing.
|
|
|
|
Signed-off-by: David A. Marlin <d.marlin@redhat.com>
|
|
|
|
Use the default device tree from the grub default file
|
|
|
|
instead of hardcoding a value.
|
|
|
|
Signed-off-by: David A. Marlin <dmarlin@redhat.com>
|
|
---
|
|
util/grub-mkconfig.in | 3 ++-
|
|
util/grub.d/10_linux.in | 15 +++++++++++++++
|
|
2 files changed, 17 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
|
|
index b0a8626dd1c..f68d4925ee6 100644
|
|
--- a/util/grub-mkconfig.in
|
|
+++ b/util/grub-mkconfig.in
|
|
@@ -254,7 +254,8 @@ export GRUB_DEFAULT \
|
|
GRUB_ENABLE_CRYPTODISK \
|
|
GRUB_BADRAM \
|
|
GRUB_OS_PROBER_SKIP_LIST \
|
|
- GRUB_DISABLE_SUBMENU
|
|
+ GRUB_DISABLE_SUBMENU \
|
|
+ GRUB_DEFAULT_DTB
|
|
|
|
if test "x${grub_cfg}" != "x"; then
|
|
rm -f "${grub_cfg}.new"
|
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
|
index 87a7da34982..233754ff296 100644
|
|
--- a/util/grub.d/10_linux.in
|
|
+++ b/util/grub.d/10_linux.in
|
|
@@ -153,6 +153,13 @@ EOF
|
|
sed "s/^/$submenu_indentation/" << EOF
|
|
echo '$(echo "$message" | grub_quote)'
|
|
initrd $(echo $initrd_path)
|
|
+EOF
|
|
+ fi
|
|
+ if test -n "${fdt}" ; then
|
|
+ message="$(gettext_printf "Loading fdt ...")"
|
|
+ sed "s/^/$submenu_indentation/" << EOF
|
|
+ echo '$(echo "$message" | grub_quote)'
|
|
+ devicetree ${rel_dirname}/${fdt}
|
|
EOF
|
|
fi
|
|
sed "s/^/$submenu_indentation/" << EOF
|
|
@@ -236,6 +243,14 @@ while [ "x$list" != "x" ] ; do
|
|
gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2
|
|
fi
|
|
|
|
+ fdt=
|
|
+ for i in "dtb-${version}" "dtb-${alt_version}"; do
|
|
+ if test -f "${dirname}/${i}/${GRUB_DEFAULT_DTB}" ; then
|
|
+ fdt="${i}/${GRUB_DEFAULT_DTB}"
|
|
+ break
|
|
+ fi
|
|
+ done
|
|
+
|
|
config=
|
|
for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
|
|
if test -e "${i}" ; then
|