From: Wenyou Yang <wenyou.yang@atmel.com>
Date: Fri, 24 Mar 2017 03:34:04 +0000 (+0800)
Subject: ARM: spl: atmel: bring in serial device before init
X-Git-Tag: v2017.05-rc2~8^2~9
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=730a7b47105ad6b6766344e59bb04c0cbb2e586a;p=oweals%2Fu-boot.git

ARM: spl: atmel: bring in serial device before init

Before setting up the serial communications, bring in the serial
device from the device tree file.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
---

diff --git a/arch/arm/mach-at91/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c
index 688289e7cf..847a30b9a9 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,6 +101,12 @@ void board_init_f(ulong dummy)
 
 	board_early_init_f();
 
+	ret = spl_init();
+	if (ret) {
+		debug("spl_init() failed: %d\n", ret);
+		hang();
+	}
+
 	preloader_console_init();
 
 	mem_init();