From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andreas =?iso-8859-1?Q?Bie=DFmann?= <andreas@biessmann.org>
Date: Sun, 16 Oct 2016 22:20:07 +0200
Subject: [U-Boot] [U-Boot, v2,
 4/4] board: sama5d2_xplained: Enable an early debug UART
In-Reply-To: <1473734945-23975-5-git-send-email-wenyou.yang@atmel.com>
References: <1473734945-23975-5-git-send-email-wenyou.yang@atmel.com>
Message-ID: <20161016202007.GA30211@mba.int.er.biessmann.org>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On Tue, Sep 13, 2016 at 10:49:05AM +0800, Wenyou Yang wrote:
> Enable an early debug UART to debug problems when an ICE or other
> debug mechanism is not available.
> 
> Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Reviewed-by: Andreas Bie?mann <andreas@biessmann.org>

> ---
> 
> Changes in v2:
>  - Collect Reviewed-by tags.
> 
>  board/atmel/sama5d2_xplained/sama5d2_xplained.c | 14 ++++++++++++++
>  configs/sama5d2_xplained_mmc_defconfig          |  6 ++++++
>  configs/sama5d2_xplained_spiflash_defconfig     |  6 ++++++
>  include/configs/sama5d2_xplained.h              |  2 ++
>  4 files changed, 28 insertions(+)
> 
> diff --git a/board/atmel/sama5d2_xplained/sama5d2_xplained.c b/board/atmel/sama5d2_xplained/sama5d2_xplained.c
> index c94574b..0ae6a7d 100644
> --- a/board/atmel/sama5d2_xplained/sama5d2_xplained.c
> +++ b/board/atmel/sama5d2_xplained/sama5d2_xplained.c
> @@ -7,6 +7,7 @@
>  
>  #include <common.h>
>  #include <atmel_hlcdc.h>
> +#include <debug_uart.h>
>  #include <dm.h>
>  #include <i2c.h>
>  #include <lcd.h>
> @@ -141,12 +142,25 @@ static void board_uart1_hw_init(void)
>  	at91_periph_clk_enable(ATMEL_ID_UART1);
>  }
>  
> +#ifdef CONFIG_DEBUG_UART_BOARD_INIT
> +void board_debug_uart_init(void)
> +{
> +	board_uart1_hw_init();
> +}
> +#endif
> +
> +#ifdef CONFIG_BOARD_EARLY_INIT_F
>  int board_early_init_f(void)
>  {
> +#ifdef CONFIG_DEBUG_UART
> +	debug_uart_init();
> +#else
>  	board_uart1_hw_init();
> +#endif
>  
>  	return 0;
>  }
> +#endif
>  
>  int board_init(void)
>  {
> diff --git a/configs/sama5d2_xplained_mmc_defconfig b/configs/sama5d2_xplained_mmc_defconfig
> index ab1b58b..ba36c8f 100644
> --- a/configs/sama5d2_xplained_mmc_defconfig
> +++ b/configs/sama5d2_xplained_mmc_defconfig
> @@ -44,6 +44,12 @@ CONFIG_SPI_FLASH=y
>  CONFIG_SPI_FLASH_ATMEL=y
>  CONFIG_PINCTRL=y
>  CONFIG_PINCTRL_AT91PIO4=y
> +CONFIG_DEBUG_UART=y
> +CONFIG_DEBUG_UART_ATMEL=y
> +CONFIG_DEBUG_UART_BASE=0xf8020000
> +CONFIG_DEBUG_UART_CLOCK=0
> +CONFIG_DEBUG_UART_BOARD_INIT=y
> +CONFIG_DEBUG_UART_ANNOUNCE=y
>  CONFIG_ATMEL_USART=y
>  CONFIG_DM_SPI=y
>  CONFIG_ATMEL_SPI=y
> diff --git a/configs/sama5d2_xplained_spiflash_defconfig b/configs/sama5d2_xplained_spiflash_defconfig
> index ecba5ef..85f3f9c 100644
> --- a/configs/sama5d2_xplained_spiflash_defconfig
> +++ b/configs/sama5d2_xplained_spiflash_defconfig
> @@ -44,6 +44,12 @@ CONFIG_SPI_FLASH=y
>  CONFIG_SPI_FLASH_ATMEL=y
>  CONFIG_PINCTRL=y
>  CONFIG_PINCTRL_AT91PIO4=y
> +CONFIG_DEBUG_UART=y
> +CONFIG_DEBUG_UART_ATMEL=y
> +CONFIG_DEBUG_UART_BASE=0xf8020000
> +CONFIG_DEBUG_UART_CLOCK=0
> +CONFIG_DEBUG_UART_BOARD_INIT=y
> +CONFIG_DEBUG_UART_ANNOUNCE=y
>  CONFIG_ATMEL_USART=y
>  CONFIG_DM_SPI=y
>  CONFIG_ATMEL_SPI=y
> diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h
> index cada04f..51fabbe 100644
> --- a/include/configs/sama5d2_xplained.h
> +++ b/include/configs/sama5d2_xplained.h
> @@ -15,6 +15,8 @@
>  
>  #include "at91-sama5_common.h"
>  
> +#define CONFIG_BOARD_EARLY_INIT_F
> +
>  #define CONFIG_MISC_INIT_R
>  
>  /* SDRAM */