| Message ID | 1345235330-14366-1-git-send-email-joe.hershberger@ni.com |
|---|---|
| State | Accepted |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
Hi Joe, On Fri, 17 Aug 2012 15:28:50 -0500, Joe Hershberger <joe.hershberger@ni.com> wrote: > ARM boards need to change device tree settings as well > > Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> > --- > arch/arm/lib/bootm.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c > index 599547d..2e0b0c1 100644 > --- a/arch/arm/lib/bootm.c > +++ b/arch/arm/lib/bootm.c > @@ -258,6 +258,9 @@ static int create_fdt(bootm_headers_t *images) > fixup_memory_node(*of_flat_tree); > fdt_fixup_ethernet(*of_flat_tree); > fdt_initrd(*of_flat_tree, *initrd_start, *initrd_end, 1); > +#ifdef CONFIG_OF_BOARD_SETUP > + ft_board_setup(*of_flat_tree, gd->bd); > +#endif > > return 0; > } Applied to u-boot-arm/master, thanks! Amicalement,
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 599547d..2e0b0c1 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -258,6 +258,9 @@ static int create_fdt(bootm_headers_t *images) fixup_memory_node(*of_flat_tree); fdt_fixup_ethernet(*of_flat_tree); fdt_initrd(*of_flat_tree, *initrd_start, *initrd_end, 1); +#ifdef CONFIG_OF_BOARD_SETUP + ft_board_setup(*of_flat_tree, gd->bd); +#endif return 0; }
ARM boards need to change device tree settings as well Signed-off-by: Joe Hershberger <joe.hershberger@ni.com> --- arch/arm/lib/bootm.c | 3 +++ 1 file changed, 3 insertions(+)