Fwd: boot kernel with append device tree

[Alex Vazquez]

Hi Sascha!
I have tested the patch with the version (2016.03.0) and now it works correctly.

Thanks!
Regards!

2016-11-08 8:29 GMT+01:00 Sascha Hauer <s.hauer at pengutronix.de>:
> On Mon, Nov 07, 2016 at 12:01:25PM +0100, Alex Vazquez wrote:
>> > Is CONFIG_OFTREE enabled in your build?
>> Yes.
>
> Ok, could you please try the following patch? Another possibility would
> be to disable CONFIG_OFTREE, but it would be good if you could test the
> patch anyway since the same bug is still present in current master.
>
> Sascha
>
> ----------------------------------8<--------------------------------
>
> From 500e5f87f9943958fa4662e29261a0abb4df24d9 Mon Sep 17 00:00:00 2001
> From: Sascha Hauer <s.hauer at pengutronix.de>
> Date: Tue, 8 Nov 2016 08:23:17 +0100
> Subject: [PATCH] ARM: Fix appended device tree when CONFIG_OFTREE is enabled
>
> When CONFIG_OFTREE is enabled the appended device tree is unflattened
> and put into data->of_root_node, but there it is never used again.
> To actually use the appended device tree put it into data->oftree
> instead.
>
> Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
> ---
>  arch/arm/lib/bootm.c | 13 +++++++++++--
>  1 file changed, 11 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
> index 28b4f4a..8977d08 100644
> --- a/arch/arm/lib/bootm.c
> +++ b/arch/arm/lib/bootm.c
> @@ -244,12 +244,21 @@ static int do_bootz_linux_fdt(int fd, struct image_data *data)
>         }
>
>         if (IS_BUILTIN(CONFIG_OFTREE)) {
> -               data->of_root_node = of_unflatten_dtb(oftree);
> -               if (!data->of_root_node) {
> +               struct device_node *root;
> +
> +               root = of_unflatten_dtb(oftree);
> +               if (!root) {
>                         pr_err("unable to unflatten devicetree\n");
>                         ret = -EINVAL;
>                         goto err_free;
>                 }
> +               data->oftree = of_get_fixed_tree(root);
> +               if (!data->oftree) {
> +                       pr_err("Unable to get fixed tree\n");
> +                       ret = -EINVAL;
> +                       goto err_free;
> +               }
> +
>                 free(oftree);
>         } else {
>                 data->oftree = oftree;
> --
> 2.10.1
>
> --
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |