[U-Boot] [PATCH V2 1/2] arm: fix bootm with device tree

[U-Boot] [PATCH V2 1/2] arm: fix bootm with device tree

[Stephen Warren]

From: Stephen Warren <swarren@nvidia.com>

Commit 0a672d4 "arm: Add Prep subcommand support to bootm" re-organized
do_bootm_linux() for ARM. During the re-organization, the code to pass
the device tree to the kernel was removed. Add it back. This restores
the ability to boot a kernel using device tree.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Tom Rini <trini@ti.com>
---
v2: Fix a build warning
---
 arch/arm/lib/bootm.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 1c1bee6..cba457f 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -317,6 +317,7 @@ static void boot_jump_linux(bootm_headers_t *images)
 	unsigned long machid = gd->bd->bi_arch_number;
 	char *s;
 	void (*kernel_entry)(int zero, int arch, uint params);
+	unsigned long r2;
 
 	kernel_entry = (void (*)(int, int, uint))images->ep;
 
@@ -330,7 +331,15 @@ static void boot_jump_linux(bootm_headers_t *images)
 		"...\n", (ulong) kernel_entry);
 	bootstage_mark(BOOTSTAGE_ID_RUN_OS);
 	announce_and_cleanup();
-	kernel_entry(0, machid, gd->bd->bi_boot_params);
+
+#ifdef CONFIG_OF_LIBFDT
+	if (images->ft_len)
+		r2 = (unsigned long)images->ft_addr;
+	else
+#endif
+		r2 = gd->bd->bi_boot_params;
+
+	kernel_entry(0, machid, r2);
 }
 
 /* Main Entry point for arm bootm implementation
-- 
1.7.0.4

[U-Boot] [PATCH V2 2/2] arm: restore fdt_fixup_ethernet call to do_bootm_linux

[Stephen Warren]

From: Stephen Warren <swarren@nvidia.com>

Commit 0a672d4 "arm: Add Prep subcommand support to bootm" re-organized
do_bootm_linux for ARM. During the re-organization, the call to
fdt_fixup_ethernet() was removed. I assume this was useful, so add it
back.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Tom Rini <trini@ti.com>
---
 arch/arm/lib/bootm.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index cba457f..599547d 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -256,6 +256,7 @@ static int create_fdt(bootm_headers_t *images)
 
 	fdt_chosen(*of_flat_tree, 1);
 	fixup_memory_node(*of_flat_tree);
+	fdt_fixup_ethernet(*of_flat_tree);
 	fdt_initrd(*of_flat_tree, *initrd_start, *initrd_end, 1);
 
 	return 0;
-- 
1.7.0.4

[U-Boot] [PATCH V2 1/2] arm: fix bootm with device tree

[Tom Warren]

Stephen,

> -----Original Message-----
> From: Stephen Warren [mailto:swarren at wwwdotorg.org]
> Sent: Thursday, April 19, 2012 2:34 PM
> To: Wolfgang Denk; Tom Rini; Albert ARIBAUD
> Cc: Simon Schwarz; u-boot at lists.denx.de; Tom Warren; Stephen Warren
> Subject: [PATCH V2 1/2] arm: fix bootm with device tree
> 
> From: Stephen Warren <swarren@nvidia.com>
> 
> Commit 0a672d4 "arm: Add Prep subcommand support to bootm" re-organized
> do_bootm_linux() for ARM. During the re-organization, the code to pass the
> device tree to the kernel was removed. Add it back. This restores the
> ability to boot a kernel using device tree.
> 
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> Acked-by: Tom Rini <trini@ti.com>
Acked-by: Tom Warren <twarren@nvidia.com>
Tested-by: Tom Warren <twarren@nvidia.com>

> ---
> v2: Fix a build warning
> ---
>  arch/arm/lib/bootm.c |   11 ++++++++++-
>  1 files changed, 10 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index
> 1c1bee6..cba457f 100644
> --- a/arch/arm/lib/bootm.c
> +++ b/arch/arm/lib/bootm.c
> @@ -317,6 +317,7 @@ static void boot_jump_linux(bootm_headers_t *images)
>  	unsigned long machid = gd->bd->bi_arch_number;
>  	char *s;
>  	void (*kernel_entry)(int zero, int arch, uint params);
> +	unsigned long r2;
> 
>  	kernel_entry = (void (*)(int, int, uint))images->ep;
> 
> @@ -330,7 +331,15 @@ static void boot_jump_linux(bootm_headers_t *images)
>  		"...\n", (ulong) kernel_entry);
>  	bootstage_mark(BOOTSTAGE_ID_RUN_OS);
>  	announce_and_cleanup();
> -	kernel_entry(0, machid, gd->bd->bi_boot_params);
> +
> +#ifdef CONFIG_OF_LIBFDT
> +	if (images->ft_len)
> +		r2 = (unsigned long)images->ft_addr;
> +	else
> +#endif
> +		r2 = gd->bd->bi_boot_params;
> +
> +	kernel_entry(0, machid, r2);
>  }
> 
>  /* Main Entry point for arm bootm implementation
> --
> 1.7.0.4
-- 
nvpublic

[U-Boot] [PATCH V2 1/2] arm: fix bootm with device tree

[Allen Martin]

On Thu, Apr 19, 2012 at 02:34:00PM -0700, Stephen Warren wrote:
> From: Stephen Warren <swarren@nvidia.com>
> 
> Commit 0a672d4 "arm: Add Prep subcommand support to bootm" re-organized
> do_bootm_linux() for ARM. During the re-organization, the code to pass
> the device tree to the kernel was removed. Add it back. This restores
> the ability to boot a kernel using device tree.
> 
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> Acked-by: Tom Rini <trini@ti.com>

Acked-by: Allen Martin <amartin@nvidia.com>
Tested-by: Allen Martin <amartin@nvidia.com>

Verified I can boot a device tree kernel again after applying this.
Thanks for fixing this Stephen, I'm not sure why device tree support
was removed, but it broken tegra bad (and anyone else using device
tree I would imagine).

-Allen

-----------------------------------------------------------------------------------
This email message is for the sole use of the intended recipient(s) and may contain
confidential information.  Any unauthorized review, use, disclosure or distribution
is prohibited.  If you are not the intended recipient, please contact the sender by
reply email and destroy all copies of the original message.
-----------------------------------------------------------------------------------

[U-Boot] [PATCH V2 1/2] arm: fix bootm with device tree

[Wolfgang Denk]

Dear Stephen Warren,

In message <1334871241-11932-1-git-send-email-swarren@wwwdotorg.org> you wrote:
> From: Stephen Warren <swarren@nvidia.com>
> 
> Commit 0a672d4 "arm: Add Prep subcommand support to bootm" re-organized
> do_bootm_linux() for ARM. During the re-organization, the code to pass
> the device tree to the kernel was removed. Add it back. This restores
> the ability to boot a kernel using device tree.
> 
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> Acked-by: Tom Rini <trini@ti.com>
> ---
> v2: Fix a build warning
> ---
>  arch/arm/lib/bootm.c |   11 ++++++++++-
>  1 files changed, 10 insertions(+), 1 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Keep your head and your heart going in the right  direction  and  you
will not have to worry about your feet.