diff mbox

[U-Boot,v2,3/3] board: at91sam9m10g45ek: Enable early debug UART

Message ID 20170412090342.19543-4-wenyou.yang@atmel.com
State Accepted
Commit 6a991af2d1ba386c1be95af084bf51a250ed5fea
Delegated to: Andreas Bießmann
Headers show

Commit Message

Wenyou Yang April 12, 2017, 9:03 a.m. UTC
Enable the 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>
---

Changes in v2:
 - Move out [PATCH] ARM: dts: at91: Add dts files for at91sam9m10g45ek.
 - Add [PATCH] board: at91sam9m10g45ek: Enable early debug UART

 board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 13 +++++++++++++
 configs/at91sam9m10g45ek_mmc_defconfig          |  6 ++++++
 configs/at91sam9m10g45ek_nandflash_defconfig    |  6 ++++++
 3 files changed, 25 insertions(+)

Comments

Simon Glass April 16, 2017, 7:31 p.m. UTC | #1
On 12 April 2017 at 03:03, Wenyou Yang <wenyou.yang@atmel.com> wrote:
> Enable the 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>
> ---
>
> Changes in v2:
>  - Move out [PATCH] ARM: dts: at91: Add dts files for at91sam9m10g45ek.
>  - Add [PATCH] board: at91sam9m10g45ek: Enable early debug UART
>
>  board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 13 +++++++++++++
>  configs/at91sam9m10g45ek_mmc_defconfig          |  6 ++++++
>  configs/at91sam9m10g45ek_nandflash_defconfig    |  6 ++++++
>  3 files changed, 25 insertions(+)

Reviewed-by: Simon Glass <sjg@chromium.org>
diff mbox

Patch

diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
index 2e8ea053fc..d3bc5c69d4 100644
--- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
+++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
@@ -7,6 +7,7 @@ 
  */
 
 #include <common.h>
+#include <debug_uart.h>
 #include <asm/io.h>
 #include <asm/arch/clk.h>
 #include <asm/arch/at91sam9g45_matrix.h>
@@ -242,10 +243,22 @@  void lcd_show_board_info(void)
 #endif /* CONFIG_LCD_INFO */
 #endif
 
+#ifdef CONFIG_DEBUG_UART_BOARD_INIT
+void board_debug_uart_init(void)
+{
+	at91_seriald_hw_init();
+}
+#endif
+
+#ifdef CONFIG_BOARD_EARLY_INIT_F
 int board_early_init_f(void)
 {
+#ifdef CONFIG_DEBUG_UART
+	debug_uart_init();
+#endif
 	return 0;
 }
+#endif
 
 int board_init(void)
 {
diff --git a/configs/at91sam9m10g45ek_mmc_defconfig b/configs/at91sam9m10g45ek_mmc_defconfig
index b0933406af..18b6ddf7cf 100644
--- a/configs/at91sam9m10g45ek_mmc_defconfig
+++ b/configs/at91sam9m10g45ek_mmc_defconfig
@@ -37,6 +37,12 @@  CONFIG_MACB=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=0xffffee00
+CONFIG_DEBUG_UART_CLOCK=132000000
+CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_DM_USB=y
diff --git a/configs/at91sam9m10g45ek_nandflash_defconfig b/configs/at91sam9m10g45ek_nandflash_defconfig
index e8324e71f3..eda54a4f39 100644
--- a/configs/at91sam9m10g45ek_nandflash_defconfig
+++ b/configs/at91sam9m10g45ek_nandflash_defconfig
@@ -37,6 +37,12 @@  CONFIG_MACB=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=0xffffee00
+CONFIG_DEBUG_UART_CLOCK=132000000
+CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ATMEL_USART=y
 CONFIG_USB=y
 CONFIG_DM_USB=y