Attachment 615583 Details for Bug 859542 – grubby patch to change the way the kernel load address is determined

[patch] grubby patch to change the way the kernel load address is determined

0001-Change-the-way-the-kernel-load-address-is-determined.patch (text/plain), 2.46 KB, created by D. Marlin on 2012-09-21 19:27:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: D. Marlin

Created: 2012-09-21 19:27:55 UTC

Size: 2.46 KB

patch

obsolete

>From 05d32ed3f270a9eb3ad45b387cc4a641930bb142 Mon Sep 17 00:00:00 2001
>From: "d.marlin" <dmarlin@redhat.com>
>Date: Tue, 28 Aug 2012 13:31:11 -0500
>Subject: [PATCH grubby/master] Change the way the kernel load address is
> determined for ARM U-Boot.
>
>
>The kernel load address was initially determined by using the
>Hardware entry in /proc/cpuinfo to identify the platform.  This
>involved a substring match that was inexact, and was based on the
>host hardware, and not the package being installed.
>
>This patch changes grubby to use the kernel flavor (last component
>of the kernel-release) of the kernel package being installed to
>determine the platform.  This approach also allows a kernel to
>be installed from a host that differs from the target platform
>when using tools like livemedia-creator.
>
>Signed-off-by: David A. Marlin <dmarlin@redhat.com>
>---
> new-kernel-pkg |   26 +++++++++++++-------------
> 1 file changed, 13 insertions(+), 13 deletions(-)
>
>diff --git a/new-kernel-pkg b/new-kernel-pkg
>index 44a67db..7ec2e5a 100755
>--- a/new-kernel-pkg
>+++ b/new-kernel-pkg
>@@ -88,22 +88,10 @@ elif [[ ${ARCH} =~ armv[5|7].*l ]] ; then
>     ubootDevice=/dev/${UBOOT_DEVICE:-"mmcblk0p1"}
>     ubootDefaultImage=${UBOOT_UIMAGE:-"uImage"}
>     ubootDefaultInitrd=${UBOOT_UINITRD:-"uInitrd"}
>+    ubootAddress=${UBOOT_IMGADDR:-"0x00008000"}
>     mounted=""
>     liloFlag=""
>     isx86=""
>-    if [ -z "$UBOOT_IMGADDR" ]; then
>-	machine=${MACHINE:-`grep "^Hardware" /proc/cpuinfo | sed 's/Hardware\s*:\s*//'`}
>-	# A few machines use an alternate kernel load address
>-	if [[ "$machine" =~ ^OMAP[3|4].* ]]; then
>-	    ubootAddress=0x80008000
>-	elif [[ "$machine" =~ ^Efika\ MX.* ]]; then
>-	    ubootAddress=0x90008000
>-	else
>-	    ubootAddress=0x00008000
>-	fi
>-    else
>-	ubootAddress="$UBOOT_IMGADDR"
>-    fi
> else
>     # this leaves i?86 and x86_64
>     liloConfig=/etc/lilo.conf
>@@ -762,6 +750,18 @@ if [ -n "$ubootDir" ]; then
>     fi
> fi
> 
>+# if we're using U-Boot, check if the default load address should change
>+if [ -n "$cfguBoot" -a -z "$UBOOT_IMGADDR" ]; then 
>+    [[ $version  =~ .([^.]*)$ ]] 
>+    platform=${BASH_REMATCH[1]}
>+    # A few platforms use an alternate kernel load address
>+    if [ "$platform" = "omap" ]; then
>+        ubootAddress=0x80008000
>+    elif [ "$platform" = "imx" ]; then
>+        ubootAddress=0x90008000
>+    fi
>+fi
>+
> # if we have a lilo config on an x86 box, see if the default boot loader
> # is lilo to determine if it should be run
> if [ -n "$cfgLilo" -a -n "$isx86" ]; then
>-- 
>1.7.10.2
>

Actions: View | Diff

Attachments on bug 859542: 615583