[U-Boot] [U-Boot, v2, 4/8] board: sama5d4_xplained: enable early debug UART

[Andreas Bießmann]

On Fri, Oct 28, 2016 at 03:16:45PM +0800, Wenyou Yang wrote:
> Enable early debug UART to debug problems when an ICE or other
> debug mechanism is not available.
> 
> Signed-off-by: Wenyou Yang <wenyou.yang at atmel.com>

Reviewed-by: Andreas Bießmann <andreas at biessmann.org>

> ---
> 
> Changes in v2: None
> 
>  board/atmel/sama5d4_xplained/sama5d4_xplained.c | 15 ++++++++++++++-
>  configs/sama5d4_xplained_mmc_defconfig          |  6 ++++++
>  configs/sama5d4_xplained_nandflash_defconfig    |  6 ++++++
>  configs/sama5d4_xplained_spiflash_defconfig     |  6 ++++++
>  include/configs/sama5d4_xplained.h              |  2 ++
>  5 files changed, 34 insertions(+), 1 deletion(-)
> 
> diff --git a/board/atmel/sama5d4_xplained/sama5d4_xplained.c b/board/atmel/sama5d4_xplained/sama5d4_xplained.c
> index 2b51e4c..c46a7a4 100644
> --- a/board/atmel/sama5d4_xplained/sama5d4_xplained.c
> +++ b/board/atmel/sama5d4_xplained/sama5d4_xplained.c
> @@ -16,6 +16,7 @@
>  #include <asm/arch/sama5d3_smc.h>
>  #include <asm/arch/sama5d4.h>
>  #include <atmel_hlcdc.h>
> +#include <debug_uart.h>
>  #include <lcd.h>
>  #include <net.h>
>  #include <netdev.h>
> @@ -197,12 +198,24 @@ static void sama5d4_xplained_serial3_hw_init(void)
>  	at91_periph_clk_enable(ATMEL_ID_USART3);
>  }
>  
> -int board_early_init_f(void)
> +#ifdef CONFIG_DEBUG_UART_BOARD_INIT
> +void board_debug_uart_init(void)
>  {
>  	sama5d4_xplained_serial3_hw_init();
> +}
> +#endif
>  
> +#ifdef CONFIG_BOARD_EARLY_INIT_F
> +int board_early_init_f(void)
> +{
> +#ifdef CONFIG_DEBUG_UART
> +	debug_uart_init();
> +#else
> +	sama5d4_xplained_serial3_hw_init();
> +#endif
>  	return 0;
>  }
> +#endif
>  
>  int board_init(void)
>  {
> diff --git a/configs/sama5d4_xplained_mmc_defconfig b/configs/sama5d4_xplained_mmc_defconfig
> index e25b26a..e7518e8 100644
> --- a/configs/sama5d4_xplained_mmc_defconfig
> +++ b/configs/sama5d4_xplained_mmc_defconfig
> @@ -46,6 +46,12 @@ CONFIG_SPI_FLASH_ATMEL=y
>  CONFIG_PINCTRL=y
>  CONFIG_PINCTRL_AT91=y
>  CONFIG_DM_SERIAL=y
> +CONFIG_DEBUG_UART=y
> +CONFIG_DEBUG_UART_ATMEL=y
> +CONFIG_DEBUG_UART_BASE=0xfc00c000
> +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/sama5d4_xplained_nandflash_defconfig b/configs/sama5d4_xplained_nandflash_defconfig
> index 53dfdd6..790d7d1 100644
> --- a/configs/sama5d4_xplained_nandflash_defconfig
> +++ b/configs/sama5d4_xplained_nandflash_defconfig
> @@ -45,6 +45,12 @@ CONFIG_SPI_FLASH_ATMEL=y
>  CONFIG_PINCTRL=y
>  CONFIG_PINCTRL_AT91=y
>  CONFIG_DM_SERIAL=y
> +CONFIG_DEBUG_UART=y
> +CONFIG_DEBUG_UART_ATMEL=y
> +CONFIG_DEBUG_UART_BASE=0xfc00c000
> +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/sama5d4_xplained_spiflash_defconfig b/configs/sama5d4_xplained_spiflash_defconfig
> index 17fd9a2..af6263f 100644
> --- a/configs/sama5d4_xplained_spiflash_defconfig
> +++ b/configs/sama5d4_xplained_spiflash_defconfig
> @@ -45,6 +45,12 @@ CONFIG_SPI_FLASH_ATMEL=y
>  CONFIG_PINCTRL=y
>  CONFIG_PINCTRL_AT91=y
>  CONFIG_DM_SERIAL=y
> +CONFIG_DEBUG_UART=y
> +CONFIG_DEBUG_UART_ATMEL=y
> +CONFIG_DEBUG_UART_BASE=0xfc00c000
> +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/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h
> index 1173583..8032164 100644
> --- a/include/configs/sama5d4_xplained.h
> +++ b/include/configs/sama5d4_xplained.h
> @@ -15,6 +15,8 @@
>  
>  #include "at91-sama5_common.h"
>  
> +#define CONFIG_BOARD_EARLY_INIT_F
> +
>  /* SDRAM */
>  #define CONFIG_NR_DRAM_BANKS		1
>  #define CONFIG_SYS_SDRAM_BASE           ATMEL_BASE_DDRCS