Message ID | 20170414005148.25042-7-wenyou.yang@atmel.com |
---|---|
State | Accepted |
Delegated to: | Simon Glass |
Headers | show |
On 13 April 2017 at 18:51, 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 v5: > - Rebase on the master branch (22e10be45) of u-boot-dm git tree. > - Update the cover-letter. > > Changes in v4: None > Changes in v3: > - Convert the macb to support DM and clean up macb init code. > - Remain the SPI speed macros. > - Update the config options for SPL. > - Update the commit log. > - Remove the unneeded dbgu init during board_early_init_f stage. > - Use CONFIG_DEBUG_UART_CLOCK as the input clock for the early > debug uart. > - Drop [PATCH] configs: sama5d3_xplained: move CONFIG_SYS_NO_FLASH > to defconfig. > - Rebase on v2017.03. > > Changes in v2: > - rebase on the patch set: > [PATCH v3 0/8] board: sama5d4: convert boards to support DM/DT > http://lists.denx.de/pipermail/u-boot/2017-February/280506.html > > board/atmel/sama5d3_xplained/sama5d3_xplained.c | 13 ++++++++++++- > configs/sama5d3_xplained_mmc_defconfig | 6 ++++++ > configs/sama5d3_xplained_nandflash_defconfig | 6 ++++++ > 3 files changed, 24 insertions(+), 1 deletion(-) Applied to u-boot-dm, thanks!
diff --git a/board/atmel/sama5d3_xplained/sama5d3_xplained.c b/board/atmel/sama5d3_xplained/sama5d3_xplained.c index f2f5506adc..21f332b382 100644 --- a/board/atmel/sama5d3_xplained/sama5d3_xplained.c +++ b/board/atmel/sama5d3_xplained/sama5d3_xplained.c @@ -12,6 +12,7 @@ #include <asm/arch/at91_rstc.h> #include <asm/arch/gpio.h> #include <asm/arch/clk.h> +#include <debug_uart.h> #include <spl.h> #include <asm/arch/atmel_mpddrc.h> #include <asm/arch/at91_wdt.h> @@ -65,12 +66,22 @@ static void sama5d3_xplained_mci0_hw_init(void) } #endif -int board_early_init_f(void) +#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/sama5d3_xplained_mmc_defconfig b/configs/sama5d3_xplained_mmc_defconfig index 921b6a2112..d28d1d9a33 100644 --- a/configs/sama5d3_xplained_mmc_defconfig +++ b/configs/sama5d3_xplained_mmc_defconfig @@ -54,6 +54,12 @@ CONFIG_PINCTRL=y CONFIG_SPL_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/sama5d3_xplained_nandflash_defconfig b/configs/sama5d3_xplained_nandflash_defconfig index 042f6a78e7..8cc8169de5 100644 --- a/configs/sama5d3_xplained_nandflash_defconfig +++ b/configs/sama5d3_xplained_nandflash_defconfig @@ -51,6 +51,12 @@ CONFIG_PINCTRL=y CONFIG_SPL_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
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 v5: - Rebase on the master branch (22e10be45) of u-boot-dm git tree. - Update the cover-letter. Changes in v4: None Changes in v3: - Convert the macb to support DM and clean up macb init code. - Remain the SPI speed macros. - Update the config options for SPL. - Update the commit log. - Remove the unneeded dbgu init during board_early_init_f stage. - Use CONFIG_DEBUG_UART_CLOCK as the input clock for the early debug uart. - Drop [PATCH] configs: sama5d3_xplained: move CONFIG_SYS_NO_FLASH to defconfig. - Rebase on v2017.03. Changes in v2: - rebase on the patch set: [PATCH v3 0/8] board: sama5d4: convert boards to support DM/DT http://lists.denx.de/pipermail/u-boot/2017-February/280506.html board/atmel/sama5d3_xplained/sama5d3_xplained.c | 13 ++++++++++++- configs/sama5d3_xplained_mmc_defconfig | 6 ++++++ configs/sama5d3_xplained_nandflash_defconfig | 6 ++++++ 3 files changed, 24 insertions(+), 1 deletion(-)