Patchwork [meta-xilinx] xilinx-kernel.bbclass: Fix support for binary device tree generation.

login
register
mail settings
Submitter Elvis Dowson
Date July 15, 2012, 6:16 p.m.
Message ID <1342376212-20391-1-git-send-email-elvis.dowson@gmail.com>
Download mbox | patch
Permalink /patch/32077/
State Accepted
Headers show

Comments

Elvis Dowson - July 15, 2012, 6:16 p.m.
This commit fixes support for binary device tree generation, which was
broken as a result of commit 8c904eb643ad8ca1bc29cb2d870a80b355dcb341
in oe-core:

linux-dtb: add multi-dtb build support
    including following enhancement:
    * support multi-dtb build
    * skip dtb build and install when KERNEL_DEVICETREE is empty
    * print a warning message when specified dts file is not available

Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
---
 classes/xilinx-kernel.bbclass |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
Adrian Alonso - July 17, 2012, 3:29 a.m.
Applied.

Thanks!

On Sun, Jul 15, 2012 at 1:16 PM, Elvis Dowson <elvis.dowson@gmail.com> wrote:
> This commit fixes support for binary device tree generation, which was
> broken as a result of commit 8c904eb643ad8ca1bc29cb2d870a80b355dcb341
> in oe-core:
>
> linux-dtb: add multi-dtb build support
>     including following enhancement:
>     * support multi-dtb build
>     * skip dtb build and install when KERNEL_DEVICETREE is empty
>     * print a warning message when specified dts file is not available
>
> Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
> ---
>  classes/xilinx-kernel.bbclass |   10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/classes/xilinx-kernel.bbclass b/classes/xilinx-kernel.bbclass
> index 14f4c7d..7c51b3d 100644
> --- a/classes/xilinx-kernel.bbclass
> +++ b/classes/xilinx-kernel.bbclass
> @@ -22,16 +22,14 @@ def device_tree(a, d):
>
>      board = bb.data.getVar('XILINX_BOARD', d, 1)
>      cpu = bb.data.getVar('TARGET_CPU', d, 1)
> -
>      if re.match('powerpc', a):
>          target = cpu + '-' + board
> -        dts = 'arch/' + a + '/boot/dts/virtex' + target + '.dts'
> +        dts = '${S}/arch/' + a + '/boot/dts/virtex' + target + '.dts'
>      else:
>          target = 'system'
> -        dts = 'arch/' + a + '/boot/dts/' + target + '.dts'
> +        dts = '${S}/arch/' + a + '/boot/dts/' + target + '.dts'
>
>      bb.data.setVar('KERNEL_TARGET', target, d)
> -
>      return dts
>
>
> @@ -44,10 +42,10 @@ if [ -n "${XILINX_BSP_PATH}" ]; then
>                 if [ -e "$dts" ]; then
>                         bbnote "Xilinx BSP device tree located in: ${dts}"
>                         if [ "${TARGET_ARCH}" = "powerpc" ]; then
> -                               bbnote "Replacing linux kernel powerpc device tree to match located hardware model"
> +                               bbnote "Replacing linux kernel powerpc device tree to match located hardware model: virtex${KERNEL_TARGET}.dts"
>                                 cp -pP ${dts} ${S}/arch/powerpc/boot/dts/virtex${KERNEL_TARGET}.dts
>                         else
> -                               bbnote "Replacing linux kernel microblaze device tree to match located hardware model"
> +                               bbnote "Replacing linux kernel microblaze device tree to match located hardware model: ${KERNEL_TARGET}.dts"
>                                 cp -pP ${dts} ${S}/arch/microblaze/platform/generic/${KERNEL_TARGET}.dts
>                         fi
>                 else
> --
> 1.7.9.5
>

Patch

diff --git a/classes/xilinx-kernel.bbclass b/classes/xilinx-kernel.bbclass
index 14f4c7d..7c51b3d 100644
--- a/classes/xilinx-kernel.bbclass
+++ b/classes/xilinx-kernel.bbclass
@@ -22,16 +22,14 @@  def device_tree(a, d):
 
     board = bb.data.getVar('XILINX_BOARD', d, 1)
     cpu = bb.data.getVar('TARGET_CPU', d, 1)
-
     if re.match('powerpc', a):
         target = cpu + '-' + board
-        dts = 'arch/' + a + '/boot/dts/virtex' + target + '.dts'
+        dts = '${S}/arch/' + a + '/boot/dts/virtex' + target + '.dts'
     else:
         target = 'system'
-        dts = 'arch/' + a + '/boot/dts/' + target + '.dts'
+        dts = '${S}/arch/' + a + '/boot/dts/' + target + '.dts'
 
     bb.data.setVar('KERNEL_TARGET', target, d)
-
     return dts
 
 
@@ -44,10 +42,10 @@  if [ -n "${XILINX_BSP_PATH}" ]; then
 		if [ -e "$dts" ]; then
 			bbnote "Xilinx BSP device tree located in: ${dts}"
 			if [ "${TARGET_ARCH}" = "powerpc" ]; then
-				bbnote "Replacing linux kernel powerpc device tree to match located hardware model"
+				bbnote "Replacing linux kernel powerpc device tree to match located hardware model: virtex${KERNEL_TARGET}.dts"
 				cp -pP ${dts} ${S}/arch/powerpc/boot/dts/virtex${KERNEL_TARGET}.dts
 			else
-				bbnote "Replacing linux kernel microblaze device tree to match located hardware model"
+				bbnote "Replacing linux kernel microblaze device tree to match located hardware model: ${KERNEL_TARGET}.dts"
 				cp -pP ${dts} ${S}/arch/microblaze/platform/generic/${KERNEL_TARGET}.dts
 			fi
 		else