diff mbox

[U-Boot,v4,3/3] board: at91sam9n12ek: Enable early debug UART

Message ID 20170418065453.7261-4-wenyou.yang@atmel.com
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Wenyou Yang April 18, 2017, 6:54 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>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes in v4:
 - Rebase on the master branch(ad46af0e76) of u-boot-dm git tree.
 - Update the cover-letter.
 - Add Reviewed-by tag.

Changes in v3:
 - Rebase on the master branch (22e10be45) of u-boot-dm git tree.
 - Update the cover-letter.

Changes in v2:
 - Use CONFIG_DEBUG_UART_CLOCK as the input clock for the early
   debug UART.
 - Move out [PATCH 1/4] ARM: dts: at91: add dts files for at91sam9n12ek.

 board/atmel/at91sam9n12ek/at91sam9n12ek.c | 13 +++++++++++++
 configs/at91sam9n12ek_mmc_defconfig       |  6 ++++++
 configs/at91sam9n12ek_nandflash_defconfig |  6 ++++++
 configs/at91sam9n12ek_spiflash_defconfig  |  6 ++++++
 4 files changed, 31 insertions(+)

Comments

Wenyou Yang April 18, 2017, 8:03 a.m. UTC | #1
Hi Simon,

The patches has been rebased on the master branch of u-boot-dm git tree

Could you help take them?


Best Regards,

Wenyou Yang

On 2017/4/18 14:54, Wenyou Yang 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>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v4:
>   - Rebase on the master branch(ad46af0e76) of u-boot-dm git tree.
>   - Update the cover-letter.
>   - Add Reviewed-by tag.
>
> Changes in v3:
>   - Rebase on the master branch (22e10be45) of u-boot-dm git tree.
>   - Update the cover-letter.
>
> Changes in v2:
>   - Use CONFIG_DEBUG_UART_CLOCK as the input clock for the early
>     debug UART.
>   - Move out [PATCH 1/4] ARM: dts: at91: add dts files for at91sam9n12ek.
>
>   board/atmel/at91sam9n12ek/at91sam9n12ek.c | 13 +++++++++++++
>   configs/at91sam9n12ek_mmc_defconfig       |  6 ++++++
>   configs/at91sam9n12ek_nandflash_defconfig |  6 ++++++
>   configs/at91sam9n12ek_spiflash_defconfig  |  6 ++++++
>   4 files changed, 31 insertions(+)
>
> diff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
> index 02b7790627..1105428986 100644
> --- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c
> +++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
> @@ -13,6 +13,7 @@
>   #include <asm/arch/at91_rstc.h>
>   #include <asm/arch/at91_pio.h>
>   #include <asm/arch/clk.h>
> +#include <debug_uart.h>
>   #include <lcd.h>
>   #include <atmel_hlcdc.h>
>   #include <netdev.h>
> @@ -162,10 +163,22 @@ void at91sam9n12ek_usb_hw_init(void)
>   }
>   #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/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig
> index abb07260be..e7e8a014c6 100644
> --- a/configs/at91sam9n12ek_mmc_defconfig
> +++ b/configs/at91sam9n12ek_mmc_defconfig
> @@ -35,6 +35,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=0xfffff200
> +CONFIG_DEBUG_UART_CLOCK=132000000
> +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/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig
> index 1b420e62b8..e626805591 100644
> --- a/configs/at91sam9n12ek_nandflash_defconfig
> +++ b/configs/at91sam9n12ek_nandflash_defconfig
> @@ -35,6 +35,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=0xfffff200
> +CONFIG_DEBUG_UART_CLOCK=132000000
> +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/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig
> index 9048b14de4..a5abcd1f3b 100644
> --- a/configs/at91sam9n12ek_spiflash_defconfig
> +++ b/configs/at91sam9n12ek_spiflash_defconfig
> @@ -35,6 +35,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=0xfffff200
> +CONFIG_DEBUG_UART_CLOCK=132000000
> +CONFIG_DEBUG_UART_BOARD_INIT=y
> +CONFIG_DEBUG_UART_ANNOUNCE=y
>   CONFIG_ATMEL_USART=y
>   CONFIG_DM_SPI=y
>   CONFIG_ATMEL_SPI=y
Simon Glass April 22, 2017, 3:07 a.m. UTC | #2
Hi Simon,

The patches has been rebased on the master branch of u-boot-dm git tree

Could you help take them?


Best Regards,

Wenyou Yang

On 2017/4/18 14:54, Wenyou Yang 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>
> Reviewed-by: Simon Glass <sjg@chromium.org>
> ---
>
> Changes in v4:
>   - Rebase on the master branch(ad46af0e76) of u-boot-dm git tree.
>   - Update the cover-letter.
>   - Add Reviewed-by tag.
>
> Changes in v3:
>   - Rebase on the master branch (22e10be45) of u-boot-dm git tree.
>   - Update the cover-letter.
>
> Changes in v2:
>   - Use CONFIG_DEBUG_UART_CLOCK as the input clock for the early
>     debug UART.
>   - Move out [PATCH 1/4] ARM: dts: at91: add dts files for at91sam9n12ek.
>
>   board/atmel/at91sam9n12ek/at91sam9n12ek.c | 13 +++++++++++++
>   configs/at91sam9n12ek_mmc_defconfig       |  6 ++++++
>   configs/at91sam9n12ek_nandflash_defconfig |  6 ++++++
>   configs/at91sam9n12ek_spiflash_defconfig  |  6 ++++++
>   4 files changed, 31 insertions(+)
>
Applied to u-boot-dm/next, thanks!
diff mbox

Patch

diff --git a/board/atmel/at91sam9n12ek/at91sam9n12ek.c b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
index 02b7790627..1105428986 100644
--- a/board/atmel/at91sam9n12ek/at91sam9n12ek.c
+++ b/board/atmel/at91sam9n12ek/at91sam9n12ek.c
@@ -13,6 +13,7 @@ 
 #include <asm/arch/at91_rstc.h>
 #include <asm/arch/at91_pio.h>
 #include <asm/arch/clk.h>
+#include <debug_uart.h>
 #include <lcd.h>
 #include <atmel_hlcdc.h>
 #include <netdev.h>
@@ -162,10 +163,22 @@  void at91sam9n12ek_usb_hw_init(void)
 }
 #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/at91sam9n12ek_mmc_defconfig b/configs/at91sam9n12ek_mmc_defconfig
index abb07260be..e7e8a014c6 100644
--- a/configs/at91sam9n12ek_mmc_defconfig
+++ b/configs/at91sam9n12ek_mmc_defconfig
@@ -35,6 +35,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=0xfffff200
+CONFIG_DEBUG_UART_CLOCK=132000000
+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/at91sam9n12ek_nandflash_defconfig b/configs/at91sam9n12ek_nandflash_defconfig
index 1b420e62b8..e626805591 100644
--- a/configs/at91sam9n12ek_nandflash_defconfig
+++ b/configs/at91sam9n12ek_nandflash_defconfig
@@ -35,6 +35,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=0xfffff200
+CONFIG_DEBUG_UART_CLOCK=132000000
+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/at91sam9n12ek_spiflash_defconfig b/configs/at91sam9n12ek_spiflash_defconfig
index 9048b14de4..a5abcd1f3b 100644
--- a/configs/at91sam9n12ek_spiflash_defconfig
+++ b/configs/at91sam9n12ek_spiflash_defconfig
@@ -35,6 +35,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=0xfffff200
+CONFIG_DEBUG_UART_CLOCK=132000000
+CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
 CONFIG_ATMEL_USART=y
 CONFIG_DM_SPI=y
 CONFIG_ATMEL_SPI=y