From: Heiko Schocher <hs@denx.de>
Date: Thu, 22 Jun 2017 05:42:50 +0000 (+0200)
Subject: atmel, at91: fix corvus board
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=72fa58931e1e7feef7801b92671c545c7aca32f1;p=u-boot.git

atmel, at91: fix corvus board

since commit: f8b7fff1d5c5 "serial: atmel_usart: Add clk support"
corvus board comes not up anymore. Fix it.

Signed-off-by: Heiko Schocher <hs@denx.de>
---

diff --git a/arch/arm/dts/at91sam9g45-corvus.dts b/arch/arm/dts/at91sam9g45-corvus.dts
index c207c02858..6367996621 100644
--- a/arch/arm/dts/at91sam9g45-corvus.dts
+++ b/arch/arm/dts/at91sam9g45-corvus.dts
@@ -18,6 +18,7 @@
 	compatible = "atmel,at91sam9m10g45ek", "atmel,at91sam9g45", "atmel,at91sam9";
 
 	chosen {
+		u-boot,dm-pre-reloc;
 		stdout-path = &dbgu;
 	};
 
@@ -38,6 +39,7 @@
 	ahb {
 		apb {
 			dbgu: serial@ffffee00 {
+				u-boot,dm-pre-reloc;
 				status = "okay";
 			};
 
diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig
index 36e6608c43..ac5eefd0d8 100644
--- a/configs/corvus_defconfig
+++ b/configs/corvus_defconfig
@@ -6,6 +6,7 @@ CONFIG_TARGET_CORVUS=y
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_SYS_MALLOC_F_LEN=0x800
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_DEFAULT_DEVICE_TREE="at91sam9g45-corvus"
@@ -31,8 +32,13 @@ CONFIG_CMD_DHCP=y
 CONFIG_CMD_PING=y
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
+CONFIG_CLK=y
+CONFIG_CLK_AT91=y
+CONFIG_AT91_UTMI=y
 CONFIG_DFU_NAND=y
 # CONFIG_MMC is not set
+# CONFIG_SPL_DM_SERIAL is not set
+CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
diff --git a/include/configs/corvus.h b/include/configs/corvus.h
index 3847a19cad..8b8b1220b4 100644
--- a/include/configs/corvus.h
+++ b/include/configs/corvus.h
@@ -43,7 +43,6 @@
 #define CONFIG_AT91_GPIO_PULLUP	1	/* keep pullups on peripheral pins */
 
 /* serial console */
-#define CONFIG_ATMEL_USART
 #define CONFIG_USART_BASE		ATMEL_BASE_DBGU
 #define CONFIG_USART_ID			ATMEL_ID_SYS
 
@@ -72,7 +71,7 @@
 #define CONFIG_SYS_SDRAM_SIZE		0x08000000
 
 #define CONFIG_SYS_INIT_SP_ADDR \
-	(CONFIG_SYS_SDRAM_BASE + SZ_4K - GENERATED_GBL_DATA_SIZE)
+	(CONFIG_SYS_SDRAM_BASE + SZ_32K - GENERATED_GBL_DATA_SIZE)
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND