diff options
| author | Tom Rini <trini@konsulko.com> | 2017-03-24 07:21:57 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-03-24 07:21:57 -0400 |
| commit | c1daa4077365747d4f85ed8c93ba4d318d96a4af (patch) | |
| tree | 4ac54134dd1970f7a98bcc3b9e225ea54d448f86 /common | |
| parent | d0ffda8ed208ff2957cd09ccc37e2d6dff81523e (diff) | |
| parent | 60083261a1b33b492ddb5335c125f1223087068b (diff) | |
Merge git://www.denx.de/git/u-boot-marvell
This mainly adds support for some new boards, like the ARMv8 community
boards MACCHIATOBin and ESPRESSBin
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/common/board_f.c b/common/board_f.c index 7d1ede0404..bb24a633fb 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -751,6 +751,13 @@ static int setup_reloc(void) return 0; } +#ifdef CONFIG_OF_BOARD_FIXUP +static int fix_fdt(void) +{ + return board_fix_fdt((void *)gd->fdt_blob); +} +#endif + /* ARM calls relocate_code from its crt0.S */ #if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) && \ !CONFIG_IS_ENABLED(X86_64) @@ -1012,6 +1019,9 @@ static const init_fnc_t init_sequence_f[] = { #ifdef CONFIG_SYS_EXTBDINFO setup_board_extra, #endif +#ifdef CONFIG_OF_BOARD_FIXUP + fix_fdt, +#endif INIT_FUNC_WATCHDOG_RESET reloc_fdt, setup_reloc, |