Attachment 889181 Details for Bug 1088933 – add support to new-kernel-pkg to update fdtdir on 32 bit arm

[patch] add support to new-kernel-pkg to update fdtdir on 32 bit arm

0001-Add-support-to-new-kernel-pkg-for-updating-fdtdir-in.patch (text/plain), 3.08 KB, created by Dennis Gilmore on 2014-04-24 03:30:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dennis Gilmore

Created: 2014-04-24 03:30:10 UTC

Size: 3.08 KB

patch

obsolete

>From ea8170e91609ca00382f7f578ea10ccbba41daeb Mon Sep 17 00:00:00 2001
>From: Dennis Gilmore <dennis@ausil.us>
>Date: Wed, 23 Apr 2014 22:19:38 -0500
>Subject: [PATCH] Add support to new-kernel-pkg for updating fdtdir in extlinux
> (#1088933)
>
>On 32 bit arm we need to tell u-boot a directory where it can find dtb
>files. Extend the devicetree support to allow for files and directories.
>Pass --devtree onto grubby when adding or updating extlinux entries,
>additionally check for the existance of the dtb directory and ensure
>that it is used on 32 bit arm systems.
>---
> new-kernel-pkg | 22 ++++++++++++++++++----
> 1 file changed, 18 insertions(+), 4 deletions(-)
>
>diff --git a/new-kernel-pkg b/new-kernel-pkg
>index d9a9b67..5016e06 100755
>--- a/new-kernel-pkg
>+++ b/new-kernel-pkg
>@@ -7,7 +7,7 @@
> # run of depmod/removal of depmod generated files
> # addition/removal of kernel images from grub/lilo configuration (via grubby)
> #
>-# Copyright 2002-2008 Red Hat, Inc.  All rights reserved.
>+# Copyright 2002-2014 Red Hat, Inc.  All rights reserved.
> #
> # This program is free software; you can redistribute it and/or modify
> # it under the terms of the GNU General Public License as published by
>@@ -153,7 +153,7 @@ install() {
>     fi
> 
>     DEVTREE=""
>-    if [ "x$devtreefile" != "x" -a -f "$devtreefile" ]; then
>+    if [ "x$devtreefile" != "x" -a -f "$devtreefile" -o -d "$devtreefile" ]; then
> 	[ -n "$verbose" ] && echo "found $devtreefile and using it with grubby"
> 	DEVTREE="--devtree $devtreefile"
>     fi
>@@ -264,7 +264,7 @@ install() {
> 	[ -n "$verbose" ] && echo "adding $version to $extlinuxConfig"
> 
> 	$grubby --extlinux -c $extlinuxConfig \
>-	    --add-kernel=$kernelImage \
>+	    --add-kernel=$kernelImage $DEVTREE \
> 	    $INITRD --copy-default $makedefault --title "$title" \
> 	    ${mbkernel:+--add-multiboot="$mbkernel"} ${mbargs:+--mbargs="$mbargs"} \
> 	    --args="root=$rootdevice $kernargs" --remove-kernel="TITLE=$title"
>@@ -411,6 +411,13 @@ update() {
> 	fi
>     fi
> 
>+    DEVTREE=""
>+    if [ "x$devtreefile" != "x" -a -f "$devtreefile" -o -d "$devtreefile" ]; then
>+        [ -n "$verbose" ] && echo "found $devtreefile and using it with grubby"
>+        DEVTREE="--devtree $devtreefile"
>+    fi
>+
>+
>     if [ -n "$cfgGrub" ]; then
> 	[ -n "$verbose" ] && echo "updating $version from $grubConfig"
> 	$grubby --grub -c $grubConfig \
>@@ -499,7 +506,7 @@ update() {
> 	[ -n "$verbose" ] && echo "updating $version from $extlinuxConfig"
> 	$grubby --extlinux -c $extlinuxConfig \
> 	    --update-kernel=$kernelImage \
>-	    $INITRD \
>+	    $DEVTREE $INITRD \
> 	    ${kernargs:+--args="$kernargs"} \
> 	    ${removeargs:+--remove-args="$removeargs"}
>     else
>@@ -724,6 +731,13 @@ if [ -z "$initrdfile" ]; then
> fi
> [ -n "$verbose" ] && echo "initrdfile is $initrdfile"
> 
>+if [[ ${ARCH} =~ armv[5|7].*l ]]; then
>+  if [ -d "$bootPrefix/dtb-$version/" ]; then
>+    devtreefile="$bootPrefix/dtb-$version/"
>+  fi
>+fi
>+[ -n "$verbose" ] && echo "devtreefile is $devtreefile"
>+
> # add dracut i18n, keyboard and plymouth kernel args if requested
> if [ -n "$dracut" -o -n "$adddracutargs" ]; then
>     if [ -r /etc/vconsole.conf ]; then
>-- 
>1.9.0
>

Actions: View | Diff

Attachments on bug 1088933: 888179 | 889181 | 913961 | 913962 | 946192 | 946193 | 946195