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 ---

arch/arm/dts/at91sam9g45-corvus.dts | 2 ++ configs/corvus_defconfig | 6 ++++++ include/configs/corvus.h | 3 +-- 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/arch/arm/dts/at91sam9g45-corvus.dts b/arch/arm/dts/at91sam9g45-corvus.dts index c207c02..6367996 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 36e6608..ac5eefd 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 3847a19..8b8b122 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