diff options
| author | Tom Rini <trini@konsulko.com> | 2017-04-13 17:31:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-13 17:31:06 -0400 |
| commit | b7b24a7a3cd74bb165d28a2959ed9143e3648fbf (patch) | |
| tree | 062fd13092cee10dc8746a1339ecea18f08d21d6 /arch/arm/mach-at91/spl_atmel.c | |
| parent | 1622559066d890f1b7622be0ede8a5d64de66ef3 (diff) | |
| parent | 22e10be456014400788f80d45fc5f5c0b9d4a81d (diff) | |
Merge git://git.denx.de/u-boot-dm
Here with some DM changes as well as the long-standing AT91 DM/DT
conversion patches which I have picked up via dm.
Diffstat (limited to 'arch/arm/mach-at91/spl_atmel.c')
| -rw-r--r-- | arch/arm/mach-at91/spl_atmel.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c index 688289e7cf..b75c2ccefd 100644 --- a/arch/arm/mach-at91/spl_atmel.c +++ b/arch/arm/mach-at91/spl_atmel.c @@ -77,6 +77,8 @@ void s_init(void) void board_init_f(ulong dummy) { + int ret; + switch_to_main_crystal_osc(); #ifdef CONFIG_SAMA5D2 @@ -99,7 +101,14 @@ void board_init_f(ulong dummy) board_early_init_f(); + mem_init(); + + ret = spl_init(); + if (ret) { + debug("spl_init() failed: %d\n", ret); + hang(); + } + preloader_console_init(); - mem_init(); } |