| Message ID | 1395435098-30003-2-git-send-email-m-karicheri2@ti.com |
|---|---|
| State | New |
| Headers | show |
Hi, On 21 March 2014 13:51, Murali Karicheri <m-karicheri2@ti.com> wrote: > From: Vitaly Andrianov <vitalya@ti.com> > > The keystone2 SOC requires to fix all 32 bit aliased addresses > to their 36 physical format. This has to happen after all fdt > nodes are added or modified. > > Signed-off-by: Vitaly Andrianov <vitalya@ti.com> > Signed-off-by: Murali Karicheri <m-karicheri2@ti.com> > Acked-by: Tom Rini <trini@ti.com> > --- > common/image-fdt.c | 5 +++++ > include/fdt_support.h | 1 + > 2 files changed, 6 insertions(+) > > diff --git a/common/image-fdt.c b/common/image-fdt.c > index a54a919..5d64009 100644 > --- a/common/image-fdt.c > +++ b/common/image-fdt.c > @@ -487,5 +487,10 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, > if (!ft_verify_fdt(blob)) > return -1; > > +#ifdef CONFIG_SOC_K2HK > + if (IMAGE_OF_BOARD_SETUP) > + ft_board_setup_ex(blob, gd->bd); > +#endif > + > return 0; > } > diff --git a/include/fdt_support.h b/include/fdt_support.h > index 9871e2f..4c1416d 100644 > --- a/include/fdt_support.h > +++ b/include/fdt_support.h > @@ -63,6 +63,7 @@ int fdt_pci_dma_ranges(void *blob, int phb_off, struct pci_controller *hose); > #endif > > void ft_board_setup(void *blob, bd_t *bd); > +void ft_board_setup_ex(void *blob, bd_t *bd); Please can we get a comment added to this function explaining what it is for? > void ft_cpu_setup(void *blob, bd_t *bd); > void ft_pci_setup(void *blob, bd_t *bd); Regards, Simon
diff --git a/common/image-fdt.c b/common/image-fdt.c index a54a919..5d64009 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -487,5 +487,10 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, if (!ft_verify_fdt(blob)) return -1; +#ifdef CONFIG_SOC_K2HK + if (IMAGE_OF_BOARD_SETUP) + ft_board_setup_ex(blob, gd->bd); +#endif + return 0; } diff --git a/include/fdt_support.h b/include/fdt_support.h index 9871e2f..4c1416d 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -63,6 +63,7 @@ int fdt_pci_dma_ranges(void *blob, int phb_off, struct pci_controller *hose); #endif void ft_board_setup(void *blob, bd_t *bd); +void ft_board_setup_ex(void *blob, bd_t *bd); void ft_cpu_setup(void *blob, bd_t *bd); void ft_pci_setup(void *blob, bd_t *bd);